]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
pbkdf2: introduce conditionals on the FIPS only parameters
authorPauli <ppzgs1@gmail.com>
Mon, 4 Aug 2025 01:20:21 +0000 (11:20 +1000)
committerPauli <ppzgs1@gmail.com>
Fri, 8 Aug 2025 00:33:22 +0000 (10:33 +1000)
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/28163)

providers/implementations/kdfs/pbkdf2.c.in

index 62e5b6ae1c918214e4d1448d08640c9909d0f244..72f6ffb072f96339eb1ae4f5173fbc9cbbd17a0e 100644 (file)
@@ -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[])