X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=1a84de3c41a9498077b25b2a0e6fb084d9e3a7bd;hb=6ea4768dfc6993c0553985ee7855e8ce51f766a9;hp=6ebf0ac4f5f0590482c343724d6aa6cc1ace8238;hpb=2d3d6273c5f1646356f4dd08f428bb7dc67b92fa;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index 6ebf0ac..1a84de3 100644
--- a/epa.el
+++ b/epa.el
@@ -32,6 +32,12 @@
   "The EasyPG Assistant"
   :group 'epg)
 
+(defcustom epa-protocol 'OpenPGP
+  "The default protocol."
+  :type '(choice (const :tag "OpenPGP" OpenPGP)
+		 (const :tag "CMS" CMS))
+  :group 'epa)
+
 (defcustom epa-armor nil
   "If non-nil, epa commands create ASCII armored output."
   :type 'boolean
@@ -41,7 +47,18 @@
   "If non-nil, epa commands treat input files as text."
   :type 'boolean
   :group 'epa)
-  
+
+(defcustom epa-popup-info-window t
+  "If non-nil, status information from epa commands is displayed on
+the separate window."
+  :type 'boolean
+  :group 'epa)
+
+(defcustom epa-info-window-height 5
+  "Number of lines used to display status information."
+  :type 'integer
+  :group 'epa)
+
 (defgroup epa-faces nil
   "Faces for epa-mode."
   :group 'epa)
@@ -154,6 +171,8 @@
 (defvar epa-key-buffer-alist nil)
 (defvar epa-key nil)
 (defvar epa-list-keys-arguments nil)
+(defvar epa-info-buffer nil)
+(defvar epa-last-coding-system-specified nil)
 
 (defvar epa-keys-mode-map
   (let ((keymap (make-sparse-keymap)))
@@ -162,7 +181,6 @@
     (define-key keymap "d" 'epa-decrypt-file)
     (define-key keymap "v" 'epa-verify-file)
     (define-key keymap "s" 'epa-sign-file)
-    (define-key keymap "S" 'epa-sign-keys)
     (define-key keymap "e" 'epa-encrypt-file)
     (define-key keymap "r" 'epa-delete-keys)
     (define-key keymap "i" 'epa-import-keys)
@@ -175,20 +193,30 @@
     (define-key keymap "q" 'epa-exit-buffer)
     keymap))
 
+(defvar epa-key-mode-map
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap "q" 'bury-buffer)
+    keymap))
+
+(defvar epa-info-mode-map
+  (let ((keymap (make-sparse-keymap)))
+    (define-key keymap "q" 'delete-window)
+    keymap))
+
 (defvar epa-exit-buffer-function #'bury-buffer)
 
 (define-widget 'epa-key 'push-button
   "Button for representing a epg-key object."
   :format "%[%v%]"
-  :button-face-get 'epa-key-widget-button-face-get
-  :value-create 'epa-key-widget-value-create
-  :action 'epa-key-widget-action
-  :help-echo 'epa-key-widget-help-echo)
+  :button-face-get 'epa--key-widget-button-face-get
+  :value-create 'epa--key-widget-value-create
+  :action 'epa--key-widget-action
+  :help-echo 'epa--key-widget-help-echo)
 
-(defun epa-key-widget-action (widget &optional event)
-  (epa-show-key (widget-get widget :value)))
+(defun epa--key-widget-action (widget &optional event)
+  (epa--show-key (widget-get widget :value)))
 
-(defun epa-key-widget-value-create (widget)
+(defun epa--key-widget-value-create (widget)
   (let* ((key (widget-get widget :value))
 	 (primary-sub-key (car (epg-key-sub-key-list key)))
 	 (primary-user-id (car (epg-key-user-id-list key))))
@@ -199,22 +227,32 @@
 		      ? ))
 	    (epg-sub-key-id primary-sub-key)
 	    " "
-	    (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))))))
+	    (if 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)
+(defun epa--key-widget-button-face-get (widget)
   (let ((validity (epg-sub-key-validity (car (epg-key-sub-key-list
 					      (widget-get widget :value))))))
     (if validity
 	(cdr (assq validity epa-validity-face-alist))
       'default)))
 
-(defun epa-key-widget-help-echo (widget)
+(defun epa--key-widget-help-echo (widget)
   (format "Show %s"
 	  (epg-sub-key-id (car (epg-key-sub-key-list
 				(widget-get widget :value))))))
 
+(if (fboundp 'encode-coding-string)
+    (defalias 'epa--encode-coding-string 'encode-coding-string)
+  (defalias 'epa--encode-coding-string 'identity))
+
+(if (fboundp 'decode-coding-string)
+    (defalias 'epa--decode-coding-string 'decode-coding-string)
+  (defalias 'epa--decode-coding-string 'identity))
+
 (defun epa-keys-mode ()
   "Major mode for `epa-list-keys'."
   (kill-all-local-variables)
@@ -224,23 +262,16 @@
 	truncate-lines t
 	buffer-read-only t)
   (use-local-map epa-keys-mode-map)
-  (set-keymap-parent (current-local-map) widget-keymap)
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(epa-font-lock-keywords t))
   ;; In XEmacs, auto-initialization of font-lock is not effective
   ;; 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
-  (let ((keymap (make-sparse-keymap)))
-    (define-key keymap "q" 'bury-buffer)
-    keymap))
-
 (defun epa-key-mode ()
-  "Major mode for `epa-show-key'."
+  "Major mode for a key description."
   (kill-all-local-variables)
   (buffer-disable-undo)
   (setq major-mode 'epa-key-mode
@@ -256,19 +287,61 @@
   (make-local-variable 'epa-exit-buffer-function)
   (run-hooks 'epa-key-mode-hook))
 
+(defun epa-info-mode ()
+  "Major mode for `epa-info-buffer'."
+  (kill-all-local-variables)
+  (buffer-disable-undo)
+  (setq major-mode 'epa-info-mode
+	mode-name "Info"
+	truncate-lines t
+	buffer-read-only t)
+  (use-local-map epa-info-mode-map)
+  (run-hooks 'epa-info-mode-hook))
+
+(defun epa-mark (&optional arg)
+  "Mark the current line.
+If ARG is non-nil, unmark the current line."
+  (interactive "P")
+  (let ((inhibit-read-only t)
+	buffer-read-only
+	properties)
+    (beginning-of-line)
+    (setq properties (text-properties-at (point)))
+    (delete-char 1)
+    (insert (if arg " " "*"))
+    (set-text-properties (1- (point)) (point) properties)
+    (forward-line)))
+
+(defun epa-unmark (&optional arg)
+  "Unmark the current line.
+If ARG is non-nil, mark the current line."
+  (interactive "P")
+  (epa-mark (not arg)))
+
+(defun epa-toggle-mark ()
+  "Toggle the mark the current line."
+  (interactive)
+  (epa-mark (eq (char-after (save-excursion (beginning-of-line) (point))) ?*)))
+
+(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-list-keys (&optional name mode protocol)
+(defun epa-list-keys (&optional name mode)
+  "List all keys matched with NAME from the keyring.
+If MODE is non-nil, it reads the private keyring.  Otherwise, it
+reads the public keyring."
   (interactive
    (if current-prefix-arg
        (let ((name (read-string "Pattern: "
 				(if epa-list-keys-arguments
 				    (car epa-list-keys-arguments)))))
 	 (list (if (equal name "") nil name)
-	       (y-or-n-p "Secret keys? ")
-	       (intern (completing-read "Protocol? "
-					'(("OpenPGP") ("CMS"))
-					nil t))))
-     (or epa-list-keys-arguments (list nil nil nil))))
+	       (y-or-n-p "Secret keys? ")))
+     (or epa-list-keys-arguments (list nil nil))))
   (unless (and epa-keys-buffer
 	       (buffer-live-p epa-keys-buffer))
     (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
@@ -276,7 +349,7 @@
   (let ((inhibit-read-only t)
 	buffer-read-only
 	(point (point-min))
-	(context (epg-make-context protocol)))
+	(context (epg-make-context epa-protocol)))
     (unless (get-text-property point 'epa-list-keys)
       (setq point (next-single-property-change point 'epa-list-keys)))
     (when point
@@ -284,30 +357,41 @@
 		     (or (next-single-property-change point 'epa-list-keys)
 			 (point-max)))
       (goto-char point))
-    (epa-list-keys-1 context name mode)
-    (epa-keys-mode))
+    (epa--insert-keys context name mode)
+    (epa-keys-mode)
+    (widget-setup)
+    (set-keymap-parent (current-local-map) widget-keymap))
   (make-local-variable 'epa-list-keys-arguments)
-  (setq epa-list-keys-arguments (list name mode protocol))
+  (setq epa-list-keys-arguments (list name mode))
   (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-marked-keys ()
+(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
 	(set-buffer epa-keys-buffer)
 	(goto-char (point-min))
@@ -336,8 +420,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
 		 (buffer-live-p epa-keys-buffer))
       (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
     (let ((inhibit-read-only t)
-	  buffer-read-only
-	  point)
+	  buffer-read-only)
       (set-buffer epa-keys-buffer)
       (erase-buffer)
       (insert prompt "\n")
@@ -356,26 +439,32 @@ If SECRET is non-nil, list secret keys instead of public keys."
       (insert "\n\n")
       (if names
 	  (while names
-	    (setq point (point))
-	    (epa-list-keys-1 context (car names) secret)
-	    (goto-char point)
-	    (epa-mark)
+	    (epa--insert-keys context (car names) secret)
+	    (if (get-text-property (point) 'epa-list-keys)
+		(epa-mark))
 	    (goto-char (point-max))
 	    (setq names (cdr names)))
-	(epa-list-keys-1 context nil secret))
+	(if secret
+	    (progn
+	      (epa--insert-keys context nil secret)
+	      (if (get-text-property (point) 'epa-list-keys)
+		  (epa-mark)))
+	  (epa--insert-keys context nil nil)))
       (epa-keys-mode)
+      (widget-setup)
+      (set-keymap-parent (current-local-map) widget-keymap)
       (setq epa-exit-buffer-function #'abort-recursive-edit)
       (goto-char (point-min))
       (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))))
-
-(defun epa-show-key (key)
+	(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))))
+
+(defun epa--show-key (key)
   (let* ((primary-sub-key (car (epg-key-sub-key-list key)))
 	 (entry (assoc (epg-sub-key-id primary-sub-key)
 		       epa-key-buffer-alist))
@@ -395,17 +484,18 @@ If SECRET is non-nil, list secret keys instead of public keys."
     (erase-buffer)
     (setq pointer (epg-key-user-id-list key))
     (while pointer
-      (insert " "
-	      (if (epg-user-id-validity (car pointer))
-		  (char-to-string
-		   (car (rassq (epg-user-id-validity (car pointer))
-			       epg-key-validity-alist)))
-		" ")
-	      " "
-	      (if (stringp (epg-user-id-string (car pointer)))
-		  (epg-user-id-string (car pointer))
-		(epg-decode-dn (epg-user-id-string (car pointer))))
-	      "\n")
+      (if (car pointer)
+	  (insert " "
+		  (if (epg-user-id-validity (car pointer))
+		      (char-to-string
+		       (car (rassq (epg-user-id-validity (car pointer))
+				   epg-key-validity-alist)))
+		    " ")
+		  " "
+		  (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))
     (while pointer
@@ -424,10 +514,13 @@ If SECRET is non-nil, list secret keys instead of public keys."
 	      (cdr (assq (epg-sub-key-algorithm (car pointer))
 			 epg-pubkey-algorithm-alist))
 	      "\n\tCreated: "
-	      (epg-sub-key-creation-time (car pointer))
+	      (format-time-string "%Y-%m-%d"
+				  (epg-sub-key-creation-time (car pointer)))
 	      (if (epg-sub-key-expiration-time (car pointer))
-		  (format "\n\tExpires: %s" (epg-sub-key-expiration-time
-					     (car pointer)))
+		  (format "\n\tExpires: %s"
+			  (format-time-string "%Y-%m-%d"
+					      (epg-sub-key-expiration-time
+					       (car pointer))))
 		"")
 	      "\n\tCapabilities: "
 	      (mapconcat #'symbol-name
@@ -441,39 +534,56 @@ If SECRET is non-nil, list secret keys instead of public keys."
     (pop-to-buffer (current-buffer))
     (epa-key-mode)))
 
-(defun epa-show-key-notify (widget &rest ignore)
-  (epa-show-key (widget-get widget :value)))
+(defun epa-display-info (info)
+  (if epa-popup-info-window
+      (save-selected-window
+	(unless epa-info-buffer
+	  (setq epa-info-buffer (generate-new-buffer "*Info*")))
+	(save-excursion
+	  (set-buffer epa-info-buffer)
+	  (let ((inhibit-read-only t)
+		buffer-read-only)
+	    (erase-buffer)
+	    (insert info))
+	  (epa-info-mode)
+	  (goto-char (point-min)))
+	(if (> (window-height)
+	       epa-info-window-height)
+	    (set-window-buffer (split-window nil (- (window-height)
+						    epa-info-window-height))
+			       epa-info-buffer)
+	  (pop-to-buffer epa-info-buffer)
+	  (if (> (window-height) epa-info-window-height)
+	      (shrink-window (- (window-height) epa-info-window-height)))))
+    (message "%s" info)))
 
-(defun epa-mark (&optional arg)
-  "Mark the current line.
-If ARG is non-nil, unmark the current line."
-  (interactive "P")
-  (let ((inhibit-read-only t)
-	buffer-read-only
-	properties)
-    (beginning-of-line)
-    (setq properties (text-properties-at (point)))
-    (delete-char 1)
-    (insert (if arg " " "*"))
-    (set-text-properties (1- (point)) (point) properties)
-    (forward-line)))
+(defun epa-display-verify-result (verify-result)
+  (epa-display-info (epg-verify-result-to-string verify-result)))
+(make-obsolete 'epa-display-verify-result 'epa-display-info)
 
-(defun epa-unmark (&optional arg)
-  "Unmark the current line.
-If ARG is non-nil, mark the current line."
-  (interactive "P")
-  (epa-mark (not arg)))
+(defun epa-passphrase-callback-function (context key-id handback)
+  (if (eq key-id 'SYM)
+      (read-passwd "Passphrase for symmetric encryption: "
+		   (eq (epg-context-operation context) 'encrypt))
+    (read-passwd
+     (if (eq key-id 'PIN)
+	"Passphrase for PIN: "
+       (let ((entry (assoc key-id epg-user-id-alist)))
+	 (if entry
+	     (format "Passphrase for %s %s: " key-id (cdr entry))
+	   (format "Passphrase for %s: " key-id)))))))
 
-(defun epa-exit-buffer ()
-  "Exit the current buffer.
-`epa-exit-buffer-function' is called if it is set."
-  (interactive)
-  (funcall epa-exit-buffer-function))
+(defun epa-progress-callback-function (context what char current total
+					       handback)
+  (message "%s: %d%% (%d/%d)" what
+	   (if (> total 0) (floor (* (/ current (float total)) 100)) 0)
+	   current total))
 
 ;;;###autoload
 (defun epa-decrypt-file (file)
   "Decrypt FILE."
   (interactive "fFile: ")
+  (setq file (expand-file-name file))
   (let* ((default-name (file-name-sans-extension file))
 	 (plain (expand-file-name
 		 (read-file-name
@@ -482,97 +592,394 @@ If ARG is non-nil, mark the current line."
 			  ") ")
 		  (file-name-directory default-name)
 		  default-name)))
-	 (context (epg-make-context)))
+	 (context (epg-make-context epa-protocol)))
+    (epg-context-set-passphrase-callback context
+					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Decrypting %s..." (file-name-nondirectory file))
     (epg-decrypt-file context file plain)
-    (message "Decrypting %s...done" (file-name-nondirectory file))
+    (message "Decrypting %s...wrote %s" (file-name-nondirectory file)
+	     (file-name-nondirectory plain))
     (if (epg-context-result-for context 'verify)
-	(message "%s"
-		 (epg-verify-result-to-string
-		  (epg-context-result-for context 'verify))))))
+	(epa-display-info (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))
+  (setq file (expand-file-name file))
+  (let* ((context (epg-make-context epa-protocol))
 	 (plain (if (equal (file-name-extension file) "sig")
 		    (file-name-sans-extension file))))
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Verifying %s..." (file-name-nondirectory file))
     (epg-verify-file context file plain)
     (message "Verifying %s...done" (file-name-nondirectory file))
-    (message "%s"
-	     (epg-verify-result-to-string
-	      (epg-context-result-for context 'verify)))))
+    (if (epg-context-result-for context 'verify)
+	(epa-display-info (epg-verify-result-to-string
+			   (epg-context-result-for context 'verify))))))
 
 ;;;###autoload
-(defun epa-sign-file (file signers detached)
-  "Sign FILE by selected SIGNERS keys.
-If DETACHED is non-nil, it creates a detached signature."
+(defun epa-sign-file (file signers mode)
+  "Sign FILE by SIGNERS keys selected."
   (interactive
    (list (expand-file-name (read-file-name "File: "))
-	 (epa-select-keys (epg-make-context) "Select keys for signing.
+	 (epa-select-keys (epg-make-context epa-protocol)
+			  "Select keys for signing.
 If no one is selected, default secret key is used.  "
 			  nil t)
-	 (y-or-n-p "Make a detached signature? ")))
-  (let ((signature (concat file (if epa-armor
-				    ".asc"
-				  (if detached
-				      ".sig"
-				    ".gpg"))))
-	(context (epg-make-context)))
+	 (catch 'done
+	   (while t
+	     (message "Signature type (n,c,d,?) ")
+	     (let ((c (read-char)))
+	       (cond ((eq c ?c)
+		      (throw 'done 'clear))
+		     ((eq c ?d)
+		      (throw 'done 'detached))
+		     ((eq c ??)
+		      (with-output-to-temp-buffer "*Help*"
+			(save-excursion
+			  (set-buffer standard-output)
+			  (insert "\
+n - Create a normal signature
+c - Create a cleartext signature
+d - Create a detached signature
+? - Show this help
+"))))
+		     (t
+		      (throw 'done nil))))))))
+  (let ((signature (concat file
+			   (if (eq epa-protocol 'OpenPGP)
+			       (if (or epa-armor
+				       (not (memq mode
+						  '(nil t normal detached))))
+				   ".asc"
+				 (if (memq mode '(t detached))
+				     ".sig"
+				   ".gpg"))
+			     (if (memq mode '(t detached))
+				 ".p7s"
+			       ".p7m"))))
+	(context (epg-make-context epa-protocol)))
     (epg-context-set-armor context epa-armor)
     (epg-context-set-textmode context epa-textmode)
-    (message "Signing %s..." (file-name-nondirectory file))
     (epg-context-set-signers context signers)
-    (epg-sign-file context file signature (not (null detached)))
-    (message "Signing %s...done" (file-name-nondirectory file))))
+    (epg-context-set-passphrase-callback context
+					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
+    (message "Signing %s..." (file-name-nondirectory file))
+    (epg-sign-file context file signature mode)
+    (message "Signing %s...wrote %s" (file-name-nondirectory file)
+	     (file-name-nondirectory signature))))
 
 ;;;###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.
+	 (epa-select-keys (epg-make-context epa-protocol)
+			  "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  ")))
-  (let ((cipher (concat file (if epa-armor ".asc" ".gpg")))
-	(context (epg-make-context)))
+  (let ((cipher (concat file (if (eq epa-protocol 'OpenPGP)
+				 (if epa-armor ".asc" ".gpg")
+			       ".p7m")))
+	(context (epg-make-context epa-protocol)))
     (epg-context-set-armor context epa-armor)
     (epg-context-set-textmode context epa-textmode)
+    (epg-context-set-passphrase-callback context
+					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Encrypting %s..." (file-name-nondirectory file))
     (epg-encrypt-file context file recipients cipher)
-    (message "Encrypting %s...done" (file-name-nondirectory file))))
+    (message "Encrypting %s...wrote %s" (file-name-nondirectory file)
+	     (file-name-nondirectory cipher))))
+
+;;;###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 epa-protocol))
+	  plain)
+      (epg-context-set-passphrase-callback context
+					   #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+					 #'epa-progress-callback-function)
+      (message "Decrypting...")
+      (setq plain (epg-decrypt-string context (buffer-substring start end)))
+      (message "Decrypting...done")
+      (delete-region start end)
+      (goto-char start)
+      (insert (epa--decode-coding-string plain
+					 (or coding-system-for-read
+					     (get-text-property
+					      start 'epa-coding-system-used))))
+      (if (epg-context-result-for context 'verify)
+	  (epa-display-info (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)))))))
+
+(if (fboundp 'select-safe-coding-system)
+    (defalias 'epa--select-safe-coding-system 'select-safe-coding-system)
+  (defun epa--select-safe-coding-system (from to)
+    buffer-file-coding-system))
+
+;;;###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 epa-protocol)))
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
+    (epg-verify-string context
+		       (epa--encode-coding-string
+			(buffer-substring start end)
+			(or coding-system-for-write
+			    (get-text-property start
+					       'epa-coding-system-used))))
+    (if (epg-context-result-for context 'verify)
+	(epa-display-info (epg-verify-result-to-string
+			   (epg-context-result-for context 'verify))))))
+
+;;;###autoload
+(defun epa-verify-cleartext-in-region (start end)
+  "Verify OpenPGP cleartext signed messages 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))
+	  (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))
+	  (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
+   (progn
+     (setq epa-last-coding-system-specified
+	   (or coding-system-for-write
+	       (epa--select-safe-coding-system
+		(region-beginning) (region-end))))
+     (list (region-beginning) (region-end)
+	   (epa-select-keys (epg-make-context epa-protocol)
+			    "Select keys for signing.
+If no one is selected, default secret key is used.  "
+			    nil t)
+	   (catch 'done
+	     (while t
+	       (message "Signature type (n,c,d,?) ")
+	       (let ((c (read-char)))
+		 (cond ((eq c ?c)
+			(throw 'done 'clear))
+		       ((eq c ?d)
+			(throw 'done 'detached))
+		       ((eq c ??)
+			(with-output-to-temp-buffer "*Help*"
+			  (save-excursion
+			    (set-buffer standard-output)
+			    (insert "\
+n - Create a normal signature
+c - Create a cleartext signature
+d - Create a detached signature
+? - Show this help
+"))))
+		       (t
+			(throw 'done nil)))))))))
+  (save-excursion
+    (let ((context (epg-make-context epa-protocol))
+	  signature)
+      ;;(epg-context-set-armor context epa-armor)
+      (epg-context-set-armor context t)
+      ;;(epg-context-set-textmode context epa-textmode)
+      (epg-context-set-textmode context t)
+      (epg-context-set-signers context signers)
+      (epg-context-set-passphrase-callback context
+					   #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+					 #'epa-progress-callback-function)
+      (message "Signing...")
+      (setq signature (epg-sign-string context
+				       (epa--encode-coding-string
+					(buffer-substring start end)
+					epa-last-coding-system-specified)
+				       mode))
+      (message "Signing...done")
+      (delete-region start end)
+      (add-text-properties (point)
+			   (progn
+			     (insert (epa--decode-coding-string
+				      signature
+				      (or coding-system-for-read
+					  epa-last-coding-system-specified)))
+			     (point))
+			   (list 'epa-coding-system-used
+				 epa-last-coding-system-specified
+				 'front-sticky nil
+				 'rear-nonsticky t
+				 'start-open t
+				 'end-open t)))))
+
+;;;###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
+   (progn
+     (setq epa-last-coding-system-specified
+	   (or coding-system-for-write
+	       (epa--select-safe-coding-system
+		(region-beginning) (region-end))))
+     (list (region-beginning) (region-end)
+	   (epa-select-keys (epg-make-context epa-protocol)
+			    "Select recipients for encryption.
+If no one is selected, symmetric encryption will be performed.  "))))
+  (save-excursion
+    (let ((context (epg-make-context epa-protocol))
+	  cipher)
+      ;;(epg-context-set-armor context epa-armor)
+      (epg-context-set-armor context t)
+      ;;(epg-context-set-textmode context epa-textmode)
+      (epg-context-set-textmode context t)
+      (epg-context-set-passphrase-callback context
+					   #'epa-passphrase-callback-function)
+      (epg-context-set-progress-callback context
+					 #'epa-progress-callback-function)
+      (message "Encrypting...")
+      (setq cipher (epg-encrypt-string context
+				       (epa--encode-coding-string
+					(buffer-substring start end)
+					epa-last-coding-system-specified)
+				       recipients))
+      (message "Encrypting...done")
+      (delete-region start end)
+      (add-text-properties (point)
+			   (progn
+			     (insert cipher)
+			     (point))
+			   (list 'epa-coding-system-used
+				 epa-last-coding-system-specified
+				 'front-sticky nil
+				 'rear-nonsticky t
+				 'start-open t
+				 'end-open t)))))
 
 ;;;###autoload
 (defun epa-delete-keys (keys &optional allow-secret)
-  "Delete selected KEYS."
+  "Delete selected KEYS.
+
+Don't use this command in Lisp programs!"
   (interactive
-   (let ((keys (epa-marked-keys)))
+   (let ((keys (epa--marked-keys)))
      (unless keys
        (error "No keys selected"))
      (list keys
 	   (eq (nth 1 epa-list-keys-arguments) t))))
-  (let ((context (epg-make-context)))
+  (let ((context (epg-make-context epa-protocol)))
     (message "Deleting...")
     (epg-delete-keys context keys allow-secret)
-    (apply #'epa-list-keys epa-list-keys-arguments)
-    (message "Deleting...done")))
+    (message "Deleting...done")
+    (apply #'epa-list-keys epa-list-keys-arguments)))
 
 ;;;###autoload
 (defun epa-import-keys (file)
-  "Import keys from FILE."
+  "Import keys from FILE.
+
+Don't use this command in Lisp programs!"
   (interactive "fFile: ")
-  (let ((context (epg-make-context)))
+  (setq file (expand-file-name file))
+  (let ((context (epg-make-context epa-protocol)))
     (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))))
+    (condition-case nil
+	(progn
+	  (epg-import-keys-from-file context file)
+	  (message "Importing %s...done" (file-name-nondirectory file)))
+      (error
+       (message "Importing %s...failed" (file-name-nondirectory file))))
+    (if (epg-context-result-for context 'import)
+	(epa-display-info (epg-import-result-to-string
+			   (epg-context-result-for context 'import))))
+    (if (eq major-mode 'epa-keys-mode)
+	(apply #'epa-list-keys epa-list-keys-arguments))))
+
+;;;###autoload
+(defun epa-import-keys-region (start end)
+  "Import keys from the region.
+
+Don't use this command in Lisp programs!"
+  (interactive "r")
+  (let ((context (epg-make-context epa-protocol)))
+    (message "Importing...")
+    (condition-case nil
+	(progn
+	  (epg-import-keys-from-string context (buffer-substring start end))
+	  (message "Importing...done"))
+      (error
+       (message "Importing...failed")))
+    (if (epg-context-result-for context 'import)
+	(epa-display-info (epg-import-result-to-string
+			   (epg-context-result-for context 'import))))))
 
 ;;;###autoload
 (defun epa-export-keys (keys file)
-  "Export selected KEYS to FILE."
+  "Export selected KEYS to FILE.
+
+Don't use this command in Lisp programs!"
   (interactive
-   (let ((keys (epa-marked-keys))
+   (let ((keys (epa--marked-keys))
 	 default-name)
      (unless keys
        (error "No keys selected"))
@@ -589,94 +996,45 @@ If no one is selected, symmetric encryption will be performed.  ")))
 		     ") ")
 	     (file-name-directory default-name)
 	     default-name)))))
-  (let ((context (epg-make-context)))
+  (let ((context (epg-make-context epa-protocol)))
     (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-insert-keys (keys)
+  "Insert selected KEYS after the point.
+
+Don't use this command in Lisp programs!"
+  (interactive
+   (list (epa-select-keys (epg-make-context epa-protocol)
+			  "Select keys to export.  ")))
+  (let ((context (epg-make-context epa-protocol)))
+    ;;(epg-context-set-armor context epa-armor)
+    (epg-context-set-armor context t)
+    (insert (epg-export-keys-to-string context keys))))
+
+;;;###autoload
 (defun epa-sign-keys (keys &optional local)
   "Sign selected KEYS.
-If LOCAL is non-nil, the signature is marked as non exportable."
+If a prefix-arg is specified, the signature is marked as non exportable.
+
+Don't use this command in Lisp programs!"
   (interactive
-   (let ((keys (epa-marked-keys)))
+   (let ((keys (epa--marked-keys)))
      (unless keys
        (error "No keys selected"))
      (list keys current-prefix-arg)))
-  (let ((context (epg-make-context)))
+  (let ((context (epg-make-context epa-protocol)))
+    (epg-context-set-passphrase-callback context
+					 #'epa-passphrase-callback-function)
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (message "Signing keys...")
     (epg-sign-keys context keys local)
     (message "Signing keys...done")))
-
-;;;###autoload
-(defun epa-decrypt-region (start end)
-  "Decrypt OpenPGP armors in the current region between START and END."
-  (interactive "r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region start end)
-      (goto-char start)
-      (let (armor-start armor-end charset context plain 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)))
-	  (setq context (epg-make-context)
-		plain (epg-decrypt-string
-		       context	       
-		       (buffer-substring armor-start armor-end)))
-	  (delete-region armor-start armor-end)
-	  (goto-char armor-start)
-	  (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)))
-	  (insert (decode-coding-string plain coding-system))
-	  (if (epg-context-result-for context 'verify)
-	      (message "%s"
-		       (epg-verify-result-to-string
-			(epg-context-result-for context 'verify)))))))))
-
-;;;###autoload
-(defun epa-verify-region (start end)
-  "Verify OpenPGP armors in the current region between START and END."
-  (interactive "r")
-  (save-excursion
-    (save-restriction
-      (narrow-to-region start end)
-      (goto-char start)
-      (let (armor-start armor-end context)
-	(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"))
-	  (setq context (epg-make-context))
-	  (epg-verify-string context
-			     (encode-coding-string
-			      (buffer-substring armor-start armor-end)
-			      coding-system-for-write))
-	  (message "%s"
-		   (epg-verify-result-to-string
-		    (epg-context-result-for context 'verify))))))))
+(make-obsolete 'epa-sign-keys "Do not use.")
 
 (provide 'epa)