lisp/ChangeLog addition:

2002-05-08  Josh Huber  <huber@alum.wpi.edu>

	* mml-sec.el (mml-signencrypt-style-alist): Rename.  Also, changed
	the default for pgpmime to support pgp v2.
	* mml-sec.el (mml-signencrypt-style): New accessor function to
	allow users to get/set the signencrypt style more easily without
	frobbing the alist directly.
	* mml.el (mml-generate-mime-1): Use accessor function.

texi/ChangeLog addition:

2002-05-08  Josh Huber  <huber@alum.wpi.edu>

	* message.texi (Security): Added a note about the signencrypt
	style, and how to change it using `mml-signencrypt-style.'

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bdec535..88d48f1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-08  Josh Huber  <huber@alum.wpi.edu>
+
+       * mml-sec.el (mml-signencrypt-style-alist): Rename.  Also, changed
+       the default for pgpmime to support pgp v2.
+       * mml-sec.el (mml-signencrypt-style): New accessor function to
+       allow users to get/set the signencrypt style more easily without
+       frobbing the alist directly.
+       * mml.el (mml-generate-mime-1): Use accessor function.
+
 2002-05-08  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus-art.el (gnus-article-mode-syntax-table): Specify matching

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index bc20511..f0f6a64 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -46,12 +46,36 @@
 (defvar mml-default-encrypt-method (caar mml-encrypt-alist)
   "Default encryption method.")
 
-(defvar mml-signencrypt-style
+(defvar mml-signencrypt-style-alist
   '(("smime"   separate)
     ("pgp"     separate)
-    ("pgpmime" combined))
+    ("pgpmime" separate))
   "Alist specifying whether or not a single sign & encrypt
-operation should be perfomed when requesting signencrypt.")
+operation should be perfomed when requesting signencrypt.
+Note that combined sign & encrypt is NOT supported by pgp v2!
+Also note that you should access this with mml-signencrypt-style")
+
+;;; Configuration/helper functions
+
+(defun mml-signencrypt-style (method &optional style)
+  "Function for setting/getting the signencrypt-style used.  Takes two
+arguments, the method (e.g. \"pgp\") and optionally the mode
+(e.g. combined).  If the mode is omitted, the current value is returned.
+
+For example, if you prefer to use combined sign & encrypt with
+smime, putting the following in your Gnus startup file will
+enable that behavior:
+
+ (mml-set-signencrypt-style \"smime\" combined)"
+  (let ((style-item (assoc method mml-signencrypt-style-alist)))
+    (if style-item
+       (if (or (eq style 'separate)
+               (eq style 'combined))
+           ;; valid style setting?
+           (setf (second style-item) style)
+         ;; otherwise, just return the current value
+         (second style-item))
+      (gnus-message 3 "Warning, attempt to set invalid signencrypt-style"))))
 
 ;;; Security functions
 

diff --git a/lisp/mml.el b/lisp/mml.el
index cb88dd2..c86a820 100644 (file)
--- a/lisp/mml.el
+++ b/lisp/mml.el
@@ -540,8 +540,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag."
              (message-options-set 'message-sender sender))
          (if (setq recipients (cdr (assq 'recipients cont)))
              (message-options-set 'message-recipients recipients))
-         (let ((style (second (assoc (first sign-item)
-                                     mml-signencrypt-style))))
+         (let ((style (mml-signencrypt-style (first encrypt-item))))
            ;; check if: we're both signing & encrypting, both methods
            ;; are the same (why would they be different?!), and that
            ;; the signencrypt style allows for combined operation.

diff --git a/texi/ChangeLog b/texi/ChangeLog
index f2a7dba..dfe2258 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-08  Josh Huber  <huber@alum.wpi.edu>
+
+       * message.texi (Security): Added a note about the signencrypt
+       style, and how to change it using `mml-signencrypt-style.'
+
 2002-05-04  Simon Josefsson  <jas@extundo.com>
 
        * emacs-mime.texi (Encoding Customization): Fix.

diff --git a/texi/message.texi b/texi/message.texi
index e053124..c8a6c9e 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -774,6 +774,19 @@ a multipart tag will be used; if no other parts are present in your
 message a single part tag will be used.  This way, message mode will
 do the Right Thing (TM) with signed/encrypted multipart messages.
 
+By default, when encrypting a message, Gnus will use the "signencrypt"
+mode.  If you would like to disable this for a particular message,
+give the mml-secure-message-encrypt-* command a prefix argument. (for
+example, C-u C-c C-m c p).  Additionally, by default Gnus will
+separately sign, then encrypt a message which has the mode
+signencrypt.  If you would like to change this behavior use the
+@code{mml-signencrypt-style} function.  For example
+
+@code{(mml-signencrypt-style "pgpmime" 'combined)}
+
+Will cause Gnus to sign and encrypt in one pass, thus generating a
+single signed and encrypted part.
+
 Since signing and especially encryption often is used when sensitive
 information is sent, you may want to have some way to ensure that your
 mail is actually signed or encrypted.  After invoking the above