security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-25 15:27:03 +01:00
Code Activity

* mainproc.c (check_sig_and_print): Show sig class when verifying a sig

Browse Source 
with --verbose on, and add version, pk and hash algorithms and sig class
to VALIDSIG.

* g10.c (main): Add --no-textmode.

* export.c (do_export_stream), keyedit.c (show_key_with_all_names,
menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c
(show_photos), trustdb.c (get_validity, reset_trust_records,
validate_keys): Make some strings translatable.
This commit is contained in:
David Shaw 2003-04-27 04:10:04 +00:00
parent 2e6d0dd2e0
commit 5cf9c2f1f2
7 changed files with 46 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
g10/ChangeLog
View File

@ -1,3 +1,16 @@
2003-04-27 David Shaw <dshaw@jabberwocky.com>
* mainproc.c (check_sig_and_print): Show sig class when verifying
a sig with --verbose on, and add version, pk and hash algorithms
and sig class to VALIDSIG.
* g10.c (main): Add --no-textmode.
* export.c (do_export_stream), keyedit.c (show_key_with_all_names,
menu_addrevoker), mainproc.c (check_sig_and_print), photoid.c
(show_photos), trustdb.c (get_validity, reset_trust_records,
validate_keys): Make some strings translatable.
2003-04-26 David Shaw <dshaw@jabberwocky.com> 2003-04-26 David Shaw <dshaw@jabberwocky.com>
* mainproc.c (check_sig_and_print): Show digest algorithm when * mainproc.c (check_sig_and_print): Show digest algorithm when

4
g10/export.c
View File

@ -318,8 +318,8 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
node->pkt->pkt.secret_key->protect.sha1chk) node->pkt->pkt.secret_key->protect.sha1chk)
{ {
/* I hope this warning doesn't confuse people. */ /* I hope this warning doesn't confuse people. */
log_info("WARNING: secret key %08lX does not have a " log_info(_("WARNING: secret key %08lX does not have a "
"simple SK checksum\n",(ulong)sk_keyid[1]); "simple SK checksum\n"),(ulong)sk_keyid[1]);
sha1_warned=1; sha1_warned=1;
} }

3
g10/g10.c
View File

@ -128,6 +128,7 @@ enum cmd_and_opt_values { aNull = 0,
aRefreshKeys, aRefreshKeys,
oTextmode, oTextmode,
oNoTextmode,
oExpert, oExpert,
oNoExpert, oNoExpert,
oAskSigExpire, oAskSigExpire,
@ -382,6 +383,7 @@ static ARGPARSE_OPTS opts[] = {
{ oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") }, { oCompress, NULL, 1, N_("|N|set compress level N (0 disables)") },
{ oTextmodeShort, NULL, 0, "@"}, { oTextmodeShort, NULL, 0, "@"},
{ oTextmode, "textmode", 0, N_("use canonical text mode")}, { oTextmode, "textmode", 0, N_("use canonical text mode")},
{ oNoTextmode, "no-textmode", 0, "@"},
{ oExpert, "expert", 0, "@"}, { oExpert, "expert", 0, "@"},
{ oNoExpert, "no-expert", 0, "@"}, { oNoExpert, "no-expert", 0, "@"},
{ oAskSigExpire, "ask-sig-expire", 0, "@"}, { oAskSigExpire, "ask-sig-expire", 0, "@"},
@ -1529,6 +1531,7 @@ main( int argc, char **argv )
break; break;
case oTextmodeShort: opt.textmode = 2; break; case oTextmodeShort: opt.textmode = 2; break;
case oTextmode: opt.textmode=1; break; case oTextmode: opt.textmode=1; break;
case oNoTextmode: opt.textmode=0; break;
case oExpert: opt.expert = 1; break; case oExpert: opt.expert = 1; break;
case oNoExpert: opt.expert = 0; break; case oNoExpert: opt.expert = 0; break;
case oAskSigExpire: opt.ask_sig_expire = 1; break; case oAskSigExpire: opt.ask_sig_expire = 1; break;

18
g10/keyedit.c
View File

@ -1915,9 +1915,9 @@ show_key_with_all_names( KBNODE keyblock, int only_marked, int with_revoker,
else else
tty_printf("(%d) ", i); tty_printf("(%d) ", i);
if ( uid->is_revoked ) if ( uid->is_revoked )
tty_printf ("[revoked] "); tty_printf (_("[revoked] "));
if ( uid->is_expired ) if ( uid->is_expired )
tty_printf ("[expired] "); tty_printf (_("[expired] "));
tty_print_utf8_string( uid->name, uid->len ); tty_print_utf8_string( uid->name, uid->len );
tty_printf("\n"); tty_printf("\n");
if( with_prefs ) if( with_prefs )
@ -2327,9 +2327,9 @@ menu_delkey( KBNODE pub_keyblock, KBNODE sec_keyblock )
if( sec_keyblock ) if( sec_keyblock )
commit_kbnode( &sec_keyblock ); commit_kbnode( &sec_keyblock );
/* No need to set update_trust here since signing keys no longer /* No need to set update_trust here since signing keys are no
are used to certify other keys, so there is no change in trust longer used to certify other keys, so there is no change in
when revoking/removing them */ trust when revoking/removing them */
} }
@ -2441,14 +2441,14 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
print_fingerprint(revoker_pk,NULL,2); print_fingerprint(revoker_pk,NULL,2);
tty_printf("\n"); tty_printf("\n");
tty_printf("WARNING: appointing a key as a designated revoker " tty_printf(_("WARNING: appointing a key as a designated revoker "
"cannot be undone!\n"); "cannot be undone!\n"));
tty_printf("\n"); tty_printf("\n");
if(!cpr_get_answer_is_yes("keyedit.add_revoker.okay", if(!cpr_get_answer_is_yes("keyedit.add_revoker.okay",
"Are you sure you want to appoint this " _("Are you sure you want to appoint this "
"key as a designated revoker? (y/N): ")) "key as a designated revoker? (y/N): ")))
continue; continue;
revkey.class=0x80; revkey.class=0x80;

22
g10/mainproc.c
View File

@ -1442,7 +1442,7 @@ check_sig_and_print( CTX c, KBNODE node )
if( !get_pubkey( pk, sig->keyid ) ) { if( !get_pubkey( pk, sig->keyid ) ) {
byte array[MAX_FINGERPRINT_LEN], *p; byte array[MAX_FINGERPRINT_LEN], *p;
char buf[MAX_FINGERPRINT_LEN*4+73], *bufp; char buf[MAX_FINGERPRINT_LEN*4+90], *bufp;
size_t i, n; size_t i, n;
bufp = buf; bufp = buf;
@ -1450,10 +1450,15 @@ check_sig_and_print( CTX c, KBNODE node )
p = array; p = array;
for(i=0; i < n ; i++, p++, bufp += 2) for(i=0; i < n ; i++, p++, bufp += 2)
sprintf(bufp, "%02X", *p ); sprintf(bufp, "%02X", *p );
sprintf(bufp, " %s %lu %lu ", /* TODO: Replace the reserved '0' in the field below
with bits for status flags (policy url, notation,
etc.). Remember to make the buffer larger to
match! */
sprintf(bufp, " %s %lu %lu %d 0 %d %d %02X ",
strtimestamp( sig->timestamp ), strtimestamp( sig->timestamp ),
(ulong)sig->timestamp, (ulong)sig->timestamp,(ulong)sig->expiredate,
(ulong)sig->expiredate ); sig->version,sig->pubkey_algo,sig->digest_algo,
sig->sig_class);
bufp = bufp + strlen (bufp); bufp = bufp + strlen (bufp);
if (!pk->is_primary) { if (!pk->is_primary) {
u32 akid[2]; u32 akid[2];
@ -1483,14 +1488,17 @@ check_sig_and_print( CTX c, KBNODE node )
if(sig->flags.expired) if(sig->flags.expired)
{ {
log_info("Signature expired %s\n",asctimestamp(sig->expiredate)); log_info(_("Signature expired %s\n"),
asctimestamp(sig->expiredate));
rc=G10ERR_GENERAL; /* need a better error here? */ rc=G10ERR_GENERAL; /* need a better error here? */
} }
else if(sig->expiredate) else if(sig->expiredate)
log_info("Signature expires %s\n",asctimestamp(sig->expiredate)); log_info(_("Signature expires %s\n"),asctimestamp(sig->expiredate));
if(opt.verbose) if(opt.verbose)
log_info(_("digest algorithm %s\n"), log_info(_("%s signature, digest algorithm %s\n"),
sig->sig_class==0x00?_("binary"):
sig->sig_class==0x01?_("textmode"):_("unknown"),
digest_algo_to_string(sig->digest_algo)); digest_algo_to_string(sig->digest_algo));
if( rc ) if( rc )

2
g10/photoid.c
View File

@ -328,6 +328,6 @@ void show_photos(const struct user_attribute *attrs,
return; return;
fail: fail:
log_error("unable to display photo ID!\n"); log_error(_("unable to display photo ID!\n"));
#endif #endif
} }

6
g10/trustdb.c
View File

@ -817,7 +817,7 @@ get_validity (PKT_public_key *pk, PKT_user_id *uid)
if (opt.no_auto_check_trustdb) if (opt.no_auto_check_trustdb)
{ {
pending_check_trustdb = 1; pending_check_trustdb = 1;
log_info ("please do a --check-trustdb\n"); log_info (_("please do a --check-trustdb\n"));
} }
else else
{ {
@ -1533,7 +1533,7 @@ reset_trust_records (KEYDB_HANDLE hd, KeyHashTable exclude)
log_error ("keydb_search_next failed: %s\n", g10_errstr(rc)); log_error ("keydb_search_next failed: %s\n", g10_errstr(rc));
} }
if (opt.verbose) if (opt.verbose)
log_info ("%d keys processed (%d validity counts cleared)\n", log_info (_("%d keys processed (%d validity counts cleared)\n"),
count, nreset); count, nreset);
} }
@ -1587,7 +1587,7 @@ validate_keys (int interactive)
* here when needed */ * here when needed */
if (!utk_list) if (!utk_list)
{ {
log_info ("no ultimately trusted keys found\n"); log_info (_("no ultimately trusted keys found\n"));
goto leave; goto leave;
} }