[svn] GnuPG - r4112 - trunk/g10

[svn author dshaw]

Author: dshaw
Date: 2006-04-19 06:29:31 +0200 (Wed, 19 Apr 2006)
New Revision: 4112

Modified:
   trunk/g10/ChangeLog
   trunk/g10/keyedit.c
Log:
* keyedit.c (menu_backsign): Give some more verbose errors when we
have no need to backsign.


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-04-19 03:56:23 UTC (rev 4111)
+++ trunk/g10/ChangeLog	2006-04-19 04:29:31 UTC (rev 4112)
@@ -1,3 +1,8 @@
+2006-04-18  David Shaw  <dshaw at jabberwocky.com>
+
+	* keyedit.c (menu_backsign): Give some more verbose errors when we
+	have no need to backsign.
+
 2006-04-11  David Shaw  <dshaw at jabberwocky.com>
 
 	* options.skel, photoid.c (get_default_photo_command): Find an

Modified: trunk/g10/keyedit.c
===================================================================
--- trunk/g10/keyedit.c	2006-04-19 03:56:23 UTC (rev 4111)
+++ trunk/g10/keyedit.c	2006-04-19 04:29:31 UTC (rev 4112)
@@ -3660,10 +3660,21 @@
 	}
 
       /* Find a signing subkey with no backsig */
-      if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY
-         && (node->pkt->pkt.public_key->pubkey_usage&PUBKEY_USAGE_SIG)
-         && !node->pkt->pkt.public_key->backsig)
-        sub_pk=node->pkt->pkt.public_key;
+      if(node->pkt->pkttype==PKT_PUBLIC_SUBKEY)
+	{
+	  if(node->pkt->pkt.public_key->pubkey_usage&PUBKEY_USAGE_SIG)
+	    {
+	      if(node->pkt->pkt.public_key->backsig)
+		tty_printf(_("signing subkey %s is already cross-certified\n"),
+			   keystr_from_pk(node->pkt->pkt.public_key));
+	      else
+		sub_pk=node->pkt->pkt.public_key;
+	    }
+	  else
+	    tty_printf(_("subkey %s does not sign and so does"
+			 " not need to be cross-certified\n"),
+		       keystr_from_pk(node->pkt->pkt.public_key));
+	}
 
       if(!sub_pk)
 	continue;
@@ -3692,7 +3703,11 @@
 	  }
 
       if(!sub_sk)
-	continue;
+	{
+	  tty_printf(_("no secret subkey for public subkey %s - ignoring\n"),
+		     keystr_from_pk(sub_pk));
+	  continue;
+	}
 
       /* Now finally find the matching selfsig on the secret subkey.
 	 We can't use chosen_selfsig here (it's not set for secret
@@ -3712,7 +3727,7 @@
 	  }
 
       /* Now we can get to work.  We have a main key and secret part,
-	 a signing subkey with signature and secret part with
+	 a signing subkey with signature and secret part possibly with
 	 signature. */
 
       passphrase=get_last_passphrase();