X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=b9eb487199d561068c283b5a75c913d218b4fb94;hb=d00ee5e0ec545a77b645d8faaf6961deb7073346;hp=cdd14fbf661609a7917c2ade9201a0c6513e61e0;hpb=f60e21560324db2d229d2297ae79ec39b8d818b3;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index cdd14fb..b9eb487 100644
--- a/epa.el
+++ b/epa.el
@@ -32,6 +32,16 @@
   "The EasyPG Assistant"
   :group 'epg)
 
+(defcustom epa-armor nil
+  "If non-nil, epa commands create ASCII armored output."
+  :type 'boolean
+  :group 'epa)
+
+(defcustom epa-textmode nil
+  "If non-nil, epa commands treat input files as text."
+  :type 'boolean
+  :group 'epa)
+
 (defgroup epa-faces nil
   "Faces for epa-mode."
   :group 'epa)
@@ -189,9 +199,9 @@
 		      ? ))
 	    (epg-sub-key-id primary-sub-key)
 	    " "
-	    (if (stringp (epg-user-id-name primary-user-id))
-		(epg-user-id-name primary-user-id)
-	      (epg-decode-dn (epg-user-id-name primary-user-id))))))
+	    (if (stringp (epg-user-id-string primary-user-id))
+		(epg-user-id-string primary-user-id)
+	      (epg-decode-dn (epg-user-id-string primary-user-id))))))
 
 (defun epa-key-widget-button-face-get (widget)
   (let ((validity (epg-sub-key-validity (car (epg-key-sub-key-list
@@ -221,6 +231,7 @@
   ;; if buffer-file-name is not set.
   (font-lock-set-defaults)
   (widget-setup)
+  (make-local-variable 'epa-exit-buffer-function)
   (run-hooks 'epa-keys-mode-hook))
 
 (defvar epa-key-mode-map
@@ -273,28 +284,37 @@
 		     (or (next-single-property-change point 'epa-list-keys)
 			 (point-max)))
       (goto-char point))
-    (epa-list-keys-1 context name mode)
+    (epa-insert-keys context name mode)
     (epa-keys-mode))
   (make-local-variable 'epa-list-keys-arguments)
   (setq epa-list-keys-arguments (list name mode protocol))
   (goto-char (point-min))
   (pop-to-buffer (current-buffer)))
 
-(defun epa-list-keys-1 (context name mode)
-  (save-restriction
-    (narrow-to-region (point) (point))
-    (let ((inhibit-read-only t)
-	  buffer-read-only
-	  (keys (epg-list-keys context name mode))
-	  point)
-      (while keys
-	(setq point (point))
-	(insert "  ")
-	(put-text-property point (point) 'epa-key (car keys))
-	(widget-create 'epa-key :value (car keys))
-	(insert "\n")
-	(setq keys (cdr keys))))      
-    (put-text-property (point-min) (point-max) 'epa-list-keys t)))
+(defun epa-insert-keys (context name mode)
+  (save-excursion
+    (save-restriction
+      (narrow-to-region (point) (point))
+      (let ((keys (epg-list-keys context name mode))
+	    point)
+	(while keys
+	  (setq point (point))
+	  (insert "  ")
+	  (add-text-properties point (point)
+			       (list 'epa-key (car keys)
+				     'front-sticky nil
+				     'rear-nonsticky t
+				     'start-open t
+				     'end-open t))
+	  (widget-create 'epa-key :value (car keys))
+	  (insert "\n")
+	  (setq keys (cdr keys))))      
+      (add-text-properties (point-min) (point-max)
+			   (list 'epa-list-keys t
+				 'front-sticky nil
+				 'rear-nonsticky t
+				 'start-open t
+				 'end-open t)))))
 
 (defun epa-marked-keys ()
   (or (save-excursion
@@ -312,7 +332,14 @@
 	  (if key
 	      (list key))))))
 
-(defun epa-select-keys (context prompt &optional names mode)
+;;;###autoload
+(defun epa-select-keys (context prompt &optional names secret)
+  "Display a user's keyring and ask him to select keys.
+CONTEXT is an epg-context.
+PROMPT is a string to prompt with.
+NAMES is a list of strings to be matched with keys.  If it is nil, all
+the keys are listed.
+If SECRET is non-nil, list secret keys instead of public keys."
   (save-excursion
     (unless (and epa-keys-buffer
 		 (buffer-live-p epa-keys-buffer))
@@ -339,23 +366,23 @@
       (if names
 	  (while names
 	    (setq point (point))
-	    (epa-list-keys-1 context (car names) mode)
+	    (epa-insert-keys context (car names) secret)
 	    (goto-char point)
 	    (epa-mark)
 	    (goto-char (point-max))
 	    (setq names (cdr names)))
-	(epa-list-keys-1 context nil mode))
+	(epa-insert-keys context nil secret))
       (epa-keys-mode)
       (setq epa-exit-buffer-function #'abort-recursive-edit)
       (goto-char (point-min))
-      (pop-to-buffer (current-buffer))
-      (unwind-protect
+      (pop-to-buffer (current-buffer)))
+    (unwind-protect
 	  (progn
 	    (recursive-edit)
 	    (epa-marked-keys))
 	(if (get-buffer-window epa-keys-buffer)
 	    (delete-window (get-buffer-window epa-keys-buffer)))
-	(kill-buffer epa-keys-buffer)))))
+	(kill-buffer epa-keys-buffer))))
 
 (defun epa-show-key (key)
   (let* ((primary-sub-key (car (epg-key-sub-key-list key)))
@@ -384,9 +411,9 @@
 			       epg-key-validity-alist)))
 		" ")
 	      " "
-	      (if (stringp (epg-user-id-name (car pointer)))
-		  (epg-user-id-name (car pointer))
-		(epg-decode-dn (epg-user-id-name (car pointer))))
+	      (if (stringp (epg-user-id-string (car pointer)))
+		  (epg-user-id-string (car pointer))
+		(epg-decode-dn (epg-user-id-string (car pointer))))
 	      "\n")
       (setq pointer (cdr pointer)))
     (setq pointer (epg-key-sub-key-list key))
@@ -427,7 +454,8 @@
   (epa-show-key (widget-get widget :value)))
 
 (defun epa-mark (&optional arg)
-  "Mark the current line."
+  "Mark the current line.
+If ARG is non-nil, unmark the current line."
   (interactive "P")
   (let ((inhibit-read-only t)
 	buffer-read-only
@@ -440,15 +468,20 @@
     (forward-line)))
 
 (defun epa-unmark (&optional arg)
-  "Unmark the current line."
+  "Unmark the current line.
+If ARG is non-nil, mark the current line."
   (interactive "P")
   (epa-mark (not arg)))
 
 (defun epa-exit-buffer ()
+  "Exit the current buffer.
+`epa-exit-buffer-function' is called if it is set."
   (interactive)
   (funcall epa-exit-buffer-function))
 
+;;;###autoload
 (defun epa-decrypt-file (file)
+  "Decrypt FILE."
   (interactive "fFile: ")
   (let* ((default-name (file-name-sans-extension file))
 	 (plain (expand-file-name
@@ -461,9 +494,15 @@
 	 (context (epg-make-context)))
     (message "Decrypting %s..." (file-name-nondirectory file))
     (epg-decrypt-file context file plain)
-    (message "Decrypting %s...done" (file-name-nondirectory file))))
+    (message "Decrypting %s...done" (file-name-nondirectory file))
+    (if (epg-context-result-for context 'verify)
+	(message "%s"
+		 (epg-verify-result-to-string
+		  (epg-context-result-for context 'verify))))))
 
+;;;###autoload
 (defun epa-verify-file (file)
+  "Verify FILE."
   (interactive "fFile: ")
   (let* ((context (epg-make-context))
 	 (plain (if (equal (file-name-extension file) "sig")
@@ -475,48 +514,222 @@
 	     (epg-verify-result-to-string
 	      (epg-context-result-for context 'verify)))))
 
-(defun epa-sign-file (file detached)
+;;;###autoload
+(defun epa-sign-file (file signers mode)
+  "Sign FILE by SIGNERS keys selected."
   (interactive
    (list (expand-file-name (read-file-name "File: "))
-	 (y-or-n-p "Make a detached signature? ")))
-  (let ((signature (concat file (if detached ".sig" ".gpg")))
+	 (epa-select-keys (epg-make-context) "Select keys for signing.
+If no one is selected, default secret key is used.  "
+			  nil t)
+	 (if (y-or-n-p "Make a detached signature? ")
+	     'detached
+	   (if (y-or-n-p "Make a cleartext signature? ")
+	       'clear))))
+  (let ((signature (concat file
+			   (if (or epa-armor
+				   (not (memq mode '(nil t normal detached))))
+			       ".asc"
+			     (if (memq mode '(t detached))
+				 ".sig"
+			       ".gpg"))))
 	(context (epg-make-context)))
+    (epg-context-set-armor context epa-armor)
+    (epg-context-set-textmode context epa-textmode)
+    (epg-context-set-signers context signers)
     (message "Signing %s..." (file-name-nondirectory file))
-    (epg-sign-file context file signature (not (null detached)))
+    (epg-sign-file context file signature mode)
     (message "Signing %s...done" (file-name-nondirectory file))))
 
+;;;###autoload
 (defun epa-encrypt-file (file recipients)
+  "Encrypt FILE for RECIPIENTS."
   (interactive
    (list (expand-file-name (read-file-name "File: "))
 	 (epa-select-keys (epg-make-context) "Select recipents for encryption.
 If no one is selected, symmetric encryption will be performed.  ")))
-  (let ((cipher (concat file ".gpg"))
+  (let ((cipher (concat file (if epa-armor ".asc" ".gpg")))
 	(context (epg-make-context)))
+    (epg-context-set-armor context epa-armor)
+    (epg-context-set-textmode context epa-textmode)
     (message "Encrypting %s..." (file-name-nondirectory file))
     (epg-encrypt-file context file recipients cipher)
     (message "Encrypting %s...done" (file-name-nondirectory file))))
 
-(defun epa-delete-keys (keys)
+;;;###autoload
+(defun epa-decrypt-region (start end)
+  "Decrypt the current region between START and END.
+
+Don't use this command in Lisp programs!"
+  (interactive "r")
+  (save-excursion
+    (let ((context (epg-make-context))
+	  plain)
+      (message "Decrypting...")
+      (setq plain (epg-decrypt-string context (buffer-substring start end)))
+      (message "Decrypting...done")
+      (delete-region start end)
+      (goto-char start)
+      (insert (decode-coding-string plain coding-system-for-read))
+      (if (epg-context-result-for context 'verify)
+	  (message "%s"
+		   (epg-verify-result-to-string
+		    (epg-context-result-for context 'verify)))))))
+
+;;;###autoload
+(defun epa-decrypt-armor-in-region (start end)
+  "Decrypt OpenPGP armors in the current region between START and END.
+
+Don't use this command in Lisp programs!"
+  (interactive "r")
+  (save-excursion
+    (save-restriction
+      (narrow-to-region start end)
+      (goto-char start)
+      (let (armor-start armor-end charset coding-system)
+	(while (re-search-forward "-----BEGIN PGP MESSAGE-----$" nil t)
+	  (setq armor-start (match-beginning 0)
+		armor-end (re-search-forward "^-----END PGP MESSAGE-----$"
+					     nil t))
+	  (unless armor-end
+	    (error "No armor tail"))
+	  (goto-char armor-start)
+	  (if (re-search-forward "^Charset: \\(.*\\)" armor-end t)
+	      (setq charset (match-string 1)))
+	  (if coding-system-for-read
+	      (setq coding-system coding-system-for-read)
+	    (if charset
+		(setq coding-system (intern (downcase charset)))
+	      (setq coding-system 'utf-8)))
+	  (let ((coding-system-for-read coding-system))
+	    (epa-decrypt-region start end)))))))
+
+;;;###autoload
+(defun epa-verify-region (start end)
+  "Verify the current region between START and END.
+
+Don't use this command in Lisp programs!"
+  (interactive "r")
+  (let ((context (epg-make-context)))
+    (epg-verify-string context
+		       (encode-coding-string
+			(buffer-substring start end)
+			coding-system-for-write))
+    (message "%s"
+	     (epg-verify-result-to-string
+	      (epg-context-result-for context 'verify)))))
+
+;;;###autoload
+(defun epa-verify-armor-in-region (start end)
+  "Verify OpenPGP armors in the current region between START and END.
+
+Don't use this command in Lisp programs!"
+  (interactive "r")
+  (save-excursion
+    (save-restriction
+      (narrow-to-region start end)
+      (goto-char start)
+      (let (armor-start armor-end)
+	(while (re-search-forward "-----BEGIN PGP\\( SIGNED\\)? MESSAGE-----$"
+				  nil t)
+	  (setq armor-start (match-beginning 0))
+	  (if (match-beginning 1)	;cleartext signed message
+	      (progn
+		(unless (re-search-forward "^-----BEGIN PGP SIGNATURE-----$"
+					   nil t)
+		  (error "Invalid cleartext signed message"))
+		(setq armor-end (re-search-forward
+				 "^-----END PGP SIGNATURE-----$"
+				 nil t)))
+	    (setq armor-end (re-search-forward
+			     "^-----END PGP MESSAGE-----$"
+			     nil t)))
+	  (unless armor-end
+	    (error "No armor tail"))
+	  (epa-verify-region armor-start armor-end))))))
+
+;;;###autoload
+(defun epa-sign-region (start end signers mode)
+  "Sign the current region between START and END by SIGNERS keys selected.
+
+Don't use this command in Lisp programs!"
+  (interactive
+   (list (region-beginning) (region-end)
+	 (epa-select-keys (epg-make-context) "Select keys for signing.
+If no one is selected, default secret key is used.  "
+			  nil t)
+	 (if (y-or-n-p "Make a detached signature? ")
+	     'detached
+	   (if (y-or-n-p "Make a cleartext signature? ")
+	       'clear))))
+  (save-excursion
+    (let ((context (epg-make-context))
+	  signature)
+      (epg-context-set-armor context epa-armor)
+      (epg-context-set-textmode context epa-textmode)
+      (epg-context-set-signers context signers)
+      (message "Signing...")
+      (setq signature (epg-sign-string context
+				       (encode-coding-string
+					(buffer-substring start end)
+					coding-system-for-write)
+				       mode))
+      (message "Signing...done")
+      (delete-region start end)
+      (insert (decode-coding-string signature coding-system-for-read)))))
+
+;;;###autoload
+(defun epa-encrypt-region (start end recipients)
+  "Encrypt the current region between START and END for RECIPIENTS.
+
+Don't use this command in Lisp programs!"
+  (interactive
+   (list (region-beginning) (region-end)
+	 (epa-select-keys (epg-make-context) "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  ")))
+  (save-excursion
+    (let ((context (epg-make-context))
+	  cipher)
+      (epg-context-set-armor context epa-armor)
+      (epg-context-set-textmode context epa-textmode)
+      (message "Encrypting...")
+      (setq cipher (epg-encrypt-string context
+				       (encode-coding-string
+					(buffer-substring start end)
+					coding-system-for-write)
+				       recipients))
+      (message "Encrypting...done")
+      (delete-region start end)
+      (insert cipher))))
+
+;;;###autoload
+(defun epa-delete-keys (keys &optional allow-secret)
+  "Delete selected KEYS."
   (interactive
    (let ((keys (epa-marked-keys)))
      (unless keys
        (error "No keys selected"))
-     (list keys)))
+     (list keys
+	   (eq (nth 1 epa-list-keys-arguments) t))))
   (let ((context (epg-make-context)))
     (message "Deleting...")
-    (epg-delete-keys context keys)
-    (apply #'epa-list-keys epa-list-keys-arguments)
-    (message "Deleting...done")))
+    (epg-delete-keys context keys allow-secret)
+    (message "Deleting...done")
+    (apply #'epa-list-keys epa-list-keys-arguments)))
 
+;;;###autoload
 (defun epa-import-keys (file)
+  "Import keys from FILE."
   (interactive "fFile: ")
   (let ((context (epg-make-context)))
     (message "Importing %s..." (file-name-nondirectory file))
     (epg-import-keys-from-file context (expand-file-name file))
-    (apply #'epa-list-keys epa-list-keys-arguments)
-    (message "Importing %s...done" (file-name-nondirectory file))))
+    (message "Importing %s...done" (file-name-nondirectory file))
+    (apply #'epa-list-keys epa-list-keys-arguments)))
 
+;;;###autoload
 (defun epa-export-keys (keys file)
+  "Export selected KEYS to FILE."
   (interactive
    (let ((keys (epa-marked-keys))
 	 default-name)
@@ -525,7 +738,7 @@ If no one is selected, symmetric encryption will be performed.  ")))
      (setq default-name
 	   (expand-file-name
 	    (concat (epg-sub-key-id (car (epg-key-sub-key-list (car keys))))
-		    ".gpg")
+		    (if epa-armor ".asc" ".gpg"))
 	    default-directory))
      (list keys
 	   (expand-file-name
@@ -536,11 +749,15 @@ If no one is selected, symmetric encryption will be performed.  ")))
 	     (file-name-directory default-name)
 	     default-name)))))
   (let ((context (epg-make-context)))
+    (epg-context-set-armor context epa-armor)
     (message "Exporting to %s..." (file-name-nondirectory file))
     (epg-export-keys-to-file context keys file)
     (message "Exporting to %s...done" (file-name-nondirectory file))))
 
+;;;###autoload
 (defun epa-sign-keys (keys &optional local)
+  "Sign selected KEYS.
+If LOCAL is non-nil, the signature is marked as non exportable."
   (interactive
    (let ((keys (epa-marked-keys)))
      (unless keys