[git] GnuPG - branch, STABLE-BRANCH-2-2, updated. gnupg-2.2.5-39-g130ad98

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-2 has been updated
       via  130ad98240c066383fa0a99bcf5e0ec72bc0dff9 (commit)
      from  0c097575a9cd923f648fb5bb695893d46400c3ad (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 130ad98240c066383fa0a99bcf5e0ec72bc0dff9
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Mar 30 16:55:01 2018 +0900

    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 at fsij.org>

diff --git a/g10/card-util.c b/g10/card-util.c
index 367e315..e33a417 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;

-----------------------------------------------------------------------

Summary of changes:
 g10/card-util.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org