[openssl] OpenSSL_1_1_1-stable update

Dr. Paul Dale pauli at openssl.org
Wed Feb 9 09:03:59 UTC 2022


The branch OpenSSL_1_1_1-stable has been updated
       via  8aa353679f0ad72f478a4800c22ad30f6b972370 (commit)
      from  191c9e6c242b85184b72ccd52d2d9af5e1122637 (commit)


- Log -----------------------------------------------------------------
commit 8aa353679f0ad72f478a4800c22ad30f6b972370
Author: Pauli <pauli at openssl.org>
Date:   Tue Feb 1 12:37:25 2022 +1100

    scrypt: increase memory usage beyond limit
    
    This brings these tests in line with 3.0 and master and makes them
    fail correctly.
    
    Fixes #17612
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/17619)

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

Summary of changes:
 test/recipes/30-test_evp_data/evpkdf.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/recipes/30-test_evp_data/evpkdf.txt b/test/recipes/30-test_evp_data/evpkdf.txt
index 34c7e6ae65..2824cb2f16 100644
--- a/test/recipes/30-test_evp_data/evpkdf.txt
+++ b/test/recipes/30-test_evp_data/evpkdf.txt
@@ -294,12 +294,12 @@ Ctrl.r = r:8
 Ctrl.p = p:1
 Output = 7023bdcb3afd7348461c06cd81fd38ebfda8fbba904f8e3ea9b543f6545da1f2d5432955613f0fcf62d49705242a9af9e61e85dc0d651e40dfcf017b45575887
 
-# Out of memory
+# Out of memory - request > 2 GB of memory
 KDF = 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
 


More information about the openssl-commits mailing list