[svn] GnuPG - r5130 - branches/STABLE-BRANCH-1-4/g10

[svn author wk]

Author: wk
Date: 2009-08-26 08:48:45 +0200 (Wed, 26 Aug 2009)
New Revision: 5130

Modified:
   branches/STABLE-BRANCH-1-4/g10/ChangeLog
   branches/STABLE-BRANCH-1-4/g10/keyedit.c
Log:
Fix debian bug#543530


Modified: branches/STABLE-BRANCH-1-4/g10/ChangeLog
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-08-26 06:46:02 UTC (rev 5129)
+++ branches/STABLE-BRANCH-1-4/g10/ChangeLog	2009-08-26 06:48:45 UTC (rev 5130)
@@ -1,3 +1,8 @@
+2009-08-26  Werner Koch  <wk at g10code.com>
+
+	* keyedit.c (menu_revsig): Check for signature right away.  Fix
+	Debian-bug#543530.
+
 2009-08-13  Werner Koch  <wk at g10code.com>
 
 	* cardglue.h: Add new error code mappings.

Modified: branches/STABLE-BRANCH-1-4/g10/keyedit.c
===================================================================
--- branches/STABLE-BRANCH-1-4/g10/keyedit.c	2009-08-26 06:46:02 UTC (rev 5129)
+++ branches/STABLE-BRANCH-1-4/g10/keyedit.c	2009-08-26 06:48:45 UTC (rev 5130)
@@ -4682,6 +4682,36 @@
 
     assert(keyblock->pkt->pkttype==PKT_PUBLIC_KEY);
 
+    /* First check whether we have any signatures at all.  */
+    any = 0;
+    for (node = keyblock; node; node = node->next ) 
+      {
+	node->flag &= ~(NODFLG_SELSIG | NODFLG_MARK_A);
+	if (node->pkt->pkttype == PKT_USER_ID) {
+          if (node->flag&NODFLG_SELUID || all)
+            skip = 0;
+          else
+            skip = 1;
+	}
+	else if (!skip && node->pkt->pkttype == PKT_SIGNATURE
+                 && ((sig = node->pkt->pkt.signature),
+                     !seckey_available(sig->keyid)     ))
+	  {
+	    if ((sig->sig_class&~3) == 0x10)
+	      {
+                any = 1;
+                break;
+              }
+	  }
+      }
+
+    if (!any)
+      {
+        tty_printf (_("Not signed by you.\n"));
+        return 0;
+      }
+
+
     /* FIXME: detect duplicates here  */
     tty_printf(_("You have signed these user IDs on key %s:\n"),
 	       keystr_from_pk(keyblock->pkt->pkt.public_key));