[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#37025: [found the culprit]
From: |
Teemu Likonen |
Subject: |
bug#37025: [found the culprit] |
Date: |
Thu, 15 Aug 2019 19:08:01 +0300 |
Teemu Likonen [2019-08-15T07:48:24+03] wrote:
> So there should also be version checking in epg.el's epg-start-sign
> and epg-start-encrypt functions (or somewhere).
OK. Here's a patch with version checking. This patch includes everything
in the previous patch (that is, use "--sender" only with OpenPGP
protocol) and additionally this checks if gpg is at least version 2.1.15
which introduced the "--sender" option.
diff --git a/lisp/epg.el b/lisp/epg.el
index ce58c520f1..838cf6b9ea 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -1617,8 +1617,13 @@ epg-start-sign
(epg-sub-key-id
(car (epg-key-sub-key-list signer)))))
(epg-context-signers context)))
- (let ((sender (epg-context-sender context)))
- (when (stringp sender)
+ (let ((sender (epg-context-sender context))
+ (version (cdr (assq 'version (epg-find-configuration
+ 'OpenPGP)))))
+ (when (and (eql 'OpenPGP (epg-context-protocol context))
+ (stringp version)
+ (version<= "2.1.15" version)
+ (stringp sender))
(list "--sender" sender)))
(epg--args-from-sig-notations
(epg-context-sig-notations context))
@@ -1714,9 +1719,15 @@ epg-start-encrypt
(car (epg-key-sub-key-list
signer)))))
(epg-context-signers context))))
- (if sign
- (let ((sender (epg-context-sender context)))
- (when (stringp sender)
+ (if (and sign
+ (eql 'OpenPGP (epg-context-protocol context)))
+ (let ((sender (epg-context-sender context))
+ (version (cdr (assq 'version
+ (epg-find-configuration
+ 'OpenPGP)))))
+ (when (and (stringp version)
+ (version<= "2.1.15" version)
+ (stringp sender))
(list "--sender" sender))))
(if sign
(epg--args-from-sig-notations
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 07d2028534..e0ec829617 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -915,7 +915,7 @@ mml-secure-epg-encrypt
(when sign
(setq signers (mml-secure-signers context signer-names))
(setf (epg-context-signers context) signers)
- (when mml-secure-openpgp-sign-with-sender
+ (when (and (eq 'OpenPGP protocol) mml-secure-openpgp-sign-with-sender)
(setf (epg-context-sender context) sender)))
(when (eq 'OpenPGP protocol)
(setf (epg-context-armor context) t)
@@ -945,10 +945,10 @@ mml-secure-epg-sign
signature micalg)
(when (eq 'OpenPGP protocol)
(setf (epg-context-armor context) t)
- (setf (epg-context-textmode context) t))
+ (setf (epg-context-textmode context) t)
+ (when mml-secure-openpgp-sign-with-sender
+ (setf (epg-context-sender context) sender)))
(setf (epg-context-signers context) signers)
- (when mml-secure-openpgp-sign-with-sender
- (setf (epg-context-sender context) sender))
(when (mml-secure-cache-passphrase-p protocol)
(epg-context-set-passphrase-callback
context
--
/// OpenPGP key: 4E1055DC84E9DFF613D78557719D69D324539450
// https://keys.openpgp.org/search?q=tlikonen@iki.fi
/ https://keybase.io/tlikonen https://github.com/tlikonen
signature.asc
Description: PGP signature
- bug#37025: 27.0.50; smime signing and encryption does not work any longer, Uwe Brauer, 2019/08/14
- bug#37025: [found the culprit] (was: bug#37025: 27.0.50; smime signing and encryption does not work any longer), Uwe Brauer, 2019/08/14
- bug#37025: [found the culprit] (was: bug#37025: 27.0.50; smime signing and encryption does not work any longer), Teemu Likonen, 2019/08/14
- bug#37025: [found the culprit], Glenn Morris, 2019/08/14
- bug#37025: [found the culprit], Teemu Likonen, 2019/08/15
- bug#37025: [found the culprit], Uwe Brauer, 2019/08/15
- bug#37025: [found the culprit],
Teemu Likonen <=
- bug#37025: [found the culprit], Uwe Brauer, 2019/08/15
- bug#37025: [found the culprit], Teemu Likonen, 2019/08/18
- bug#37025: [found the culprit], Lars Ingebrigtsen, 2019/08/26
- bug#37025: [found the culprit], Uwe Brauer, 2019/08/26
- bug#37025: [confirmed] (was: bug#37025: [found the culprit]), Uwe Brauer, 2019/08/26
- bug#37025: [confirmed] (was: bug#37025: [found the culprit]), Teemu Likonen, 2019/08/26
- bug#37025: [confirmed], Lars Ingebrigtsen, 2019/08/27