lisp/ChangeLog addition:

2002-01-25  Josh Huber  <huber@alum.wpi.edu>

	* mml2015.el (mml2015-mailcrypt-decrypt): Display a signature if
	one exists in the case of an encrypted message with an internal
	signature.

contrib/ChangeLog addition:

2002-01-25  Josh Huber  <huber@alum.wpi.edu>

	* gpg.el (gpg-command-decrypt): Enable the status-fd command line
	option to gpg when decrypting so `mml2015-mailcrypt-decrypt' can
	parse and display the output.

diff --git a/contrib/ChangeLog b/contrib/ChangeLog
index 9f58afd..fc27e8c 100644 (file)
--- a/contrib/ChangeLog
+++ b/contrib/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-25  Josh Huber  <huber@alum.wpi.edu>
+
+       * gpg.el (gpg-command-decrypt): Enable the status-fd command line
+       option to gpg when decrypting so `mml2015-mailcrypt-decrypt' can
+       parse and display the output.
+

 2002-01-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-mdrtn.el (gnus-moderation-cancel-article): Insert an extra
 2002-01-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-mdrtn.el (gnus-moderation-cancel-article): Insert an extra

diff --git a/contrib/gpg.el b/contrib/gpg.el
index 9f8e5e5..233f859 100644 (file)
--- a/contrib/gpg.el
+++ b/contrib/gpg.el
@@ -7,7 +7,7 @@
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 
 ;; Keywords: crypto
 ;; Created: 2000-04-15
 

-;; $Id: gpg.el,v 1.16 2001/08/24 21:09:02 larsi Exp $
+;; $Id: gpg.el,v 1.17 2001/12/26 15:23:03 fw Exp $

 
 ;; This file is NOT (yet?) part of GNU Emacs.
 
 
 ;; This file is NOT (yet?) part of GNU Emacs.
 


@@ -342,7 +342,7 @@ endings; the input data shall be treated as binary."
   :group 'gpg-commands)
 
 (defcustom gpg-command-decrypt
   :group 'gpg-commands)
 
 (defcustom gpg-command-decrypt

-  '(gpg . ("--decrypt" "--batch" "--passphrase-fd=0"))
+  '(gpg . ("--status-fd" "2" "--decrypt" "--batch" "--passphrase-fd=0"))

   "Command to decrypt a message.
 The invoked program has to read the passphrase from standard
 input, followed by the encrypted message.  It writes the decrypted
   "Command to decrypt a message.
 The invoked program has to read the passphrase from standard
 input, followed by the encrypted message.  It writes the decrypted

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index da5b904..5265ce0 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-25  Josh Huber  <huber@alum.wpi.edu>
+
+       * mml2015.el (mml2015-mailcrypt-decrypt): Display a signature if
+       one exists in the case of an encrypted message with an internal
+       signature.
+

 2002-01-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-agent.el (gnus-agent-save-alist): Optimized.
 2002-01-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-agent.el (gnus-agent-save-alist): Optimized.

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 5c88821..fe36ea9 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -126,7 +126,11 @@ by you.")
        (setq handles (mm-dissect-buffer t)))
       (mm-destroy-parts handle)
       (mm-set-handle-multipart-parameter
        (setq handles (mm-dissect-buffer t)))
       (mm-destroy-parts handle)
       (mm-set-handle-multipart-parameter

-       mm-security-handle 'gnus-info "OK")
+       mm-security-handle 'gnus-info
+       (concat "OK"
+              (let ((sig (with-current-buffer mml2015-result-buffer
+                           (mml2015-gpg-extract-signature-details))))
+                (concat ", Signer: " sig))))

       (if (listp (car handles))
          handles
        (list handles)))))
       (if (listp (car handles))
          handles
        (list handles)))))