security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

one debian bug fixed

Browse Source
This commit is contained in:
Werner Koch 2001-06-16 11:09:29 +00:00
parent 8c24595c41
commit ae78aed6b6
3 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
THANKS
View File

@ -50,6 +50,7 @@ Fabio Coatti cova@ferrara.linux.it
Felix von Leitner leitner@amdiv.de Felix von Leitner leitner@amdiv.de
fish stiqz fish@analog.org fish stiqz fish@analog.org
Florian Weimer Florian.Weimer@rus.uni-stuttgart.de Florian Weimer Florian.Weimer@rus.uni-stuttgart.de
Francesco Potorti pot@gnu.org
Frank Donahoe fdonahoe@wilkes1.wilkes.edu Frank Donahoe fdonahoe@wilkes1.wilkes.edu
Frank Heckenbach heckenb@mi.uni-erlangen.de Frank Heckenbach heckenb@mi.uni-erlangen.de
Frank Stajano frank.stajano@cl.cam.ac.uk Frank Stajano frank.stajano@cl.cam.ac.uk

6
g10/ChangeLog
View File

@ -1,3 +1,9 @@
2001-06-15 Werner Koch <wk@gnupg.org>
* getkey.c (merge_selfsigs): Exit gracefully when a secret key is
encountered. May happen if a secret key is in public keyring.
Reported by Francesco Potorti.
2001-06-12 Werner Koch <wk@gnupg.org> 2001-06-12 Werner Koch <wk@gnupg.org>
* getkey.c (compare_name): Use ascii_memistr(), ascii_memcasecmp() * getkey.c (compare_name): Use ascii_memistr(), ascii_memcasecmp()

11
g10/getkey.c
View File

@ -1807,8 +1807,17 @@ merge_selfsigs( KBNODE keyblock )
int revoked; int revoked;
PKT_public_key *main_pk; PKT_public_key *main_pk;
if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY ) if ( keyblock->pkt->pkttype != PKT_PUBLIC_KEY ) {
if (keyblock->pkt->pkttype == PKT_SECRET_KEY ) {
log_error ("expected public key but found secret key "
"- must stop\n");
/* we better exit here becuase a public key is expected at
other places too. FIXME: Figure this out earlier and
don't get to here at all */
g10_exit (1);
}
BUG (); BUG ();
}
merge_selfsigs_main ( keyblock, &revoked ); merge_selfsigs_main ( keyblock, &revoked );
main_pk = keyblock->pkt->pkt.public_key; main_pk = keyblock->pkt->pkt.public_key;