Skip to content

Commit

Permalink
rand: remove unimplemented librandom stub code
Browse files Browse the repository at this point in the history
Clean up of unsuable / no-op code.

Reviewed-by: Paul Dale <ppzgs1@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from #24465)
  • Loading branch information
xnox authored and t8m committed May 24, 2024
1 parent 46f5523 commit 05faa4f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 20 deletions.
2 changes: 1 addition & 1 deletion Configure
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
5 changes: 0 additions & 5 deletions INSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions crypto/info.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions providers/implementations/rands/seeding/rand_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 05faa4f

Please sign in to comment.