security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

g10: Enumerated keys for decryption should be unique.

Browse Source 
* g10/getkey.c (enum_secret_keys): Collecting keys in the context,
check duplicate to make sure returning only unique keys.
* g10/pubkey-enc.c (get_session_key): Now, it's the responsibility of
enum_secret_keys to free keys.

--

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2018-06-11 11:48:14 +09:00
parent ce2f717601
commit 30153c65f0
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
g10/getkey.c
View File

@ -3993,6 +3993,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
kbnode_t keyblock; kbnode_t keyblock;
kbnode_t node; kbnode_t node;
getkey_ctx_t ctx; getkey_ctx_t ctx;
pubkey_t results;
} *c = *context; } *c = *context;
if (!c) if (!c)
@ -4007,6 +4008,7 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
if (!sk) if (!sk)
{ {
/* Free the context. */ /* Free the context. */
pubkeys_free (c->results);
release_kbnode (c->keyblock); release_kbnode (c->keyblock);
getkey_end (ctrl, c->ctx); getkey_end (ctrl, c->ctx);
xfree (c); xfree (c);
@ -4109,8 +4111,31 @@ enum_secret_keys (ctrl_t ctrl, void **context, PKT_public_key *sk)
if (c->node->pkt->pkttype == PKT_PUBLIC_KEY if (c->node->pkt->pkttype == PKT_PUBLIC_KEY
|| c->node->pkt->pkttype == PKT_PUBLIC_SUBKEY) || c->node->pkt->pkttype == PKT_PUBLIC_SUBKEY)
{ {
pubkey_t r;
/* Skip this candidate if it's already enumerated. */
for (r = c->results; r; r = r->next)
if (!cmp_public_keys (r->pk, c->node->pkt->pkt.public_key))
break;
if (r)
continue;
copy_public_key (sk, c->node->pkt->pkt.public_key); copy_public_key (sk, c->node->pkt->pkt.public_key);
c->node = c->node->next; c->node = c->node->next;
r = xtrycalloc (1, sizeof (*r));
if (!r)
{
err = gpg_error_from_syserror ();
free_public_key (sk);
return err;
}
r->pk = sk;
r->keyblock = NULL;
r->next = c->results;
c->results = r;
return 0; /* Found. */ return 0; /* Found. */
} }
} }

2
g10/pubkey-enc.c
View File

@ -87,7 +87,6 @@ get_session_key (ctrl_t ctrl, struct pubkey_enc_list *list, DEK *dek)
{ {
struct pubkey_enc_list *k; struct pubkey_enc_list *k;
free_public_key (sk);
sk = xmalloc_clear (sizeof *sk); sk = xmalloc_clear (sizeof *sk);
rc = enum_secret_keys (ctrl, &enum_context, sk); rc = enum_secret_keys (ctrl, &enum_context, sk);
if (rc) if (rc)
@ -156,7 +155,6 @@ get_session_key (ctrl_t ctrl, struct pubkey_enc_list *list, DEK *dek)
} }
} }
enum_secret_keys (ctrl, &enum_context, NULL); /* free context */ enum_secret_keys (ctrl, &enum_context, NULL); /* free context */
free_public_key (sk);
if (DBG_CLOCK) if (DBG_CLOCK)
log_clock ("get_session_key leave"); log_clock ("get_session_key leave");