* epg.el (epg-sign-file): Signal an error only when a signature is not

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index 305883e..b32d57a 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -33,6 +33,11 @@
   :group 'epg
   :type 'string)
 
   :group 'epg
   :type 'string)
 

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

 (defconst epg-version-number "0.0.0")
 
 (defvar epg-user-id nil
 (defconst epg-version-number "0.0.0")
 
 (defvar epg-user-id nil

@@ -123,6 +128,19 @@
     (?c . certify)
     (?a . authentication)))
 
     (?c . certify)
     (?a . authentication)))
 

+(defvar epg-dn-type-alist
+  '(("1.2.840.113549.1.9.1" . "EMail")
+    ("2.5.4.12" . "T")
+    ("2.5.4.42" . "GN")
+    ("2.5.4.4" . "SN")
+    ("0.2.262.1.10.7.20" . "NameDistinguisher")
+    ("2.5.4.16" . "ADDR")
+    ("2.5.4.15" . "BC")
+    ("2.5.4.13" . "D")
+    ("2.5.4.17" . "PostalCode")
+    ("2.5.4.65" . "Pseudo")
+    ("2.5.4.5" . "SerialNumber")))
+

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

@@ -261,49 +279,49 @@ This function is for internal use only."
   "Set the result of the previous cryptographic operation."
   (aset context 12 result))
 
   "Set the result of the previous cryptographic operation."
   (aset context 12 result))
 

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

   (vector status key-id user-id nil nil))
 
   (vector status key-id user-id nil nil))
 

-(defun epg-verify-result-status (verify-result)
-  "Return the status code of VERIFY-RESULT."
-  (aref verify-result 0))
+(defun epg-signature-status (signature)
+  "Return the status code of SIGNATURE."
+  (aref signature 0))

 
 

-(defun epg-verify-result-key-id (verify-result)
-  "Return the key-id of VERIFY-RESULT."
-  (aref verify-result 1))
+(defun epg-signature-key-id (signature)
+  "Return the key-id of SIGNATURE."
+  (aref signature 1))

 
 

-(defun epg-verify-result-user-id (verify-result)
-  "Return the user-id of VERIFY-RESULT."
-  (aref verify-result 2))
+(defun epg-signature-user-id (signature)
+  "Return the user-id of SIGNATURE."
+  (aref signature 2))

   
   

-(defun epg-verify-result-validity (verify-result)
-  "Return the validity of VERIFY-RESULT."
-  (aref verify-result 3))
+(defun epg-signature-validity (signature)
+  "Return the validity of SIGNATURE."
+  (aref signature 3))

 
 

-(defun epg-verify-result-fingerprint (verify-result)
-  "Return the fingerprint of VERIFY-RESULT."
-  (aref verify-result 4))
+(defun epg-signature-fingerprint (signature)
+  "Return the fingerprint of SIGNATURE."
+  (aref signature 4))

 
 

-(defun epg-verify-result-set-status (verify-result status)
- "Set the status code of VERIFY-RESULT."
-  (aset verify-result 0 status))
+(defun epg-signature-set-status (signature status)
+ "Set the status code of SIGNATURE."
+  (aset signature 0 status))

 
 

-(defun epg-verify-result-set-key-id (verify-result key-id)
- "Set the key-id of VERIFY-RESULT."
-  (aset verify-result 1 key-id))
+(defun epg-signature-set-key-id (signature key-id)
+ "Set the key-id of SIGNATURE."
+  (aset signature 1 key-id))

 
 

-(defun epg-verify-result-set-user-id (verify-result user-id)
- "Set the user-id of VERIFY-RESULT."
-  (aset verify-result 2 user-id))
+(defun epg-signature-set-user-id (signature user-id)
+ "Set the user-id of SIGNATURE."
+  (aset signature 2 user-id))

   
   

-(defun epg-verify-result-set-validity (verify-result validity)
- "Set the validity of VERIFY-RESULT."
-  (aset verify-result 3 validity))
+(defun epg-signature-set-validity (signature validity)
+ "Set the validity of SIGNATURE."
+  (aset signature 3 validity))

 
 

-(defun epg-verify-result-set-fingerprint (verify-result fingerprint)
- "Set the fingerprint of VERIFY-RESULT."
-  (aset verify-result 4 fingerprint))
+(defun epg-signature-set-fingerprint (signature fingerprint)
+ "Set the fingerprint of SIGNATURE."
+  (aset signature 4 fingerprint))

 
 (defun epg-make-key (owner-trust)
   "Return a key object."
 
 (defun epg-make-key (owner-trust)
   "Return a key object."

@@ -388,13 +406,13 @@ This function is for internal use only."
   "Return the name of USER-ID."
   (aref user-id 1))
 
   "Return the name of USER-ID."
   (aref user-id 1))
 

-(defun epg-user-id-verify-result-list (user-id)
-  "Return the verify-result list of USER-ID."
+(defun epg-user-id-signature-list (user-id)
+  "Return the signature list of USER-ID."

   (aref user-id 2))
 
   (aref user-id 2))
 

-(defun epg-user-id-set-verify-result-list (user-id verify-result-list)
-  "Set the verify-result list of USER-ID."
-  (aset user-id 2 verify-result-list))
+(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))))

@@ -406,22 +424,26 @@ 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-verify-result-to-string (verify-result)
-  (format "%s verify-result from %s %s%s"
-         (capitalize (symbol-name (epg-verify-result-status verify-result)))
-         (epg-verify-result-key-id verify-result)
-         (epg-verify-result-user-id verify-result)
-         (if (epg-verify-result-validity verify-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)"
              (format " (trust %s)"

-                     (epg-verify-result-validity verify-result))
+                     (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"

                             "--yes")
                             "--yes")

+                      (unless (eq (epg-context-protocol context) 'CMS)
+                        (list "--command-fd" "0"))

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

@@ -438,7 +460,10 @@ This function is for internal use only."
            (setq epg-debug-buffer (generate-new-buffer " *epg-debug*")))
          (set-buffer epg-debug-buffer)
          (goto-char (point-max))
            (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
+         (insert (format "%s %s\n"
+                         (if (eq (epg-context-protocol context) 'CMS)
+                             epg-gpgsm-program
+                          epg-gpg-program)

                          (mapconcat #'identity args " ")))))
     (with-current-buffer buffer
       (make-local-variable 'epg-read-point)
                          (mapconcat #'identity args " ")))))
     (with-current-buffer buffer
       (make-local-variable 'epg-read-point)

@@ -453,9 +478,14 @@ This function is for internal use only."
        (progn
          (set-default-file-modes 448)
          (setq process
        (progn
          (set-default-file-modes 448)
          (setq process

-               (apply #'start-process "epg" buffer epg-gpg-program args)))
+               (apply #'start-process "epg" buffer
+                      (if (eq (epg-context-protocol context) 'CMS)
+                          epg-gpgsm-program
+                        epg-gpg-program)
+                      args)))

       (set-default-file-modes orig-mode))
     (set-process-filter process #'epg-process-filter)
       (set-default-file-modes orig-mode))
     (set-process-filter process #'epg-process-filter)

+    (set-process-sentinel process #'epg-process-sentinel)

     (epg-context-set-process context process)))
 
 (defun epg-process-filter (process input)
     (epg-context-set-process context process)))
 
 (defun epg-process-filter (process input)

@@ -487,6 +517,21 @@ This function is for internal use only."
          (forward-line))
        (setq epg-read-point (point)))))
 
          (forward-line))
        (setq epg-read-point (point)))))
 

+(defun epg-process-sentinel (process status)
+  (if (and (buffer-live-p (process-buffer process))
+          (not (equal status "finished\n")))
+      (save-excursion
+       (set-buffer (process-buffer process))
+       ;; gpg process exited abnormally, but we have not received an
+       ;; error response from it.  Set it here.
+       (unless (epg-context-result-for epg-context 'error)
+         (if (string-match "\\`exited abnormally with code \\(.*\\)\n" status)
+             (epg-context-set-result-for
+              epg-context 'error
+              (list (cons 'exit (string-to-number (match-string 1 status)))))
+           (epg-context-set-result-for epg-context 'error
+                                   (list (cons 'signal status))))))))
+

 (defun epg-read-output (context)
   (with-temp-buffer
     (if (fboundp 'set-buffer-multibyte)
 (defun epg-read-output (context)
   (with-temp-buffer
     (if (fboundp 'set-buffer-multibyte)

@@ -549,44 +594,82 @@ This function is for internal use only."
 (defun epg-status-GET_HIDDEN (process string)
   (if (and epg-key-id
           (string-match "\\`passphrase\\." string))
 (defun epg-status-GET_HIDDEN (process string)
   (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)))))))
+      (let (inhibit-quit
+           passphrase
+           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-key-id
+                        (if (consp (epg-context-passphrase-callback
+                                    epg-context))
+                            (cdr (epg-context-passphrase-callback
+                                  epg-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)))
+             (quit
+              (epg-context-set-result-for
+               epg-context 'error
+               (cons 'quit
+                     (epg-context-result-for epg-context 'error)))
+              (delete-process process)))
+         (if passphrase
+             (fillarray passphrase 0))
+         (if passphrase-with-new-line
+             (fillarray passphrase-with-new-line 0))))))

 
 (defun epg-status-GET_BOOL (process string)
 
 (defun epg-status-GET_BOOL (process string)

-  (let ((entry (assoc string epg-prompt-alist)))
-    (if (y-or-n-p (if entry (cdr entry) (concat string "? ")))
-       (process-send-string process "y\n")
-      (process-send-string process "n\n"))))
+  (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"))
+      (quit
+       (epg-context-set-result-for
+       epg-context 'error
+       (cons 'quit
+             (epg-context-result-for epg-context 'error)))
+       (delete-process process)))))

 
 (defun epg-status-GET_LINE (process string)
 
 (defun epg-status-GET_LINE (process string)

-  (let* ((entry (assoc string epg-prompt-alist))
-        (string (read-string (if entry (cdr entry) (concat string ": ")))))
-    (process-send-string process (concat string "\n"))))
+  (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"))
+      (quit
+       (epg-context-set-result-for
+       epg-context 'error
+       (cons 'quit
+             (epg-context-result-for epg-context 'error)))
+       (delete-process process)))))

 
 (defun epg-status-GOODSIG (process string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (epg-context-set-result-for
        epg-context
        'verify
 
 (defun epg-status-GOODSIG (process string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (epg-context-set-result-for
        epg-context
        'verify

-       (cons (epg-make-verify-result 'good
-                                (match-string 1 string)
-                                (match-string 2 string))
+       (cons (epg-make-signature
+             'good
+             (match-string 1 string)
+             (if (eq (epg-context-protocol epg-context) 'CMS)
+                 (condition-case nil
+                     (epg-dn-from-string (match-string 2 string))
+                   (error (match-string 2 string)))
+               (match-string 2 string)))

             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-EXPSIG (process string)
             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-EXPSIG (process string)

@@ -594,9 +677,14 @@ This function is for internal use only."
       (epg-context-set-result-for
        epg-context
        'verify
       (epg-context-set-result-for
        epg-context
        'verify

-       (cons (epg-make-verify-result 'expired
-                                (match-string 1 string)
-                                (match-string 2 string))
+       (cons (epg-make-signature
+             'expired
+             (match-string 1 string)
+             (if (eq (epg-context-protocol epg-context) 'CMS)
+                 (condition-case nil
+                     (epg-dn-from-string (match-string 2 string))
+                   (error (match-string 2 string)))
+               (match-string 2 string)))

             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-EXPKEYSIG (process string)
             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-EXPKEYSIG (process string)

@@ -604,9 +692,14 @@ This function is for internal use only."
       (epg-context-set-result-for
        epg-context
        'verify
       (epg-context-set-result-for
        epg-context
        'verify

-       (cons (epg-make-verify-result 'expired-key
-                                (match-string 1 string)
-                                (match-string 2 string))
+       (cons (epg-make-signature
+             'expired-key
+             (match-string 1 string)
+             (if (eq (epg-context-protocol epg-context) 'CMS)
+                 (condition-case nil
+                     (epg-dn-from-string (match-string 2 string))
+                   (error (match-string 2 string)))
+               (match-string 2 string)))

             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-REVKEYSIG (process string)
             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-REVKEYSIG (process string)

@@ -614,9 +707,14 @@ This function is for internal use only."
       (epg-context-set-result-for
        epg-context
        'verify
       (epg-context-set-result-for
        epg-context
        'verify

-       (cons (epg-make-verify-result 'revoked-key
-                                (match-string 1 string)
-                                (match-string 2 string))
+       (cons (epg-make-signature
+             'revoked-key
+             (match-string 1 string)
+             (if (eq (epg-context-protocol epg-context) 'CMS)
+                 (condition-case nil
+                     (epg-dn-from-string (match-string 2 string))
+                   (error (match-string 2 string)))
+               (match-string 2 string)))

             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-BADSIG (process string)
             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-BADSIG (process string)

@@ -624,47 +722,52 @@ This function is for internal use only."
       (epg-context-set-result-for
        epg-context
        'verify
       (epg-context-set-result-for
        epg-context
        'verify

-       (cons (epg-make-verify-result 'bad
-                                (match-string 1 string)
-                                (match-string 2 string))
+       (cons (epg-make-signature
+             'bad
+             (match-string 1 string)
+             (if (eq (epg-context-protocol epg-context) 'CMS)
+                 (condition-case nil
+                     (epg-dn-from-string (match-string 2 string))
+                   (error (match-string 2 string)))
+               (match-string 2 string)))

             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-VALIDSIG (process string)
             (epg-context-result-for epg-context 'verify)))))
 
 (defun epg-status-VALIDSIG (process string)

-  (let ((verify-result (car (epg-context-result-for epg-context 'verify))))
-    (if (and verify-result
-            (eq (epg-verify-result-status verify-result) 'good)
+  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+    (if (and signature
+            (eq (epg-signature-status signature) 'good)

             (string-match "\\`\\([^ ]+\\) " string))
             (string-match "\\`\\([^ ]+\\) " string))

-       (epg-verify-result-set-fingerprint verify-result (match-string 1 string)))))
+       (epg-signature-set-fingerprint signature (match-string 1 string)))))

 
 (defun epg-status-TRUST_UNDEFINED (process string)
 
 (defun epg-status-TRUST_UNDEFINED (process string)

-  (let ((verify-result (car (epg-context-result-for epg-context 'verify))))
-    (if (and verify-result
-            (eq (epg-verify-result-status verify-result) 'good))
-       (epg-verify-result-set-validity verify-result 'undefined))))
+  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+    (if (and signature
+            (eq (epg-signature-status signature) 'good))
+       (epg-signature-set-validity signature 'undefined))))

 
 (defun epg-status-TRUST_NEVER (process string)
 
 (defun epg-status-TRUST_NEVER (process string)

-  (let ((verify-result (car (epg-context-result-for epg-context 'verify))))
-    (if (and verify-result
-            (eq (epg-verify-result-status verify-result) 'good))
-       (epg-verify-result-set-validity verify-result 'never))))
+  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+    (if (and signature
+            (eq (epg-signature-status signature) 'good))
+       (epg-signature-set-validity signature 'never))))

 
 (defun epg-status-TRUST_MARGINAL (process string)
 
 (defun epg-status-TRUST_MARGINAL (process string)

-  (let ((verify-result (car (epg-context-result-for epg-context 'verify))))
-    (if (and verify-result
-            (eq (epg-verify-result-status verify-result) 'marginal))
-       (epg-verify-result-set-validity verify-result 'marginal))))
+  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+    (if (and signature
+            (eq (epg-signature-status signature) 'marginal))
+       (epg-signature-set-validity signature 'marginal))))

 
 (defun epg-status-TRUST_FULLY (process string)
 
 (defun epg-status-TRUST_FULLY (process string)

-  (let ((verify-result (car (epg-context-result-for epg-context 'verify))))
-    (if (and verify-result
-            (eq (epg-verify-result-status verify-result) 'good))
-       (epg-verify-result-set-validity verify-result 'full))))
+  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+    (if (and signature
+            (eq (epg-signature-status signature) 'good))
+       (epg-signature-set-validity signature 'full))))

 
 (defun epg-status-TRUST_ULTIMATE (process string)
 
 (defun epg-status-TRUST_ULTIMATE (process string)

-  (let ((verify-result (car (epg-context-result-for epg-context 'verify))))
-    (if (and verify-result
-            (eq (epg-verify-result-status verify-result) 'good))
-       (epg-verify-result-set-validity verify-result 'ultimate))))
+  (let ((signature (car (epg-context-result-for epg-context 'verify))))
+    (if (and signature
+            (eq (epg-signature-status signature) 'good))
+       (epg-signature-set-validity signature 'ultimate))))

 
 (defun epg-status-PROGRESS (process string)
   (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"
 
 (defun epg-status-PROGRESS (process string)
   (if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"

@@ -786,15 +889,21 @@ This function is for internal use only."
                           config))))
     config))
 
                           config))))
     config))
 

-(defun epg-list-keys-1 (name mode)
+(defun epg-list-keys-1 (context name mode)

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

-                           "--fixed-list-mode" "--with-fingerprint"
+                           "--with-fingerprint"

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

+                     (unless (eq (epg-context-protocol context) 'CMS)
+                       '("--fixed-list-mode"))

                      (if name (list name))))
        keys string field index)
     (with-temp-buffer
                      (if name (list name))))
        keys string field index)
     (with-temp-buffer

-      (apply #'call-process epg-gpg-program nil (list t nil) nil args)
+      (apply #'call-process
+            (if (eq (epg-context-protocol context) 'CMS)
+                epg-gpgsm-program
+              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 keys (cons (make-vector 15 nil) keys)
       (goto-char (point-min))
       (while (re-search-forward "^[a-z][a-z][a-z]:.*" nil t)
        (setq keys (cons (make-vector 15 nil) keys)

@@ -822,12 +931,12 @@ This function is for internal use only."
    (aref line 5)
    (aref line 6)))
 
    (aref line 5)
    (aref line 6)))
 

-(defun epg-list-keys (&optional name mode)
-  (let ((lines (epg-list-keys-1 name mode))
-       keys)
+(defun epg-list-keys (context &optional name mode)
+  (let ((lines (epg-list-keys-1 context name mode))
+       keys cert)

     (while lines
       (cond
     (while lines
       (cond

-       ((member (aref (car lines) 0) '("pub" "sec"))
+       ((member (aref (car lines) 0) '("pub" "sec" "crt" "crs"))

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

@@ -835,7 +944,8 @@ This function is for internal use only."
          (epg-key-set-user-id-list
           (car keys)
           (nreverse (epg-key-user-id-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
+       (setq cert (member (aref (car lines) 0) '("crt" "crs"))
+             keys (cons (epg-make-key

                          (if (aref (car lines) 8)
                              (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))))

@@ -856,12 +966,23 @@ This function is for internal use only."
                (if (aref (car lines) 1)
                    (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))
+               (if cert
+                   (condition-case nil
+                       (epg-dn-from-string (aref (car lines) 9))
+                     (error (aref (car lines) 9)))
+                 (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)))
               (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)))

+    (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)))))

     (nreverse keys)))
 
 (if (fboundp 'make-temp-file)
     (nreverse keys)))
 
 (if (fboundp 'make-temp-file)

@@ -927,7 +1048,9 @@ If you are unsure, use synchronous version of this function
     (error "Not a file"))
   (epg-context-set-result context nil)
   (epg-start context (list "--decrypt" (epg-data-file cipher)))
     (error "Not a file"))
   (epg-context-set-result context nil)
   (epg-start context (list "--decrypt" (epg-data-file cipher)))

-  (epg-wait-for-status context '("BEGIN_DECRYPTION")))
+  ;; `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"))))

 
 ;;;###autoload
 (defun epg-decrypt-file (context cipher plain)
 
 ;;;###autoload
 (defun epg-decrypt-file (context cipher plain)

@@ -957,7 +1080,7 @@ If PLAIN is nil, it returns the result as a string."
        (coding-system-for-write 'binary))
     (unwind-protect
        (progn
        (coding-system-for-write 'binary))
     (unwind-protect
        (progn

-         (write-region cipher nil input-file)
+         (write-region cipher nil input-file nil 'quiet)

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

@@ -1045,7 +1168,7 @@ For a normal or a clear text signature, SIGNED-TEXT should be nil."
          (if signed-text
              (progn
                (setq input-file (epg-make-temp-file "epg-signature"))
          (if signed-text
              (progn
                (setq input-file (epg-make-temp-file "epg-signature"))

-               (write-region signature nil input-file)
+               (write-region signature nil input-file nil 'quiet)

                (epg-start-verify context
                                  (epg-make-data-from-file input-file)
                                  (epg-make-data-from-string signed-text)))
                (epg-start-verify context
                                  (epg-make-data-from-file input-file)
                                  (epg-make-data-from-string signed-text)))

@@ -1089,7 +1212,9 @@ If you are unsure, use synchronous version of this function
                             (epg-context-signers context)))
                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))
                             (epg-context-signers context)))
                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))

-  (epg-wait-for-status context '("BEGIN_SIGNING"))
+  ;; `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_SIGNING")))

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

@@ -1110,9 +1235,9 @@ Otherwise, it makes a normal signature."
                                       (epg-make-temp-file "epg-output")))
        (epg-start-sign context (epg-make-data-from-file plain) mode)
        (epg-wait-for-completion context)
                                       (epg-make-temp-file "epg-output")))
        (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: %S"
-                  (epg-context-result-for context 'error)))
+       (unless (epg-context-result-for context 'sign)
+         (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

@@ -1132,9 +1257,9 @@ Otherwise, it makes a normal signature."
        (epg-start-sign context (epg-make-data-from-string plain) mode)
        (epg-flush context)
        (epg-wait-for-completion context)
        (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)
-           (error "Sign failed: %S"
-                  (epg-context-result-for context 'error)))
+       (unless (epg-context-result-for context 'sign)
+         (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)))

@@ -1170,9 +1295,11 @@ If you are unsure, use synchronous version of this function
                             recipients))
                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))
                             recipients))
                     (if (epg-data-file plain)
                         (list (epg-data-file plain)))))

-  (if sign
-      (epg-wait-for-status context '("BEGIN_SIGNING")))
-  (epg-wait-for-status context '("BEGIN_ENCRYPTION"))
+  ;; `gpgsm' does not read passphrase from stdin, so waiting is not needed.
+  (unless (eq (epg-context-protocol context) 'CMS)
+    (if sign
+       (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)

@@ -1193,6 +1320,10 @@ If RECIPIENTS is nil, it performs symmetric encryption."
        (epg-start-encrypt context (epg-make-data-from-file plain)
                           recipients sign always-trust)
        (epg-wait-for-completion context)
        (epg-start-encrypt context (epg-make-data-from-file plain)
                           recipients sign always-trust)
        (epg-wait-for-completion context)

+       (if (and sign
+                (not (epg-context-result-for context 'sign)))
+           (error "Sign encrypt failed: %S"
+                  (epg-context-result-for context 'error)))

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

@@ -1215,6 +1346,10 @@ If RECIPIENTS is nil, it performs symmetric encryption."
                           recipients sign always-trust)
        (epg-flush context)
        (epg-wait-for-completion context)
                           recipients sign always-trust)
        (epg-flush context)
        (epg-wait-for-completion context)

+       (if (and sign
+                (not (epg-context-result-for context 'sign)))
+           (error "Sign encrypt failed: %S"
+                  (epg-context-result-for context 'error)))

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

@@ -1251,7 +1386,8 @@ If you are unsure, use synchronous version of this function
        (epg-start-export-keys context keys)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
        (epg-start-export-keys context keys)
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

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

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

@@ -1289,7 +1425,8 @@ If you are unsure, use synchronous version of this function
            (epg-flush context))
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)
            (epg-flush context))
        (epg-wait-for-completion context)
        (if (epg-context-result-for context 'error)

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

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

@@ -1327,12 +1464,126 @@ If you are unsure, use synchronous version of this function
   "Delete KEYS from the key ring."
   (unwind-protect
       (progn
   "Delete KEYS from the key ring."
   (unwind-protect
       (progn

-       (epg-start-delete-keys context keys)
+       (epg-start-delete-keys context keys allow-secret)

        (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 "Delete key failed")))
+           (error "Delete keys failed: %S"
+                  (epg-context-result-for context 'error))))

     (epg-reset context)))
 
     (epg-reset context)))
 

+;;;###autoload
+(defun epg-start-sign-keys (context keys &optional local)
+  "Initiate an sign 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-sign-keys' instead."
+  (epg-context-set-result context nil)
+  (epg-start context (cons (if local
+                              "--lsign-key"
+                            "--sign-key")
+                          (mapcar
+                           (lambda (key)
+                             (epg-sub-key-id
+                              (car (epg-key-sub-key-list key))))
+                           keys))))
+
+;;;###autoload
+(defun epg-sign-keys (context keys &optional local)
+  "Sign KEYS from the key ring."
+  (unwind-protect
+      (progn
+       (epg-start-sign-keys context keys local)
+       (epg-wait-for-completion context)
+       (if (epg-context-result-for context 'error)
+           (error "Sign keys failed: %S"
+                  (epg-context-result-for context 'error))))
+    (epg-reset context)))
+
+(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)
+  (let ((index 0))
+    (while (string-match "\\\\\\(\\([,=+<>#;\\\"]\\)\\|\
+\\([0-9A-Fa-f][0-9A-Fa-f]\\)\\|\\(.\\)\\)"
+                        string index)
+      (if (match-beginning 2)
+         (setq string (replace-match "\\2" t nil string)
+               index (1+ index))
+       (if (match-beginning 3)
+           (setq string (replace-match "\\x\\3" t nil string)
+                 index (+ index 4))
+         (setq string (replace-match "\\\\\\\\\\4" t nil string)
+               index (+ index 3)))))
+    (car (read-from-string (concat "\"" string "\"")))))
+
+(defun epg-dn-from-string (string)
+  "Parse STRING as LADPv3 Distinguished Names (RFC2253).
+The return value is an alist mapping from types to values."
+  (let ((index 0)
+       (length (length string))
+       alist type value group)
+    (while (< index length)
+      (if (eq index (string-match "[ \t\n\r]*" string index))
+         (setq index (match-end 0)))
+      (if (eq index (string-match
+                    "\\([0-9]+\\(\\.[0-9]+\\)*\\)\[ \t\n\r]*=[ \t\n\r]*"
+                    string index))
+         (setq type (match-string 1 string)
+               index (match-end 0))
+       (if (eq index (string-match "\\([0-9A-Za-z]+\\)[ \t\n\r]*=[ \t\n\r]*"
+                                   string index))
+           (setq type (match-string 1 string)
+                 index (match-end 0))))
+      (unless type
+       (error "Invalid type"))
+      (if (eq index (string-match
+                    "\\([^,=+<>#;\\\"]\\|\\\\.\\)+"
+                    string index))
+         (setq index (match-end 0)
+               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)))
+         (if (eq index (string-match "\"\\([^\\\"]\\|\\\\.\\)*\""
+                                     string index))
+             (setq index (match-end 0)
+                   value (epg-decode-quotedstring (match-string 0 string))))))
+      (if group
+         (if (stringp (car (car alist)))
+             (setcar alist (list (cons type value) (car alist)))
+           (setcar alist (cons (cons type value) (car alist))))
+       (if (consp (car (car alist)))
+           (setcar alist (nreverse (car alist))))
+       (setq alist (cons (cons type value) alist)
+             type nil
+             value nil))
+      (if (eq index (string-match "[ \t\n\r]*\\([,;+]\\)" string index))
+         (setq index (match-end 0)
+               group (eq (aref string (match-beginning 1)) ?+))))
+    (nreverse alist)))
+
+(defun epg-decode-dn (alist)
+  "Convert ALIST returned by `epg-dn-from-string' to a human readable form.
+Type names are resolved using `epg-dn-type-alist'."
+  (mapconcat
+   (lambda (rdn)
+     (if (stringp (car rdn))
+        (let ((entry (assoc (car rdn) epg-dn-type-alist)))
+          (if entry
+              (format "%s=%s" (cdr entry) (cdr rdn))
+            (format "%s=%s" (car rdn) (cdr rdn))))
+       (concat "(" (epg-decode-dn rdn) ")")))
+   alist
+   ", "))
+

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