x942kdf: introduce conditionals on the FIPS only parameters

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/28163)

diff --git a/providers/implementations/kdfs/x942kdf.c.in b/providers/implementations/kdfs/x942kdf.c.in
index 3fe78cafc4c7620554b62a66d464f4152b3f2c35..18a89942d2be468cd145835f9aeb6ecfa6cc63d4 100644 (file)
--- a/providers/implementations/kdfs/x942kdf.c.in
+++ b/providers/implementations/kdfs/x942kdf.c.in
@@ -543,7 +543,7 @@ static int x942kdf_derive(void *vctx, unsigned char *key, size_t keylen,
                           ['KDF_PARAM_X942_SUPP_PRIVINFO',  'priv',     'octet_string'],
                           ['KDF_PARAM_X942_USE_KEYBITS',    'kbits',    'int'],
                           ['KDF_PARAM_CEK_ALG',             'cekalg',   'utf8_string'],
-                          ['KDF_PARAM_FIPS_KEY_CHECK',      'ind_k',    'int'],
+                          ['KDF_PARAM_FIPS_KEY_CHECK',      'ind_k',    'int', 'fips'],
                          )); -}
 
 static int x942kdf_set_ctx_params(void *vctx, const OSSL_PARAM params[])
@@ -628,7 +628,7 @@ static const OSSL_PARAM *x942kdf_settable_ctx_params(ossl_unused void *ctx,
 
 {- produce_param_decoder('sshkdf_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 x942kdf_get_ctx_params(void *vctx, OSSL_PARAM params[])