* options.h, g10.c (main), mainproc.c (check_sig_and_print): Remove
authorDavid Shaw <dshaw@jabberwocky.com>
Wed, 3 Mar 2004 20:54:03 +0000 (20:54 +0000)
committerDavid Shaw <dshaw@jabberwocky.com>
Wed, 3 Mar 2004 20:54:03 +0000 (20:54 +0000)
verify-option show-long-keyids and replace with the more general
keyid-format.

g10/ChangeLog
g10/g10.c
g10/mainproc.c
g10/options.h

index 5da24be..f110030 100644 (file)
@@ -1,5 +1,9 @@
 2004-03-03  David Shaw  <dshaw@jabberwocky.com>
 
 2004-03-03  David Shaw  <dshaw@jabberwocky.com>
 
+       * options.h, g10.c (main), mainproc.c (check_sig_and_print):
+       Remove verify-option show-long-keyids and replace with
+       the more general keyid-format.
+
        * build-packet.c (write_header2): Remove call to start old gpg
        partial length mode and change all callers.
        (do_plaintext): Turn off partial length encoding now that we're
        * build-packet.c (write_header2): Remove call to start old gpg
        partial length mode and change all callers.
        (do_plaintext): Turn off partial length encoding now that we're
index 03e93cc..815cb34 100644 (file)
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -2144,7 +2144,6 @@ main( int argc, char **argv )
                  {"show-notations",VERIFY_SHOW_NOTATIONS,NULL},
                  {"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,NULL},
                  {"show-validity",VERIFY_SHOW_VALIDITY,NULL},
                  {"show-notations",VERIFY_SHOW_NOTATIONS,NULL},
                  {"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,NULL},
                  {"show-validity",VERIFY_SHOW_VALIDITY,NULL},
-                 {"show-long-keyids",VERIFY_SHOW_LONG_KEYIDS,NULL},
                  {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL},
                  {NULL,0,NULL}
                };
                  {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL},
                  {NULL,0,NULL}
                };
index bca9240..c168f6d 100644 (file)
@@ -1272,7 +1272,7 @@ static int
 check_sig_and_print( CTX c, KBNODE node )
 {
     PKT_signature *sig = node->pkt->pkt.signature;
 check_sig_and_print( CTX c, KBNODE node )
 {
     PKT_signature *sig = node->pkt->pkt.signature;
-    const char *astr, *tstr;
+    const char *astr;
     int rc, is_expkey=0, is_revkey=0;
 
     if( opt.skip_verify ) {
     int rc, is_expkey=0, is_revkey=0;
 
     if( opt.skip_verify ) {
@@ -1335,18 +1335,17 @@ check_sig_and_print( CTX c, KBNODE node )
         }
     }
 
         }
     }
 
-    tstr = asctimestamp(sig->timestamp);
     astr = pubkey_algo_to_string( sig->pubkey_algo );
     astr = pubkey_algo_to_string( sig->pubkey_algo );
-    if(opt.verify_options&VERIFY_SHOW_LONG_KEYIDS)
+    if(keystrlen()>8)
       {
       {
-       log_info(_("Signature made %.*s\n"),(int)strlen(tstr), tstr);
-       log_info(_("               using %s key %08lX%08lX\n"),
-                astr? astr: "?",(ulong)sig->keyid[0],(ulong)sig->keyid[1] );
+       log_info(_("Signature made %s\n"),asctimestamp(sig->timestamp));
+       log_info(_("               using %s key %s\n"),
+                astr? astr: "?",keystr(sig->keyid));
       }
     else
       }
     else
-      log_info(_("Signature made %.*s using %s key ID %08lX\n"),
-              (int)strlen(tstr), tstr, astr? astr: "?",
-              (ulong)sig->keyid[1] );
+      log_info(_("Signature made %s using %s key ID %s\n"),
+              asctimestamp(sig->timestamp), astr? astr: "?",
+              keystr(sig->keyid));
 
     rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
     if( rc == G10ERR_NO_PUBKEY && opt.keyserver_scheme && opt.keyserver_options.auto_key_retrieve) {
 
     rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey );
     if( rc == G10ERR_NO_PUBKEY && opt.keyserver_scheme && opt.keyserver_options.auto_key_retrieve) {
index 9aabc23..ee76a29 100644 (file)
@@ -262,7 +262,6 @@ struct
 #define VERIFY_SHOW_NOTATIONS            (1<<2)
 #define VERIFY_SHOW_KEYSERVER_URLS       (1<<3)
 #define VERIFY_SHOW_VALIDITY             (1<<4)
 #define VERIFY_SHOW_NOTATIONS            (1<<2)
 #define VERIFY_SHOW_KEYSERVER_URLS       (1<<3)
 #define VERIFY_SHOW_VALIDITY             (1<<4)
-#define VERIFY_SHOW_LONG_KEYIDS          (1<<5)
-#define VERIFY_SHOW_UNUSABLE_UIDS        (1<<6)
+#define VERIFY_SHOW_UNUSABLE_UIDS        (1<<5)
 
 #endif /*G10_OPTIONS_H*/
 
 #endif /*G10_OPTIONS_H*/