Synch to No Gnus 200508051153.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e031d81..4b1ab94 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-05  Daiki Ueno <ueno@unixuser.org>
+
+       * mml2015.el (mml2015-pgg-sign): Make sure micalg is correct.
+
+       * pgg-parse.el (pgg-parse-hash-algorithm-alist): Add SHA-2.
+
 2005-08-05  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * mm-bodies.el (mm-encode-body): Use coding system rather than

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 87dea72..958aa92 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -645,7 +645,8 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
   (autoload 'pgg-decrypt-region "pgg")
   (autoload 'pgg-verify-region "pgg")
   (autoload 'pgg-sign-region "pgg")
-  (autoload 'pgg-encrypt-region "pgg"))
+  (autoload 'pgg-encrypt-region "pgg")
+  (autoload 'pgg-parse-armor "pgg-parse"))
 
 (defun mml2015-pgg-decrypt (handle ctl)
   (catch 'error
@@ -813,15 +814,23 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
   (let ((pgg-errors-buffer mml2015-result-buffer)
        (boundary (mml-compute-boundary cont))
        (pgg-default-user-id (or (message-options-get 'mml-sender)
-                                pgg-default-user-id)))
+                                pgg-default-user-id))
+       entry)
     (unless (pgg-sign-region (point-min) (point-max))
       (pop-to-buffer mml2015-result-buffer)
       (error "Sign error"))
     (goto-char (point-min))
     (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n"
                    boundary))
-      ;;; FIXME: what is the micalg?
-    (insert "\tmicalg=pgp-sha1; protocol=\"application/pgp-signature\"\n")
+    (if (setq entry (assq 2 (pgg-parse-armor
+                            (with-current-buffer pgg-output-buffer
+                              (buffer-string)))))
+       (setq entry (assq 'hash-algorithm (cdr entry))))
+    (insert (format "\tmicalg=%s; "
+                   (if (cdr entry)
+                       (downcase (format "pgp-%s" (cdr entry)))
+                     "pgp-sha1")))
+    (insert "protocol=\"application/pgp-signature\"\n")
     (insert (format "\n--%s\n" boundary))
     (goto-char (point-max))
     (insert (format "\n--%s\n" boundary))