From b95a0bfbba75025761aa163eca74c7653d76981a Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 1 Apr 2020 17:43:05 +0200
Subject: [PATCH] scd:p15: Add missing keygrip retrieval for decryption.

* scd/app-p15.c (do_decipher): Get the keygrip.
--

This was lost during the backport.

Fixes-commit: 4af38ea5e450b3eb79af98b9876b2b968110a459
Signed-off-by: Werner Koch <wk@gnupg.org>
---
 scd/app-p15.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scd/app-p15.c b/scd/app-p15.c
index c0fd6ad6c..744630b00 100644
--- a/scd/app-p15.c
+++ b/scd/app-p15.c
@@ -3637,6 +3637,14 @@ do_decipher (app_t app, const char *keyidstr,
       return gpg_error (GPG_ERR_INV_CARD);
     }
 
+  /* We need some more info about the key - get the keygrip to
+   * populate these fields.  */
+  err = keygrip_from_prkdf (app, prkdf);
+  if (err)
+    {
+      log_error ("p15: keygrip_from_prkdf failed: %s\n", gpg_strerror (err));
+      return err;
+    }
 
   /* Verify the PIN.  */
   err = prepare_verify_pin (app, keyidstr, prkdf, aodf);