From: Pauli Date: Mon, 4 Aug 2025 01:20:21 +0000 (+1000) Subject: pbkdf2: introduce conditionals on the FIPS only parameters X-Git-Tag: openssl-3.6.0-alpha1~241 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c098acb0542173380a63e62e37090c42628e34f4;p=thirdparty%2Fopenssl.git pbkdf2: 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/pbkdf2.c.in b/providers/implementations/kdfs/pbkdf2.c.in index 62e5b6ae1c9..72f6ffb072f 100644 --- a/providers/implementations/kdfs/pbkdf2.c.in +++ b/providers/implementations/kdfs/pbkdf2.c.in @@ -356,7 +356,7 @@ static const OSSL_PARAM *kdf_pbkdf2_settable_ctx_params(ossl_unused void *ctx, {- produce_param_decoder('pbkdf2_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 kdf_pbkdf2_get_ctx_params(void *vctx, OSSL_PARAM params[])