mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-23 10:29:58 +01:00
See ChangeLog: Mon Jul 24 10:30:17 CEST 2000 Werner Koch
This commit is contained in:
parent
2dd340f0c4
commit
fdfb475cd2
1
THANKS
1
THANKS
@ -7,6 +7,7 @@ Adam Mitchell adam@cafe21.org
|
||||
Alec Habig habig@budoe2.bu.edu
|
||||
Allan Clark allanc@sco.com
|
||||
Anand Kumria wildfire@progsoc.uts.edu.au
|
||||
Anthony Mulcahy anthony@kcn.ne.jp
|
||||
Ariel T Glenn ariel@columbia.edu
|
||||
Bodo Moeller Bodo_Moeller@public.uni-hamburg.de
|
||||
Brenno de Winter brenno@dewinter.com
|
||||
|
@ -1,3 +1,7 @@
|
||||
Mon Jul 24 10:30:17 CEST 2000 Werner Koch <wk@openit.de>
|
||||
|
||||
* 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 <wk@openit.de>
|
||||
|
||||
Wed Jun 7 19:19:09 CEST 2000 Werner Koch <wk@openit.de>
|
||||
|
||||
* 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 <wk@openit.de>
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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 );
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user