[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  bf477a40d742c82826dc6979a33306eb0120d6ad (commit)
      from  4b1f34f11ff94bc2d0169d6669bfc47f99bd93b3 (commit)


- Log -----------------------------------------------------------------
commit bf477a40d742c82826dc6979a33306eb0120d6ad
Author: Pauli <pauli at openssl.org>
Date:   Thu Apr 8 12:26:08 2021 +1000

    Revert "Fix AES-CBC perf test failure issue"
    
    This reverts commit bec9289143c955b330a8f9ad32f26f3da76e2685.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14796)

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

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

diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c
index 73d39ad1eb..53ecbc9012 100644
--- a/providers/implementations/ciphers/ciphercommon.c
+++ b/providers/implementations/ciphers/ciphercommon.c
@@ -97,7 +97,6 @@ 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)
 
 /*