From 671e54d62c39a9e196d13714cb67c2f3c38f2fa0 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Wed, 21 Aug 2019 14:18:43 +0200
Subject: [PATCH] scd:nks: Support attributes $ENCRKEYID and $SIGNKEYID.

* scd/app-nks.c (do_getattr): Add new attributes.
--

Note that these were already added to 2.2 as part of
commit 23784f8bf0ac6d6c52cb2de2f99f46017a92c11a

Signed-off-by: Werner Koch <wk@gnupg.org>
---
 scd/app-nks.c | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/scd/app-nks.c b/scd/app-nks.c
index d12720cf6..8b6d768d4 100644
--- a/scd/app-nks.c
+++ b/scd/app-nks.c
@@ -309,8 +309,10 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
     int special;
   } table[] = {
     { "$AUTHKEYID",   1 },
-    { "NKS-VERSION",  2 },
-    { "CHV-STATUS",   3 },
+    { "$ENCRKEYID",   2 },
+    { "$SIGNKEYID",   3 },
+    { "NKS-VERSION",  4 },
+    { "CHV-STATUS",   5 },
     { NULL, 0 }
   };
   gpg_error_t err = 0;
@@ -340,13 +342,27 @@ do_getattr (app_t app, ctrl_t ctrl, const char *name)
       }
       break;
 
-    case 2: /* NKS-VERSION */
+    case 2: /* $ENCRKEYID */
+      {
+        char const tmp[] = "NKS-NKS3.45B1";
+        send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
+      }
+      break;
+
+    case 3: /* $SIGNKEYID */
+      {
+        char const tmp[] = "NKS-NKS3.4531";
+        send_status_info (ctrl, table[idx].name, tmp, strlen (tmp), NULL, 0);
+      }
+      break;
+
+    case 4: /* NKS-VERSION */
       snprintf (buffer, sizeof buffer, "%d", app->app_local->nks_version);
       send_status_info (ctrl, table[idx].name,
                         buffer, strlen (buffer), NULL, 0);
       break;
 
-    case 3: /* CHV-STATUS */
+    case 5: /* CHV-STATUS */
       {
         /* Returns: PW1.CH PW2.CH PW1.CH.SIG PW2.CH.SIG That are the
            two global passwords followed by the two SigG passwords.