security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Activity

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>
This commit is contained in:
NIIBE Yutaka 2018-03-30 16:55:01 +09:00
parent 0c097575a9
commit 130ad98240
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g10/card-util.c
View File

@ -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;