diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/engine-gpg.c | 38 | ||||
| -rw-r--r-- | src/keylist.c | 2 |
2 files changed, 31 insertions, 9 deletions
diff --git a/src/engine-gpg.c b/src/engine-gpg.c index c0391d11..eeb09c7b 100644 --- a/src/engine-gpg.c +++ b/src/engine-gpg.c @@ -2103,17 +2103,39 @@ append_args_from_signers (engine_gpg_t gpg, gpgme_ctx_t ctx /* FIXME */) gpgme_error_t err = 0; int i; gpgme_key_t key; + gpgme_subkey_t subkey; + const char *s; for (i = 0; (key = gpgme_signers_enum (ctx, i)); i++) { - const char *s = key->subkeys ? key->subkeys->keyid : NULL; - if (s) - { - if (!err) - err = add_arg (gpg, "-u"); - if (!err) - err = add_arg (gpg, s); - } + if (key->subkeys) + { + /* First check whether any subkey has the subkey_match set + * and use that one. If that is not the case we use the + * fingerprint of the primary key or if that does not exist + * the keyid. */ + for (subkey = key->subkeys; subkey; subkey = subkey->next) + if (subkey->subkey_match) + break; + if (subkey && subkey->fpr) + { + if (!err) + err = add_arg (gpg, "-u"); + if (!err) + err = add_arg_pfx (gpg, subkey->fpr, "!"); + } + else + { + subkey = key->subkeys; /* Reset to the primary key. */ + if ((s=subkey->fpr) || (s=subkey->keyid)) + { + if (!err) + err = add_arg (gpg, "-u"); + if (!err) + err = add_arg (gpg, s); + } + } + } gpgme_key_unref (key); if (err) break; diff --git a/src/keylist.c b/src/keylist.c index 11b68408..c0bf2155 100644 --- a/src/keylist.c +++ b/src/keylist.c @@ -1359,7 +1359,7 @@ gpgme_op_keylist_ext_start (gpgme_ctx_t ctx, const char *pattern[], err = maybe_setup_for_requested_subkey (opd, pattern[i]); if (err) return TRACE_ERR (err); - /* We can only handle one exact subnkey request. Thus we + /* We can only handle one exact subkey request. Thus we * stop after the first seen. */ if (opd->requested_subkey) break; |