gpg: Reorder signatures, if appropriate.neal/issue2236

XXX

--
Signed-off-by: Neal H. Walfield <[email protected]>
GnuPG-bug-id: 2236

1 files changed, 31 insertions, 0 deletions

diff --git a/g10/gpg.c b/g10/gpg.c
index 330d5a3fa..458bba0c1 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -165,6 +165,7 @@ enum cmd_and_opt_values
     aPasswd,
     aServer,
     aTOFUPolicy,
+    aCheckKey,
 
     oTextmode,
     oNoTextmode,
@@ -487,6 +488,7 @@ static ARGPARSE_OPTS opts[] = {
   ARGPARSE_c (aServer,   "server",  N_("run in server mode")),
   ARGPARSE_c (aTOFUPolicy, "tofu-policy",
 	      N_("|VALUE|set the TOFU policy for a key")),
+  ARGPARSE_c (aCheckKey, "check-key", N_("Check a key")),
 
   ARGPARSE_group (301, N_("@\nOptions:\n ")),
 
@@ -2464,6 +2466,10 @@ main (int argc, char **argv)
             set_cmd (&cmd, pargs.r_opt);
             break;
 
+          case aCheckKey:
+            set_cmd (&cmd, pargs.r_opt);
+            break;
+
 	  case oArmor: opt.armor = 1; opt.no_armor=0; break;
 	  case oOutput: opt.outfile = pargs.r.ret_str; break;
 	  case oMaxOutput: opt.max_output = pargs.r.ret_ulong; break;
@@ -4589,6 +4595,31 @@ main (int argc, char **argv)
 #endif /*USE_TOFU*/
 	break;
 
+      case aCheckKey:
+        {
+          int i;
+
+	  if (argc < 1)
+	    wrong_args ("--check-key KEYID...");
+
+	  for (i = 0; i < argc; i ++)
+	    {
+	      kbnode_t kb;
+
+              rc = get_pubkey_byname (ctrl, NULL, NULL, argv[i], &kb,
+                                      NULL, 1, 1);
+              if (rc)
+                {
+		  log_error (_("looking up key '%s': %s\n"),
+                             argv[i], gpg_strerror (rc));
+		  g10_exit (1);
+		}
+
+              keyblock_check_sigs (kb, 0);
+	    }
+	}
+        break;
+
       case aListPackets:
 	opt.list_packets=2;
       default: