From: Pauli Date: Wed, 13 Aug 2025 02:56:44 +0000 (+1000) Subject: cmac: make parameters conditional on FIPS X-Git-Tag: openssl-3.6.0-alpha1~115 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2d1280e5ee1c1589ab7c958206f6d97a5ae7be9f;p=thirdparty%2Fopenssl.git cmac: make parameters conditional on FIPS Reviewed-by: Shane Lontis Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/28243) --- diff --git a/providers/implementations/macs/cmac_prov.c.in b/providers/implementations/macs/cmac_prov.c.in index e8198842b81..f25f7b3c7e2 100644 --- a/providers/implementations/macs/cmac_prov.c.in +++ b/providers/implementations/macs/cmac_prov.c.in @@ -206,7 +206,7 @@ static int cmac_final(void *vmacctx, unsigned char *out, size_t *outl, {- produce_param_decoder('cmac_get_ctx_params', (['MAC_PARAM_SIZE', 'size', 'size_t'], ['MAC_PARAM_BLOCK_SIZE', 'bsize', 'size_t'], - ['ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int'], + ['ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int', 'fips'], )); -} static const OSSL_PARAM *cmac_gettable_ctx_params(ossl_unused void *ctx, @@ -240,7 +240,7 @@ static int cmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) ['ALG_PARAM_ENGINE', 'engine', 'utf8_string', 'hidden'], ['MAC_PARAM_PROPERTIES', 'propq', 'utf8_string'], ['MAC_PARAM_KEY', 'key', 'octet_string'], - ['CIPHER_PARAM_FIPS_ENCRYPT_CHECK', 'ind_ec', 'int'], + ['CIPHER_PARAM_FIPS_ENCRYPT_CHECK', 'ind_ec', 'int', 'fips'], )); -} static const OSSL_PARAM *cmac_settable_ctx_params(ossl_unused void *ctx,