2 files changed, 9 insertions, 0 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 80eaf708bc9..6ec0cf56cc0 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-05-22  Daiki Ueno  <ueno@gnu.org>
+
+        * mml2015.el (mml2015-epg-sign): Make sure to insert newline after the
+        signed data to conform the standard.  (Bug#14232)
+
 2013-05-20  Adam Sjøgren  <asjo@koldfront.dk>
 
         * gnus-spec.el (gnus-parse-complex-format): Use unicode escape for left
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index c3905b88e7b..5d122dfbe40 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -1085,6 +1085,10 @@ If no one is selected, default secret key is used.  "
         (epg-context-set-passphrase-callback
          context
          #'mml2015-epg-passphrase-callback))
+    ;; Signed data must end with a newline (RFC 3156, 5).
+    (goto-char (point-max))
+    (unless (bolp)
+      (insert "\n"))
     (condition-case error
         (setq signature (epg-sign-string context (buffer-string) t)
               mml2015-epg-secret-key-id-list nil)