X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epg.el;h=6000dc5e7389b7d83bfba5d78426a0dc09739f78;hb=c3f7df32c68315e9c66b2a9a0f3e181771c79890;hp=3c4bd34188ddc9df57af2fcbe883def8759b066a;hpb=e758c1c4fa0db80cd0462cea53dc9aec4889f0b5;p=elisp%2Fepg.git

diff --git a/epg.el b/epg.el
index 3c4bd34..6000dc5 100644
--- a/epg.el
+++ b/epg.el
@@ -25,20 +25,7 @@
 
 ;;; Code:
 
-(defgroup epg ()
-  "The EasyPG Library")
-
-(defcustom epg-gpg-program "gpg"
-  "The `gpg' executable."
-  :group 'epg
-  :type 'string)
-
-(defcustom epg-gpgsm-program "gpgsm"
-  "The `gpgsm' executable."
-  :group 'epg
-  :type 'string)
-
-(defconst epg-version-number "0.0.1")
+(require 'epg-config)
 
 (defvar epg-user-id nil
   "GnuPG ID of your default identity.")
@@ -47,6 +34,7 @@
   "An alist mapping from key ID to user ID.")
 
 (defvar epg-read-point nil)
+(defvar epg-process-filter-running nil)
 (defvar epg-pending-status-list nil)
 (defvar epg-key-id nil)
 (defvar epg-context nil)
@@ -200,7 +188,7 @@
 		cipher-algorithm digest-algorithm compress-algorithm
 		#'epg-passphrase-callback-function
 		#'epg-progress-callback-function
-		nil nil nil nil)))
+		nil nil nil nil nil)))
 
 (defun epg-context-protocol (context)
   "Return the protocol used within CONTEXT."
@@ -283,6 +271,12 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aref (cdr context) 12))
 
+(defun epg-context-operation (context)
+  "Return the name of the current cryptographic operation."
+  (unless (eq (car context) 'epg-context)
+    (signal 'wrong-type-argument (list 'epg-context-p context)))
+  (aref (cdr context) 13))
+
 (defun epg-context-set-protocol (context protocol)
   "Set the protocol used within CONTEXT."
   (unless (eq (car context) 'epg-context)
@@ -364,6 +358,12 @@ This function is for internal use only."
     (signal 'wrong-type-argument (list 'epg-context-p context)))
   (aset (cdr context) 12 result))
 
+(defun epg-context-set-operation (context operation)
+  "Set the name of the current cryptographic operation."
+  (unless (eq (car context) 'epg-context)
+    (signal 'wrong-type-argument (list 'epg-context-p context)))
+  (aset (cdr context) 13 operation))
+
 (defun epg-make-signature (status &optional key-id)
   "Return a signature object."
   (cons 'epg-signature (vector status key-id nil nil nil nil nil nil nil nil)))
@@ -746,15 +746,14 @@ This function is for internal use only."
 	   ((eq (epg-signature-status signature) 'no-pubkey)
 	    "No public key for "))
      (epg-signature-key-id signature)
-     " "
      (if user-id
-	 (concat (if (stringp user-id)
+	 (concat " "
+		 (if (stringp user-id)
 		     user-id
-		   (epg-decode-dn user-id))
-		 " ")
+		   (epg-decode-dn user-id)))
        "")
      (if (epg-signature-validity signature)
-	 (format "(trust %s)"  (epg-signature-validity signature))
+	 (format " (trust %s)"  (epg-signature-validity signature))
        ""))))
 
 (defun epg-verify-result-to-string (verify-result)
@@ -779,7 +778,7 @@ This function is for internal use only."
    (format "%02X " (epg-new-signature-class new-signature))
    (epg-new-signature-fingerprint new-signature)))
 
-(defun epg-start (context args)
+(defun epg--start (context args)
   "Start `epg-gpg-program' in a subprocess with given ARGS."
   (if (and (epg-context-process context)
 	   (eq (process-status (epg-context-process context)) 'run))
@@ -790,6 +789,8 @@ This function is for internal use only."
   (let* ((args (append (list "--no-tty"
 			     "--status-fd" "1"
 			     "--yes")
+		       (if epg-gpg-home-directory
+			   (list "--homedir" epg-gpg-home-directory))
 		       (unless (eq (epg-context-protocol context) 'CMS)
 			 (list "--command-fd" "0"))
 		       (if (epg-context-armor context) '("--armor"))
@@ -816,6 +817,8 @@ This function is for internal use only."
     (with-current-buffer buffer
       (make-local-variable 'epg-read-point)
       (setq epg-read-point (point-min))
+      (make-local-variable 'epg-process-filter-running)
+      (setq epg-process-filter-running nil)
       (make-local-variable 'epg-pending-status-list)
       (setq epg-pending-status-list nil)
       (make-local-variable 'epg-key-id)
@@ -832,10 +835,10 @@ This function is for internal use only."
 			 epg-gpg-program)
 		       args)))
       (set-default-file-modes orig-mode))
-    (set-process-filter process #'epg-process-filter)
+    (set-process-filter process #'epg--process-filter)
     (epg-context-set-process context process)))
 
-(defun epg-process-filter (process input)
+(defun epg--process-filter (process input)
   (if epg-debug
       (save-excursion
 	(unless epg-debug-buffer
@@ -848,21 +851,26 @@ This function is for internal use only."
 	(set-buffer (process-buffer process))
 	(goto-char (point-max))
 	(insert input)
-	(goto-char epg-read-point)
-	(beginning-of-line)
-	(while (looking-at ".*\n")	;the input line finished
-	  (save-excursion
-	    (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
-		(let* ((status (match-string 1))
-		       (string (match-string 2))
-		       (symbol (intern-soft (concat "epg-status-" status))))
-		  (if (member status epg-pending-status-list)
-		      (setq epg-pending-status-list nil))
-		  (if (and symbol
-			   (fboundp symbol))
-		      (funcall symbol process string)))))
-	  (forward-line))
-	(setq epg-read-point (point)))))
+	(unless epg-process-filter-running
+	  (unwind-protect
+	      (progn
+		(setq epg-process-filter-running t)
+		(goto-char epg-read-point)
+		(beginning-of-line)
+		(while (looking-at ".*\n") ;the input line finished
+		  (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
+		      (let* ((status (match-string 1))
+			     (string (match-string 2))
+			     (symbol (intern-soft (concat "epg--status-"
+							  status))))
+			(if (member status epg-pending-status-list)
+			    (setq epg-pending-status-list nil))
+			(if (and symbol
+				 (fboundp symbol))
+			    (funcall symbol epg-context string))))
+		  (forward-line)
+		  (setq epg-read-point (point))))
+	    (setq epg-process-filter-running nil))))))
 
 (defun epg-read-output (context)
   "Read the output file CONTEXT and return the content as a string."
@@ -880,12 +888,12 @@ This function is for internal use only."
     (setq epg-pending-status-list status-list)
     (while (and (eq (process-status (epg-context-process context)) 'run)
 		epg-pending-status-list)
-      (accept-process-output (epg-context-process context) 0 1))))
+      (accept-process-output (epg-context-process context) 1))))
 
 (defun epg-wait-for-completion (context)
   "Wait until the `epg-gpg-program' process completes."
   (while (eq (process-status (epg-context-process context)) 'run)
-    (accept-process-output (epg-context-process context) 0 1)))
+    (accept-process-output (epg-context-process context) 1)))
 
 (defun epg-reset (context)
   "Reset the CONTEXT."
@@ -900,7 +908,7 @@ This function is for internal use only."
 	   (file-exists-p (epg-context-output-file context)))
       (delete-file (epg-context-output-file context))))
 
-(defun epg-status-USERID_HINT (process string)
+(defun epg--status-USERID_HINT (context string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))
 	     (user-id (match-string 2 string))
@@ -910,94 +918,100 @@ This function is for internal use only."
 	  (setq epg-user-id-alist (cons (cons key-id user-id)
 					epg-user-id-alist))))))
 
-(defun epg-status-NEED_PASSPHRASE (process string)
+(defun epg--status-NEED_PASSPHRASE (context string)
   (if (string-match "\\`\\([^ ]+\\)" string)
       (setq epg-key-id (match-string 1 string))))
 
-(defun epg-status-NEED_PASSPHRASE_SYM (process string)
+(defun epg--status-NEED_PASSPHRASE_SYM (context string)
   (setq epg-key-id 'SYM))
 
-(defun epg-status-NEED_PASSPHRASE_PIN (process string)
+(defun epg--status-NEED_PASSPHRASE_PIN (context string)
   (setq epg-key-id 'PIN))
 
-(defun epg-status-GET_HIDDEN (process string)
+(defun epg--status-GET_HIDDEN (context string)
   (if (and epg-key-id
 	   (string-match "\\`passphrase\\." string))
       (let (inhibit-quit
 	    passphrase
-	    passphrase-with-new-line)
+	    passphrase-with-new-line
+	    encoded-passphrase-with-new-line)
 	(unwind-protect
 	    (condition-case nil
 		(progn
 		  (setq passphrase
 			(funcall
-			 (if (consp (epg-context-passphrase-callback
-				     epg-context))
-			     (car (epg-context-passphrase-callback
-				   epg-context))
-			   (epg-context-passphrase-callback epg-context))
-			 epg-context
+			 (if (consp (epg-context-passphrase-callback context))
+			     (car (epg-context-passphrase-callback context))
+			   (epg-context-passphrase-callback context))
+			 context
 			 epg-key-id
-			 (if (consp (epg-context-passphrase-callback
-				     epg-context))
-			     (cdr (epg-context-passphrase-callback
-				   epg-context)))))
+			 (if (consp (epg-context-passphrase-callback context))
+			     (cdr (epg-context-passphrase-callback context)))))
 		  (when passphrase
 		    (setq passphrase-with-new-line (concat passphrase "\n"))
-		    (fillarray passphrase 0)
-		    (setq passphrase nil)
-		    (process-send-string process passphrase-with-new-line)))
+		    (epg--clear-string passphrase)
+		    (setq passphrase nil
+			  encoded-passphrase-with-new-line
+			  (encode-coding-string passphrase-with-new-line
+						(terminal-coding-system)))
+		    
+		    (process-send-string (epg-context-process context)
+					 encoded-passphrase-with-new-line)))
 	      (quit
 	       (epg-context-set-result-for
-		epg-context 'error
+		context 'error
 		(cons '(quit)
-		      (epg-context-result-for epg-context 'error)))
-	       (delete-process process)))
+		      (epg-context-result-for context 'error)))
+	       (delete-process (epg-context-process context))))
 	  (if passphrase
-	      (fillarray passphrase 0))
+	      (epg--clear-string passphrase))
 	  (if passphrase-with-new-line
-	      (fillarray passphrase-with-new-line 0))))))
+	      (epg--clear-string passphrase-with-new-line))
+	  (if encoded-passphrase-with-new-line
+	      (epg--clear-string encoded-passphrase-with-new-line))))))
 
-(defun epg-status-GET_BOOL (process string)
+(defun epg--status-GET_BOOL (context string)
   (let ((entry (assoc string epg-prompt-alist))
 	inhibit-quit)
     (condition-case nil
       (if (y-or-n-p (if entry (cdr entry) (concat string "? ")))
-	  (process-send-string process "y\n")
-	(process-send-string process "n\n"))
+	  (process-send-string (epg-context-process context) "y\n")
+	(process-send-string (epg-context-process context) "n\n"))
       (quit
        (epg-context-set-result-for
-	epg-context 'error
+	context 'error
 	(cons '(quit)
-	      (epg-context-result-for epg-context 'error)))
-       (delete-process process)))))
+	      (epg-context-result-for context 'error)))
+       (delete-process (epg-context-process context))))))
 
-(defun epg-status-GET_LINE (process string)
+(defun epg--status-GET_LINE (context string)
   (let ((entry (assoc string epg-prompt-alist))
 	inhibit-quit)
     (condition-case nil
-	(process-send-string
-	 process
-	 (concat (read-string (if entry (cdr entry) (concat string ": ")))
-		 "\n"))
+	(process-send-string (epg-context-process context)
+			     (concat (read-string
+				      (if entry
+					  (cdr entry)
+					(concat string ": ")))
+				     "\n"))
       (quit
        (epg-context-set-result-for
-	epg-context 'error
+	context 'error
 	(cons '(quit)
-	      (epg-context-result-for epg-context 'error)))
-       (delete-process process)))))
+	      (epg-context-result-for context 'error)))
+       (delete-process (epg-context-process context))))))
 
-(defun epg-status-*SIG (status string)
+(defun epg--status-*SIG (context status string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))
 	     (user-id (match-string 2 string))
 	     (entry (assoc key-id epg-user-id-alist)))
 	(epg-context-set-result-for
-	 epg-context
+	 context
 	 'verify
 	 (cons (epg-make-signature status key-id)
-	       (epg-context-result-for epg-context 'verify)))
-	(if (eq (epg-context-protocol epg-context) 'CMS)
+	       (epg-context-result-for context 'verify)))
+	(if (eq (epg-context-protocol context) 'CMS)
 	    (condition-case nil
 		(setq user-id (epg-dn-from-string user-id))
 	      (error)))
@@ -1006,60 +1020,66 @@ This function is for internal use only."
 	  (setq epg-user-id-alist
 		(cons (cons key-id user-id) epg-user-id-alist))))
     (epg-context-set-result-for
-     epg-context
+     context
      'verify
      (cons (epg-make-signature status)
-	   (epg-context-result-for epg-context 'verify)))))
+	   (epg-context-result-for context 'verify)))))
 
-(defun epg-status-GOODSIG (process string)
-  (epg-status-*SIG 'good string))
+(defun epg--status-GOODSIG (context string)
+  (epg--status-*SIG context 'good string))
 
-(defun epg-status-EXPSIG (process string)
-  (epg-status-*SIG 'expired string))
+(defun epg--status-EXPSIG (context string)
+  (epg--status-*SIG context 'expired string))
 
-(defun epg-status-EXPKEYSIG (process string)
-  (epg-status-*SIG 'expired-key string))
+(defun epg--status-EXPKEYSIG (context string)
+  (epg--status-*SIG context 'expired-key string))
 
-(defun epg-status-REVKEYSIG (process string)
-  (epg-status-*SIG 'revoked-key string))
+(defun epg--status-REVKEYSIG (context string)
+  (epg--status-*SIG context 'revoked-key string))
 
-(defun epg-status-BADSIG (process string)
-  (epg-status-*SIG 'bad string))
+(defun epg--status-BADSIG (context string)
+  (epg--status-*SIG context 'bad string))
 
-(defun epg-status-NO_PUBKEY (process string)
-  (epg-context-set-result-for
-     epg-context
-     'verify
-     (cons (epg-make-signature 'no-pubkey string)
-	   (epg-context-result-for epg-context 'verify))))
-
-(defun epg-status-ERRSIG (process string)
-  (let ((signatures (epg-context-result-for epg-context 'verify)))
-    (unless signatures
-      (setq signatures (list (epg-make-signature 'error)))
-      (epg-context-set-result-for epg-context 'verify signatures))
-    (when (and (not (eq (epg-signature-status (car signatures)) 'good))
-	       (string-match "\\`\\([^ ]+\\) \\([0-9]+\\) \\([0-9]+\\) \
-\\([0-9A-Fa-f][0-9A-Fa-f]\\) \\([^ ]+\\) \\([0-9]+\\)"
-			     string))
-      (epg-signature-set-key-id
-       (car signatures)
-       (match-string 1 string))
-      (epg-signature-set-pubkey-algorithm
-       (car signatures)
-       (string-to-number (match-string 2 string)))
-      (epg-signature-set-digest-algorithm
-       (car signatures)
-       (string-to-number (match-string 3 string)))
-      (epg-signature-set-class
-       (car signatures)
-       (string-to-number (match-string 4 string) 16))
-      (epg-signature-set-creation-time
-       (car signatures)
-       (match-string 5 string)))))
+(defun epg--status-NO_PUBKEY (context string)
+  (let ((signature (car (epg-context-result-for context 'verify))))
+    (if (and signature
+	     (eq (epg-signature-status signature) 'error)
+	     (equal (epg-signature-key-id signature) string))
+	(epg-signature-set-status signature 'no-pubkey))))
+
+(defun epg--time-from-seconds (seconds)
+  (let ((number-seconds (string-to-number (concat seconds ".0"))))
+    (cons (floor (/ number-seconds 65536))
+	  (floor (mod number-seconds 65536)))))
 
-(defun epg-status-VALIDSIG (process string)
-  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-ERRSIG (context string)
+  (if (string-match "\\`\\([^ ]+\\) \\([0-9]+\\) \\([0-9]+\\) \
+\\([0-9A-Fa-f][0-9A-Fa-f]\\) \\([^ ]+\\) \\([0-9]+\\)"
+		    string)
+      (let ((signature (epg-make-signature 'error)))
+	(epg-context-set-result-for
+	 context
+	 'verify
+	 (cons signature
+	       (epg-context-result-for context 'verify)))
+	(epg-signature-set-key-id
+	 signature
+	 (match-string 1 string))
+	(epg-signature-set-pubkey-algorithm
+	 signature
+	 (string-to-number (match-string 2 string)))
+	(epg-signature-set-digest-algorithm
+	 signature
+	 (string-to-number (match-string 3 string)))
+	(epg-signature-set-class
+	 signature
+	 (string-to-number (match-string 4 string) 16))
+	(epg-signature-set-creation-time
+	 signature
+	 (epg--time-from-seconds (match-string 5 string))))))
+
+(defun epg--status-VALIDSIG (context string)
+  (let ((signature (car (epg-context-result-for context 'verify))))
     (when (and signature
 	       (eq (epg-signature-status signature) 'good)
 	       (string-match "\\`\\([^ ]+\\) [^ ]+ \\([^ ]+\\) \\([^ ]+\\) \
@@ -1071,10 +1091,10 @@ This function is for internal use only."
        (match-string 1 string))
       (epg-signature-set-creation-time
        signature
-       (match-string 2 string))
+       (epg--time-from-seconds (match-string 2 string)))
       (epg-signature-set-expiration-time
        signature
-       (match-string 3 string))
+       (epg--time-from-seconds (match-string 3 string)))
       (epg-signature-set-version
        signature
        (string-to-number (match-string 4 string)))
@@ -1088,141 +1108,142 @@ This function is for internal use only."
        signature
        (string-to-number (match-string 7 string) 16)))))
 
-(defun epg-status-TRUST_UNDEFINED (process string)
-  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_UNDEFINED (context string)
+  (let ((signature (car (epg-context-result-for context 'verify))))
     (if (and signature
 	     (eq (epg-signature-status signature) 'good))
 	(epg-signature-set-validity signature 'undefined))))
 
-(defun epg-status-TRUST_NEVER (process string)
-  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_NEVER (context string)
+  (let ((signature (car (epg-context-result-for context 'verify))))
     (if (and signature
 	     (eq (epg-signature-status signature) 'good))
 	(epg-signature-set-validity signature 'never))))
 
-(defun epg-status-TRUST_MARGINAL (process string)
-  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_MARGINAL (context string)
+  (let ((signature (car (epg-context-result-for context 'verify))))
     (if (and signature
 	     (eq (epg-signature-status signature) 'marginal))
 	(epg-signature-set-validity signature 'marginal))))
 
-(defun epg-status-TRUST_FULLY (process string)
-  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_FULLY (context string)
+  (let ((signature (car (epg-context-result-for context 'verify))))
     (if (and signature
 	     (eq (epg-signature-status signature) 'good))
 	(epg-signature-set-validity signature 'full))))
 
-(defun epg-status-TRUST_ULTIMATE (process string)
-  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_ULTIMATE (context string)
+  (let ((signature (car (epg-context-result-for context 'verify))))
     (if (and signature
 	     (eq (epg-signature-status signature) 'good))
 	(epg-signature-set-validity signature 'ultimate))))
 
-(defun epg-status-PROGRESS (process string)
+(defun epg--status-PROGRESS (context string)
   (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"
 		    string)
-      (funcall (if (consp (epg-context-progress-callback epg-context))
-		   (car (epg-context-progress-callback epg-context))
-		 (epg-context-progress-callback epg-context))
-	       epg-context
+      (funcall (if (consp (epg-context-progress-callback context))
+		   (car (epg-context-progress-callback context))
+		 (epg-context-progress-callback context))
+	       context
 	       (match-string 1 string)
 	       (match-string 2 string)
 	       (string-to-number (match-string 3 string))
 	       (string-to-number (match-string 4 string))
-	       (if (consp (epg-context-progress-callback epg-context))
-		   (cdr (epg-context-progress-callback epg-context))))))
+	       (if (consp (epg-context-progress-callback context))
+		   (cdr (epg-context-progress-callback context))))))
 
-(defun epg-status-DECRYPTION_FAILED (process string)
+(defun epg--status-DECRYPTION_FAILED (context string)
   (epg-context-set-result-for
-   epg-context 'error
+   context 'error
    (cons '(decryption-failed)
-	 (epg-context-result-for epg-context 'error))))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-NODATA (process string)
+(defun epg--status-NODATA (context string)
   (epg-context-set-result-for
-   epg-context 'error
+   context 'error
    (cons (list 'no-data (cons 'reason (string-to-number string)))
-	 (epg-context-result-for epg-context 'error))))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-UNEXPECTED (process string)
+(defun epg--status-UNEXPECTED (context string)
   (epg-context-set-result-for
-   epg-context 'error
+   context 'error
    (cons (list 'unexpected (cons 'reason (string-to-number string)))
-	 (epg-context-result-for epg-context 'error))))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-KEYEXPIRED (process string)
+(defun epg--status-KEYEXPIRED (context string)
   (epg-context-set-result-for
-   epg-context 'error
-   (cons (list 'key-expired (cons 'expiration-time string))
-	 (epg-context-result-for epg-context 'error))))
+   context 'error
+   (cons (list 'key-expired (cons 'expiration-time
+				  (epg--time-from-seconds string)))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-KEYREVOKED (process string)
+(defun epg--status-KEYREVOKED (context string)
   (epg-context-set-result-for
-   epg-context 'error
+   context 'error
    (cons '(key-revoked)
-	 (epg-context-result-for epg-context 'error))))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-BADARMOR (process string)
+(defun epg--status-BADARMOR (context string)
   (epg-context-set-result-for
-   epg-context 'error
+   context 'error
    (cons '(bad-armor)
-	 (epg-context-result-for epg-context 'error))))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-INV_RECP (process string)
+(defun epg--status-INV_RECP (context string)
   (if (string-match "\\`\\([0-9]+\\) \\(.*\\)" string)
       (epg-context-set-result-for
-       epg-context 'error
+       context 'error
        (cons (list 'invalid-recipient
 		   (cons 'reason
 			 (string-to-number (match-string 1 string)))
 		   (cons 'requested-recipient
 			 (match-string 2 string)))
-	     (epg-context-result-for epg-context 'error)))))
+	     (epg-context-result-for context 'error)))))
 
-(defun epg-status-NO_RECP (process string)
+(defun epg--status-NO_RECP (context string)
   (epg-context-set-result-for
-   epg-context 'error
+   context 'error
    (cons '(no-recipients)
-	 (epg-context-result-for epg-context 'error))))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-DELETE_PROBLEM (process string)
+(defun epg--status-DELETE_PROBLEM (context string)
   (if (string-match "\\`\\([0-9]+\\)" string)
       (epg-context-set-result-for
-       epg-context 'error
+       context 'error
        (cons (list 'delete-problem
 		   (cons 'reason (string-to-number (match-string 1 string))))
-	     (epg-context-result-for epg-context 'error)))))
+	     (epg-context-result-for context 'error)))))
 
-(defun epg-status-SIG_CREATED (process string)
+(defun epg--status-SIG_CREATED (context string)
   (if (string-match "\\`\\([DCS]\\) \\([0-9]+\\) \\([0-9]+\\) \
 \\([0-9A-Fa-F][0-9A-Fa-F]\\) \\(.*\\) " string)
       (epg-context-set-result-for
-       epg-context 'sign
+       context 'sign
        (cons (epg-make-new-signature
 	      (cdr (assq (aref (match-string 1 string) 0)
 			 epg-new-signature-type-alist))
 	      (string-to-number (match-string 2 string))
 	      (string-to-number (match-string 3 string))
 	      (string-to-number (match-string 4 string) 16)
-	      (match-string 5 string)
+	      (epg--time-from-seconds (match-string 5 string))
 	      (substring string (match-end 0)))
-	     (epg-context-result-for epg-context 'sign)))))
+	     (epg-context-result-for context 'sign)))))
 
-(defun epg-status-KEY_CREATED (process string)
+(defun epg--status-KEY_CREATED (context string)
   (if (string-match "\\`\\([BPS]\\) \\([^ ]+\\)" string)
       (epg-context-set-result-for
-       epg-context 'generate-key
+       context 'generate-key
        (cons (list (cons 'type (string-to-char (match-string 1 string)))
 		   (cons 'fingerprint (match-string 2 string)))
-	     (epg-context-result-for epg-context 'generate-key)))))
+	     (epg-context-result-for context 'generate-key)))))
 
-(defun epg-status-KEY_NOT_CREATED (process string)
+(defun epg--status-KEY_NOT_CREATED (context string)
   (epg-context-set-result-for
-   epg-context 'error
+   context 'error
    (cons '(key-not-created)
-	 (epg-context-result-for epg-context 'error))))
+	 (epg-context-result-for context 'error))))
 
-(defun epg-status-IMPORTED (process string)
+(defun epg--status-IMPORTED (context string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))
 	     (user-id (match-string 2 string))
@@ -1232,13 +1253,13 @@ This function is for internal use only."
 	  (setq epg-user-id-alist (cons (cons key-id user-id)
 					epg-user-id-alist)))
 	(epg-context-set-result-for
-	 epg-context 'import
+	 context 'import
 	 (cons (list (cons 'key-id key-id)
 		     (cons 'user-id user-id))
-	       (epg-context-result-for epg-context 'import))))))
+	       (epg-context-result-for context 'import))))))
 
-(defun epg-status-IMPORT_OK (process string)
-  (let ((result (epg-context-result-for epg-context 'import)))
+(defun epg--status-IMPORT_OK (context string)
+  (let ((result (epg-context-result-for context 'import)))
     (if (and result
 	     (string-match "\\`\\([0-9]+\\)\\( \\(.+\\)\\)?" string))
 	(setcar result
@@ -1250,10 +1271,10 @@ This function is for internal use only."
 					(match-string 3 string))))
 			(car result))))))
 
-(defun epg-status-IMPORT_PROBLEM (process string)
+(defun epg--status-IMPORT_PROBLEM (context string)
   (if (string-match "\\`\\([0-9]+\\)\\( \\(.+\\)\\)?" string)
       (epg-context-set-result-for
-       epg-context 'error
+       context 'error
        (cons (cons 'import-problem
 		   (append (list (cons 'reason
 				       (string-to-number
@@ -1261,14 +1282,15 @@ This function is for internal use only."
 			   (if (match-beginning 2)
 			       (list (cons 'fingerprint
 					   (match-string 3 string))))))
-	     (epg-context-result-for epg-context 'error)))))
+	     (epg-context-result-for context 'error)))))
 
 (defun epg-passphrase-callback-function (context key-id handback)
-  (read-passwd
-   (if (eq key-id 'SYM)
-       "Passphrase for symmetric encryption: "
+  (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: "
+	"Passphrase for PIN: "
        (let ((entry (assoc key-id epg-user-id-alist)))
 	 (if entry
 	     (format "Passphrase for %s %s: " key-id (cdr entry))
@@ -1278,28 +1300,10 @@ This function is for internal use only."
 					       handback)
   (message "%s: %d%%/%d%%" what current total))
 
-(defun epg-configuration ()
-  "Return a list of internal configuration parameters of `epg-gpg-program'."
-  (let (config type)
-    (with-temp-buffer
-      (apply #'call-process epg-gpg-program nil (list t nil) nil
-	     '("--with-colons" "--list-config"))
-      (goto-char (point-min))
-      (while (re-search-forward "^cfg:\\([^:]+\\):\\(.*\\)" nil t)
-	(setq type (intern (match-string 1))
-	      config (cons (cons type
-				 (if (memq type
-					   '(pubkey cipher digest compress))
-				     (mapcar #'string-to-number
-					     (delete "" (split-string
-							 (match-string 2)
-							 ";")))
-				   (match-string 2)))
-			   config))))
-    config))
-
-(defun epg-list-keys-1 (context name mode)
-  (let ((args (append (list "--with-colons" "--no-greeting" "--batch"
+(defun epg--list-keys-1 (context name mode)
+  (let ((args (append (if epg-gpg-home-directory
+			  (list "--homedir" epg-gpg-home-directory))
+		      (list "--with-colons" "--no-greeting" "--batch"
 			    "--with-fingerprint"
 			    "--with-fingerprint"
 			    (if (memq mode '(t secret))
@@ -1330,7 +1334,7 @@ This function is for internal use only."
 	  (setq field (1+ field))))
       (nreverse keys))))
 
-(defun epg-make-sub-key-1 (line)
+(defun epg--make-sub-key-1 (line)
   (epg-make-sub-key
    (if (aref line 1)
        (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))
@@ -1341,8 +1345,8 @@ This function is for internal use only."
    (string-to-number (aref line 3))
    (string-to-number (aref line 2))
    (aref line 4)
-   (aref line 5)
-   (aref line 6)))
+   (epg--time-from-seconds (aref line 5))
+   (epg--time-from-seconds (aref line 6))))
 
 ;;;###autoload
 (defun epg-list-keys (context &optional name mode)
@@ -1351,7 +1355,7 @@ If MODE is nil or 'public, only public keyring should be searched.
 If MODE is t or 'secret, only secret keyring should be searched. 
 Otherwise, only public keyring should be searched and the key
 signatures should be included."
-  (let ((lines (epg-list-keys-1 context name mode))
+  (let ((lines (epg--list-keys-1 context name mode))
 	keys cert pointer pointer-1)
     (while lines
       (cond
@@ -1364,12 +1368,12 @@ signatures should be included."
 			 keys))
 	(epg-key-set-sub-key-list
 	 (car keys)
-	 (cons (epg-make-sub-key-1 (car lines))
+	 (cons (epg--make-sub-key-1 (car lines))
 	       (epg-key-sub-key-list (car keys)))))
        ((member (aref (car lines) 0) '("sub" "ssb"))
 	(epg-key-set-sub-key-list
 	 (car keys)
-	 (cons (epg-make-sub-key-1 (car lines))
+	 (cons (epg--make-sub-key-1 (car lines))
 	       (epg-key-sub-key-list (car keys)))))
        ((equal (aref (car lines) 0) "uid")
 	(epg-key-set-user-id-list
@@ -1397,8 +1401,8 @@ signatures should be included."
 			  epg-key-validity-alist)))
 	   (string-to-number (aref (car lines) 3))
 	   (aref (car lines) 4)
-	   (aref (car lines) 5)
-	   (aref (car lines) 6)
+	   (epg--time-from-seconds (aref (car lines) 5))
+	   (epg--time-from-seconds (aref (car lines) 6))
 	   (aref (car lines) 9)
 	   (string-to-number (aref (car lines) 10) 16)
 	   (eq (aref (aref (car lines) 10) 2) ?x))
@@ -1423,10 +1427,10 @@ signatures should be included."
     keys))
 
 (if (fboundp 'make-temp-file)
-    (defalias 'epg-make-temp-file 'make-temp-file)
+    (defalias 'epg--make-temp-file 'make-temp-file)
   (defvar temporary-file-directory)
   ;; stolen from poe.el.
-  (defun epg-make-temp-file (prefix)
+  (defun epg--make-temp-file (prefix)
     "Create a temporary file.
 The returned file name (created by appending some random characters at the end
 of PREFIX, and expanding against `temporary-file-directory' if necessary),
@@ -1476,6 +1480,11 @@ You can then use `write-region' to write new data into the file."
 	     (file-directory-p tempdir)
 	     (delete-directory tempdir))))))
 
+(if (fboundp 'clear-string)
+    (defalias 'epg--clear-string 'clear-string)
+  (defun epg--clear-string (string)
+    (fillarray string 0)))
+
 ;;;###autoload
 (defun epg-cancel (context)
   (if (buffer-live-p (process-buffer (epg-context-process context)))
@@ -1500,8 +1509,9 @@ If you are unsure, use synchronous version of this function
 `epg-decrypt-file' or `epg-decrypt-string' instead."
   (unless (epg-data-file cipher)
     (error "Not a file"))
+  (epg-context-set-operation context 'decrypt)
   (epg-context-set-result context nil)
-  (epg-start context (list "--decrypt" (epg-data-file cipher)))
+  (epg--start context (list "--decrypt" (epg-data-file cipher)))
   ;; `gpgsm' does not read passphrase from stdin, so waiting is not needed.
   (unless (eq (epg-context-protocol context) 'CMS)
     (epg-wait-for-status context '("BEGIN_DECRYPTION"))))
@@ -1515,7 +1525,7 @@ If PLAIN is nil, it returns the result as a string."
 	(if plain
 	    (epg-context-set-output-file context plain)
 	  (epg-context-set-output-file context
-				       (epg-make-temp-file "epg-output")))
+				       (epg--make-temp-file "epg-output")))
 	(epg-start-decrypt context (epg-make-data-from-file cipher))
 	(epg-wait-for-completion context)
 	(if (epg-context-result-for context 'error)
@@ -1530,13 +1540,13 @@ If PLAIN is nil, it returns the result as a string."
 ;;;###autoload
 (defun epg-decrypt-string (context cipher)
   "Decrypt a string CIPHER and return the plain text."
-  (let ((input-file (epg-make-temp-file "epg-input"))
+  (let ((input-file (epg--make-temp-file "epg-input"))
 	(coding-system-for-write 'binary))
     (unwind-protect
 	(progn
 	  (write-region cipher nil input-file nil 'quiet)
 	  (epg-context-set-output-file context
-				       (epg-make-temp-file "epg-output"))
+				       (epg--make-temp-file "epg-output"))
 	  (epg-start-decrypt context (epg-make-data-from-file input-file))
 	  (epg-wait-for-completion context)
 	  (if (epg-context-result-for context 'error)
@@ -1561,13 +1571,14 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-verify-file' or `epg-verify-string' instead."
+  (epg-context-set-operation context 'verify)
   (epg-context-set-result context nil)
   (if signed-text
       ;; Detached signature.
       (if (epg-data-file signed-text)
-	  (epg-start context (list "--verify" (epg-data-file signature)
+	  (epg--start context (list "--verify" (epg-data-file signature)
 				   (epg-data-file signed-text)))
-	(epg-start context (list "--verify" (epg-data-file signature) "-"))
+	(epg--start context (list "--verify" (epg-data-file signature) "-"))
 	(if (eq (process-status (epg-context-process context)) 'run)
 	    (process-send-string (epg-context-process context)
 				 (epg-data-string signed-text)))
@@ -1575,8 +1586,8 @@ If you are unsure, use synchronous version of this function
 	    (process-send-eof (epg-context-process context))))
     ;; Normal (or cleartext) signature.
     (if (epg-data-file signature)
-	(epg-start context (list "--verify" (epg-data-file signature)))
-      (epg-start context (list "--verify"))
+	(epg--start context (list "--verify" (epg-data-file signature)))
+      (epg--start context (list "--verify"))
       (if (eq (process-status (epg-context-process context)) 'run)
 	  (process-send-string (epg-context-process context)
 			       (epg-data-string signature)))
@@ -1595,7 +1606,7 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil."
 	(if plain
 	    (epg-context-set-output-file context plain)
 	  (epg-context-set-output-file context
-				       (epg-make-temp-file "epg-output")))
+				       (epg--make-temp-file "epg-output")))
 	(if signed-text
 	    (epg-start-verify context
 			      (epg-make-data-from-file signature)
@@ -1624,10 +1635,10 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil."
     (unwind-protect
 	(progn
 	  (epg-context-set-output-file context
-				       (epg-make-temp-file "epg-output"))
+				       (epg--make-temp-file "epg-output"))
 	  (if signed-text
 	      (progn
-		(setq input-file (epg-make-temp-file "epg-signature"))
+		(setq input-file (epg--make-temp-file "epg-signature"))
 		(write-region signature nil input-file nil 'quiet)
 		(epg-start-verify context
 				  (epg-make-data-from-file input-file)
@@ -1658,8 +1669,9 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-sign-file' or `epg-sign-string' instead."
+  (epg-context-set-operation context 'sign)
   (epg-context-set-result context nil)
-  (epg-start context
+  (epg--start context
 	     (append (list (if (memq mode '(t detached))
 			       "--detach-sign"
 			     (if (memq mode '(nil normal))
@@ -1696,7 +1708,7 @@ Otherwise, it makes a clear text signature."
 	(if signature
 	    (epg-context-set-output-file context signature)
 	  (epg-context-set-output-file context
-				       (epg-make-temp-file "epg-output")))
+				       (epg--make-temp-file "epg-output")))
 	(epg-start-sign context (epg-make-data-from-file plain) mode)
 	(epg-wait-for-completion context)
 	(unless (epg-context-result-for context 'sign)
@@ -1719,7 +1731,7 @@ Otherwise, it makes a clear text signature."
   (unwind-protect
       (progn
 	(epg-context-set-output-file context
-				     (epg-make-temp-file "epg-output"))
+				     (epg--make-temp-file "epg-output"))
 	(epg-start-sign context (epg-make-data-from-string plain) mode)
 	(epg-wait-for-completion context)
 	(unless (epg-context-result-for context 'sign)
@@ -1743,16 +1755,21 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-encrypt-file' or `epg-encrypt-string' instead."
+  (epg-context-set-operation context 'encrypt)
   (epg-context-set-result context nil)
-  (epg-start context
+  (epg--start context
 	     (append (if always-trust '("--always-trust"))
 		     (if recipients '("--encrypt") '("--symmetric"))
 		     (if sign
 			 (cons "--sign"
 			       (apply #'nconc
-				      (mapcar (lambda (signer)
-						(list "-u" signer))
-					      (epg-context-signers context)))))
+				      (mapcar
+				       (lambda (signer)
+					 (list "-u"
+					       (epg-sub-key-id
+						(car (epg-key-sub-key-list
+						      signer)))))
+				       (epg-context-signers context)))))
 		     (apply #'nconc
 			    (mapcar
 			     (lambda (recipient)
@@ -1785,7 +1802,7 @@ If RECIPIENTS is nil, it performs symmetric encryption."
 	(if cipher
 	    (epg-context-set-output-file context cipher)
 	  (epg-context-set-output-file context
-				       (epg-make-temp-file "epg-output")))
+				       (epg--make-temp-file "epg-output")))
 	(epg-start-encrypt context (epg-make-data-from-file plain)
 			   recipients sign always-trust)
 	(epg-wait-for-completion context)
@@ -1812,7 +1829,7 @@ If RECIPIENTS is nil, it performs symmetric encryption."
   (unwind-protect
       (progn
 	(epg-context-set-output-file context
-				     (epg-make-temp-file "epg-output"))
+				     (epg--make-temp-file "epg-output"))
 	(epg-start-encrypt context (epg-make-data-from-string plain)
 			   recipients sign always-trust)
 	(epg-wait-for-completion context)
@@ -1838,8 +1855,9 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-export-keys-to-file' or `epg-export-keys-to-string' instead."
+  (epg-context-set-operation context 'export-keys)
   (epg-context-set-result context nil)
-  (epg-start context (cons "--export"
+  (epg--start context (cons "--export"
 			   (mapcar
 			    (lambda (key)
 			      (epg-sub-key-id
@@ -1854,7 +1872,7 @@ If you are unsure, use synchronous version of this function
 	(if keys
 	    (epg-context-set-output-file context file)
 	  (epg-context-set-output-file context
-				       (epg-make-temp-file "epg-output")))
+				       (epg--make-temp-file "epg-output")))
 	(epg-start-export-keys context keys)
 	(epg-wait-for-completion context)
 	(if (epg-context-result-for context 'error)
@@ -1881,8 +1899,11 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-import-keys-from-file' or `epg-import-keys-from-string' instead."
+  (epg-context-set-operation context 'import-keys)
   (epg-context-set-result context nil)
-  (epg-start context (list "--import" (epg-data-file keys)))
+  (epg--start context (if (epg-data-file keys)
+			  (list "--import" (epg-data-file keys))
+			(list "--import")))
   (when (epg-data-string keys)
     (if (eq (process-status (epg-context-process context)) 'run)
 	(process-send-string (epg-context-process context)
@@ -1890,7 +1911,7 @@ If you are unsure, use synchronous version of this function
     (if (eq (process-status (epg-context-process context)) 'run)
 	(process-send-eof (epg-context-process context)))))
 
-(defun epg-import-keys-1 (context keys)
+(defun epg--import-keys-1 (context keys)
   (unwind-protect
       (progn
 	(epg-start-import-keys context keys)
@@ -1903,12 +1924,12 @@ If you are unsure, use synchronous version of this function
 ;;;###autoload
 (defun epg-import-keys-from-file (context keys)
   "Add keys from a file KEYS."
-  (epg-import-keys-1 context (epg-make-data-from-file keys)))
+  (epg--import-keys-1 context (epg-make-data-from-file keys)))
 
 ;;;###autoload
 (defun epg-import-keys-from-string (context keys)
   "Add keys from a string KEYS."
-  (epg-import-keys-1 context (epg-make-data-from-string keys)))
+  (epg--import-keys-1 context (epg-make-data-from-string keys)))
 
 ;;;###autoload
 (defun epg-start-receive-keys (context key-id-list)
@@ -1920,8 +1941,9 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-generate-key-from-file' or `epg-generate-key-from-string' instead."
+  (epg-context-set-operation context 'receive-keys)
   (epg-context-set-result context nil)
-  (epg-start context (cons "--recv-keys" key-id-list)))
+  (epg--start context (cons "--recv-keys" key-id-list)))
 
 ;;;###autoload
 (defun epg-receive-keys (context keys)
@@ -1948,8 +1970,9 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-delete-keys' instead."
+  (epg-context-set-operation context 'delete-keys)
   (epg-context-set-result context nil)
-  (epg-start context (cons (if allow-secret
+  (epg--start context (cons (if allow-secret
 			       "--delete-secret-key"
 			     "--delete-key")
 			   (mapcar
@@ -1979,8 +2002,9 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-sign-keys' instead."
+  (epg-context-set-operation context 'sign-keys)
   (epg-context-set-result context nil)
-  (epg-start context (cons (if local
+  (epg--start context (cons (if local
 			       "--lsign-key"
 			     "--sign-key")
 			   (mapcar
@@ -2011,11 +2035,12 @@ If you use this function, you will need to wait for the completion of
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
 `epg-generate-key-from-file' or `epg-generate-key-from-string' instead."
+  (epg-context-set-operation context 'generate-key)
   (epg-context-set-result context nil)
   (if (epg-data-file parameters)
-      (epg-start context (list "--batch" "--genkey"
+      (epg--start context (list "--batch" "--genkey"
 			       (epg-data-file parameters)))
-    (epg-start context '("--batch" "--genkey"))
+    (epg--start context '("--batch" "--genkey"))
     (if (eq (process-status (epg-context-process context)) 'run)
 	(process-send-string (epg-context-process context)
 			     (epg-data-string parameters)))
@@ -2048,14 +2073,14 @@ PARAMETERS is a string which tells how to create the key."
 		   (epg-context-result-for context 'error))))
     (epg-reset context)))
 
-(defun epg-decode-hexstring (string)
+(defun epg--decode-hexstring (string)
   (let ((index 0))
     (while (eq index (string-match "[0-9A-Fa-f][0-9A-Fa-f]" string index))
       (setq string (replace-match "\\x\\&" t nil string)
 	    index (+ index 4)))
     (car (read-from-string (concat "\"" string "\"")))))
 
-(defun epg-decode-quotedstring (string)
+(defun epg--decode-quotedstring (string)
   (let ((index 0))
     (while (string-match "\\\\\\(\\([,=+<>#;\\\"]\\)\\|\
 \\([0-9A-Fa-f][0-9A-Fa-f]\\)\\|\\(.\\)\\)"
@@ -2094,14 +2119,15 @@ The return value is an alist mapping from types to values."
 		     "\\([^,=+<>#;\\\"]\\|\\\\.\\)+"
 		     string index))
 	  (setq index (match-end 0)
-		value (epg-decode-quotedstring (match-string 0 string)))
+		value (epg--decode-quotedstring (match-string 0 string)))
 	(if (eq index (string-match "#\\([0-9A-Fa-f]+\\)" string index))
 	    (setq index (match-end 0)
-		  value (epg-decode-hexstring (match-string 1 string)))
+		  value (epg--decode-hexstring (match-string 1 string)))
 	  (if (eq index (string-match "\"\\([^\\\"]\\|\\\\.\\)*\""
 				      string index))
 	      (setq index (match-end 0)
-		    value (epg-decode-quotedstring (match-string 0 string))))))
+		    value (epg--decode-quotedstring
+			   (match-string 0 string))))))
       (if group
 	  (if (stringp (car (car alist)))
 	      (setcar alist (list (cons type value) (car alist)))