From: Shane Lontis Date: Sat, 22 May 2021 02:40:42 +0000 (+1000) Subject: Fix incorrect gettable OSSL_CIPHER_PARAM_TLS_MAC parameter X-Git-Tag: openssl-3.0.0-beta1~327 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b6b3694c9002faf17636a32ae2486e252b3247b4;p=thirdparty%2Fopenssl.git Fix incorrect gettable OSSL_CIPHER_PARAM_TLS_MAC parameter Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/15416) --- diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c index 2019699cc26..f84f7a36c22 100644 --- a/providers/implementations/ciphers/ciphercommon.c +++ b/providers/implementations/ciphers/ciphercommon.c @@ -30,7 +30,6 @@ static const OSSL_PARAM cipher_known_gettable_params[] = { OSSL_PARAM_int(OSSL_CIPHER_PARAM_CUSTOM_IV, NULL), OSSL_PARAM_int(OSSL_CIPHER_PARAM_CTS, NULL), OSSL_PARAM_int(OSSL_CIPHER_PARAM_TLS1_MULTIBLOCK, NULL), - { OSSL_CIPHER_PARAM_TLS_MAC, OSSL_PARAM_OCTET_PTR, NULL, 0, OSSL_PARAM_UNMODIFIED }, OSSL_PARAM_END }; const OSSL_PARAM *ossl_cipher_generic_gettable_params(ossl_unused void *provctx) @@ -92,6 +91,7 @@ int ossl_cipher_generic_get_params(OSSL_PARAM params[], unsigned int md, } CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_START(ossl_cipher_generic) +{ OSSL_CIPHER_PARAM_TLS_MAC, OSSL_PARAM_OCTET_PTR, NULL, 0, OSSL_PARAM_UNMODIFIED }, CIPHER_DEFAULT_GETTABLE_CTX_PARAMS_END(ossl_cipher_generic) CIPHER_DEFAULT_SETTABLE_CTX_PARAMS_START(ossl_cipher_generic)