Importing Oort Gnus v0.04.

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

diff --git a/lisp/mml-smime.el b/lisp/mml-smime.el
index 46db906..ac87492 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)
@@ -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
@@ -146,8 +148,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 +170,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 ", "))