diff options
Diffstat (limited to '')
| -rw-r--r-- | g10/ChangeLog | 4 | ||||
| -rw-r--r-- | g10/g10.c | 1 | ||||
| -rw-r--r-- | g10/mainproc.c | 17 | ||||
| -rw-r--r-- | g10/options.h | 3 |
4 files changed, 13 insertions, 12 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 5da24be58..f110030a4 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,9 @@ 2004-03-03 David Shaw <[email protected]> + * 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 @@ -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-long-keyids",VERIFY_SHOW_LONG_KEYIDS,NULL}, {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL}, {NULL,0,NULL} }; diff --git a/g10/mainproc.c b/g10/mainproc.c index bca9240e7..c168f6da7 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -1272,7 +1272,7 @@ static int 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 ) { @@ -1335,18 +1335,17 @@ check_sig_and_print( CTX c, KBNODE node ) } } - tstr = asctimestamp(sig->timestamp); 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 - 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) { diff --git a/g10/options.h b/g10/options.h index 9aabc23ce..ee76a29e1 100644 --- a/g10/options.h +++ b/g10/options.h @@ -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_LONG_KEYIDS (1<<5) -#define VERIFY_SHOW_UNUSABLE_UIDS (1<<6) +#define VERIFY_SHOW_UNUSABLE_UIDS (1<<5) #endif /*G10_OPTIONS_H*/ |