security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-02 12:01:32 +01:00
Code Activity

gpg: Fix searching for the ADSK key when adding an ADSK.

Browse Source 
* 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:
Werner Koch 2023-05-25 11:57:04 +02:00
parent 39a4373780
commit e9dd47d789
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
g10/getkey.c
View File

@ -3655,6 +3655,9 @@ finish_lookup (kbnode_t keyblock, unsigned int req_usage, int want_exact,
break; 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. */ /* Get the user id that matched that low-level search criteria. */

9
g10/keyedit.c
View File

@ -4844,6 +4844,15 @@ menu_addadsk (ctrl_t ctrl, kbnode_t pub_keyblock, const char *adskfpr)
continue; 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); free_public_key (adsk_pk);
adsk_pk = xcalloc (1, sizeof *adsk_pk); adsk_pk = xcalloc (1, sizeof *adsk_pk);
adsk_pk->req_usage = PUBKEY_USAGE_ENC; adsk_pk->req_usage = PUBKEY_USAGE_ENC;