mirror of
git://git.gnupg.org/gnupg.git
synced 2024-12-22 10:19:57 +01:00
gpg: Fix searching for the ADSK key when adding an ADSK.
* g10/keyedit.c (menu_addadsk): Request an exact search. * g10/getkey.c (finish_lookup): Add an debug output. -- GnuPG-bug-id: 6504
This commit is contained in:
parent
0f8e5f1c1d
commit
14828c75be
@ -3655,6 +3655,9 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (DBG_LOOKUP)
|
||||
log_debug ("finish_lookup: exact search requested: %sfound\n",
|
||||
foundk? "":"not ");
|
||||
}
|
||||
|
||||
/* Get the user id that matched that low-level search criteria. */
|
||||
|
@ -4844,6 +4844,15 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr)
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Force searching for that exact fingerprint and for any key
|
||||
* which has a key with that fingerprint. */
|
||||
if (!strchr (answer, '!'))
|
||||
{
|
||||
char *tmpstr = xstrconcat (answer, "!", NULL);
|
||||
xfree (answer);
|
||||
answer = tmpstr;
|
||||
}
|
||||
|
||||
free_public_key (adsk_pk);
|
||||
adsk_pk = xcalloc (1, sizeof *adsk_pk);
|
||||
adsk_pk->req_usage = PUBKEY_USAGE_ENC;
|
||||
|
Loading…
x
Reference in New Issue
Block a user