diff options
| author | David Shaw <[email protected]> | 2004-03-19 23:15:27 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2004-03-19 23:15:27 +0000 |
| commit | 36a5e54e54d171f4caf07b004ea646045c52c9e0 (patch) | |
| tree | ec6fdea83b37d2a7e0a1cb24038f06f71bf0cbab /g10/keyedit.c | |
| parent | * mainproc.c (proc_pubkey_enc, print_pkenc_list, list_node): (diff) | |
| download | gnupg-36a5e54e54d171f4caf07b004ea646045c52c9e0.tar.gz gnupg-36a5e54e54d171f4caf07b004ea646045c52c9e0.zip | |
* 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.
Diffstat (limited to '')
| -rw-r--r-- | g10/keyedit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index 0b648dc9a..9b488b059 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -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 ); |