diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-22 22:04:03 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-09-22 22:04:03 +0000 |
| commit | b33bb87ba29ca41823f1c7d822f18e3e31e81d56 (patch) | |
| tree | a92ec658cb61b8a4e69d38881a0aac2afac46115 /sys/dev/rnd.c | |
| parent | ea8e0b118e98c06a987816c9cdc3f35dac4ec136 (diff) | |
Stop pushing version & cfdata into as entropy, since the contents are
known and we rely on the bootpath to prime us anyways.
This also solves the issue raised by kettenis, of version potentially
being non-word aligned
ok kettenis djm
Diffstat (limited to 'sys/dev/rnd.c')
| -rw-r--r-- | sys/dev/rnd.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/sys/dev/rnd.c b/sys/dev/rnd.c index affc45886a2..a98ee2a4183 100644 --- a/sys/dev/rnd.c +++ b/sys/dev/rnd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rnd.c,v 1.185 2016/09/04 16:15:30 kettenis Exp $ */ +/* $OpenBSD: rnd.c,v 1.186 2016/09/22 22:04:02 deraadt Exp $ */ /* * Copyright (c) 2011 Theo de Raadt. @@ -807,14 +807,6 @@ random_start(void) rnd_states[RND_SRC_TRUE].dont_count_entropy = 1; rnd_states[RND_SRC_TRUE].max_entropy = 1; - /* Provide some data from this kernel */ - add_entropy_words((u_int32_t *)version, - strlen(version) / sizeof(u_int32_t)); - - /* Provide some data from this kernel */ - add_entropy_words((u_int32_t *)cfdata, - 8192 / sizeof(u_int32_t)); - /* Message buffer may contain data from previous boot */ if (msgbufp->msg_magic == MSG_MAGIC) add_entropy_words((u_int32_t *)msgbufp->msg_bufc, |