Commit aa24cc01 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

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: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/9762)
parent fb6a82c4

crypto/rand/rand_unix.c

+0 −5
Original line number Diff line number Diff line
@@ -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;