security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

* getkey.c (get_pubkey_byname), import.c (import_one): Fix key selection

Browse Source 
problem when auto-key-locate returns a list of keys, not all of which are
usable (revoked, expired, etc).  Noted by Simon Josefsson.
This commit is contained in:
David Shaw 2006-05-22 16:53:09 +00:00
parent 6089d7f5d8
commit 7596ae1f6a
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2006-05-22 David Shaw <dshaw@jabberwocky.com>
* getkey.c (get_pubkey_byname), import.c (import_one): Fix key
selection problem when auto-key-locate returns a list of keys, not
all of which are usable (revoked, expired, etc). Noted by Simon
Josefsson.
2006-04-26 David Shaw <dshaw@jabberwocky.com> 2006-04-26 David Shaw <dshaw@jabberwocky.com>
* keyserver.c (direct_uri_map): New. * keyserver.c (direct_uri_map): New.

2
g10/getkey.c
View File

@ -934,7 +934,7 @@ get_pubkey_byname (PKT_public_key *pk,
for(akl=opt.auto_key_locate;akl;akl=akl->next) for(akl=opt.auto_key_locate;akl;akl=akl->next)
{ {
unsigned char *fpr; unsigned char *fpr=NULL;
size_t fpr_len; size_t fpr_len;
switch(akl->type) switch(akl->type)

14
g10/import.c
View File

@ -696,9 +696,6 @@ import_one( const char *fname, KBNODE keyblock, struct stats_s *stats,
pk = node->pkt->pkt.public_key; pk = node->pkt->pkt.public_key;
if(fpr)
*fpr=fingerprint_from_pk(pk,NULL,fpr_len);
keyid_from_pk( pk, keyid ); keyid_from_pk( pk, keyid );
uidnode = find_next_kbnode( keyblock, PKT_USER_ID ); uidnode = find_next_kbnode( keyblock, PKT_USER_ID );
@ -981,6 +978,17 @@ import_one( const char *fname, KBNODE keyblock, struct stats_s *stats,
} }
else if(new_key) else if(new_key)
{ {
if(fpr && stats->imported==1)
{
xfree(*fpr);
*fpr=fingerprint_from_pk(pk,NULL,fpr_len);
}
else
{
xfree(*fpr);
*fpr=NULL;
}
revocation_present(keyblock); revocation_present(keyblock);
if(seckey_available(keyid)==0) if(seckey_available(keyid)==0)
check_prefs(keyblock); check_prefs(keyblock);