wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove ifndef FIPS_MODE from rand_unix.c

Browse source 
This will never be the case for 1.1.1 so removed.

Fixes: comment 1 of #9757

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9762)
This commit is contained in:
Bernd Edlinger 2019-09-04 11:50:54 +02:00
parent fb6a82c498
commit aa24cc0195
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crypto/rand/rand_unix.c
View file

@ -364,12 +364,10 @@ static int keep_random_devices_open = 1;
# if defined(__linux) && defined(DEVRANDOM_WAIT)
static void *shm_addr;
# if !defined(FIPS_MODE)
static void cleanup_shm(void)
{
shmdt(shm_addr);
}
# endif
/*
* Ensure that the system randomness source has been adequately seeded.
@ -435,11 +433,8 @@ static int wait_random_seeded(void)
* If this call fails, it isn't a big problem.
*/
shm_addr = shmat(shm_id, NULL, SHM_RDONLY);
# ifndef FIPS_MODE
/* TODO 3.0: The FIPS provider doesn't have OPENSSL_atexit */
if (shm_addr != (void *)-1)
OPENSSL_atexit(&cleanup_shm);
# endif
}
}
return seeded;