[svn] GnuPG - r5234 - trunk/g10

[svn author wk]

Author: wk
Date: 2009-12-17 18:55:43 +0100 (Thu, 17 Dec 2009)
New Revision: 5234

Modified:
   trunk/g10/ChangeLog
   trunk/g10/sig-check.c
Log:
Fix bug#1059 (missing status line signature verification done with a
subkey while on the main key has expired).


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2009-12-17 17:25:26 UTC (rev 5233)
+++ trunk/g10/ChangeLog	2009-12-17 17:55:43 UTC (rev 5234)
@@ -1,5 +1,8 @@
 2009-12-17  Werner Koch  <wk at g10code.com>
 
+	* sig-check.c (do_check_messages): Evaluate the HAS_EXPIRED flag.
+	Fixes bug#1059.
+
 	* gpg.c: Add new option --faked-system-time.
 
 2009-12-15  Werner Koch  <wk at g10code.com>

Modified: trunk/g10/sig-check.c
===================================================================
--- trunk/g10/sig-check.c	2009-12-17 17:25:26 UTC (rev 5233)
+++ trunk/g10/sig-check.c	2009-12-17 17:55:43 UTC (rev 5234)
@@ -229,7 +229,11 @@
 	  return G10ERR_TIME_CONFLICT;
       }
 
-    if( pk->expiredate && pk->expiredate < cur_time ) {
+    /* Check whether the key has expired.  We check the has_expired
+       flag which is set after a full evaluation of the key (getkey.c)
+       as well as a simple compare to the current time in case the
+       merge has for whatever reasons not been done.  */
+    if( pk->has_expired || (pk->expiredate && pk->expiredate < cur_time)) {
         char buf[11];
         if (opt.verbose)
 	  log_info(_("NOTE: signature key %s expired %s\n"),