提交 f493bd6f 编写于 作者: P Pauli

Fix NITs in comments and CHANGES for DEVRANDOM seeded check.

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

(cherry picked from commit 46a9cc9451213039fd53f62733b2ccd04e853bb2)
上级 51e236df
...@@ -9,6 +9,15 @@ ...@@ -9,6 +9,15 @@
Changes between 1.1.1c and 1.1.1d [xx XXX xxxx] 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 *) Early start up entropy quality from the DEVRANDOM seed source has been
improved for older Linux systems. The RAND subsystem will wait for improved for older Linux systems. The RAND subsystem will wait for
/dev/random to be producing output before seeding from /dev/urandom. /dev/random to be producing output before seeding from /dev/urandom.
......
...@@ -388,7 +388,7 @@ static int wait_random_seeded(void) ...@@ -388,7 +388,7 @@ static int wait_random_seeded(void)
fd_set fds; fd_set fds;
if (!seeded) { 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) { 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. * Check the kernel's version and fail if it is too recent.
...@@ -422,7 +422,7 @@ static int wait_random_seeded(void) ...@@ -422,7 +422,7 @@ static int wait_random_seeded(void)
close(fd); close(fd);
if (r == 1) { if (r == 1) {
seeded = 1; seeded = 1;
/* Craete the shared memory indicator */ /* Create the shared memory indicator */
shm_id = shmget(OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID, 1, shm_id = shmget(OPENSSL_RAND_SEED_DEVRANDOM_SHM_ID, 1,
IPC_CREAT | S_IRUSR | S_IRGRP | S_IROTH); IPC_CREAT | S_IRUSR | S_IRGRP | S_IROTH);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册