2002-01-27 Richard M. Stallman <rms@gnu.org>

[gnus] / lisp / mml-smime.el

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index c7207e4..d5baf3f 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -1,5 +1,5 @@
 ;;; mml-smime.el --- S/MIME support for MML
-;; Copyright (c) 2000 Free Software Foundation, Inc.
+;; Copyright (c) 2000, 2001 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: Gnus, MIME, S/MIME, MML
@@ -32,7 +32,8 @@
   (when (null smime-keys)
     (customize-variable 'smime-keys)
     (error "No S/MIME keys configured, use customize to add your key"))
-  (smime-sign-buffer (cdr (assq 'keyfile cont))))
+  (smime-sign-buffer (cdr (assq 'keyfile cont)))
+  (goto-char (point-max)))
 
 (defun mml-smime-encrypt (cont)
   (let (certnames certfiles tmp file tmpfiles)
@@ -56,7 +57,8 @@
          t)
       (while (setq tmp (pop tmpfiles))
        (delete-file tmp))
-      nil)))
+      nil))
+  (goto-char (point-max)))
 
 (defun mml-smime-sign-query ()
   ;; query information (what certificate) from user when MML tag is
@@ -77,7 +79,7 @@
              (smime-get-key-by-email
               (completing-read "Sign this part with what signature? "
                                smime-keys nil nil
-                               (and (listp (car-safe smime-keys)) 
+                               (and (listp (car-safe smime-keys))
                                     (caar smime-keys))))))))
 
 (defun mml-smime-get-file-cert ()
@@ -93,7 +95,7 @@
        (while (not result)
          (setq who (read-from-minibuffer
                     (format "%sLookup certificate for: " (or bad ""))
-                    (cadr (funcall gnus-extract-address-components 
+                    (cadr (funcall gnus-extract-address-components
                                    (or (save-excursion
                                          (save-restriction
                                            (message-narrow-to-headers)
@@ -110,8 +112,9 @@
   ;; todo: try dns/ldap automatically first, before prompting user
   (let (certs done)
     (while (not done)
-      (ecase (read (gnus-completing-read "dns" "Fetch certificate from"
-                                        '(("dns") ("file")) nil t))
+      (ecase (read (gnus-completing-read-with-default
+                   "dns" "Fetch certificate from"
+                   '(("dns") ("file")) nil t))
        (dns (setq certs (append certs
                                 (mml-smime-get-dns-cert))))
        (file (setq certs (append certs
@@ -124,9 +127,9 @@
     (insert-buffer (mm-handle-multipart-original-buffer ctl))
     (goto-char (point-min))
     (insert (format "Content-Type: %s; " (mm-handle-media-type ctl)))
-    (insert (format "protocol=\"%s\"; " 
+    (insert (format "protocol=\"%s\"; "
                    (mm-handle-multipart-ctl-parameter ctl 'protocol)))
-    (insert (format "micalg=\"%s\"; " 
+    (insert (format "micalg=\"%s\"; "
                    (mm-handle-multipart-ctl-parameter ctl 'micalg)))
     (insert (format "boundary=\"%s\"\n\n"
                    (mm-handle-multipart-ctl-parameter ctl 'boundary)))
@@ -142,12 +145,12 @@
       (if (not good-signature)
          (progn
            ;; we couldn't verify message, fail with openssl output as message
-           (mm-set-handle-multipart-parameter 
+           (mm-set-handle-multipart-parameter
             mm-security-handle 'gnus-info "Failed")
            (mm-set-handle-multipart-parameter
-            mm-security-handle 'gnus-details 
-            (concat "OpenSSL failed to verify message:\n" 
-                    "---------------------------------\n" 
+            mm-security-handle 'gnus-details
+            (concat "OpenSSL failed to verify message integrity:\n"
+                    "-------------------------------------------\n"
                     openssl-output)))
        ;; verify mail addresses in mail against those in certificate
        (when (and (smime-pkcs7-region (point-min) (point-max))
@@ -162,22 +165,22 @@
              (delete-region (point-min) (point)))
            (setq addresses (mapcar 'downcase addresses))))
        (if (not (member (downcase (or (mm-handle-multipart-from ctl) "")) addresses))
-           (mm-set-handle-multipart-parameter 
+           (mm-set-handle-multipart-parameter
             mm-security-handle 'gnus-info "Sender address forged")
          (if good-certificate
-             (mm-set-handle-multipart-parameter 
+             (mm-set-handle-multipart-parameter
               mm-security-handle 'gnus-info "Ok (sender authenticated)")
            (mm-set-handle-multipart-parameter
-            mm-security-handle 'gnus-info "Integrity OK (sender unknown)")))
+            mm-security-handle 'gnus-info "Ok (sender not trusted)")))
        (mm-set-handle-multipart-parameter
-        mm-security-handle 'gnus-details 
-        (concat "Sender clamed to be: " (mm-handle-multipart-from ctl) "\n"
+        mm-security-handle 'gnus-details
+        (concat "Sender claimed to be: " (mm-handle-multipart-from ctl) "\n"
                 (if addresses
-                    (concat "Addresses in certificate: " 
+                    (concat "Addresses in certificate: "
                             (mapconcat 'identity addresses ", "))
                   "No addresses found in certificate. (Requires OpenSSL 0.9.6 or later.)")
-                "\n" "\n" 
-                "OpenSSL output:\n" 
+                "\n" "\n"
+                "OpenSSL output:\n"
                 "---------------\n" openssl-output "\n"
                 "Certificate(s) inside S/MIME signature:\n"
                 "---------------------------------------\n"