zzy/openssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct the "Out of memory" EVP tests

Browse Source 
This affects test/recipes/30-test_evp_data/evpkdf_scrypt.txt and
test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt, where the "Out
of memory" stanza weren't up to the task, as they didn't hit the
default scrypt memory limit like they did in OpenSSL 1.1.1.

We solve this by setting the |n| value to the next power of two, and
correcting the expected result.

Fixes #16519

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16521)

(cherry picked from commit 437d4202212daae86b66ef776706d2e1a27a7953)
This commit is contained in:
Richard Levitte 2021-09-07 07:27:01 +02:00
parent 3dd74e21fa
commit 1e7479e8a4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/recipes/30-test_evp_data/evpkdf_scrypt.txt
View File

@ -57,7 +57,7 @@ Output = 7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d543295
KDF = id-scrypt
Ctrl.pass = pass:pleaseletmein
Ctrl.salt = salt:SodiumChloride
Ctrl.N = n:1048576
Ctrl.N = n:2097152
Ctrl.r = r:8
Ctrl.p = p:1
Result = KDF_MISMATCH
Result = KDF_DERIVE_ERROR

4
test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt
View File

@ -57,7 +57,7 @@ Output = 7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d543295
PKEYKDF = scrypt
Ctrl.pass = pass:pleaseletmein
Ctrl.salt = salt:SodiumChloride
Ctrl.N = N:1048576
Ctrl.N = n:2097152
Ctrl.r = r:8
Ctrl.p = p:1
Result = KDF_MISMATCH
Result = KDF_DERIVE_ERROR