diff options
| author | Simon Arlott <[email protected]> | 2017-02-05 21:31:35 +0000 |
|---|---|---|
| committer | Daniel Kahn Gillmor <[email protected]> | 2017-04-26 01:22:48 +0000 |
| commit | d9fd52afacebf98b5571de7269c9a1b37100e1ec (patch) | |
| tree | c13706204ef260bfb0e6e9d7c313c14e11a228a9 /g10/getkey.c | |
| parent | dirmngr: Fix aliasing problem in dns.c. (diff) | |
| download | gnupg-dkg/T1967.tar.gz gnupg-dkg/T1967.zip | |
g10: Skip signing keys where no secret key is available.dkg/T1967
* g10/getkey.c (finish_lookup): When requiring PUBKEY_USAGE_SIG, skip
over keys where no signing key is available.
--
This should only be relevant when gpg is required to choose which key
to sign with -- if verifying signatures, we already know which subkey
to look at, and indeed gpg doesn't seem to have a problem with this.
This patch comes from
https://bugs.gnupg.org/gnupg/file793/sign-fix.patch
I (dkg) have reviewed and tested it with missing local keys, and it
makes sense to me as the default behavior. If the user has the secret
key for a signing-capable subkey available and the command is --sign,
it should be used.
If the user has explicitly specified a subkey that happens to be
missing (e.g. with the trailing ! for --default-key 0x${FPR}!) then
this does not override that behavior (the signature will still fail).
GnuPG-bug-id: 1967
Debian-bug-id: 834922
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 75b8564f3..6ee9fe5b7 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -3549,6 +3549,13 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact, continue; } + if ((req_usage & PUBKEY_USAGE_SIG) && agent_probe_secret_key (NULL, pk)) + { + if (DBG_LOOKUP) + log_debug ("\tno secret key for signing\n"); + continue; + } + if (DBG_LOOKUP) log_debug ("\tsubkey might be fine\n"); /* In case a key has a timestamp of 0 set, we make sure |