From 05faa4ffee7f20fcee129f77d153f2dcc609bdc8 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 22 May 2024 20:05:07 +0100 Subject: [PATCH] rand: remove unimplemented librandom stub code Clean up of unsuable / no-op code. Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/24465) --- Configure | 2 +- INSTALL.md | 5 ----- crypto/info.c | 3 --- providers/implementations/rands/seeding/rand_unix.c | 11 ----------- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/Configure b/Configure index 75f3f720f9fcf..c15f5b2fffe26 100755 --- a/Configure +++ b/Configure @@ -816,7 +816,7 @@ my %cmdvars = (); # Stores FOO='blah' type arguments my %unsupported_options = (); my %deprecated_options = (); # If you change this, update apps/version.c -my @known_seed_sources = qw(getrandom devrandom os egd none rdcpu librandom); +my @known_seed_sources = qw(getrandom devrandom os egd none rdcpu); my @seed_sources = (); while (@argvcopy) { diff --git a/INSTALL.md b/INSTALL.md index 8e56ed4a07560..2060973ec2349 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -510,11 +510,6 @@ This source is ignored by the FIPS provider. Use the `RDSEED` or `RDRAND` command on x86 or `RNDRRS` command on aarch64 if provided by the CPU. -### librandom - -Use librandom (not implemented yet). -This source is ignored by the FIPS provider. - ### none Disable automatic seeding. This is the default on some operating systems where diff --git a/crypto/info.c b/crypto/info.c index 3c74fd58e0de6..c823283279ba9 100644 --- a/crypto/info.c +++ b/crypto/info.c @@ -171,9 +171,6 @@ DEFINE_RUN_ONCE_STATIC(init_info_strings) add_seeds_string("rdrand ( rdseed rdrand )"); # endif #endif -#ifdef OPENSSL_RAND_SEED_LIBRANDOM - add_seeds_string("C-library-random"); -#endif #ifdef OPENSSL_RAND_SEED_GETRANDOM add_seeds_string("getrandom-syscall"); #endif diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c index 9a936d800d418..8c63a3056035a 100644 --- a/providers/implementations/rands/seeding/rand_unix.c +++ b/providers/implementations/rands/seeding/rand_unix.c @@ -95,7 +95,6 @@ static uint64_t get_time_stamp(void); /* none means none. this simplifies the following logic */ # undef OPENSSL_RAND_SEED_OS # undef OPENSSL_RAND_SEED_GETRANDOM -# undef OPENSSL_RAND_SEED_LIBRANDOM # undef OPENSSL_RAND_SEED_DEVRANDOM # undef OPENSSL_RAND_SEED_RDTSC # undef OPENSSL_RAND_SEED_RDCPU @@ -207,10 +206,6 @@ void ossl_rand_pool_keep_random_devices_open(int keep) # define OPENSSL_RAND_SEED_DEVRANDOM # endif -# if defined(OPENSSL_RAND_SEED_LIBRANDOM) -# error "librandom not (yet) supported" -# endif - # if (defined(__FreeBSD__) || defined(__NetBSD__)) && defined(KERN_ARND) /* * sysctl_random(): Use sysctl() to read a random number from the kernel @@ -659,12 +654,6 @@ size_t ossl_pool_acquire_entropy(RAND_POOL *pool) return entropy_available; # endif -# if defined(OPENSSL_RAND_SEED_LIBRANDOM) - { - /* Not yet implemented. */ - } -# endif - # if defined(OPENSSL_RAND_SEED_DEVRANDOM) if (wait_random_seeded()) { size_t bytes_needed;