]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
kbkdf: 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/kbkdf.c.in

index 6a058194afb74885d5cdfaa5e04e85a78a078724..f4fee5cfd75a937e64e78504bd1489774bf17e5a 100644 (file)
@@ -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[])