|
|
@ -0,0 +1,34 @@ |
|
|
|
commit 84020385be19556800b22cc5b0ce098acd424298 |
|
|
|
Author: NIIBE Yutaka <gniibe@fsij.org> |
|
|
|
Date: Thu Nov 19 13:49:08 2020 +0900 |
|
|
|
|
|
|
|
scd:openpgp: Public keys should be available for check_keyidstr. |
|
|
|
|
|
|
|
* scd/app-openpgp.c (check_keyidstr): Call get_public_key. |
|
|
|
|
|
|
|
-- |
|
|
|
|
|
|
|
GnuPG-bug-id: 5065 |
|
|
|
Fixes-commit: 1049f06c6d2e1a833af4c73ea67a05417bbd0967 |
|
|
|
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org> |
|
|
|
|
|
|
|
diff --git a/scd/app-openpgp.c b/scd/app-openpgp.c
|
|
|
|
index 6245a5331..ec60db2e6 100644
|
|
|
|
--- a/scd/app-openpgp.c
|
|
|
|
+++ b/scd/app-openpgp.c
|
|
|
|
@@ -4392,10 +4392,15 @@ check_keyidstr (app_t app, const char *keyidstr, int keyno, int *r_use_auth)
|
|
|
|
const char *s; |
|
|
|
int n; |
|
|
|
const char *fpr = NULL; |
|
|
|
+ int i;
|
|
|
|
|
|
|
|
if (r_use_auth) |
|
|
|
*r_use_auth = 0; |
|
|
|
|
|
|
|
+ /* Make sure we have load the public keys. */
|
|
|
|
+ for (i = 0; i < 3; i++)
|
|
|
|
+ get_public_key (app, i);
|
|
|
|
+
|
|
|
|
if (strlen (keyidstr) < 32) |
|
|
|
return gpg_error (GPG_ERR_INV_ID); |
|
|
|
else |