[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  1e7479e8a4f33b1afa7d62b07c682f6987e6a515 (commit)
      from  3dd74e21fa04c7d8d7793b25b9a4609625e314cd (commit)


- Log -----------------------------------------------------------------
commit 1e7479e8a4f33b1afa7d62b07c682f6987e6a515
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Sep 7 07:27:01 2021 +0200

    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 at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/16521)
    
    (cherry picked from commit 437d4202212daae86b66ef776706d2e1a27a7953)

-----------------------------------------------------------------------

Summary of changes:
 test/recipes/30-test_evp_data/evpkdf_scrypt.txt      | 4 ++--
 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