diff options
| -rw-r--r-- | THANKS | 1 | ||||
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/keyedit.c | 2 | ||||
| -rw-r--r-- | g10/keylist.c | 7 |
4 files changed, 14 insertions, 2 deletions
@@ -7,6 +7,7 @@ Adam Mitchell [email protected] Alec Habig [email protected] Allan Clark [email protected] Anand Kumria [email protected] +Anthony Mulcahy [email protected] Ariel T Glenn [email protected] Bodo Moeller [email protected] Brenno de Winter [email protected] diff --git a/g10/ChangeLog b/g10/ChangeLog index dd7406b70..99d7e26f2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,7 @@ +Mon Jul 24 10:30:17 CEST 2000 Werner Koch <[email protected]> + + * keyedit.c (menu_expire): expire date for primary key can be set again. + Wed Jul 19 11:26:43 CEST 2000 Werner Koch <wk@> * keylist.c (is_uid_valid): New. @@ -58,7 +62,7 @@ Fri Jun 9 10:09:52 CEST 2000 Werner Koch <[email protected]> Wed Jun 7 19:19:09 CEST 2000 Werner Koch <[email protected]> - * sig-check.c (do_check): Use EMULATE_MDENCODE also on v4 paclets. + * sig-check.c (do_check): Use EMULATE_MDENCODE also on v4 packets. Wed Jun 7 17:25:38 CEST 2000 Werner Koch <[email protected]> diff --git a/g10/keyedit.c b/g10/keyedit.c index b28fadb45..84e8cd194 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1501,7 +1501,7 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock ) else if( node->pkt->pkttype == PKT_USER_ID ) uid = node->pkt->pkt.user_id; else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE - && sub_pk != NULL ) { + && ( mainkey || sub_pk ) ) { PKT_signature *sig = node->pkt->pkt.signature; if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] && ( (mainkey && uid && (sig->sig_class&~3) == 0x10) diff --git a/g10/keylist.c b/g10/keylist.c index 3be29a89e..32012f422 100644 --- a/g10/keylist.c +++ b/g10/keylist.c @@ -118,6 +118,13 @@ is_uid_valid ( KBNODE keyblock, KBNODE uidnode, u32 *mainkid ) KBNODE node; PKT_signature *selfsig = NULL; /* the latest valid self signature */ + /* The key signature verify function can's handle secret keys yet and + * becuase we are not sure whether the duplication of user IDs and + * self-signatures should be kept on secret keys we are not going to fix + * it there. */ + if ( keyblock->pkt->pkttype == PKT_SECRET_KEY ) + return NULL; + assert ( uidnode->pkt->pkttype == PKT_USER_ID || uidnode->pkt->pkttype == PKT_PHOTO_ID ); |