mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* pkclist.c (do_edit_ownertrust): Use the same translated string for
showing the user ID as mainproc.c:print_pkenc_list. * mainproc.c (print_pkenc_list): Allow translating the quotes around the user ID. * card-util.c, g10.c, photoid.c, trustdb.c: The last of the \"%s\" -> `%s' quoting for things that aren't user IDs. * keyserver.c (keyserver_spawn): If there is no keyserver host, print the whole URI since it is self-contained.
This commit is contained in:
parent
e3fd0f0c60
commit
bf079613b7
8 changed files with 51 additions and 27 deletions
|
@ -457,16 +457,13 @@ print_pkenc_list( struct kidlist_item *list, int failed )
|
|||
pk->pubkey_algo = list->pubkey_algo;
|
||||
if( !get_pubkey( pk, list->kid ) )
|
||||
{
|
||||
size_t n;
|
||||
char *p;
|
||||
log_info( _("encrypted with %u-bit %s key, ID %s, created %s\n"),
|
||||
nbits_from_pk( pk ), algstr, keystr_from_pk(pk),
|
||||
strtimestamp(pk->timestamp) );
|
||||
fputs(" \"", log_stream() );
|
||||
p = get_user_id( list->kid, &n );
|
||||
print_utf8_string2 ( log_stream(), p, n, '"' );
|
||||
p=get_user_id_native(list->kid);
|
||||
fprintf(log_stream(),_(" \"%s\"\n"),p);
|
||||
m_free(p);
|
||||
fputs("\"\n", log_stream() );
|
||||
}
|
||||
else
|
||||
log_info(_("encrypted with %s key, ID %s\n"),
|
||||
|
@ -579,7 +576,7 @@ proc_encrypted( CTX c, PACKET *pkt )
|
|||
sprintf ( buf, "%d:", c->dek->algo );
|
||||
for(i=0; i < c->dek->keylen; i++ )
|
||||
sprintf(buf+strlen(buf), "%02X", c->dek->key[i] );
|
||||
log_info( "session key: \"%s\"\n", buf );
|
||||
log_info( "session key: `%s'\n", buf );
|
||||
write_status_text ( STATUS_SESSION_KEY, buf );
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue