security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-20 14:37:08 +01:00
Code Activity

gpg: Make --try-all-secrets work for hidden recipients

Browse Source 
* g10/getkey.c (enum_secret_keys): Really enumerate all secret
keys if --try-all-secrets is specified.
--

GnuPG-bug-id: 1985
Signed-off-by: Daiki Ueno <ueno@gnu.org>

- Add new arg CTRL to getkey_byname call.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Daiki Ueno 2015-08-18 16:57:44 +09:00 committed by Werner Koch
parent 7b96a8d736
commit 82b90eee10
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
g10/getkey.c
View File

@ -3555,6 +3555,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
{ {
gpg_error_t err = 0; gpg_error_t err = 0;
const char *name; const char *name;
kbnode_t keyblock;
struct struct
{ {
int eof; int eof;
@ -3562,6 +3563,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
strlist_t sl; strlist_t sl;
kbnode_t keyblock; kbnode_t keyblock;
kbnode_t node; kbnode_t node;
getkey_ctx_t ctx;
} *c = *context; } *c = *context;
if (!c) if (!c)
@ -3577,6 +3579,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
{ {
/* Free the context. */ /* Free the context. */
release_kbnode (c->keyblock); release_kbnode (c->keyblock);
getkey_end (c->ctx);
xfree (c); xfree (c);
*context = NULL; *context = NULL;
return 0; return 0;
@ -3594,6 +3597,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
do do
{ {
name = NULL; name = NULL;
keyblock = NULL;
switch (c->state) switch (c->state)
{ {
case 0: /* First try to use the --default-key. */ case 0: /* First try to use the --default-key. */
@ -3616,24 +3620,60 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
c->state++; c->state++;
break; break;
case 3: /* Init search context to try all keys. */
if (opt.try_all_secrets)
{
err = getkey_bynames (&c->ctx, NULL, NULL, 1, &keyblock);
if (err)
{
release_kbnode (keyblock);
keyblock = NULL;
getkey_end (c->ctx);
c->ctx = NULL;
}
}
c->state++;
break;
case 4: /* Get next item from the context. */
if (c->ctx)
{
err = getkey_next (c->ctx, NULL, &keyblock);
if (err)
{
release_kbnode (keyblock);
keyblock = NULL;
getkey_end (c->ctx);
c->ctx = NULL;
}
}
else
c->state++;
break;
default: /* No more names to check - stop. */ default: /* No more names to check - stop. */
c->eof = 1; c->eof = 1;
return gpg_error (GPG_ERR_EOF); return gpg_error (GPG_ERR_EOF);
} }
} }
while (!name || !*name); while ((!name || !*name) && !keyblock);
err = getkey_byname (ctrl, NULL, NULL, name, 1, &c->keyblock); if (keyblock)
if (err) c->node = c->keyblock = keyblock;
{
/* getkey_byname might return a keyblock even in the
error case - I have not checked. Thus better release
it. */
release_kbnode (c->keyblock);
c->keyblock = NULL;
}
else else
c->node = c->keyblock; {
err = getkey_byname (ctrl, NULL, NULL, name, 1, &c->keyblock);
if (err)
{
/* getkey_byname might return a keyblock even in the
error case - I have not checked. Thus better release
it. */
release_kbnode (c->keyblock);
c->keyblock = NULL;
}
else
c->node = c->keyblock;
}
} }
/* Get the next key from the current keyblock. */ /* Get the next key from the current keyblock. */