* 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.

1 files changed, 6 insertions, 0 deletions

diff --git a/g10/keygen.c b/g10/keygen.c
index 82d11303f..c1a6ee540 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -163,6 +163,12 @@ keygen_add_key_expire( PKT_signature *sig, void *opaque )
 	buf[3] = u & 0xff;
 	build_sig_subpkt( sig, SIGSUBPKT_KEY_EXPIRE, buf, 4 );
     }
+    else
+      {
+	/* Make sure we don't leave a key expiration subpacket lying
+	   around */
+	delete_sig_subpkt (sig->hashed, SIGSUBPKT_KEY_EXPIRE);
+      }
 
     return 0;
 }