* mml-sec.el (mml-smime-encrypt-buffer): Warn about combined signing.

(mml-pgp-encrypt-buffer): Support combined signing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3f58bac..e0e149e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2002-10-10  Simon Josefsson  <jas@extundo.com>
 
+       * mml-sec.el (mml-smime-encrypt-buffer): Warn about combined signing.
+       (mml-pgp-encrypt-buffer): Support combined signing.
+
        * mml1991.el (mml1991-mailcrypt-encrypt): Support combined signing.
        (mml1991-gpg-encrypt): Ditto.
        (mml1991-pgg-encrypt): Ditto.

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index 858737c..8a02fc5 100644 (file)
--- a/lisp/mml-sec.el
+++ b/lisp/mml-sec.el
@@ -95,7 +95,10 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
   (or (mml-smime-sign cont)
       (error "Signing failed... inspect message logs for errors")))
 
-(defun mml-smime-encrypt-buffer (cont)
+(defun mml-smime-encrypt-buffer (cont &optional sign)
+  (when sign
+    (message "Combined sign and encrypt S/MIME not support yet")
+    (sit-for 1))
   (or (mml-smime-encrypt cont)
       (error "Encryption failed... inspect message logs for errors")))
 
@@ -103,8 +106,8 @@ You can also customize or set `mml-signencrypt-style-alist' instead."
   (or (mml1991-sign cont)
       (error "Signing failed... inspect message logs for errors")))
 
-(defun mml-pgp-encrypt-buffer (cont)
-  (or (mml1991-encrypt cont)
+(defun mml-pgp-encrypt-buffer (cont &optional sign)
+  (or (mml1991-encrypt cont sign)
       (error "Encryption failed... inspect message logs for errors")))
 
 (defun mml-pgpmime-sign-buffer (cont)