From: Pauli Date: Wed, 13 Aug 2025 02:56:44 +0000 (+1000) Subject: kmac: make parameters conditional on FIPS X-Git-Tag: openssl-3.6.0-alpha1~113 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40dd58e016430d0b5f481784ba0b3a7cb3c3c621;p=thirdparty%2Fopenssl.git kmac: 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/kmac_prov.c.in b/providers/implementations/macs/kmac_prov.c.in index 78332fd5e48..1944be266fe 100644 --- a/providers/implementations/macs/kmac_prov.c.in +++ b/providers/implementations/macs/kmac_prov.c.in @@ -395,7 +395,7 @@ static int kmac_final(void *vmacctx, unsigned char *out, size_t *outl, {- produce_param_decoder('kmac_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 *kmac_gettable_ctx_params(ossl_unused void *ctx, @@ -433,8 +433,8 @@ static int kmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) ['MAC_PARAM_SIZE', 'size', 'size_t'], ['MAC_PARAM_KEY', 'key', 'octet_string'], ['MAC_PARAM_CUSTOM', 'custom', 'octet_string'], - ['MAC_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int'], - ['MAC_PARAM_FIPS_NO_SHORT_MAC', 'ind_sht', 'int'], + ['MAC_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int', 'fips'], + ['MAC_PARAM_FIPS_NO_SHORT_MAC', 'ind_sht', 'int', 'fips'], )); -} static const OSSL_PARAM *kmac_settable_ctx_params(ossl_unused void *ctx,