summaryrefslogtreecommitdiffstats
path: root/sys/dev/random
diff options
context:
space:
mode:
authormarkm <markm@FreeBSD.org>2004-07-18 09:07:58 +0000
committermarkm <markm@FreeBSD.org>2004-07-18 09:07:58 +0000
commit011bdc845d0f941994d935075062812df92fb535 (patch)
treef18052b4218199e05c19b165c274c61f875bbe43 /sys/dev/random
parent531ff1b33d19b93deec39768dbfc19d4761013aa (diff)
downloadFreeBSD-src-011bdc845d0f941994d935075062812df92fb535.zip
FreeBSD-src-011bdc845d0f941994d935075062812df92fb535.tar.gz
Start the entropy device insecure/unblocked. I'll be handing over
responsibility for critical randomness requirements (like sshd) to rc.d/* Requested by: many
Diffstat (limited to 'sys/dev/random')
-rw-r--r--sys/dev/random/randomdev.c4
-rw-r--r--sys/dev/random/randomdev_soft.c4
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 28cddd9..007bcc1 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -108,9 +108,7 @@ random_read(struct cdev *dev __unused, struct uio *uio, int flag)
if (flag & IO_NDELAY)
error = EWOULDBLOCK;
else {
- /* No complaints please. This is temporary! */
- printf("Entropy device is blocking. "
- "Dance fandango on keyboard to unblock.\n");
+ printf("Entropy device is blocking.\n");
error = tsleep(&random_systat,
PUSER | PCATCH, "block", 0);
}
diff --git a/sys/dev/random/randomdev_soft.c b/sys/dev/random/randomdev_soft.c
index a2d18c0..c73e098 100644
--- a/sys/dev/random/randomdev_soft.c
+++ b/sys/dev/random/randomdev_soft.c
@@ -67,7 +67,7 @@ struct random_systat random_yarrow = {
.read = random_yarrow_read,
.write = random_yarrow_write,
.reseed = random_yarrow_reseed,
- .seeded = 0,
+ .seeded = 1,
};
MALLOC_DEFINE(M_ENTROPY, "entropy", "Entropy harvesting buffers");
@@ -132,7 +132,7 @@ random_yarrow_init(void)
o = SYSCTL_ADD_PROC(&random_clist,
SYSCTL_CHILDREN(random_sys_o),
OID_AUTO, "seeded", CTLTYPE_INT | CTLFLAG_RW,
- &random_systat.seeded, 0, random_check_boolean, "I",
+ &random_systat.seeded, 1, random_check_boolean, "I",
"Seeded State");
o = SYSCTL_ADD_NODE(&random_clist,
OpenPOWER on IntegriCloud