From: Pauli Date: Wed, 13 Aug 2025 02:59:22 +0000 (+1000) Subject: hash drbg: make indicator parameter conditional on FIPS X-Git-Tag: openssl-3.6.0-alpha1~109 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4e1eaa17c74a12bd732ecdf4f5683f88d6268b9b;p=thirdparty%2Fopenssl.git hash drbg: make indicator parameter conditional on FIPS Reviewed-by: Shane Lontis Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/28243) --- diff --git a/providers/implementations/rands/drbg_hash.c.in b/providers/implementations/rands/drbg_hash.c.in index e059d1d8c84..7fdfe7c7d12 100644 --- a/providers/implementations/rands/drbg_hash.c.in +++ b/providers/implementations/rands/drbg_hash.c.in @@ -491,7 +491,7 @@ static void drbg_hash_free(void *vdrbg) ['DRBG_PARAM_RESEED_TIME', 'reseed_time', 'time_t'], ['DRBG_PARAM_RESEED_REQUESTS', 'reseed_req', 'uint'], ['DRBG_PARAM_RESEED_TIME_INTERVAL', 'reseed_int', 'uint64'], - ['KDF_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int'], + ['KDF_PARAM_FIPS_APPROVED_INDICATOR', 'ind', 'int', 'fips'], )); -} static int drbg_hash_get_ctx_params(void *vdrbg, OSSL_PARAM params[]) @@ -634,7 +634,7 @@ static int drbg_hash_set_ctx_params_locked ['PROV_PARAM_CORE_PROV_NAME', 'prov', 'utf8_string'], ['DRBG_PARAM_RESEED_REQUESTS', 'reseed_req', 'uint'], ['DRBG_PARAM_RESEED_TIME_INTERVAL', 'reseed_time', 'uint64'], - ['KDF_PARAM_FIPS_DIGEST_CHECK', 'ind_d', 'int'], + ['KDF_PARAM_FIPS_DIGEST_CHECK', 'ind_d', 'int', 'fips'], )); -} static int drbg_hash_set_ctx_params(void *vctx, const OSSL_PARAM params[])