[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  bec9289143c955b330a8f9ad32f26f3da76e2685 (commit)
      from  30573117bbfef0991b522fd0f7c3d4abc5e296cd (commit)


- Log -----------------------------------------------------------------
commit bec9289143c955b330a8f9ad32f26f3da76e2685
Author: Fangming.Fang <fangming.fang at arm.com>
Date:   Fri Apr 2 11:17:05 2021 +0000

    Fix AES-CBC perf test failure issue
    
    As ossl_cipher_generic dosen't support to set key length, and
    "openssl speed aes-(128|192|256)-cbc" tests fail. A small fix by
    adding OSSL_CIPHER_PARAM_KEYLEN params.
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14777)

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

Summary of changes:
 providers/implementations/ciphers/ciphercommon.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c
index 53ecbc9012..73d39ad1eb 100644
--- a/providers/implementations/ciphers/ciphercommon.c
+++ b/providers/implementations/ciphers/ciphercommon.c
@@ -97,6 +97,7 @@ CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(ossl_cipher_generic)
 CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(ossl_cipher_generic)
 OSSL_PARAM_uint(OSSL_CIPHER_PARAM_TLS_VERSION, NULL),
 OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_TLS_MAC_SIZE, NULL),
+OSSL_PARAM_size_t(OSSL_CIPHER_PARAM_KEYLEN, NULL),
 CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_END(ossl_cipher_generic)
 
 /*