1*4882a593SmuzhiyunFrom 579b5930e15de8855bf63b3c20b6c3aaf894c3eb Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
3*4882a593SmuzhiyunDate: Mon, 1 Feb 2016 19:27:59 -0500
4*4882a593SmuzhiyunSubject: [PATCH] handle generic error when no passphrase callback present
5*4882a593Smuzhiyun
6*4882a593Smuzhiyunapparently gpg 2.1 returns ERR_GENERAL right now if the pinentry was
7*4882a593Smuzhiyunin loopback mode and no passphrase callback was supplied.  Earlier
8*4882a593Smuzhiyunversions supplied ERR_BAD_PASSPHRASE.
9*4882a593Smuzhiyun
10*4882a593SmuzhiyunUpstream-Status: Backport
11*4882a593Smuzhiyun
12*4882a593SmuzhiyunSigned-off-by: Catalin Enache <catalin.enache@windriver.com>
13*4882a593Smuzhiyun
14*4882a593Smuzhiyun---
15*4882a593Smuzhiyun tests/test_passphrase.py | 2 +-
16*4882a593Smuzhiyun 1 file changed, 1 insertion(+), 1 deletion(-)
17*4882a593Smuzhiyun
18*4882a593Smuzhiyundiff --git a/tests/test_passphrase.py b/tests/test_passphrase.py
19*4882a593Smuzhiyunindex 0a235e9..35b3c59 100644
20*4882a593Smuzhiyun--- a/tests/test_passphrase.py
21*4882a593Smuzhiyun+++ b/tests/test_passphrase.py
22*4882a593Smuzhiyun@@ -41,7 +41,7 @@ class PassphraseTestCase(GpgHomeTestCase):
23*4882a593Smuzhiyun             new_sigs = ctx.sign(plaintext, signature, gpgme.SIG_MODE_CLEAR)
24*4882a593Smuzhiyun         except gpgme.GpgmeError as exc:
25*4882a593Smuzhiyun             self.assertEqual(exc.args[0], gpgme.ERR_SOURCE_GPGME)
26*4882a593Smuzhiyun-            self.assertEqual(exc.args[1], gpgme.ERR_BAD_PASSPHRASE)
27*4882a593Smuzhiyun+            self.assertEqual(exc.args[1], gpgme.ERR_GENERAL)
28*4882a593Smuzhiyun         else:
29*4882a593Smuzhiyun             self.fail('gpgme.GpgmeError not raised')
30*4882a593Smuzhiyun
31