From aa24cc01957f813beb5329c26ae581fe6b7482a7 Mon Sep 17 00:00:00 2001 From: Bernd Edlinger Date: Wed, 4 Sep 2019 11:50:54 +0200 Subject: [PATCH] Remove ifndef FIPS_MODE from rand_unix.c This will never be the case for 1.1.1 so removed. Fixes: comment 1 of #9757 Reviewed-by: Matt Caswell Reviewed-by: Paul Dale (Merged from https://github.com/openssl/openssl/pull/9762) --- crypto/rand/rand_unix.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index e57b6dd893..d118360366 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -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; -- 2.25.1