diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 12:50:09 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2016-07-04 12:53:15 +0200 |
| commit | 5b1fef1e9dba778bed0586534744133c17215bca (patch) | |
| tree | 2df1647a156a31ef4eddc10fb0c8b76065dc2d23 | |
| parent | 6d2e8976d8fefbafa91638ab0b43aa4a93c4c0d9 (diff) | |
gajim: Fix patch for fixing with GnuPG 2.1.13
The previous patch didn't handle the KEY_CONSIDERED status at the correct position, because the status will be returned during signing and not during verification. So this time, let's handle it during signing and actually test it (I did and it worked). Signed-off-by: aszlig <aszlig@redmoonstudios.org>
| -rw-r--r-- | modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch b/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch index c2898cab..a67188af 100644 --- a/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch +++ b/modules/user/aszlig/programs/gajim/gnupg-2.1.13.patch @@ -1,12 +1,11 @@ --- a/src/common/gnupg.py 1970-01-01 01:00:01.000000000 +0100 -+++ b/src/common/gnupg.py 2016-07-04 12:23:04.660012839 +0200 -@@ -229,7 +229,8 @@ - "DECRYPTION_OKAY", "INV_SGNR", "FILE_START", "FILE_ERROR", - "FILE_DONE", "PKA_TRUST_GOOD", "PKA_TRUST_BAD", "BADMDC", - "GOODMDC", "NO_SGNR", "NOTATION_NAME", "NOTATION_DATA", -- "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG"): -+ "PROGRESS", "PINENTRY_LAUNCHED", "NEWSIG", -+ "KEY_CONSIDERED"): ++++ b/src/common/gnupg.py 2016-07-04 12:44:42.680621101 +0200 +@@ -613,7 +613,7 @@ + "GOOD_PASSPHRASE", "BEGIN_SIGNING", "CARDCTRL", "INV_SGNR", + "NO_SGNR", "MISSING_PASSPHRASE", "NEED_PASSPHRASE_PIN", + "SC_OP_FAILURE", "SC_OP_SUCCESS", "PROGRESS", +- "PINENTRY_LAUNCHED"): ++ "PINENTRY_LAUNCHED", "KEY_CONSIDERED"): pass - elif key == "BADSIG": - self.valid = False + elif key in ("KEYEXPIRED", "SIGEXPIRED"): + self.status = 'key expired' |