diff options
| author | David Shaw <[email protected]> | 2004-09-14 01:55:58 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-09-14 01:55:58 +0000 |
| commit | b96dc04cdef9f3cf6f31c63de7accd0963398240 (patch) | |
| tree | ae7603ecde593c61a8c35aa8b16a3e56cfce0c87 | |
| parent | * pgpgroup-to-gpggroup: New perl script to take groups from PGP command (diff) | |
| download | gnupg-b96dc04cdef9f3cf6f31c63de7accd0963398240.tar.gz gnupg-b96dc04cdef9f3cf6f31c63de7accd0963398240.zip | |
* getkey.c (premerge_public_with_secret): Fix subkey<->binding sig
mismatch when some secret subkeys are missing. Discovered by Michael
Roth.
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/getkey.c | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 729479d8b..3efd090bb 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2004-09-13 David Shaw <[email protected]> + + * 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 <[email protected]> * keydb.c (maybe_create_keyring): Try to create the home directory diff --git a/g10/getkey.c b/g10/getkey.c index 31828a704..b5b6cc4b9 100644 --- a/g10/getkey.c +++ b/g10/getkey.c @@ -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 */ |