security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

Fix length of KEK, no additional data.

Browse Source 
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2022-02-21 16:20:19 +09:00
parent a8a65240fb
commit 19ed445845
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
g10/passphrase.c
View File

@ -558,19 +558,15 @@ passphrase_to_dek (int cipher_algo, STRING2KEY *s2k,
if (s2k->mode == 4)
{
unsigned long param[4];
unsigned char ad[4];
param[0] = dek->keylen + 1;
param[0] = dek->keylen;
param[1] = s2k->u.a.t;
param[2] = (1UL << ((s2k->u.a.m & 0x1f) - 10));
param[3] = s2k->u.a.p;
ad[0] = 0xc3;
ad[1] = 0x04;
ad[2] = dek->algo;
err = gnupg_kdf_derive (GCRY_KDF_ARGON2, GCRY_KDF_ARGON2ID,
param, 4, pw, strlen (pw),
s2k->u.a.salt, 16, NULL, 0, ad, 3,
dek->keylen + 1, dek->key);
s2k->u.a.salt, 16, NULL, 0, NULL, 0,
dek->keylen, dek->key);
}
else
err = gcry_kdf_derive (pw, strlen (pw),