From 130ad98240c066383fa0a99bcf5e0ec72bc0dff9 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Fri, 30 Mar 2018 16:55:01 +0900
Subject: [PATCH] g10: Fix card-edit/kdf-setup for single salt.

* g10/card-util.c (gen_kdf_data): Use SALT_USER.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 g10/card-util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/g10/card-util.c b/g10/card-util.c
index 367e31538..e33a41706 100644
--- a/g10/card-util.c
+++ b/g10/card-util.c
@@ -2017,7 +2017,9 @@ gen_kdf_data (unsigned char *data, int single_salt)
   gcry_randomize (p, 8, GCRY_STRONG_RANDOM);
   p += 8;
 
-  if (!single_salt)
+  if (single_salt)
+    salt_admin = salt_user;
+  else
     {
       memcpy (p, h2, sizeof h2);
       p += sizeof h2;