security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-05-24 16:43:28 +02:00
Code Activity

* options.h, g10.c (main), mainproc.c (check_sig_and_print): Remove

Browse Source 
verify-option show-long-keyids and replace with the more general
keyid-format.
This commit is contained in:
David Shaw 2004-03-03 20:54:03 +00:00
parent 56a6945261
commit c562c9e837
4 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/ChangeLog
View 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 * build-packet.c (write_header2): Remove call to start old gpg
partial length mode and change all callers. partial length mode and change all callers.
(do_plaintext): Turn off partial length encoding now that we're (do_plaintext): Turn off partial length encoding now that we're

1
g10/g10.c
View File

@ -2144,7 +2144,6 @@ main( int argc, char **argv )
{"show-notations",VERIFY_SHOW_NOTATIONS,NULL}, {"show-notations",VERIFY_SHOW_NOTATIONS,NULL},
{"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,NULL}, {"show-keyserver-urls",VERIFY_SHOW_KEYSERVER_URLS,NULL},
{"show-validity",VERIFY_SHOW_VALIDITY,NULL}, {"show-validity",VERIFY_SHOW_VALIDITY,NULL},
{"show-long-keyids",VERIFY_SHOW_LONG_KEYIDS,NULL},
{"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL}, {"show-unusable-uids",VERIFY_SHOW_UNUSABLE_UIDS,NULL},
{NULL,0,NULL} {NULL,0,NULL}
}; };

17
g10/mainproc.c
View File

@ -1272,7 +1272,7 @@ static int
check_sig_and_print( CTX c, KBNODE node ) check_sig_and_print( CTX c, KBNODE node )
{ {
PKT_signature *sig = node->pkt->pkt.signature; PKT_signature *sig = node->pkt->pkt.signature;
const char *astr, *tstr; const char *astr;
int rc, is_expkey=0, is_revkey=0; int rc, is_expkey=0, is_revkey=0;
if( opt.skip_verify ) { 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(_("Signature made %s\n"),asctimestamp(sig->timestamp));
log_info(_(" using %s key %08lX%08lX\n"), log_info(_(" using %s key %s\n"),
astr? astr: "?",(ulong)sig->keyid[0],(ulong)sig->keyid[1] ); astr? astr: "?",keystr(sig->keyid));
} }
else else
log_info(_("Signature made %.*s using %s key ID %08lX\n"), log_info(_("Signature made %s using %s key ID %s\n"),
(int)strlen(tstr), tstr, astr? astr: "?", asctimestamp(sig->timestamp), astr? astr: "?",
(ulong)sig->keyid[1] ); keystr(sig->keyid));
rc = do_check_sig(c, node, NULL, &is_expkey, &is_revkey ); 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) { if( rc == G10ERR_NO_PUBKEY && opt.keyserver_scheme && opt.keyserver_options.auto_key_retrieve) {

3
g10/options.h
View File

@ -262,7 +262,6 @@ struct
#define VERIFY_SHOW_NOTATIONS (1<<2) #define VERIFY_SHOW_NOTATIONS (1<<2)
#define VERIFY_SHOW_KEYSERVER_URLS (1<<3) #define VERIFY_SHOW_KEYSERVER_URLS (1<<3)
#define VERIFY_SHOW_VALIDITY (1<<4) #define VERIFY_SHOW_VALIDITY (1<<4)
#define VERIFY_SHOW_LONG_KEYIDS (1<<5) #define VERIFY_SHOW_UNUSABLE_UIDS (1<<5)
#define VERIFY_SHOW_UNUSABLE_UIDS (1<<6)
#endif /*G10_OPTIONS_H*/ #endif /*G10_OPTIONS_H*/