* gnus-agent.el (gnus-agent-regenerate-group): New function.

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 5af8aba..5c88821 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -23,6 +23,9 @@
 
 ;;; Commentary:
 
+;; RFC 2015 is updated by RFC 3156, this file should be compatible
+;; with both.
+
 ;;; Code:
 
 (eval-when-compile (require 'cl))
@@ -64,7 +67,7 @@
   '((trust-undefined . nil)
     (trust-none      . nil)
     (trust-marginal  . t)
-    (trust-fully     . t)
+    (trust-full      . t)
     (trust-ultimate  . t))
   "Trust boundaries for a signer's GnuPG key.
 This alist contains pairs of the form (trust-symbol . boolean), with
@@ -149,7 +152,8 @@ by you.")
 
 (defun mml2015-fix-micalg (alg)
   (and alg
-       (upcase (if (string-match "^pgp-" alg)
+       ;; Mutt/1.2.5i has seen sending micalg=php-sha1
+       (upcase (if (string-match "^p[gh]p-" alg)
                   (substring alg (match-end 0))
                 alg))))
 
@@ -361,7 +365,10 @@ by you.")
               (buffer-string)))
            (set-buffer cipher)
            (erase-buffer)
-           (insert-buffer plain)))
+           (insert-buffer plain)
+           (goto-char (point-min))
+           (while (search-forward "\r\n" nil t)
+             (replace-match "\n" t t))))
        '(t)
       ;; Some wrong with the return value, check plain text buffer.
       (if (> (point-max) (point-min))
@@ -421,7 +428,7 @@ by you.")
                    (unless trust-good-enough-p
                      (concat "\nUntrusted, Fingerprint: "
                              (mml2015-gpg-pretty-print-fpr fprint))))
-         (error "From unknown user")))
+         "From unknown user"))
     (if (re-search-forward "^gpg: Good signature from \"\\(.*\\)\"$" nil t)
        (match-string 1)
       "From unknown user")))
@@ -440,6 +447,16 @@ by you.")
       (with-temp-buffer
        (setq message (current-buffer))
        (insert part)
+       ;; Convert <LF> to <CR><LF> in verify mode.  Sign and
+       ;; clearsign use --textmode. The conversion is not necessary.
+       ;; In clearverify, the conversion is not necessary either.
+       (goto-char (point-min))
+       (end-of-line)
+       (while (not (eobp))
+         (unless (eq (char-before) ?\r)
+           (insert "\r"))
+         (forward-line)
+         (end-of-line))
        (with-temp-buffer
          (setq signature (current-buffer))
          (unless (setq part (mm-find-part-by-type