From: Pauli Date: Thu, 29 Aug 2019 21:29:35 +0000 (+1000) Subject: Fix NITs in comments and CHANGES for DEVRANDOM seeded check. X-Git-Tag: openssl-3.0.0-alpha1~1519 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=46a9cc9451213039fd53f62733b2ccd04e853bb2;p=oweals%2Fopenssl.git Fix NITs in comments and CHANGES for DEVRANDOM seeded check. Reviewed-by: Matthias St. Pierre (Merged from https://github.com/openssl/openssl/pull/9734) --- diff --git a/CHANGES b/CHANGES index c5f42ecce0..369b32756c 100644 --- a/CHANGES +++ b/CHANGES @@ -14,8 +14,8 @@ /dev/random to be producing output before seeding from /dev/urandom. The seeded state is stored for future library initialisations using a system global shared memory segment. The shared memory identifier - can be configured by defining OSSL_SHM_SEEDED to the desired value. - The default identifier is 114. + can be configured by defining OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID to + the desired value. The default identifier is 114. [Paul Dale] *) Revised BN_generate_prime_ex to not avoid factors 2..17863 in p-1 diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 7e20fa29c6..e59882cde7 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -367,7 +367,7 @@ static int wait_random_seeded(void) fd_set fds; if (!seeded) { - /* See if anthing has created the global seeded indication */ + /* See if anything has created the global seeded indication */ if ((shm_id = shmget(OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID, 1, 0)) == -1) { /* * Check the kernel's version and fail if it is too recent. @@ -401,7 +401,7 @@ static int wait_random_seeded(void) close(fd); if (r == 1) { seeded = 1; - /* Craete the shared memory indicator */ + /* Create the shared memory indicator */ shm_id = shmget(OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID, 1, IPC_CREAT | S_IRUSR | S_IRGRP | S_IROTH); }