1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00

* trustdb.c (update_min_ownertrust, validate_keys): Do not use keystr

functions in log_debug.

* import.c (import_one): Try and collapse user IDs when importing a key
for the first time.

* keyedit.c (menu_addrevoker): Allow appointing a subkey as a designated
revoker if the user forces it via keyid!, so long as the subkey can
certify.  Also use the proper date string when prompting for confirmation.

* g10.c (main): Maintain ordering of multiple Comment lines. Requested by
Peter Hyman.
This commit is contained in:
David Shaw 2004-03-19 23:15:27 +00:00
parent ba3f9044d3
commit 36a5e54e54
5 changed files with 29 additions and 7 deletions

View file

@ -2685,8 +2685,10 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
goto fail;
}
/* Note that I'm requesting SIG here and not CERT. We're making
a certification, but it is okay to be a subkey. */
revoker_pk->req_usage=PUBKEY_USAGE_SIG;
rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL,1);
if(rc)
{
log_error (_("key `%s' not found: %s\n"),answer,g10_errstr(rc));
@ -2756,7 +2758,7 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive )
tty_printf("\npub %4u%c/%08lX %s ",
nbits_from_pk( revoker_pk ),
pubkey_letter( revoker_pk->pubkey_algo ),
(ulong)keyid[1], datestr_from_pk(pk) );
(ulong)keyid[1], datestr_from_pk(revoker_pk) );
p = get_user_id( keyid, &n );
tty_print_utf8_string( p, n );