* epg.el (epg-status-GET_HIDDEN): Don't pass KEY-ID to

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index bcc09d0..f4c2f83 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.")
 

@@ -45,46 +47,7 @@
 (defvar epg-context nil)
 (defvar epg-debug nil)
 
 (defvar epg-context nil)
 (defvar epg-debug nil)
 

-(defvar epg-colons-pub-spec
-  '((trust "[^:]")
-    (length "[0-9]+" 0 string-to-number)
-    (algorithm "[0-9]+" 0 string-to-number)
-    (key-id "[^:]+")
-    (creation-date "[0-9]+")
-    (expiration-date "[0-9]+")
-    nil
-    (ownertrust "[^:]")
-    nil
-    nil
-    (capability "[escaESCA]*"))
-  "The schema of keylisting output whose type is \"pub\".
-This is used by `epg-list-keys'.")
-
-(defvar epg-colons-sec-spec
-  '((trust "[^:]")
-    (length "[0-9]+" 0 string-to-number)
-    (algorithm "[0-9]+" 0 string-to-number)
-    (key-id "[^:]+")
-    (creation-date "[0-9]+")
-    (expiration-date "[0-9]+")
-    nil
-    (ownertrust "[^:]"))
-"The schema of keylisting output whose type is \"sec\".
-This is used by `epg-list-keys'.")
-
-(defvar epg-colons-uid-spec
-  '((trust "[^:]")
-    nil
-    nil
-    nil
-    (creation-date "[0-9]+")
-    (expiration-date "[0-9]+")
-    (hash "[^:]+")
-    nil
-    (user-id "[^:]+"))
-  "The schema of keylisting output whose type is \"uid\".
-This is used by `epg-list-keys'.")
-
+;; from gnupg/include/cipher.h

 (defconst epg-cipher-algorithm-alist
   '((0 . "NONE")
     (1 . "IDEA")
 (defconst epg-cipher-algorithm-alist
   '((0 . "NONE")
     (1 . "IDEA")

@@ -97,6 +60,7 @@ This is used by `epg-list-keys'.")
     (10 . "TWOFISH")
     (110 . "DUMMY")))
 
     (10 . "TWOFISH")
     (110 . "DUMMY")))
 

+;; from gnupg/include/cipher.h

 (defconst epg-pubkey-algorithm-alist
   '((1 . "RSA")
     (2 . "RSA_E")
 (defconst epg-pubkey-algorithm-alist
   '((1 . "RSA")
     (2 . "RSA_E")

@@ -105,6 +69,7 @@ This is used by `epg-list-keys'.")
     (17 . "DSA")
     (20 . "ELGAMAL")))
 
     (17 . "DSA")
     (20 . "ELGAMAL")))
 

+;; from gnupg/include/cipher.h

 (defconst epg-digest-algorithm-alist
   '((1 . "MD5")
     (2 . "SHA1")
 (defconst epg-digest-algorithm-alist
   '((1 . "MD5")
     (2 . "SHA1")

@@ -113,12 +78,50 @@ This is used by `epg-list-keys'.")
     (9 . "SHA384")
     (10 . "SHA512")))
 
     (9 . "SHA384")
     (10 . "SHA512")))
 

+;; from gnupg/include/cipher.h

 (defconst epg-compress-algorithm-alist
   '((0 . "NONE")
     (1 . "ZIP")
     (2 . "ZLIB")
     (3 . "BZIP2")))
 
 (defconst epg-compress-algorithm-alist
   '((0 . "NONE")
     (1 . "ZIP")
     (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)
+    (?d . disabled)
+    (?r . revoked)
+    (?e . expired)
+    (?- . none)
+    (?q . undefined)
+    (?n . never)
+    (?m . marginal)
+    (?f . full)
+    (?u . ultimate)))
+
+(defvar epg-key-capablity-alist
+  '((?e . encrypt)
+    (?s . sign)
+    (?c . certify)
+    (?a . authentication)))
+

 (defvar epg-prompt-alist nil)
 
 (defun epg-make-data-from-file (file)
 (defvar epg-prompt-alist nil)
 
 (defun epg-make-data-from-file (file)

@@ -137,23 +140,26 @@ This is used by `epg-list-keys'.")
   "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)

@@ -161,74 +167,98 @@ This is used by `epg-list-keys'.")
 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."

@@ -274,6 +304,97 @@ This function is for internal use only."
  "Set the fingerprint of SIGNATURE."
   (aset signature 4 fingerprint))
 
  "Set the fingerprint of SIGNATURE."
   (aset signature 4 fingerprint))
 

+(defun epg-make-key (owner-trust)
+  "Return a key object."
+  (vector owner-trust nil nil))
+
+(defun epg-key-owner-trust (key)
+  "Return the owner trust of KEY."
+  (aref key 0))
+
+(defun epg-key-sub-key-list (key)
+  "Return the sub key list of KEY."
+  (aref key 1))
+
+(defun epg-key-user-id-list (key)
+  "Return the user ID list of KEY."
+  (aref key 2))
+
+(defun epg-key-set-sub-key-list (key sub-key-list)
+  "Set the sub key list of KEY."
+  (aset key 1 sub-key-list))
+
+(defun epg-key-set-user-id-list (key user-id-list)
+  "Set the user ID list of KEY."
+  (aset key 2 user-id-list))
+
+(defun epg-make-sub-key (validity capability secret algorithm length id
+                                 creation-time expiration-time)
+  "Return a sub key object."
+  (vector validity capability secret algorithm length id creation-time
+         expiration-time nil))
+
+(defun epg-sub-key-validity (sub-key)
+  "Return the validity of SUB-KEY."
+  (aref sub-key 0))
+
+(defun epg-sub-key-capability (sub-key)
+  "Return the capability of SUB-KEY."
+  (aref sub-key 1))
+
+(defun epg-sub-key-secret (sub-key)
+  "Return non-nil if SUB-KEY is a secret key."
+  (aref sub-key 2))
+
+(defun epg-sub-key-algorithm (sub-key)
+  "Return the algorithm of SUB-KEY."
+  (aref sub-key 3))
+
+(defun epg-sub-key-length (sub-key)
+  "Return the length of SUB-KEY."
+  (aref sub-key 4))
+
+(defun epg-sub-key-id (sub-key)
+  "Return the ID of SUB-KEY."
+  (aref sub-key 5))
+
+(defun epg-sub-key-creation-time (sub-key)
+  "Return the creation time of SUB-KEY."
+  (aref sub-key 6))
+
+(defun epg-sub-key-expiration-time (sub-key)
+  "Return the expiration time of SUB-KEY."
+  (aref sub-key 7))
+
+(defun epg-sub-key-fingerprint (sub-key)
+  "Return the fingerprint of SUB-KEY."
+  (aref sub-key 8))
+
+(defun epg-sub-key-set-fingerprint (sub-key fingerprint)
+  "Set the fingerprint of SUB-KEY.
+This function is for internal use only."
+  (aset sub-key 8 fingerprint))
+
+(defun epg-make-user-id (validity name)
+  "Return a user ID object."
+  (vector validity name nil))
+
+(defun epg-user-id-validity (user-id)
+  "Return the validity of USER-ID."
+  (aref user-id 0))
+
+(defun epg-user-id-name (user-id)
+  "Return the name of USER-ID."
+  (aref user-id 1))
+
+(defun epg-user-id-signature-list (user-id)
+  "Return the signature list of USER-ID."
+  (aref user-id 2))
+
+(defun epg-user-id-set-signature-list (user-id signature-list)
+  "Set the signature list of USER-ID."
+  (aset user-id 2 signature-list))
+

 (defun epg-context-result-for (context name)
   (cdr (assq name (epg-context-result context))))
 
 (defun epg-context-result-for (context name)
   (cdr (assq name (epg-context-result context))))
 

@@ -299,6 +420,12 @@ 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
+         (set-buffer (get-buffer-create  " *epg-debug*"))
+         (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))

@@ -362,8 +489,9 @@ This function is for internal use only."
                epg-pending-status-list)
       (accept-process-output (epg-context-process context) 1))))
 
                epg-pending-status-list)
       (accept-process-output (epg-context-process context) 1))))
 

-(defun epg-wait-for-completion (context)
-  (if (eq (process-status (epg-context-process context)) 'run)
+(defun epg-wait-for-completion (context &optional no-eof)
+  (if (and (not no-eof)
+          (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
       (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

@@ -406,7 +534,6 @@ This function is for internal use only."
         (funcall (if (consp (epg-context-passphrase-callback epg-context))
                      (car (epg-context-passphrase-callback epg-context))
                    (epg-context-passphrase-callback epg-context))
         (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 (consp (epg-context-passphrase-callback epg-context))
                      (cdr (epg-context-passphrase-callback epg-context)))))
        string)

@@ -510,7 +637,7 @@ This function is for internal use only."
   (let ((signature (car (epg-context-result-for epg-context 'verify))))
     (if (and signature
             (eq (epg-signature-status signature) 'good))
   (let ((signature (car (epg-context-result-for epg-context 'verify))))
     (if (and signature
             (eq (epg-signature-status signature) 'good))

-       (epg-signature-set-validity signature 'fully))))
+       (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 (process string)
   (let ((signature (car (epg-context-result-for epg-context 'verify))))

@@ -567,16 +694,38 @@ 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-passphrase-callback-function (key-id handback)
+(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-passphrase-callback-function (handback)

   (read-passwd
   (read-passwd

-   (if (eq key-id 'SYM)
+   (if (eq epg-key-id 'SYM)

        "Passphrase for symmetric encryption: "
        "Passphrase for symmetric encryption: "

-     (if (eq key-id 'PIN)
+     (if (eq epg-key-id 'PIN)

         "Passphrase for PIN: "
         "Passphrase for PIN: "

-       (let ((entry (assoc key-id epg-user-id-alist)))
+       (let ((entry (assoc epg-key-id epg-user-id-alist)))

         (if entry
         (if entry

-            (format "Passphrase for %s %s: " key-id (cdr entry))
-          (format "Passphrase for %s: " key-id)))))))
+            (format "Passphrase for %s %s: " epg-key-id (cdr entry))
+          (format "Passphrase for %s: " epg-key-id)))))))

 
 (defun epg-progress-callback-function (what char current total handback)
   (message "%s: %d%%/%d%%" what current total))
 
 (defun epg-progress-callback-function (what char current total handback)
   (message "%s: %d%%/%d%%" what current total))

@@ -601,59 +750,84 @@ This function is for internal use only."
                           config))))
     config))
 
                           config))))
     config))
 

-(defun epg-list-keys (name &optional secret)
-  "List keys associated with STRING."
+(defun epg-list-keys-1 (name mode)

   (let ((args (append (list "--with-colons" "--no-greeting" "--batch"
   (let ((args (append (list "--with-colons" "--no-greeting" "--batch"

-                           "--fixed-list-mode"
-                           (if secret "--list-secret-keys" "--list-keys"))
+                           "--fixed-list-mode" "--with-fingerprint"
+                           "--with-fingerprint"
+                           (if mode "--list-secret-keys" "--list-keys"))

                      (if name (list name))))
                      (if name (list name))))

-       keys type symbol pointer)
+       keys string field index)

     (with-temp-buffer
       (apply #'call-process epg-gpg-program nil (list t nil) nil args)
       (goto-char (point-min))
     (with-temp-buffer
       (apply #'call-process epg-gpg-program nil (list t nil) nil args)
       (goto-char (point-min))

-      (while (re-search-forward "^\\([a-z][a-z][a-z]\\):\\(.*\\)" nil t)
-       (setq type (match-string 1)
-             symbol (intern-soft (format "epg-colons-%s-spec" type)))
-       (if (member type '("pub" "sec"))
-           (setq keys (cons nil keys)))
-       (if (and symbol
-                (boundp symbol))
-           (setcar keys (cons (cons (intern type)
-                                    (epg-parse-colons
-                                     (symbol-value symbol)
-                                     (match-string 2)))
-                              (car keys))))
-       (forward-line)))
-    (setq pointer keys)
-    (while pointer
-      (setcar pointer (nreverse (car pointer)))
-      (setq pointer (cdr pointer)))
+      (while (re-search-forward "^[a-z][a-z][a-z]:.*" nil t)
+       (setq keys (cons (make-vector 15 nil) keys)
+             string (match-string 0)
+             index 0
+             field 0)
+       (while (eq index
+                  (string-match "\\([^:]+\\)?:" string index))
+         (setq index (match-end 0))
+         (aset (car keys) field (match-string 1 string))
+         (setq field (1+ field))))
+      (nreverse keys))))
+
+(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)))
+   (delq nil
+        (mapcar (lambda (char) (cdr (assq char epg-key-capablity-alist)))
+                (aref line 11)))
+   (member (aref line 0) '("sec" "ssb"))
+   (string-to-number (aref line 3))
+   (string-to-number (aref line 2))
+   (aref line 4)
+   (aref line 5)
+   (aref line 6)))
+
+(defun epg-list-keys (&optional name mode)
+  (let ((lines (epg-list-keys-1 name mode))
+       keys)
+    (while lines
+      (cond
+       ((member (aref (car lines) 0) '("pub" "sec"))
+       (when (car keys)
+         (epg-key-set-sub-key-list
+          (car keys)
+          (nreverse (epg-key-sub-key-list (car keys))))
+         (epg-key-set-user-id-list
+          (car keys)
+          (nreverse (epg-key-user-id-list (car keys)))))
+       (setq keys (cons (epg-make-key
+                         (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)
+        (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))
+              (epg-key-sub-key-list (car keys)))))
+       ((equal (aref (car lines) 0) "uid")
+       (epg-key-set-user-id-list
+        (car keys)
+        (cons (epg-make-user-id
+               (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")
+       (epg-sub-key-set-fingerprint (car (epg-key-sub-key-list (car keys)))
+                                    (aref (car lines) 9))))
+      (setq lines (cdr lines)))

     (nreverse keys)))
 
     (nreverse keys)))
 

-(defun epg-parse-colons (alist string)
-  (let ((index 0)
-       result)
-    (while (and alist
-               (or (null (car alist))
-                   (eq index
-                       (string-match
-                        (concat "\\(" (nth 1 (car alist)) "\\)?:")
-                        string index))))
-      (if (car alist)
-         (progn
-           (setq index (match-end 0))
-           (if (match-beginning 1)
-               (setq result
-                     (cons (cons (car (car alist))
-                                 (funcall (or (nth 3 (car alist)) #'identity)
-                                          (match-string
-                                           (1+ (or (nth 2 (car alist)) 0))
-                                           string)))
-                           result))))
-       (setq index (1+ index)))
-      (setq alist (cdr alist)))
-    (nreverse result)))
-

 (if (fboundp 'make-temp-file)
     (defalias 'epg-make-temp-file 'make-temp-file)
   ;; stolen from poe.el.
 (if (fboundp 'make-temp-file)
     (defalias 'epg-make-temp-file 'make-temp-file)
   ;; stolen from poe.el.

@@ -730,9 +904,10 @@ 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 cipher))
          (epg-context-set-output-file context
                                       (epg-make-temp-file "epg-output")))
        (epg-start-decrypt context (epg-make-data-from-file cipher))

-       (epg-wait-for-completion context)
+       (epg-wait-for-completion context t)

        (if (epg-context-result-for context 'error)
        (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

@@ -752,7 +927,8 @@ If PLAIN is nil, it returns the result as a string."
          (epg-start-decrypt context (epg-make-data-from-file input-file))
          (epg-wait-for-completion context)
          (if (epg-context-result-for context 'error)
          (epg-start-decrypt context (epg-make-data-from-file input-file))
          (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)

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

-       (epg-wait-for-completion context)
+       (epg-wait-for-completion context t)

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

@@ -892,9 +1068,10 @@ 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-file plain) mode)
          (epg-context-set-output-file context
                                       (epg-make-temp-file "epg-output")))
        (epg-start-sign context (epg-make-data-from-file plain) mode)

-       (epg-wait-for-completion context)
+       (epg-wait-for-completion context t)

        (if (epg-context-result-for context 'error)
        (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

@@ -914,7 +1091,8 @@ Otherwise, it makes a normal signature."
        (epg-start-sign context (epg-make-data-from-string plain) mode)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-start-sign context (epg-make-data-from-string 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)))

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

@@ -948,9 +1126,8 @@ If you are unsure, use synchronous version of this function
                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))
   (if sign
                     (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_SIGNING")))
+  (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)

@@ -970,9 +1147,10 @@ If RECIPIENTS is nil, it performs symmetric encryption."
                                       (epg-make-temp-file "epg-output")))
        (epg-start-encrypt context (epg-make-data-from-file plain)
                           recipients sign always-trust)
                                       (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)
+       (epg-wait-for-completion context t)

        (if (epg-context-result-for context 'error)
        (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

@@ -992,37 +1170,54 @@ 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)))

        (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.

@@ -1034,7 +1229,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)

@@ -1044,7 +1239,7 @@ 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)

-       (epg-wait-for-completion context)
+       (epg-wait-for-completion context (epg-data-file keys))

        (if (epg-context-result-for context 'error)
            (error "Import keys failed"))
        (epg-read-output context))
        (if (epg-context-result-for context 'error)
            (error "Import keys failed"))
        (epg-read-output context))

@@ -1060,6 +1255,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 t)
+       (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