mirror of
git://git.gnupg.org/gnupg.git
synced 2025-03-24 22:09:57 +01:00
* getkey.c (premerge_public_with_secret): Fix subkey<->binding sig
mismatch when some secret subkeys are missing. Discovered by Michael Roth.
This commit is contained in:
parent
3e47f2e936
commit
1d8e25695f
@ -1,5 +1,9 @@
|
||||
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
|
||||
function.
|
||||
|
||||
|
@ -2173,7 +2173,7 @@ premerge_public_with_secret ( KBNODE pubblock, KBNODE secblock )
|
||||
assert ( last );
|
||||
/* find the next subkey */
|
||||
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 )
|
||||
;
|
||||
/* make new link */
|
||||
|
Loading…
x
Reference in New Issue
Block a user