* 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:
David Shaw 2004-09-14 01:55:58 +00:00
parent bdecc362bc
commit b96dc04cde
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +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.
2004-08-31 Werner Koch <wk@g10code.de>
* keydb.c (maybe_create_keyring): Try to create the home directory

View File

@ -2164,7 +2164,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 */