2000-12-01 Simon Josefsson <sj@extundo.com>

	* mml-smime.el (mml-smime-verify): Fix address parsing.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8c47d9d..1d1d466 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-01  Simon Josefsson  <sj@extundo.com>
+
+       * mml-smime.el (mml-smime-verify): Fix address parsing.
+
 2000-12-01  Simon Josefsson  <sj@extundo.com>
 
        * mml-smime.el (mml-smime-verify): Don't modify MM buffer.  Handle

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 8a8e99f..835516a 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -150,13 +150,11 @@
          (with-temp-buffer
            (insert-buffer-substring buf)
            (goto-char (point-min))
-           (while (re-search-forward "-----BEGIN CERTIFICATE-----" nil t)
-             (forward-line 0)
-             (if (re-search-forward "-----END CERTIFICATE-----" nil t)
-                 (smime-pkcs7-email-region (point-min) (point))
-               (delete-region (point-min) (point))))
-           (setq addresses (smime-buffer-as-string-region (point-min)
-                                                          (point-max)))))
+           (while (re-search-forward "-----END CERTIFICATE-----" nil t)
+             (smime-pkcs7-email-region (point-min) (point))
+             (setq addresses (append (smime-buffer-as-string-region
+                                      (point-min) (point)) addresses))
+             (delete-region (point-min) (point)))))
        (if (not (member mm-security-from addresses))
            (mm-set-handle-multipart-parameter 
             mm-security-handle 'gnus-info "Sender forged")