diff options
| author | Richard Levitte <levitte@openssl.org> | 2021-09-07 07:27:01 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2021-09-07 10:55:04 +0200 |
| commit | 437d4202212daae86b66ef776706d2e1a27a7953 (patch) | |
| tree | 35c03bf343b657701b55ac58ca19d1b2d0b372ef | |
| parent | 7364545e0734ad25e08d7d5ad0e2c9dac85d2d0d (diff) | |
Correct the "Out of memory" EVP tests
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)
| -rw-r--r-- | test/recipes/30-test_evp_data/evpkdf_scrypt.txt | 4 | ||||
| -rw-r--r-- | test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/recipes/30-test_evp_data/evpkdf_scrypt.txt b/test/recipes/30-test_evp_data/evpkdf_scrypt.txt index 64176091fc..29ae89b5be 100644 --- a/test/recipes/30-test_evp_data/evpkdf_scrypt.txt +++ b/test/recipes/30-test_evp_data/evpkdf_scrypt.txt @@ -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 diff --git a/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt b/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt index 1f7c06c6d4..c9c7f3ca78 100644 --- a/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt +++ b/test/recipes/30-test_evp_data/evppkey_kdf_scrypt.txt @@ -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 |