]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
hash drbg: make indicator parameter conditional on FIPS
authorPauli <ppzgs1@gmail.com>
Wed, 13 Aug 2025 02:59:22 +0000 (12:59 +1000)
committerPauli <ppzgs1@gmail.com>
Fri, 15 Aug 2025 01:03:12 +0000 (11:03 +1000)
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28243)

providers/implementations/rands/drbg_hash.c.in

index e059d1d8c84e0d9a0d1f35f53118d1db15209627..7fdfe7c7d1242a7b4ece43703b85b17215df93e9 100644 (file)
@@ -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[])