2006-04-30 Andreas Seltenreich <uwi7@rz.uni-karlsruhe.de>

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 3199df8..a35e206 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1,6 +1,7 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005
-;;        Free Software Foundation, Inc.
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
@@ -34,6 +35,8 @@
 (require 'mm-util)
 (require 'mml)
 
+(defvar mc-pgp-always-sign)
+
 (defvar mml2015-use (or
                     (progn
                       (ignore-errors
@@ -645,7 +648,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
@@ -707,6 +711,8 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
             (buffer-string))))
        (progn
          (erase-buffer)
+         ;; Treat data which pgg returns as a unibyte string.
+         (mm-disable-multibyte)
          (insert-buffer-substring pgg-output-buffer)
          (goto-char (point-min))
          (while (search-forward "\r\n" nil t)
@@ -813,15 +819,24 @@ 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))
+       (pgg-text-mode t)
+       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))
@@ -833,6 +848,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
 
 (defun mml2015-pgg-encrypt (cont &optional sign)
   (let ((pgg-errors-buffer mml2015-result-buffer)
+       (pgg-text-mode t)
        (boundary (mml-compute-boundary cont)))
     (unless (pgg-encrypt-region (point-min) (point-max)
                                (split-string
@@ -867,7 +883,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.")
        (erase-buffer)
        t)
     (setq mml2015-result-buffer
-         (gnus-get-buffer-create "*MML2015 Result*"))
+         (gnus-get-buffer-create " *MML2015 Result*"))
     nil))
 
 (defsubst mml2015-clear-decrypt-function ()