diff options
| author | Lars Ingebrigtsen | 2018-04-14 17:18:53 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen | 2018-04-14 17:18:53 +0200 |
| commit | 0b0d3815da99f575b74e82234bfb963d89362152 (patch) | |
| tree | d2b321946257c4326f871b98cd4b66028b351120 | |
| parent | e20d7381ee85611f9e1d1e6bef4fe2d7e2ae7780 (diff) | |
| download | emacs-0b0d3815da99f575b74e82234bfb963d89362152.tar.gz emacs-0b0d3815da99f575b74e82234bfb963d89362152.zip | |
Revert "Revert "Give better errors in signing failures in Gnus""
This reverts commit 42141da5b0885b199636524c1e57f08ee1723aea.
This patch was reverted in error. I misinterpreted an email saying that
it didn't work, but apparently it worked as it should.
| -rw-r--r-- | lisp/gnus/mml1991.el | 2 | ||||
| -rw-r--r-- | lisp/gnus/mml2015.el | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el index 93b1b5049a8..b2056b2fd0d 100644 --- a/lisp/gnus/mml1991.el +++ b/lisp/gnus/mml1991.el | |||
| @@ -275,6 +275,8 @@ Whether the passphrase is cached at all is controlled by | |||
| 275 | (mm-decode-content-transfer-encoding cte))) | 275 | (mm-decode-content-transfer-encoding cte))) |
| 276 | (let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear)) | 276 | (let* ((pair (mml-secure-epg-sign 'OpenPGP 'clear)) |
| 277 | (signature (car pair))) | 277 | (signature (car pair))) |
| 278 | (unless (stringp signature) | ||
| 279 | (error "Signature failed")) | ||
| 278 | (delete-region (point-min) (point-max)) | 280 | (delete-region (point-min) (point-max)) |
| 279 | (insert | 281 | (insert |
| 280 | (with-temp-buffer | 282 | (with-temp-buffer |
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 5980ddb38fe..403b5e1af6a 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el | |||
| @@ -958,6 +958,8 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." | |||
| 958 | (let* ((pair (mml-secure-epg-sign 'OpenPGP t)) | 958 | (let* ((pair (mml-secure-epg-sign 'OpenPGP t)) |
| 959 | (signature (car pair)) | 959 | (signature (car pair)) |
| 960 | (micalg (cdr pair))) | 960 | (micalg (cdr pair))) |
| 961 | (unless (stringp signature) | ||
| 962 | (error "Signature failed")) | ||
| 961 | (goto-char (point-min)) | 963 | (goto-char (point-min)) |
| 962 | (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" | 964 | (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" |
| 963 | boundary)) | 965 | boundary)) |