mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* 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.
This commit is contained in:
parent
2e6d0dd2e0
commit
5cf9c2f1f2
7 changed files with 46 additions and 22 deletions
|
@ -1442,7 +1442,7 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
|
||||
if( !get_pubkey( pk, sig->keyid ) ) {
|
||||
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;
|
||||
|
||||
bufp = buf;
|
||||
|
@ -1450,10 +1450,15 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
p = array;
|
||||
for(i=0; i < n ; i++, p++, bufp += 2)
|
||||
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 ),
|
||||
(ulong)sig->timestamp,
|
||||
(ulong)sig->expiredate );
|
||||
(ulong)sig->timestamp,(ulong)sig->expiredate,
|
||||
sig->version,sig->pubkey_algo,sig->digest_algo,
|
||||
sig->sig_class);
|
||||
bufp = bufp + strlen (bufp);
|
||||
if (!pk->is_primary) {
|
||||
u32 akid[2];
|
||||
|
@ -1483,14 +1488,17 @@ check_sig_and_print( CTX c, KBNODE node )
|
|||
|
||||
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? */
|
||||
}
|
||||
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)
|
||||
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));
|
||||
|
||||
if( rc )
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue