Handle gpg errors better when trying to display PGP key image.

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 130a3ca..f8f0a56 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1,7 +1,6 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
 
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
 

-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-;;   2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2000-2012 Free Software Foundation, Inc.

 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML


@@ -28,8 +27,8 @@
 
 ;;; Code:
 
 
 ;;; Code:
 

-;; For Emacs < 22.2.

 (eval-and-compile
 (eval-and-compile

+  ;; For Emacs <22.2 and XEmacs.

   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
 
   (if (locate-library "password-cache")
   (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))
 
   (if (locate-library "password-cache")


@@ -56,18 +55,15 @@
                           'epg)
                       (error))
                     (progn
                           'epg)
                       (error))
                     (progn

-                      (ignore-errors
-                       ;; Avoid the "Recursive load suspected" error
-                       ;; in Emacs 21.1.
-                       (let ((recursive-load-depth-limit 100))
-                         (require 'pgg)))
-                      (and (fboundp 'pgg-sign-region)
-                           'pgg))
-                    (progn
-                      (ignore-errors
-                        (require 'gpg))
-                      (and (fboundp 'gpg-sign-detached)
-                           'gpg))
+                      (let ((abs-file (locate-library "pgg")))
+                        ;; Don't load PGG if it is marked as obsolete
+                        ;; (Emacs 24).
+                        (when (and abs-file
+                                   (not (string-match "/obsolete/[^/]*\\'"
+                                                      abs-file)))
+                          (ignore-errors (require 'pgg))
+                          (and (fboundp 'pgg-sign-region)
+                               'pgg))))

                     (progn (ignore-errors
                              (load "mc-toplev"))
                            (and (fboundp 'mc-encrypt-generic)
                     (progn (ignore-errors
                              (load "mc-toplev"))
                            (and (fboundp 'mc-encrypt-generic)


@@ -75,7 +71,7 @@
                                 (fboundp 'mc-cleanup-recipient-headers)
                                 'mailcrypt)))
   "The package used for PGP/MIME.
                                 (fboundp 'mc-cleanup-recipient-headers)
                                 'mailcrypt)))
   "The package used for PGP/MIME.

-Valid packages include `epg', `pgg', `gpg' and `mailcrypt'.")
+Valid packages include `epg', `pgg' and `mailcrypt'.")

 
 ;; Something is not RFC2015.
 (defvar mml2015-function-alist
 
 ;; Something is not RFC2015.
 (defvar mml2015-function-alist


@@ -85,24 +81,18 @@ Valid packages include `epg', `pgg', `gpg' and `mailcrypt'.")
               mml2015-mailcrypt-decrypt
               mml2015-mailcrypt-clear-verify
               mml2015-mailcrypt-clear-decrypt)
               mml2015-mailcrypt-decrypt
               mml2015-mailcrypt-clear-verify
               mml2015-mailcrypt-clear-decrypt)

-    (gpg mml2015-gpg-sign
-        mml2015-gpg-encrypt
-        mml2015-gpg-verify
-        mml2015-gpg-decrypt
-        mml2015-gpg-clear-verify
-        mml2015-gpg-clear-decrypt)
-  (pgg mml2015-pgg-sign
-       mml2015-pgg-encrypt
-       mml2015-pgg-verify
-       mml2015-pgg-decrypt
-       mml2015-pgg-clear-verify
-       mml2015-pgg-clear-decrypt)
-  (epg mml2015-epg-sign
-       mml2015-epg-encrypt
-       mml2015-epg-verify
-       mml2015-epg-decrypt
-       mml2015-epg-clear-verify
-       mml2015-epg-clear-decrypt))
+    (pgg mml2015-pgg-sign
+        mml2015-pgg-encrypt
+        mml2015-pgg-verify
+        mml2015-pgg-decrypt
+        mml2015-pgg-clear-verify
+        mml2015-pgg-clear-decrypt)
+    (epg mml2015-epg-sign
+        mml2015-epg-encrypt
+        mml2015-epg-verify
+        mml2015-epg-decrypt
+        mml2015-epg-clear-verify
+        mml2015-epg-clear-decrypt))

   "Alist of PGP/MIME functions.")
 
 (defvar mml2015-result-buffer nil)
   "Alist of PGP/MIME functions.")
 
 (defvar mml2015-result-buffer nil)


@@ -119,11 +109,6 @@ Valid packages include `epg', `pgg', `gpg' and `mailcrypt'.")
   :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
 
   :type '(repeat (cons (regexp :tag "GnuPG output regexp")
                       (boolean :tag "Trust key"))))
 

-(defcustom mml2015-verbose mml-secure-verbose
-  "If non-nil, ask the user about the current operation more verbosely."
-  :group 'mime-security
-  :type 'boolean)
-

 (defcustom mml2015-cache-passphrase mml-secure-cache-passphrase
   "If t, cache passphrase."
   :group 'mime-security
 (defcustom mml2015-cache-passphrase mml-secure-cache-passphrase
   "If t, cache passphrase."
   :group 'mime-security


@@ -137,10 +122,17 @@ Whether the passphrase is cached at all is controlled by
   :type 'integer)
 
 (defcustom mml2015-signers nil
   :type 'integer)
 
 (defcustom mml2015-signers nil

-  "A list of your own key ID which will be used to sign a message."
+  "A list of your own key ID(s) which will be used to sign a message.
+If set, it overrides the setting of `mml2015-sign-with-sender'."

   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 
   :group 'mime-security
   :type '(repeat (string :tag "Key ID")))
 

+(defcustom mml2015-sign-with-sender nil
+  "If t, use message sender so find a key to sign with."
+  :group 'mime-security
+  :type 'boolean
+  :version "24.1")
+

 (defcustom mml2015-encrypt-to-self nil
   "If t, add your own key ID to recipient list when encryption."
   :group 'mime-security
 (defcustom mml2015-encrypt-to-self nil
   "If t, add your own key ID to recipient list when encryption."
   :group 'mime-security


@@ -153,7 +145,7 @@ Whether the passphrase is cached at all is controlled by
 
 ;; Extract plaintext from cleartext signature.  IMO, this kind of task
 ;; should be done by GnuPG rather than Elisp, but older PGP backends
 
 ;; Extract plaintext from cleartext signature.  IMO, this kind of task
 ;; should be done by GnuPG rather than Elisp, but older PGP backends

-;; (such as Mailcrypt, PGG, and gpg.el) discard the output from GnuPG.
+;; (such as Mailcrypt, and PGG) discard the output from GnuPG.

 (defun mml2015-extract-cleartext-signature ()
   ;; Daiki Ueno in
   ;; <54a15d860801080142l70b95d7dkac4bf51a86196011@mail.gmail.com>: ``I still
 (defun mml2015-extract-cleartext-signature ()
   ;; Daiki Ueno in
   ;; <54a15d860801080142l70b95d7dkac4bf51a86196011@mail.gmail.com>: ``I still


@@ -193,9 +185,6 @@ Whether the passphrase is cached at all is controlled by
 (autoload 'mc-cleanup-recipient-headers "mc-toplev")
 (autoload 'mc-sign-generic "mc-toplev")
 
 (autoload 'mc-cleanup-recipient-headers "mc-toplev")
 (autoload 'mc-sign-generic "mc-toplev")
 

-(defvar mc-default-scheme)
-(defvar mc-schemes)
-

 (defvar mml2015-decrypt-function 'mailcrypt-decrypt)
 (defvar mml2015-verify-function 'mailcrypt-verify)
 
 (defvar mml2015-decrypt-function 'mailcrypt-decrypt)
 (defvar mml2015-verify-function 'mailcrypt-verify)
 


@@ -242,6 +231,58 @@ Whether the passphrase is cached at all is controlled by
          handles
        (list handles)))))
 
          handles
        (list handles)))))
 

+(defun mml2015-gpg-pretty-print-fpr (fingerprint)
+  (let* ((result "")
+        (fpr-length (string-width fingerprint))
+        (n-slice 0)
+        slice)
+    (setq fingerprint (string-to-list fingerprint))
+    (while fingerprint
+      (setq fpr-length (- fpr-length 4))
+      (setq slice (butlast fingerprint fpr-length))
+      (setq fingerprint (nthcdr 4 fingerprint))
+      (setq n-slice (1+ n-slice))
+      (setq result
+           (concat
+            result
+            (case n-slice
+              (1  slice)
+              (otherwise (concat " " slice))))))
+    result))
+
+(defun mml2015-gpg-extract-signature-details ()
+  (goto-char (point-min))
+  (let* ((expired (re-search-forward
+                  "^\\[GNUPG:\\] SIGEXPIRED$"
+                  nil t))
+        (signer (and (re-search-forward
+                      "^\\[GNUPG:\\] GOODSIG \\([0-9A-Za-z]*\\) \\(.*\\)$"
+                      nil t)
+                     (cons (match-string 1) (match-string 2))))
+        (fprint (and (re-search-forward
+                      "^\\[GNUPG:\\] VALIDSIG \\([0-9a-zA-Z]*\\) "
+                      nil t)
+                     (match-string 1)))
+        (trust  (and (re-search-forward
+                      "^\\[GNUPG:\\] \\(TRUST_.*\\)$"
+                      nil t)
+                     (match-string 1)))
+        (trust-good-enough-p
+         (cdr (assoc trust mml2015-unabbrev-trust-alist))))
+    (cond ((and signer fprint)
+          (concat (cdr signer)
+                  (unless trust-good-enough-p
+                    (concat "\nUntrusted, Fingerprint: "
+                            (mml2015-gpg-pretty-print-fpr fprint)))
+                  (when expired
+                    (format "\nWARNING: Signature from expired key (%s)"
+                            (car signer)))))
+         ((re-search-forward
+           "^\\(gpg: \\)?Good signature from \"\\(.*\\)\"$" nil t)
+          (match-string 2))
+         (t
+          "From unknown user"))))
+

 (defun mml2015-mailcrypt-clear-decrypt ()
   (let (result)