diff options
| author | Werner Koch <[email protected]> | 2016-08-29 05:55:06 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2016-08-29 05:56:03 +0000 |
| commit | bdbd03608b6f508ac4732f9986a046de8a85a311 (patch) | |
| tree | 51aa2dbe0b915664c91ae193fff2474ec5edf479 /g10/getkey.c | |
| parent | gpg: Fix false negatives in Ed25519 signature verification. (diff) | |
| download | gnupg-bdbd03608b6f508ac4732f9986a046de8a85a311.tar.gz gnupg-bdbd03608b6f508ac4732f9986a046de8a85a311.zip | |
gpg: Make decryption of -R work w/o --try-secret-key or --default-key.
* g10/getkey.c (enum_secret_keys): At state 3 enumerate the keys in all
cases not just when --try-all-secrets is used.
--
Regression-due-to: 82b90eee100cf1c9680517059b2d35e295dd992a
Reported-by: Carola Grunwald
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'g10/getkey.c')
| -rw-r--r-- | g10/getkey.c | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/g10/getkey.c b/g10/getkey.c index 90083ba6e..8b1759882 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -3620,17 +3620,14 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk) c->state++; break; - case 3: /* Init search context to try all keys. */ - if (opt.try_all_secrets) + case 3: /* Init search context to enum all secret keys. */ + err = getkey_bynames (&c->ctx, NULL, NULL, 1, &keyblock); + if (err) { - err = getkey_bynames (&c->ctx, NULL, NULL, 1, &keyblock); - if (err) - { - release_kbnode (keyblock); - keyblock = NULL; - getkey_end (c->ctx); - c->ctx = NULL; - } + release_kbnode (keyblock); + keyblock = NULL; + getkey_end (c->ctx); + c->ctx = NULL; } c->state++; break; |