989d921f5d
I'm very pleased to announce the release of our new website and documentation using the new toolchain with Hugo and AsciiDoctor. To get more information about the new toolchain please read the FreeBSD Documentation Project Primer[1], Hugo docs[2] and AsciiDoctor docs[3]. Acknowledgment: Benedict Reuschling <bcr@> Glen Barber <gjb@> Hiroki Sato <hrs@> Li-Wen Hsu <lwhsu@> Sean Chittenden <seanc@> The FreeBSD Foundation [1] https://docs.FreeBSD.org/en/books/fdp-primer/ [2] https://gohugo.io/documentation/ [3] https://docs.asciidoctor.org/home/ Approved by: doceng, core
81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
Index: sys/dev/random/randomdev.c
|
|
===================================================================
|
|
--- sys/dev/random/randomdev.c (revision 185214)
|
|
+++ sys/dev/random/randomdev.c (working copy)
|
|
@@ -90,6 +90,7 @@
|
|
&& (securelevel_gt(td->td_ucred, 0) == 0)) {
|
|
(*random_systat.reseed)();
|
|
random_systat.seeded = 1;
|
|
+ arc4rand(NULL, 0, 1); /* Reseed arc4random as well. */
|
|
}
|
|
|
|
return (0);
|
|
Index: sys/dev/random/randomdev_soft.c
|
|
===================================================================
|
|
--- sys/dev/random/randomdev_soft.c (revision 185214)
|
|
+++ sys/dev/random/randomdev_soft.c (working copy)
|
|
@@ -61,6 +61,7 @@
|
|
u_int, u_int, enum esource);
|
|
static int random_yarrow_poll(int event,struct thread *td);
|
|
static int random_yarrow_block(int flag);
|
|
+static void random_yarrow_flush_reseed(void);
|
|
|
|
struct random_systat random_yarrow = {
|
|
.ident = "Software, Yarrow",
|
|
@@ -70,7 +71,7 @@
|
|
.read = random_yarrow_read,
|
|
.write = random_yarrow_write,
|
|
.poll = random_yarrow_poll,
|
|
- .reseed = random_yarrow_reseed,
|
|
+ .reseed = random_yarrow_flush_reseed,
|
|
.seeded = 1,
|
|
};
|
|
|
|
@@ -96,7 +97,7 @@
|
|
/* Harvested entropy */
|
|
static struct entropyfifo harvestfifo[ENTROPYSOURCE];
|
|
|
|
-/* <0 to end the kthread, 0 to let it run */
|
|
+/* <0 to end the kthread, 0 to let it run, 1 to flush the harvest queues */
|
|
static int random_kthread_control = 0;
|
|
|
|
static struct proc *random_kthread_proc;
|
|
@@ -241,7 +242,7 @@
|
|
local_count = 0;
|
|
|
|
/* Process until told to stop */
|
|
- for (; random_kthread_control == 0;) {
|
|
+ for (; random_kthread_control >= 0;) {
|
|
|
|
active = 0;
|
|
|
|
@@ -276,6 +277,13 @@
|
|
KASSERT(local_count == 0, ("random_kthread: local_count %d",
|
|
local_count));
|
|
|
|
+ /*
|
|
+ * If a queue flush was commanded, it has now happened,
|
|
+ * and we can mark this by resetting the command.
|
|
+ */
|
|
+ if (random_kthread_control == 1)
|
|
+ random_kthread_control = 0;
|
|
+
|
|
/* Found nothing, so don't belabour the issue */
|
|
if (!active)
|
|
pause("-", hz / 10);
|
|
@@ -400,3 +408,15 @@
|
|
|
|
return error;
|
|
}
|
|
+
|
|
+/* Helper routine to perform explicit reseeds */
|
|
+static void
|
|
+random_yarrow_flush_reseed(void)
|
|
+{
|
|
+ /* Command a entropy queue flush and wait for it to finish */
|
|
+ random_kthread_control = 1;
|
|
+ while (random_kthread_control)
|
|
+ pause("-", hz / 10);
|
|
+
|
|
+ random_yarrow_reseed();
|
|
+}
|