From: Pauli Date: Mon, 4 Aug 2025 01:20:22 +0000 (+1000) Subject: x942kdf: introduce conditionals on the FIPS only parameters X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=1b71051b864fb956b7201ccd1a51f4e7124e4334;p=thirdparty%2Fopenssl.git x942kdf: 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/x942kdf.c.in b/providers/implementations/kdfs/x942kdf.c.in index 3fe78cafc4..18a89942d2 100644 --- 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[])