From ea97683d58205363d48fd41ef5559926be46681e Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 24 May 2022 16:14:30 +0900
Subject: [PATCH] scd: Support automatic card selection for READCERT with
 keygrip.

* scd/command.c (cmd_readcert): Select by KEYGRIP.

--

GnuPG-bug-id: 6003
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 scd/command.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scd/command.c b/scd/command.c
index bc2e1f979..e73228f3d 100644
--- a/scd/command.c
+++ b/scd/command.c
@@ -639,6 +639,7 @@ cmd_readcert (assuan_context_t ctx, char *line)
   unsigned char *cert;
   size_t ncert;
   card_t card;
+  const char *keygrip = NULL;
 
   if ((rc = open_card (ctrl)))
     return rc;
@@ -647,7 +648,10 @@ cmd_readcert (assuan_context_t ctx, char *line)
   if (!line)
     return gpg_error_from_syserror ();
 
-  card = card_get (ctrl, NULL);
+  if (strlen (line) == 40)
+    keygrip = line;
+
+  card = card_get (ctrl, keygrip);
   if (!card)
     {
       xfree (line);