From 587d5fc63b5ff4d566419b897a56b2fff92dfd34 Mon Sep 17 00:00:00 2001 From: Mark Murray Date: Sun, 18 Jul 2004 09:07:58 +0000 Subject: Start the entropy device insecure/unblocked. I'll be handing over responsibility for critical randomness requirements (like sshd) to rc.d/* Requested by: many --- sys/dev/random/randomdev.c | 4 +--- sys/dev/random/randomdev_soft.c | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 28cddd9af5b8a..007bcc18ac8f9 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 a2d18c02d40a7..c73e09881b90b 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, -- cgit v1.3