gnupg/g10 (ChangeLog getkey.c)

[cvs user dshaw]

    Date: Wednesday, June 8, 2005 @ 15:12:57
  Author: dshaw
    Path: /cvs/gnupg/gnupg/g10

Modified: ChangeLog getkey.c

* getkey.c (fixup_uidnode, merge_selfsigs_main): Handle both expired
and revoked uids in fixup_uidnode().  No need to special case in
merge_selfsigs_main().  This also means that an expired uid will have
its selfsig tagged with chosen_selfsig.


-----------+
 ChangeLog |    7 +++++++
 getkey.c  |   21 +++++++++------------
 2 files changed, 16 insertions(+), 12 deletions(-)


Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.750 gnupg/g10/ChangeLog:1.751
--- gnupg/g10/ChangeLog:1.750	Wed Jun  8 05:31:47 2005
+++ gnupg/g10/ChangeLog	Wed Jun  8 15:12:57 2005
@@ -1,3 +1,10 @@
+2005-06-08  David Shaw  <dshaw at jabberwocky.com>
+
+	* getkey.c (fixup_uidnode, merge_selfsigs_main): Handle both
+	expired and revoked uids in fixup_uidnode().  No need to special
+	case in merge_selfsigs_main().  This also means that an expired
+	uid will have its selfsig tagged with chosen_selfsig.
+
 2005-06-07  David Shaw  <dshaw at jabberwocky.com>
 
 	* options.h, g10.c (main), export.c (parse_export_options,
Index: gnupg/g10/getkey.c
diff -u gnupg/g10/getkey.c:1.127 gnupg/g10/getkey.c:1.128
--- gnupg/g10/getkey.c:1.127	Tue May 31 10:39:16 2005
+++ gnupg/g10/getkey.c	Wed Jun  8 15:12:57 2005
@@ -1347,11 +1347,18 @@
         return; /* has been revoked */
     }
 
+    uid->expiredate = sig->expiredate;
+
+    if(sig->flags.expired)
+      {
+	uid->is_expired = 1;
+	return; /* has expired */
+      }
+
     uid->created = sig->timestamp; /* this one is okay */
     uid->selfsigversion = sig->version;
     /* If we got this far, it's not expired :) */
     uid->is_expired = 0;
-    uid->expiredate = sig->expiredate;
 
     /* store the key flags in the helper variable for later processing */
     uid->help_key_usage=parse_key_usage(sig);
@@ -1652,19 +1659,9 @@
                      * the same email address may become valid again (hired,
                      * fired, hired again).
                      */
-		    if(sig->flags.expired)
-		      {
-			uidnode->pkt->pkt.user_id->is_expired=1;
-			signode = NULL;
-		      }
-                    else
-		      {
-			uidnode->pkt->pkt.user_id->is_expired=0;
-			signode = k;
-		      }
 
 		    sigdate = sig->timestamp;
-		    uidnode->pkt->pkt.user_id->expiredate=sig->expiredate;
+		    signode = k;
 		    if( sig->version > sigversion )
 		      sigversion = sig->version;
                 }