29 lines
1.1 KiB
Diff
29 lines
1.1 KiB
Diff
|
From 41a0e04d2e81f58c1aff1338a0c89d49ce399d39 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
|
||
|
|
Date: Mon, 1 Feb 2016 19:27:59 -0500
|
||
|
|
Subject: [PATCH 3/6] handle generic error when no passphrase callback present
|
||
|
|
|
||
|
|
apparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was
|
||
|
|
in loopback mode and no passphrase callback was supplied. Earlier
|
||
|
|
versions supplied ERR_BAD_PASSPHRASE.
|
||
|
|
---
|
||
|
|
tests/test_passphrase.py | 2 +-
|
||
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/tests/test_passphrase.py b/tests/test_passphrase.py
|
||
|
|
index 0a235e9..35b3c59 100644
|
||
|
|
--- a/tests/test_passphrase.py
|
||
|
|
+++ b/tests/test_passphrase.py
|
||
|
|
@@ -41,7 +41,7 @@ class PassphraseTestCase(GpgHomeTestCase):
|
||
|
|
new_sigs = ctx.sign(plaintext, signature, gpgme.SIG_MODE_CLEAR)
|
||
|
|
except gpgme.GpgmeError as exc:
|
||
|
|
self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_GPGME)
|
||
|
|
- self.assertEqual(exc.args[1], gpgme.ERR_BAD_PASSPHRASE)
|
||
|
|
+ self.assertEqual(exc.args[1], gpgme.ERR_GENERAL)
|
||
|
|
else:
|
||
|
|
self.fail('gpgme.GpgmeError not raised')
|
||
|
|
|
||
|
|
--
|
||
|
|
2.7.4
|
||
|
|
|