diff options
| author | David Shaw <[email protected]> | 2002-12-26 22:22:50 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-26 22:22:50 +0000 |
| commit | f3f1015f6a82482dd6075343d41f4aca1e795e48 (patch) | |
| tree | c67b1a5f42380195a65378b229867eadce93d278 /g10/keyedit.c | |
| parent | * iobuf.c (iobuf_flush): Only print debug info if debugging is on. (diff) | |
| download | gnupg-f3f1015f6a82482dd6075343d41f4aca1e795e48.tar.gz gnupg-f3f1015f6a82482dd6075343d41f4aca1e795e48.zip | |
* keydb.h, getkey.c (key_byname): Flag to enable or disable including
disabled keys. Keys specified via keyid (i.e. 0x...) are always included.
* getkey.c (get_pubkey_byname, get_seckey_byname2, get_seckey_bynames),
keyedit.c (keyedit_menu, menu_addrevoker): Include disabled keys in these
functions.
* pkclist.c (build_pk_list): Do not include disabled keys for -r or the
key prompt. Do include disabled keys for the default key and
--encrypt-to.
* trustdb.h, trustdb.c (is_disabled): New skipfnc for skipping disabled
keys.
* gpgv.c (is_disabled): Stub.
* keygen.c (keygen_add_key_expire): Properly handle updating a key
expiration to a no-expiration value.
* keyedit.c (enable_disable_key): Comment.
* import.c (import_one): When in interactive mode and --verbose, don't
repeat some key information twice.
Diffstat (limited to 'g10/keyedit.c')
| -rw-r--r-- | g10/keyedit.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/g10/keyedit.c b/g10/keyedit.c index e25debf90..87830e2cc 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1105,7 +1105,7 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands, } /* get the public key */ - rc = get_pubkey_byname (NULL, username, &keyblock, &kdbhd); + rc = get_pubkey_byname (NULL, username, &keyblock, &kdbhd, 1); if( rc ) goto leave; if( fix_keyblock( keyblock ) ) @@ -2478,7 +2478,7 @@ menu_addrevoker( KBNODE pub_keyblock, KBNODE sec_keyblock, int sensitive ) if(answer[0]=='\0' || answer[0]=='\004') goto fail; - rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL); + rc=get_pubkey_byname(revoker_pk,answer,NULL,NULL,1); if(rc) { @@ -3376,7 +3376,10 @@ menu_revkey( KBNODE pub_keyblock, KBNODE sec_keyblock ) return changed; } - +/* Note that update_ownertrust is going to mark the trustdb dirty when + enabling or disabling a key. This is arguably sub-optimal as + disabled keys are still counted in the web of trust, but perhaps + not worth adding extra complexity to change. -ds */ static int enable_disable_key( KBNODE keyblock, int disable ) { |