diff options
Diffstat (limited to 'tests/run-keylist.c')
| -rw-r--r-- | tests/run-keylist.c | 37 |
1 files changed, 33 insertions, 4 deletions
diff --git a/tests/run-keylist.c b/tests/run-keylist.c index 27cdbb2..08f9b8c 100644 --- a/tests/run-keylist.c +++ b/tests/run-keylist.c @@ -55,9 +55,11 @@ show_usage (int ex) " --tofu use GPGME_KEYLIST_MODE_TOFU\n" " --sig-notations use GPGME_KEYLIST_MODE_SIG_NOTATIONS\n" " --ephemeral use GPGME_KEYLIST_MODE_EPHEMERAL\n" + " --v5fpr use GPGME_KEYLIST_MODE_V5FPR\n" " --validate use GPGME_KEYLIST_MODE_VALIDATE\n" " --import import all keys\n" " --offline use offline mode\n" + " --no-trust-check disable automatic trust database check\n" " --from-file list all keys in the given file\n" " --from-wkd list key from a web key directory\n" " --require-gnupg required at least the given GnuPG version\n" @@ -103,6 +105,7 @@ main (int argc, char **argv) gpgme_protocol_t protocol = GPGME_PROTOCOL_OpenPGP; int only_secret = 0; int offline = 0; + int no_trust_check = 0; int from_file = 0; int from_wkd = 0; gpgme_data_t data = NULL; @@ -182,6 +185,11 @@ main (int argc, char **argv) mode |= GPGME_KEYLIST_MODE_WITH_SECRET; argc--; argv++; } + else if (!strcmp (*argv, "--v5fpr")) + { + mode |= GPGME_KEYLIST_MODE_WITH_V5FPR; + argc--; argv++; + } else if (!strcmp (*argv, "--import")) { import = 1; @@ -192,6 +200,11 @@ main (int argc, char **argv) offline = 1; argc--; argv++; } + else if (!strcmp (*argv, "--no-trust-check")) + { + no_trust_check = 1; + argc--; argv++; + } else if (!strcmp (*argv, "--from-file")) { from_file = 1; @@ -238,6 +251,12 @@ main (int argc, char **argv) gpgme_set_offline (ctx, offline); + if (no_trust_check) + { + err = gpgme_set_ctx_flag (ctx, "no-auto-check-trustdb", "1"); + fail_if_err (err); + } + if (trust_model) { err = gpgme_set_ctx_flag (ctx, "trust-model", trust_model); @@ -272,11 +291,16 @@ main (int argc, char **argv) int nsigs; printf ("keyid : %s\n", key->subkeys?nonnull (key->subkeys->keyid):"?"); - printf ("caps : %s%s%s%s\n", + printf ("can_cap : %s%s%s%s\n", key->can_encrypt? "e":"", key->can_sign? "s":"", key->can_certify? "c":"", key->can_authenticate? "a":""); + printf ("has_cap : %s%s%s%s\n", + key->has_encrypt? "e":"", + key->has_sign? "s":"", + key->has_certify? "c":"", + key->has_authenticate? "a":""); printf ("flags :%s%s%s%s%s%s%s%s\n", key->secret? " secret":"", key->revoked? " revoked":"", @@ -292,23 +316,28 @@ main (int argc, char **argv) for (nsub=0; subkey; subkey = subkey->next, nsub++) { printf ("fpr %2d: %s\n", nsub, nonnull (subkey->fpr)); + if (subkey->v5fpr) + printf ("v5fpr %2d: %s\n", nsub, nonnull (subkey->v5fpr)); if (subkey->keygrip) printf ("grip %2d: %s\n", nsub, subkey->keygrip); if (subkey->curve) printf ("curve %2d: %s\n", nsub, subkey->curve); - printf ("caps %2d: %s%s%s%s\n", + printf ("caps %2d: %s%s%s%s%s%s\n", nsub, subkey->can_encrypt? "e":"", subkey->can_sign? "s":"", subkey->can_certify? "c":"", - subkey->can_authenticate? "a":""); - printf ("flags %2d:%s%s%s%s%s%s%s%s\n", + subkey->can_authenticate? "a":"", + subkey->can_renc? "r":"", + subkey->can_timestamp? "t":""); + printf ("flags %2d:%s%s%s%s%s%s%s%s%s\n", nsub, subkey->secret? " secret":"", subkey->revoked? " revoked":"", subkey->expired? " expired":"", subkey->disabled? " disabled":"", subkey->invalid? " invalid":"", + subkey->is_group_owned? " group":"", subkey->is_qualified? " qualified":"", subkey->is_de_vs? " de-vs":"", subkey->is_cardkey? " cardkey":""); |