aboutsummaryrefslogtreecommitdiffstats
path: root/tests/gpg/t-keylist.c
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2011-04-27 10:56:19 +0000
committerMarcus Brinkmann <[email protected]>2011-04-27 16:03:46 +0000
commit43f38db1afe9830b888076adeec1eec21f32335c (patch)
tree388b99bc09ea279d33a760a54011008c410d7a86 /tests/gpg/t-keylist.c
parentRequire autoconf 1.11 (diff)
downloadgpgme-43f38db1afe9830b888076adeec1eec21f32335c.tar.gz
gpgme-43f38db1afe9830b888076adeec1eec21f32335c.zip
Update GPGME test suite for use with GnuPG 2.1.
Diffstat (limited to 'tests/gpg/t-keylist.c')
-rw-r--r--tests/gpg/t-keylist.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/tests/gpg/t-keylist.c b/tests/gpg/t-keylist.c
index e536b47a..2c049359 100644
--- a/tests/gpg/t-keylist.c
+++ b/tests/gpg/t-keylist.c
@@ -115,8 +115,8 @@ struct key_info_s keys[] =
{ "23FD347A419429BACCD5E72D6BC4778054ACD246", "EF9DC276A172C881",
{ { "Zulu Test", "demo key", "[email protected]" } }, 1 },
{ "ADAB7FCC1F4DE2616ECFA402AF82244F9CD9FD55", "087DD7E0381701C4",
- { { "Joe Random Hacker", "test key with passphrase \"x\"",
- "[email protected]" } }, 1 },
+ { { "Joe Random Hacker", "test key with passphrase \"abc\"",
+ "[email protected]" } }, 1 },
{ NULL }
};
@@ -169,11 +169,14 @@ main (int argc, char **argv)
fprintf (stderr, "Key unexpectedly invalid\n");
exit (1);
}
+#if 0
+ /* GnuPG 2.1+ have a different subkey for encryption. */
if (!key->can_encrypt)
{
fprintf (stderr, "Key unexpectedly unusable for encryption\n");
exit (1);
}
+#endif
if (!key->can_sign)
{
fprintf (stderr, "Key unexpectedly unusable for signing\n");