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

* import.c (import_one): Fix bug when importing a new key from a file.

Browse Source
This commit is contained in:
David Shaw 2006-05-22 21:38:13 +00:00
parent a26d0ff496
commit 3bee120e15
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/ChangeLog
View File

@ -1,5 +1,8 @@
2006-05-22 David Shaw <dshaw@jabberwocky.com> 2006-05-22 David Shaw <dshaw@jabberwocky.com>
* import.c (import_one): Fix bug when importing a new key from a
file.
* getkey.c (get_pubkey_byname), import.c (import_one): Fix key * getkey.c (get_pubkey_byname), import.c (import_one): Fix key
selection problem when auto-key-locate returns a list of keys, not selection problem when auto-key-locate returns a list of keys, not
all of which are usable (revoked, expired, etc). Noted by Simon all of which are usable (revoked, expired, etc). Noted by Simon

12
g10/import.c
View File

@ -978,15 +978,13 @@ import_one( const char *fname, KBNODE keyblock, struct stats_s *stats,
} }
else if(new_key) else if(new_key)
{ {
if(fpr && stats->imported==1) if(fpr)
{ {
xfree(*fpr); xfree(*fpr);
*fpr=fingerprint_from_pk(pk,NULL,fpr_len); if(stats->imported==1)
} *fpr=fingerprint_from_pk(pk,NULL,fpr_len);
else else
{ *fpr=NULL;
xfree(*fpr);
*fpr=NULL;
} }
revocation_present(keyblock); revocation_present(keyblock);