From: Pauli Date: Wed, 13 Aug 2025 02:56:44 +0000 (+1000) Subject: hmac: make parameters conditional on FIPS X-Git-Tag: openssl-3.6.0-alpha1~114 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60f8ff15112c1f74b2a069f9ea8abfee50ddb25c;p=thirdparty%2Fopenssl.git hmac: 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/hmac_prov.c.in b/providers/implementations/macs/hmac_prov.c.in index 444257ea799..49d624c1cc5 100644 --- a/providers/implementations/macs/hmac_prov.c.in +++ b/providers/implementations/macs/hmac_prov.c.in @@ -273,7 +273,7 @@ static int hmac_final(void *vmacctx, unsigned char *out, size_t *outl, {- produce_param_decoder('hmac_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 *hmac_gettable_ctx_params(ossl_unused void *ctx, @@ -315,7 +315,7 @@ static int hmac_get_ctx_params(void *vmacctx, OSSL_PARAM params[]) ['MAC_PARAM_PROPERTIES', 'propq', 'utf8_string'], ['MAC_PARAM_KEY', 'key', 'octet_string'], ['MAC_PARAM_TLS_DATA_SIZE', 'tlssize', 'size_t'], - ['MAC_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int'], + ['MAC_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int', 'fips'], )); -} static const OSSL_PARAM *hmac_settable_ctx_params(ossl_unused void *ctx,