From: Pauli Date: Mon, 4 Aug 2025 01:20:21 +0000 (+1000) Subject: kbkdf: introduce conditionals on the FIPS only parameters X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=ba2b292e96677c4dbff3662c87061dc5b03c8c7b;p=thirdparty%2Fopenssl.git kbkdf: introduce conditionals on the FIPS only parameters Reviewed-by: Matt Caswell Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/28163) --- diff --git a/providers/implementations/kdfs/kbkdf.c.in b/providers/implementations/kdfs/kbkdf.c.in index 6a058194af..f4fee5cfd7 100644 --- a/providers/implementations/kdfs/kbkdf.c.in +++ b/providers/implementations/kdfs/kbkdf.c.in @@ -382,7 +382,7 @@ done: ['KDF_PARAM_KBKDF_USE_L', 'use_l', 'int'], ['KDF_PARAM_KBKDF_USE_SEPARATOR', 'sep', 'int'], ['KDF_PARAM_KBKDF_R', 'r', 'int'], - ['KDF_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int'], + ['KDF_PARAM_FIPS_KEY_CHECK', 'ind_k', 'int', 'fips'], )); -} static int kbkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) @@ -485,7 +485,7 @@ static const OSSL_PARAM *kbkdf_settable_ctx_params(ossl_unused void *ctx, {- produce_param_decoder('kbkdf_get_ctx_params', (['KDF_PARAM_SIZE', 'size', 'size_t'], - ['KDF_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int'], + ['KDF_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int', 'fips'], )); -} static int kbkdf_get_ctx_params(void *vctx, OSSL_PARAM params[])