D297.diff
View Options

	diff --git a/g10/getkey.c b/g10/getkey.c
	--- a/g10/getkey.c
	+++ b/g10/getkey.c
	@@ -144,7 +144,7 @@
	kbnode_t ret_keyblock, kbnode_t ret_found_key);
	static kbnode_t finish_lookup (kbnode_t keyblock,
	unsigned int req_usage, int want_exact,
	- unsigned int *r_flags);
	+ int want_secret, unsigned int *r_flags);
	static void print_status_key_considered (kbnode_t keyblock, unsigned int flags);


	@@ -1734,7 +1734,7 @@
	/* Warning: node flag bits 0 and 1 should be preserved by
	* merge_selfsigs. FIXME: Check whether this still holds. */
	merge_selfsigs (ctrl, keyblock);
	- found_key = finish_lookup (keyblock, pk->req_usage, 0, &infoflags);
	+ found_key = finish_lookup (keyblock, pk->req_usage, 0, 0, &infoflags);
	print_status_key_considered (keyblock, infoflags);
	if (found_key)
	pk_from_block (pk, keyblock, found_key);
	@@ -3428,7 +3428,7 @@
	*/
	static kbnode_t
	finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
	- unsigned int *r_flags)
	+ int want_secret, unsigned int *r_flags)
	{
	kbnode_t k;

	@@ -3570,6 +3570,13 @@
	continue;
	}

	+ if (want_secret && agent_probe_secret_key (NULL, pk))
	+ {
	+ if (DBG_LOOKUP)
	+ log_debug ("\tno secret key\n");
	+ continue;
	+ }
	+
	if (DBG_LOOKUP)
	log_debug ("\tsubkey might be fine\n");
	/* In case a key has a timestamp of 0 set, we make sure
	@@ -3757,7 +3764,7 @@
	* merge_selfsigs. */
	merge_selfsigs (ctrl, keyblock);
	found_key = finish_lookup (keyblock, ctx->req_usage, ctx->exact,
	- &infoflags);
	+ want_secret, &infoflags);
	print_status_key_considered (keyblock, infoflags);
	if (found_key)
	{

File Metadata