* epa.el (epa-list-keys-1): Add 'epa-list-keys property to keylist

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index 6356fae..3ba189f 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1,4 +1,4 @@
-;;; epg.el --- EasyPG, yet another GnuPG interface.
+;;; epg.el --- the EasyPG Library

 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
 ;;   2005, 2006 Free Software Foundation, Inc.
 ;; Copyright (C) 2006 Daiki Ueno
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
 ;;   2005, 2006 Free Software Foundation, Inc.
 ;; Copyright (C) 2006 Daiki Ueno

@@ -26,13 +26,15 @@
 ;;; Code:
 
 (defgroup epg ()
 ;;; Code:
 
 (defgroup epg ()

-  "EasyPG, yet another GnuPG interface.")
+  "The EasyPG Library")

 
 (defcustom epg-gpg-program "gpg"
   "The `gpg' executable."
   :group 'epg
   :type 'string)
 
 
 (defcustom epg-gpg-program "gpg"
   "The `gpg' executable."
   :group 'epg
   :type 'string)
 

+(defconst epg-version-number "0.0.0")
+

 (defvar epg-user-id nil
   "GnuPG ID of your default identity.")
 
 (defvar epg-user-id nil
   "GnuPG ID of your default identity.")
 

@@ -44,6 +46,7 @@
 (defvar epg-key-id nil)
 (defvar epg-context nil)
 (defvar epg-debug nil)
 (defvar epg-key-id nil)
 (defvar epg-context nil)
 (defvar epg-debug nil)

+(defvar epg-debug-buffer nil)

 
 ;; from gnupg/include/cipher.h
 (defconst epg-cipher-algorithm-alist
 
 ;; from gnupg/include/cipher.h
 (defconst epg-cipher-algorithm-alist

@@ -83,6 +86,24 @@
     (2 . "ZLIB")
     (3 . "BZIP2")))
 
     (2 . "ZLIB")
     (3 . "BZIP2")))
 

+(defconst epg-invalid-recipients-alist
+  '((0 . "No specific reason given")
+    (1 . "Not Found")
+    (2 . "Ambigious specification")
+    (3 . "Wrong key usage")
+    (4 . "Key revoked")
+    (5 . "Key expired")
+    (6 . "No CRL known")
+    (7 . "CRL too old")
+    (8 . "Policy mismatch")
+    (9 . "Not a secret key")
+    (10 . "Key not trusted")))
+
+(defconst epg-delete-problem-alist
+  '((1 . "No such key")
+    (2 . "Must delete secret key first")
+    (3 . "Ambigious specification")))
+

 (defvar epg-key-validity-alist
   '((?o . unknown)
     (?i . invalid)
 (defvar epg-key-validity-alist
   '((?o . unknown)
     (?i . invalid)

@@ -120,23 +141,26 @@
   "Return the string of DATA."
   (aref data 1))
 
   "Return the string of DATA."
   (aref data 1))
 

-(defun epg-make-context (&optional protocol armor textmode include-certs)
+(defun epg-make-context (&optional protocol armor textmode include-certs
+                                  cipher-algorithm digest-algorithm
+                                  compress-algorithm)

   "Return a context object."
   (vector protocol armor textmode include-certs
   "Return a context object."
   (vector protocol armor textmode include-certs

+         cipher-algorithm digest-algorithm compress-algorithm

          #'epg-passphrase-callback-function
          #'epg-progress-callback-function
          nil nil nil nil))
 
 (defun epg-context-protocol (context)
          #'epg-passphrase-callback-function
          #'epg-progress-callback-function
          nil nil nil nil))
 
 (defun epg-context-protocol (context)

-  "Return the protocol used within the context."
+  "Return the protocol used within CONTEXT."

   (aref context 0))
 
 (defun epg-context-armor (context)
   (aref context 0))
 
 (defun epg-context-armor (context)

-  "Return t if the output shouled be ASCII armored in the CONTEXT context."
+  "Return t if the output shouled be ASCII armored in CONTEXT."

   (aref context 1))
 
 (defun epg-context-textmode (context)
   (aref context 1))
 
 (defun epg-context-textmode (context)

-  "Return t if canonical text mode should be used in the CONTEXT context."
+  "Return t if canonical text mode should be used in CONTEXT."

   (aref context 2))
 
 (defun epg-context-include-certs (context)
   (aref context 2))
 
 (defun epg-context-include-certs (context)

@@ -144,74 +168,98 @@
 message."
   (aref context 3))
 
 message."
   (aref context 3))
 

+(defun epg-context-cipher-algorithm (context)
+  "Return the cipher algorithm in CONTEXT."
+  (aref context 4))
+
+(defun epg-context-digest-algorithm (context)
+  "Return the digest algorithm in CONTEXT."
+  (aref context 5))
+
+(defun epg-context-compress-algorithm (context)
+  "Return the compress algorithm in CONTEXT."
+  (aref context 6))
+

 (defun epg-context-passphrase-callback (context)
   "Return the function used to query passphrase."
 (defun epg-context-passphrase-callback (context)
   "Return the function used to query passphrase."

-  (aref context 4))
+  (aref context 7))

 
 (defun epg-context-progress-callback (context)
   "Return the function which handles progress update."
 
 (defun epg-context-progress-callback (context)
   "Return the function which handles progress update."

-  (aref context 5))
+  (aref context 8))

 
 (defun epg-context-signers (context)
   "Return the list of key-id for singning."
 
 (defun epg-context-signers (context)
   "Return the list of key-id for singning."

-  (aref context 6))
+  (aref context 9))

 
 (defun epg-context-process (context)
   "Return the process object of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-process (context)
   "Return the process object of `epg-gpg-program'.
 This function is for internal use only."

-  (aref context 7))
+  (aref context 10))

 
 (defun epg-context-output-file (context)
   "Return the output file of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-output-file (context)
   "Return the output file of `epg-gpg-program'.
 This function is for internal use only."

-  (aref context 8))
+  (aref context 11))

 
 (defun epg-context-result (context)
   "Return the result of the previous cryptographic operation."
 
 (defun epg-context-result (context)
   "Return the result of the previous cryptographic operation."

-  (aref context 9))
+  (aref context 12))

 
 (defun epg-context-set-protocol (context protocol)
 
 (defun epg-context-set-protocol (context protocol)

-  "Set the protocol used within the context."
+  "Set the protocol used within CONTEXT."

   (aset context 0 protocol))
 
 (defun epg-context-set-armor (context armor)
   (aset context 0 protocol))
 
 (defun epg-context-set-armor (context armor)

-  "Specify if the output shouled be ASCII armored in the CONTEXT context."
+  "Specify if the output shouled be ASCII armored in CONTEXT."

   (aset context 1 armor))
 
 (defun epg-context-set-textmode (context textmode)
   (aset context 1 armor))
 
 (defun epg-context-set-textmode (context textmode)

-  "Specify if canonical text mode should be used in the CONTEXT context."
+  "Specify if canonical text mode should be used in CONTEXT."

   (aset context 2 textmode))
 
 (defun epg-context-set-include-certs (context include-certs)
  "Set how many certificates should be included in an S/MIME signed message."
   (aset context 3 include-certs))
 
   (aset context 2 textmode))
 
 (defun epg-context-set-include-certs (context include-certs)
  "Set how many certificates should be included in an S/MIME signed message."
   (aset context 3 include-certs))
 

+(defun epg-context-set-cipher-algorithm (context cipher-algorithm)
+ "Set the cipher algorithm in CONTEXT."
+  (aset context 4 cipher-algorithm))
+
+(defun epg-context-set-digest-algorithm (context digest-algorithm)
+ "Set the digest algorithm in CONTEXT."
+  (aset context 5 digest-algorithm))
+
+(defun epg-context-set-compress-algorithm (context compress-algorithm)
+ "Set the compress algorithm in CONTEXT."
+  (aset context 6 compress-algorithm))
+

 (defun epg-context-set-passphrase-callback (context
                                                 passphrase-callback)
   "Set the function used to query passphrase."
 (defun epg-context-set-passphrase-callback (context
                                                 passphrase-callback)
   "Set the function used to query passphrase."

-  (aset context 4 passphrase-callback))
+  (aset context 7 passphrase-callback))

 
 (defun epg-context-set-progress-callback (context progress-callback)
   "Set the function which handles progress update."
 
 (defun epg-context-set-progress-callback (context progress-callback)
   "Set the function which handles progress update."

-  (aset context 5 progress-callback))
+  (aset context 8 progress-callback))

 
 (defun epg-context-set-signers (context signers)
  "Set the list of key-id for singning."
 
 (defun epg-context-set-signers (context signers)
  "Set the list of key-id for singning."

-  (aset context 6 signers))
+  (aset context 9 signers))

 
 (defun epg-context-set-process (context process)
   "Set the process object of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-set-process (context process)
   "Set the process object of `epg-gpg-program'.
 This function is for internal use only."

-  (aset context 7 process))
+  (aset context 10 process))

 
 (defun epg-context-set-output-file (context output-file)
   "Set the output file of `epg-gpg-program'.
 This function is for internal use only."
 
 (defun epg-context-set-output-file (context output-file)
   "Set the output file of `epg-gpg-program'.
 This function is for internal use only."

-  (aset context 8 output-file))
+  (aset context 11 output-file))

 
 (defun epg-context-set-result (context result)
   "Set the result of the previous cryptographic operation."
 
 (defun epg-context-set-result (context result)
   "Set the result of the previous cryptographic operation."

-  (aset context 9 result))
+  (aset context 12 result))

 
 (defun epg-make-signature (status key-id user-id)
   "Return a signature object."
 
 (defun epg-make-signature (status key-id user-id)
   "Return a signature object."

@@ -358,11 +406,25 @@ This function is for internal use only."
        (setcdr entry value)
       (epg-context-set-result context (cons (cons name value) result)))))
 
        (setcdr entry value)
       (epg-context-set-result context (cons (cons name value) result)))))
 

+(defun epg-signature-to-string (signature)
+  (format "%s signature from %s %s%s"
+         (capitalize (symbol-name (epg-signature-status signature)))
+         (epg-signature-key-id signature)
+         (epg-signature-user-id signature)
+         (if (epg-signature-validity signature)
+             (format " (trust %s)"
+                     (epg-signature-validity signature))
+           "")))
+
+(defun epg-verify-result-to-string (verify-result)
+  (mapconcat #'epg-signature-to-string verify-result "\n"))
+

 (defun epg-start (context args)
   "Start `epg-gpg-program' in a subprocess with given ARGS."
   (let* ((args (append (list "--no-tty"
                             "--status-fd" "1"
 (defun epg-start (context args)
   "Start `epg-gpg-program' in a subprocess with given ARGS."
   (let* ((args (append (list "--no-tty"
                             "--status-fd" "1"

-                            "--command-fd" "0")
+                            "--command-fd" "0"
+                            "--yes")

                       (if (epg-context-armor context) '("--armor"))
                       (if (epg-context-textmode context) '("--textmode"))
                       (if (epg-context-output-file context)
                       (if (epg-context-armor context) '("--armor"))
                       (if (epg-context-textmode context) '("--textmode"))
                       (if (epg-context-output-file context)

@@ -373,6 +435,14 @@ This function is for internal use only."
         (orig-mode (default-file-modes))
         (buffer (generate-new-buffer " *epg*"))
         process)
         (orig-mode (default-file-modes))
         (buffer (generate-new-buffer " *epg*"))
         process)

+    (if epg-debug
+       (save-excursion
+         (unless epg-debug-buffer
+           (setq epg-debug-buffer (generate-new-buffer " *epg-debug*")))
+         (set-buffer epg-debug-buffer)
+         (goto-char (point-max))
+         (insert (format "%s %s\n" epg-gpg-program
+                         (mapconcat #'identity args " ")))))

     (with-current-buffer buffer
       (make-local-variable 'epg-read-point)
       (setq epg-read-point (point-min))
     (with-current-buffer buffer
       (make-local-variable 'epg-read-point)
       (setq epg-read-point (point-min))

@@ -394,7 +464,9 @@ This function is for internal use only."
 (defun epg-process-filter (process input)
   (if epg-debug
       (save-excursion
 (defun epg-process-filter (process input)
   (if epg-debug
       (save-excursion

-       (set-buffer (get-buffer-create  " *epg-debug*"))
+       (unless epg-debug-buffer
+         (setq epg-debug-buffer (generate-new-buffer " *epg-debug*")))
+       (set-buffer epg-debug-buffer)

        (goto-char (point-max))
        (insert input)))
   (if (buffer-live-p (process-buffer process))
        (goto-char (point-max))
        (insert input)))
   (if (buffer-live-p (process-buffer process))

@@ -404,7 +476,7 @@ This function is for internal use only."
        (insert input)
        (goto-char epg-read-point)
        (beginning-of-line)
        (insert input)
        (goto-char epg-read-point)
        (beginning-of-line)

-       (while (looking-at ".*\n")      ;the input line is finished
+       (while (looking-at ".*\n")      ;the input line finished

          (save-excursion
            (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
                (let* ((status (match-string 1))
          (save-excursion
            (if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
                (let* ((status (match-string 1))

@@ -437,13 +509,15 @@ This function is for internal use only."
       (accept-process-output (epg-context-process context) 1))))
 
 (defun epg-wait-for-completion (context)
       (accept-process-output (epg-context-process context) 1))))
 
 (defun epg-wait-for-completion (context)

-  (if (eq (process-status (epg-context-process context)) 'run)
-      (process-send-eof (epg-context-process context)))

   (while (eq (process-status (epg-context-process context)) 'run)
     ;; We can't use accept-process-output instead of sit-for here
     ;; because it may cause an interrupt during the sentinel execution.
     (sit-for 0.1)))
 
   (while (eq (process-status (epg-context-process context)) 'run)
     ;; We can't use accept-process-output instead of sit-for here
     ;; because it may cause an interrupt during the sentinel execution.
     (sit-for 0.1)))
 

+(defun epg-flush (context)
+  (if (eq (process-status (epg-context-process context)) 'run)
+      (process-send-eof (epg-context-process context))))
+

 (defun epg-reset (context)
   (if (and (epg-context-process context)
           (buffer-live-p (process-buffer (epg-context-process context))))
 (defun epg-reset (context)
   (if (and (epg-context-process context)
           (buffer-live-p (process-buffer (epg-context-process context))))

@@ -476,23 +550,26 @@ This function is for internal use only."
   (setq epg-key-id 'PIN))
 
 (defun epg-status-GET_HIDDEN (process string)
   (setq epg-key-id 'PIN))
 
 (defun epg-status-GET_HIDDEN (process string)

-  (let ((passphrase
-        (funcall (if (consp (epg-context-passphrase-callback epg-context))
-                     (car (epg-context-passphrase-callback epg-context))
-                   (epg-context-passphrase-callback epg-context))
-                 epg-key-id
-                 (if (consp (epg-context-passphrase-callback epg-context))
-                     (cdr (epg-context-passphrase-callback epg-context)))))
-       string)
-    (if passphrase
-       (unwind-protect
-           (progn
-             (setq string (concat passphrase "\n"))
-             (fillarray passphrase 0)
-             (setq passphrase nil)
-             (process-send-string process string))
-         (if string
-             (fillarray string 0))))))
+  (if (and epg-key-id
+          (string-match "\\`passphrase\\." string))
+    (let ((passphrase
+          (funcall
+           (if (consp (epg-context-passphrase-callback epg-context))
+               (car (epg-context-passphrase-callback epg-context))
+             (epg-context-passphrase-callback epg-context))
+           epg-key-id
+           (if (consp (epg-context-passphrase-callback epg-context))
+               (cdr (epg-context-passphrase-callback epg-context)))))
+         string)
+      (if passphrase
+         (unwind-protect
+             (progn
+               (setq string (concat passphrase "\n"))
+               (fillarray passphrase 0)
+               (setq passphrase nil)
+               (process-send-string process string))
+           (if string
+               (fillarray string 0)))))))

 
 (defun epg-status-GET_BOOL (process string)
   (let ((entry (assoc string epg-prompt-alist)))
 
 (defun epg-status-GET_BOOL (process string)
   (let ((entry (assoc string epg-prompt-alist)))

@@ -641,6 +718,43 @@ This function is for internal use only."
    (cons 'bad-armor
         (epg-context-result-for epg-context 'error))))
 
    (cons 'bad-armor
         (epg-context-result-for epg-context 'error))))
 

+(defun epg-status-INV_RECP (process string)
+  (if (string-match "\\`\\([0-9]+\\) \\(.*\\)" string)
+      (epg-context-set-result-for
+       epg-context 'error
+       (cons (list 'invalid-recipient
+                  (string-to-number (match-string 1 string))
+                  (match-string 2 string))
+            (epg-context-result-for epg-context 'error)))))
+
+(defun epg-status-NO_RECP (process string)
+  (epg-context-set-result-for
+   epg-context 'error
+   (cons 'no-recipients
+        (epg-context-result-for epg-context 'error))))
+
+(defun epg-status-DELETE_PROBLEM (process string)
+  (if (string-match "\\`\\([0-9]+\\)" string)
+      (epg-context-set-result-for
+       epg-context 'error
+       (cons (cons 'delete-problem (string-to-number (match-string 1 string)))
+            (epg-context-result-for epg-context 'error)))))
+
+(defun epg-status-SIG_CREATED (process 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
+       (cons (list (cons 'type (string-to-char (match-string 1 string)))
+                  (cons 'pubkey-algorithm
+                        (string-to-number (match-string 2 string)))
+                  (cons 'digest-algorithm
+                        (string-to-number (match-string 3 string)))
+                  (cons 'class (string-to-number (match-string 4 string) 16))
+                  (cons 'creation-time (match-string 5 string))
+                  (cons 'fingerprint (substring string (match-end 0))))
+            (epg-context-result-for epg-context 'sign)))))
+

 (defun epg-passphrase-callback-function (key-id handback)
   (read-passwd
    (if (eq key-id 'SYM)
 (defun epg-passphrase-callback-function (key-id handback)
   (read-passwd
    (if (eq key-id 'SYM)

@@ -699,7 +813,8 @@ This function is for internal use only."
 
 (defun epg-make-sub-key-1 (line)
   (epg-make-sub-key
 
 (defun epg-make-sub-key-1 (line)
   (epg-make-sub-key

-   (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist))
+   (if (aref line 1)
+       (cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))

    (delq nil
         (mapcar (lambda (char) (cdr (assq char epg-key-capablity-alist)))
                 (aref line 11)))
    (delq nil
         (mapcar (lambda (char) (cdr (assq char epg-key-capablity-alist)))
                 (aref line 11)))

@@ -724,8 +839,9 @@ This function is for internal use only."
           (car keys)
           (nreverse (epg-key-user-id-list (car keys)))))
        (setq keys (cons (epg-make-key
           (car keys)
           (nreverse (epg-key-user-id-list (car keys)))))
        (setq keys (cons (epg-make-key

-                         (cdr (assq (string-to-char (aref (car lines) 8))
-                                    epg-key-validity-alist)))
+                         (if (aref (car lines) 8)
+                             (cdr (assq (string-to-char (aref (car lines) 8))
+                                        epg-key-validity-alist))))

                         keys))
        (epg-key-set-sub-key-list
         (car keys)
                         keys))
        (epg-key-set-sub-key-list
         (car keys)

@@ -740,8 +856,9 @@ This function is for internal use only."
        (epg-key-set-user-id-list
         (car keys)
         (cons (epg-make-user-id
        (epg-key-set-user-id-list
         (car keys)
         (cons (epg-make-user-id

-               (cdr (assq (string-to-char (aref (car lines) 1))
-                          epg-key-validity-alist))
+               (if (aref (car lines) 1)
+                   (cdr (assq (string-to-char (aref (car lines) 1))
+                              epg-key-validity-alist)))

                (aref (car lines) 9))
               (epg-key-user-id-list (car keys)))))
        ((equal (aref (car lines) 0) "fpr")
                (aref (car lines) 9))
               (epg-key-user-id-list (car keys)))))
        ((equal (aref (car lines) 0) "fpr")

@@ -828,7 +945,8 @@ If PLAIN is nil, it returns the result as a string."
        (epg-start-decrypt context (epg-make-data-from-file cipher))
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-start-decrypt context (epg-make-data-from-file cipher))
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

-           (error "Decryption failed"))
+           (error "Decrypt failed: %S"
+                  (epg-context-result-for context 'error)))

        (unless plain
          (epg-read-output context)))
     (unless plain
        (unless plain
          (epg-read-output context)))
     (unless plain

@@ -846,9 +964,11 @@ If PLAIN is nil, it returns the result as a string."
          (epg-context-set-output-file context
                                       (epg-make-temp-file "epg-output"))
          (epg-start-decrypt context (epg-make-data-from-file input-file))
          (epg-context-set-output-file context
                                       (epg-make-temp-file "epg-output"))
          (epg-start-decrypt context (epg-make-data-from-file input-file))

+         (epg-flush context)

          (epg-wait-for-completion context)
          (if (epg-context-result-for context 'error)
          (epg-wait-for-completion context)
          (if (epg-context-result-for context 'error)

-             (error "Decryption failed"))
+             (error "Decrypt failed: %S"
+                    (epg-context-result-for context 'error)))

          (epg-read-output context))
       (epg-delete-output-file context)
       (if (file-exists-p input-file)
          (epg-read-output context))
       (epg-delete-output-file context)
       (if (file-exists-p input-file)

@@ -933,6 +1053,7 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil."
                                  (epg-make-data-from-file input-file)
                                  (epg-make-data-from-string signed-text)))
            (epg-start-verify context (epg-make-data-from-string signature)))
                                  (epg-make-data-from-file input-file)
                                  (epg-make-data-from-string signed-text)))
            (epg-start-verify context (epg-make-data-from-string signature)))

+         (epg-flush context)

          (epg-wait-for-completion context)
          (epg-read-output context))
       (epg-delete-output-file context)
          (epg-wait-for-completion context)
          (epg-read-output context))
       (epg-delete-output-file context)

@@ -963,9 +1084,12 @@ If you are unsure, use synchronous version of this function
                                 "--detach-sign"
                               "--sign")))
                     (apply #'nconc
                                 "--detach-sign"
                               "--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)))

                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))
   (epg-wait-for-status context '("BEGIN_SIGNING"))
                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))
   (epg-wait-for-status context '("BEGIN_SIGNING"))

@@ -990,7 +1114,8 @@ Otherwise, it makes a normal signature."
        (epg-start-sign context (epg-make-data-from-file plain) mode)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-start-sign context (epg-make-data-from-file plain) mode)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

-           (error "Sign failed"))
+           (error "Sign failed: %S"
+                  (epg-context-result-for context 'error)))

        (unless signature
          (epg-read-output context)))
     (unless signature
        (unless signature
          (epg-read-output context)))
     (unless signature

@@ -1008,9 +1133,11 @@ Otherwise, it makes a normal signature."
        (epg-context-set-output-file context
                                     (epg-make-temp-file "epg-output"))
        (epg-start-sign context (epg-make-data-from-string plain) mode)
        (epg-context-set-output-file context
                                     (epg-make-temp-file "epg-output"))
        (epg-start-sign context (epg-make-data-from-string plain) mode)

+       (epg-flush context)

        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

-           (error "Sign failed"))
+           (error "Sign failed: %S"
+                  (epg-context-result-for context 'error)))

        (epg-read-output context))
     (epg-delete-output-file context)
     (epg-reset context)))
        (epg-read-output context))
     (epg-delete-output-file context)
     (epg-reset context)))

@@ -1038,15 +1165,17 @@ If you are unsure, use synchronous version of this function
                                                (list "-u" signer))
                                              (epg-context-signers context)))))
                     (apply #'nconc
                                                (list "-u" signer))
                                              (epg-context-signers context)))))
                     (apply #'nconc

-                           (mapcar (lambda (recipient)
-                                     (list "-r" recipient))
-                                   recipients))
+                           (mapcar
+                            (lambda (recipient)
+                              (list "-r"
+                                    (epg-sub-key-id
+                                     (car (epg-key-sub-key-list recipient)))))
+                            recipients))

                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))
   (if sign
       (epg-wait-for-status context '("BEGIN_SIGNING"))
                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))
   (if sign
       (epg-wait-for-status context '("BEGIN_SIGNING"))

-    (if (null recipients)
-       (epg-wait-for-status context '("BEGIN_ENCRYPTION"))))
+    (epg-wait-for-status context '("BEGIN_ENCRYPTION")))

   (if (and (epg-data-string plain)
           (eq (process-status (epg-context-process context)) 'run))
       (process-send-string (epg-context-process context)
   (if (and (epg-data-string plain)
           (eq (process-status (epg-context-process context)) 'run))
       (process-send-string (epg-context-process context)

@@ -1068,7 +1197,8 @@ If RECIPIENTS is nil, it performs symmetric encryption."
                           recipients sign always-trust)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
                           recipients sign always-trust)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

-           (error "Encrypt failed"))
+           (error "Encrypt failed: %S"
+                  (epg-context-result-for context 'error)))

        (unless cipher
          (epg-read-output context)))
     (unless cipher
        (unless cipher
          (epg-read-output context)))
     (unless cipher

@@ -1086,39 +1216,57 @@ If RECIPIENTS is nil, it performs symmetric encryption."
                                     (epg-make-temp-file "epg-output"))
        (epg-start-encrypt context (epg-make-data-from-string plain)
                           recipients sign always-trust)
                                     (epg-make-temp-file "epg-output"))
        (epg-start-encrypt context (epg-make-data-from-string plain)
                           recipients sign always-trust)

+       (epg-flush context)

        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

-           (error "Encrypt failed"))
+           (error "Encrypt failed: %S"
+                  (epg-context-result-for context 'error)))

        (epg-read-output context))
     (epg-delete-output-file context)
     (epg-reset context)))
 
 ;;;###autoload
        (epg-read-output context))
     (epg-delete-output-file context)
     (epg-reset context)))
 
 ;;;###autoload

-(defun epg-start-export-keys (context pattern)
+(defun epg-start-export-keys (context keys)

   "Initiate an export keys operation.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function
   "Initiate an export keys operation.
 
 If you use this function, you will need to wait for the completion of
 `epg-gpg-program' by using `epg-wait-for-completion' and call
 `epg-reset' to clear a temporaly output file.
 If you are unsure, use synchronous version of this function

-`epg-export-keys' instead."
+`epg-export-keys-to-file' or `epg-export-keys-to-string' instead."

   (epg-context-set-result context nil)
   (epg-context-set-result context nil)

-  (epg-context-set-output-file context (epg-make-temp-file "epg-output"))
-  (epg-start context (list "--export" pattern)))
+  (epg-start context (cons "--export"
+                          (mapcar
+                           (lambda (key)
+                             (epg-sub-key-id
+                              (car (epg-key-sub-key-list key))))
+                           keys))))

 
 ;;;###autoload
 
 ;;;###autoload

-(defun epg-export-keys (context pattern)
-  "Extract public keys matched with PATTERN and return them."
+(defun epg-export-keys-to-file (context keys file)
+  "Extract public KEYS."

   (unwind-protect
       (progn
   (unwind-protect
       (progn

-       (epg-start-export-keys context pattern)
+       (if keys
+           (epg-context-set-output-file context file)
+         (epg-context-set-output-file context
+                                      (epg-make-temp-file "epg-output")))
+       (epg-start-export-keys context keys)

        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
            (error "Export keys failed"))
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
            (error "Export keys failed"))

-       (epg-read-output context))
+       (unless file
+         (epg-read-output context)))
+    (unless file
+      (epg-delete-output-file context))

     (epg-reset context)))
 
 ;;;###autoload
     (epg-reset context)))
 
 ;;;###autoload

+(defun epg-export-keys-to-string (context keys)
+  "Extract public KEYS and return them as a string."
+  (epg-export-keys-to-file context keys nil))
+
+;;;###autoload

 (defun epg-start-import-keys (context keys)
   "Initiate an import keys operation.
 KEYS is a data object.
 (defun epg-start-import-keys (context keys)
   "Initiate an import keys operation.
 KEYS is a data object.

@@ -1130,7 +1278,7 @@ 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-result context nil)
   (epg-context-set-output-file context (epg-make-temp-file "epg-output"))
 `epg-import-keys-from-file' or `epg-import-keys-from-string' instead."
   (epg-context-set-result context nil)
   (epg-context-set-output-file context (epg-make-temp-file "epg-output"))

-  (epg-start context (append (list "--import") (epg-data-file keys)))
+  (epg-start context (list "--import" (epg-data-file keys)))

   (if (and (epg-data-string keys)
           (eq (process-status (epg-context-process context)) 'run))
       (process-send-string (epg-context-process context)
   (if (and (epg-data-string keys)
           (eq (process-status (epg-context-process context)) 'run))
       (process-send-string (epg-context-process context)

@@ -1140,6 +1288,8 @@ If you are unsure, use synchronous version of this function
   (unwind-protect
       (progn
        (epg-start-import-keys context keys)
   (unwind-protect
       (progn
        (epg-start-import-keys context keys)

+       (if (epg-data-file keys)
+           (epg-flush context))

        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
            (error "Import keys failed"))
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
            (error "Import keys failed"))

@@ -1156,6 +1306,36 @@ If you are unsure, use synchronous version of this function
   "Add keys from a string KEYS."
   (epg-import-keys-1 context (epg-make-data-from-string keys)))
 
   "Add keys from a string KEYS."
   (epg-import-keys-1 context (epg-make-data-from-string keys)))
 

+;;;###autoload
+(defun epg-start-delete-keys (context keys &optional allow-secret)
+  "Initiate an delete keys operation.
+
+If you use this function, you will need to wait for the completion of
+`epg-gpg-program' by using `epg-wait-for-completion' and call
+`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-result context nil)
+  (epg-start context (cons (if allow-secret
+                              "--delete-secret-key"
+                            "--delete-key")
+                          (mapcar
+                           (lambda (key)
+                             (epg-sub-key-id
+                              (car (epg-key-sub-key-list key))))
+                           keys))))
+
+;;;###autoload
+(defun epg-delete-keys (context keys &optional allow-secret)
+  "Delete KEYS from the key ring."
+  (unwind-protect
+      (progn
+       (epg-start-delete-keys context keys)
+       (epg-wait-for-completion context)
+       (if (epg-context-result-for context 'error)
+           (error "Delete key failed")))
+    (epg-reset context)))
+

 (provide 'epg)
 
 ;;; epg.el ends here
 (provide 'epg)
 
 ;;; epg.el ends here