security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-28 22:49:59 +01:00
Code Activity

* getkey.c (premerge_public_with_secret): Fix subkey<->binding sig

Browse Source 
mismatch when some secret subkeys are missing.  Discovered by Michael
Roth.
This commit is contained in:
David Shaw 2004-09-14 02:00:39 +00:00
parent 3e47f2e936
commit 1d8e25695f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View File

@ -1,5 +1,9 @@
2004-09-13 David Shaw <dshaw@jabberwocky.com> 2004-09-13 David Shaw <dshaw@jabberwocky.com>
* getkey.c (premerge_public_with_secret): Fix subkey<->binding sig
mismatch when some secret subkeys are missing. Discovered by
Michael Roth.
* main.h, keylist.c (print_subpackets_colon): Make a public * main.h, keylist.c (print_subpackets_colon): Make a public
function. function.

2
g10/getkey.c
View File

@ -2173,7 +2173,7 @@ premerge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
assert ( last ); assert ( last );
/* find the next subkey */ /* find the next subkey */
for (next=pub->next,ll=pub; for (next=pub->next,ll=pub;
next && pub->pkt->pkttype != PKT_PUBLIC_SUBKEY; next && next->pkt->pkttype != PKT_PUBLIC_SUBKEY;
ll = next, next = next->next ) ll = next, next = next->next )
; ;
/* make new link */ /* make new link */