Commit f493bd6f authored Aug 30, 2019 by Pauli

Fix NITs in comments and CHANGES for DEVRANDOM seeded check.



Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
(Merged from https://github.com/openssl/openssl/pull/9734)

(cherry picked from commit 46a9cc9451213039fd53f62733b2ccd04e853bb2)

parent 51e236df

CHANGES

+9 −0

Original line number	Diff line number	Diff line
		@@ -9,6 +9,15 @@

		Changes between 1.1.1c and 1.1.1d [xx XXX xxxx]

		*) Early start up entropy quality from the DEVRANDOM seed source has been
		improved for older Linux systems. The RAND subsystem will wait for
		/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 OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID to
		the desired value. The default identifier is 114.
		[Paul Dale]

		*) Early start up entropy quality from the DEVRANDOM seed source has been
		improved for older Linux systems. The RAND subsystem will wait for
		/dev/random to be producing output before seeding from /dev/urandom.

crypto/rand/rand_unix.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -388,7 +388,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.
		@@ -422,7 +422,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);
		}