git: fa8db724ae6e - main - random: Treat writes to /dev/random as separate from /entropy

The branch main has been updated by markj:

URL: https://cgit.FreeBSD.org/src/commit/?id=fa8db724ae6ea301830ceaea9f37c28016c2d14a

commit fa8db724ae6ea301830ceaea9f37c28016c2d14a
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2025-07-18 20:23:09 +0000
Commit:     Mark Johnston <markj@FreeBSD.org>
CommitDate: 2025-07-18 20:33:06 +0000

    random: Treat writes to /dev/random as separate from /entropy
    
    RANDOM_CACHED is overloaded to refer both to entropy obtained from files
    loaded by the boot loader, and entropy obtained via writes to
    /dev/random.  Introduce a new source, RANDOM_RANDOMDEV, to refer to the
    latter.  This is to enable treating RANDOM_CACHED as a special case in
    the NIST health test implementation.
    
    Update the default harvest_mask in rc.conf to include RANDOM_RANDOMDEV,
    preserving the old behaviour of accepting writes to /dev/random.
    
    Bump __FreeBSD_version for modules which register a pure source, since
    all of their values have now shifted.
    
    Reviewed by:    cem
    MFC after:      3 months
    Sponsored by:   Stormshield
    Sponsored by:   Klara, Inc.
    Differential Revision:  https://reviews.freebsd.org/D51155
---
 libexec/rc/rc.conf               | 2 +-
 sys/dev/random/random_harvestq.c | 3 ++-
 sys/dev/random/randomdev.c       | 2 +-
 sys/sys/random.h                 | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/libexec/rc/rc.conf b/libexec/rc/rc.conf
index 00f4b718bfad..d502361eca37 100644
--- a/libexec/rc/rc.conf
+++ b/libexec/rc/rc.conf
@@ -694,7 +694,7 @@ entropy_file="/entropy"	# Set to NO to disable late (used when going multi-user)
 entropy_dir="/var/db/entropy" # Set to NO to disable caching entropy via cron.
 entropy_save_sz="4096"	# Size of the entropy cache files.
 entropy_save_num="8"	# Number of entropy cache files to save.
-harvest_mask="511"	# Entropy device harvests all but the very invasive sources.
+harvest_mask="4607"	# Entropy device harvests all but the very invasive sources.
 			# (See 'sysctl kern.random.harvest' and random(4))
 osrelease_enable="YES"	# Update /var/run/os-release on boot (or NO).
 osrelease_file="/var/run/os-release" # File to update for os-release.
diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c
index 29d4cd4d6857..c7762967c4fb 100644
--- a/sys/dev/random/random_harvestq.c
+++ b/sys/dev/random/random_harvestq.c
@@ -588,7 +588,8 @@ static const char *random_source_descr[ENTROPYSOURCE] = {
 	[RANDOM_SWI] = "SWI",
 	[RANDOM_FS_ATIME] = "FS_ATIME",
 	[RANDOM_UMA] = "UMA",
-	[RANDOM_CALLOUT] = "CALLOUT", /* ENVIRONMENTAL_END */
+	[RANDOM_CALLOUT] = "CALLOUT",
+	[RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */
 	[RANDOM_PURE_OCTEON] = "PURE_OCTEON", /* PURE_START */
 	[RANDOM_PURE_SAFE] = "PURE_SAFE",
 	[RANDOM_PURE_GLXSB] = "PURE_GLXSB",
diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c
index 9d1c7b1167c8..ced4dd8067d9 100644
--- a/sys/dev/random/randomdev.c
+++ b/sys/dev/random/randomdev.c
@@ -312,7 +312,7 @@ randomdev_accumulate(uint8_t *buf, u_int count)
 	for (i = 0; i < RANDOM_KEYSIZE_WORDS; i += sizeof(event.he_entropy)/sizeof(event.he_entropy[0])) {
 		event.he_somecounter = random_get_cyclecount();
 		event.he_size = sizeof(event.he_entropy);
-		event.he_source = RANDOM_CACHED;
+		event.he_source = RANDOM_RANDOMDEV;
 		event.he_destination = destination++; /* Harmless cheating */
 		memcpy(event.he_entropy, entropy_data + i, sizeof(event.he_entropy));
 		p_random_alg_context->ra_event_processor(&event);
diff --git a/sys/sys/random.h b/sys/sys/random.h
index 254ba9451d0a..5abf762cd200 100644
--- a/sys/sys/random.h
+++ b/sys/sys/random.h
@@ -85,7 +85,8 @@ enum random_entropy_source {
 	RANDOM_FS_ATIME,
 	RANDOM_UMA,	/* Special!! UMA/SLAB Allocator */
 	RANDOM_CALLOUT,
-	RANDOM_ENVIRONMENTAL_END = RANDOM_CALLOUT,
+	RANDOM_RANDOMDEV,
+	RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV,
 	/* Fast hardware random-number sources from here on. */
 	RANDOM_PURE_START,
 	RANDOM_PURE_OCTEON = RANDOM_PURE_START,