]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix incorrect gettable OSSL_CIPHER_PARAM_TLS_MAC parameter
authorShane Lontis <shane.lontis@oracle.com>
Sat, 22 May 2021 02:40:42 +0000 (12:40 +1000)
committerTomas Mraz <tomas@openssl.org>
Fri, 28 May 2021 12:29:13 +0000 (14:29 +0200)
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15416)

providers/implementations/ciphers/ciphercommon.c

index 2019699cc263dbcab71dd872d5e3c756c7bdb436..f84f7a36c222e9504bc1a4375d7c27934c3518b6 100644 (file)
@@ -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)