* nnmail.el (nnmail-split-it): Revoke the change of 1999-08-19.

[elisp/gnus.git-] / lisp / mml-smime.el

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 46db906..2eec919 100644 (file)
--- a/lisp/mml-smime.el
+++ b/lisp/mml-smime.el
@@ -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)
@@ -44,7 +45,8 @@
       (if (not (and (not (file-exists-p tmp))
                    (get-buffer tmp)))
          (push tmp certfiles)
-       (setq file (make-temp-name mm-tmp-directory))
+       (setq file (mm-make-temp-file (expand-file-name "mml." 
+                                                       mm-tmp-directory)))
        (with-current-buffer tmp
          (write-region (point-min) (point-max) file))
        (push file certfiles)
@@ -56,7 +58,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
@@ -110,8 +113,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
@@ -146,8 +150,8 @@
             mm-security-handle 'gnus-info "Failed")
            (mm-set-handle-multipart-parameter
             mm-security-handle 'gnus-details
-            (concat "OpenSSL failed to verify message:\n"
-                    "---------------------------------\n"
+            (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))
@@ -168,10 +172,10 @@
              (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"
+        (concat "Sender claimed to be: " (mm-handle-multipart-from ctl) "\n"
                 (if addresses
                     (concat "Addresses in certificate: "
                             (mapconcat 'identity addresses ", "))