From: Pauli Date: Wed, 13 Aug 2025 02:55:26 +0000 (+1000) Subject: ecdh: make parameters conditional on FIPS X-Git-Tag: openssl-3.6.0-alpha1~118 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9bf224ef980a7c93ee699dabda354d3b32b426a;p=thirdparty%2Fopenssl.git ecdh: 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/exchange/ecdh_exch.c.in b/providers/implementations/exchange/ecdh_exch.c.in index 9f5b31eb901..16295b4ad28 100644 --- a/providers/implementations/exchange/ecdh_exch.c.in +++ b/providers/implementations/exchange/ecdh_exch.c.in @@ -254,9 +254,9 @@ void *ecdh_dupctx(void *vpecdhctx) ['EXCHANGE_PARAM_KDF_DIGEST_PROPS', 'propq', 'utf8_string'], ['EXCHANGE_PARAM_KDF_OUTLEN', 'len', 'size_t'], ['EXCHANGE_PARAM_KDF_UKM', 'ukm', 'octet_string'], - ['EXCHANGE_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int'], - ['EXCHANGE_PARAM_FIPS_DIGEST_CHECK', 'ind_d', 'int'], - ['EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK', 'ind_cofac', 'int'], + ['EXCHANGE_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int', 'fips'], + ['EXCHANGE_PARAM_FIPS_DIGEST_CHECK', 'ind_d', 'int', 'fips'], + ['EXCHANGE_PARAM_FIPS_ECDH_COFACTOR_CHECK', 'ind_cofac', 'int', 'fips'], )); -} static @@ -370,7 +370,7 @@ const OSSL_PARAM *ecdh_settable_ctx_params(ossl_unused void *vpecdhctx, ['EXCHANGE_PARAM_KDF_DIGEST', 'digest', 'utf8_string'], ['EXCHANGE_PARAM_KDF_OUTLEN', 'len', 'size_t'], ['EXCHANGE_PARAM_KDF_UKM', 'ukm', 'octet_ptr'], - ['ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int'], + ['ALG_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int', 'fips'], )); -} static