aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2022-02-22 01:26:48 +0000
committerNIIBE Yutaka <[email protected]>2022-02-22 01:26:48 +0000
commit07af23249330b572669fb062f3b21fe454166a85 (patch)
treefba24e88c46e4992bf273888f369f75e890b4512
parentFix length of KEK, no additional data. (diff)
downloadgnupg-07af23249330b572669fb062f3b21fe454166a85.tar.gz
gnupg-07af23249330b572669fb062f3b21fe454166a85.zip
Fix the semantics of memory_cost.
Signed-off-by: NIIBE Yutaka <[email protected]>
-rw-r--r--g10/passphrase.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/g10/passphrase.c b/g10/passphrase.c
index 1792c00d3..8730ba1ad 100644
--- a/g10/passphrase.c
+++ b/g10/passphrase.c
@@ -561,7 +561,7 @@ passphrase_to_dek (int cipher_algo, STRING2KEY *s2k,
param[0] = dek->keylen;
param[1] = s2k->u.a.t;
- param[2] = (1UL << ((s2k->u.a.m & 0x1f) - 10));
+ param[2] = (1UL << (s2k->u.a.m & 0x1f));
param[3] = s2k->u.a.p;
err = gnupg_kdf_derive (GCRY_KDF_ARGON2, GCRY_KDF_ARGON2ID,
param, 4, pw, strlen (pw),