diff options
| author | Pauli <ppzgs1@gmail.com> | 2024-09-20 00:58:47 +0200 |
|---|---|---|
| committer | Pauli <ppzgs1@gmail.com> | 2024-10-09 04:53:10 +0200 |
| commit | 3a01d5d65bdc95745e7ff762541b6394032e48a0 (patch) | |
| tree | 856243346de256a23bf3d4aec3dee13f16a5e1ac /providers | |
| parent | Add configuration option to allow the FIPS provider to use the jitter source ... (diff) | |
| download | openssl-3a01d5d65bdc95745e7ff762541b6394032e48a0.tar.xz openssl-3a01d5d65bdc95745e7ff762541b6394032e48a0.zip | |
jitter: support an internal jitter entropy source in the FIPS provider
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/25498)
Diffstat (limited to 'providers')
| -rw-r--r-- | providers/fips/fipsprov.c | 3 | ||||
| -rw-r--r-- | providers/implementations/rands/build.info | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index 561f7123ad..ba82435dd9 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -390,6 +390,9 @@ static const OSSL_ALGORITHM fips_rands[] = { { PROV_NAMES_CTR_DRBG, FIPS_DEFAULT_PROPERTIES, ossl_drbg_ctr_functions }, { PROV_NAMES_HASH_DRBG, FIPS_DEFAULT_PROPERTIES, ossl_drbg_hash_functions }, { PROV_NAMES_HMAC_DRBG, FIPS_DEFAULT_PROPERTIES, ossl_drbg_ossl_hmac_functions }, +#ifndef OPENSSL_NO_FIPS_JITTER + { PROV_NAMES_JITTER, FIPS_DEFAULT_PROPERTIES, ossl_jitter_functions }, +#endif { PROV_NAMES_TEST_RAND, FIPS_UNAPPROVED_PROPERTIES, ossl_test_rng_functions }, { NULL, NULL, NULL } }; diff --git a/providers/implementations/rands/build.info b/providers/implementations/rands/build.info index 8e0894faa6..98230648e3 100644 --- a/providers/implementations/rands/build.info +++ b/providers/implementations/rands/build.info @@ -5,3 +5,7 @@ $RANDS_GOAL=../../libdefault.a ../../libfips.a SOURCE[$RANDS_GOAL]=drbg.c test_rng.c drbg_ctr.c drbg_hash.c drbg_hmac.c SOURCE[../../libdefault.a]=seed_src.c seed_src_jitter.c SOURCE[../../libfips.a]=fips_crng_test.c + +IF[{- !$disabled{'fips-jitter'} -}] + SOURCE[../../libfips.a]=seed_src_jitter.c +ENDIF |