From nobody Fri Nov 07 23:39:31 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4d3Frz4lgVz6DppV; Fri, 07 Nov 2025 23:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d3Frz431bz3fsM; Fri, 07 Nov 2025 23:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762558771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HgH4dVE+jVJYSRhyzquaIWs5X8ghMYcrEOyrOxPUmq4=; b=poXKEEF8UBeXV28trn7Dm0tt8OHu7gS1StWC4AQ3L/TxD+BBgvBUV6jAVMnAx1DVsRarQX Hy1ojwmpKu2nHqOuO0oMwH7RSYFOZTtDCYJybmUPHo47pPyy1fWjoP/pqIeMhF3ZAfeD0Q DOAuQh36RH4gYlWwXDT0BeZj/EAD6vAxu7qLQBFksR7wSvLI5D5rqssR0CC5C4l9P5LaFO qPNFRBNXa9IfrnC78l2NOUOADSBpa3BFI57AtSv+xe/Zow/YzibLGnLxsWzJckZz0sYell KAnZJMgwTgOw1Vp01FtLk0Pgmh/aYSwuECigq0zUTH0oUSSQ1YWdk9zWCixg8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762558771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HgH4dVE+jVJYSRhyzquaIWs5X8ghMYcrEOyrOxPUmq4=; b=D+zhJWnKqKUjGwMLAs/UKqKFXo4X7jsfstVpHIOjXLsGtFIkbgEyGWTn3BX4UIra8eWcnZ jsnhOyiEgcra9iNZpXccS4nxTsuQj/JSUyUA+e6cb1GRXFEmUPqaVSnHsHEEDVDlVG6b1j 7pX3e51nOEkWAV2U4akBowFzxxfoX7QMF5S+X9Jeabm+1/oI6OBHb0R7rinnsvcPVjQji4 vbLi3Aq8E1M/5ACUCBWsw6PU/AGeuMkxZ9+4S4qo00chxyN/Vdd7BtkABLa91uzA31U2M4 VAl0tiNEYYTEphO+7GVB/DWHsl7YIVw6srU+G6RTILw3JTWruCA5OCu3GGSusg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762558771; a=rsa-sha256; cv=none; b=Px2tHL+FxhRg9hsa+N8lNGnDXtLy8pywROSFjO2B7xQJU2Yy7y6Ay/cDQesboErZSmohwU SCmGMrn4NIWNUGVzTvvIb88VopMeRJu9i4w4JpXiDzYU33Dp++yugP56QmCRSlTOAFtGIE 2HSKp6T2G+wSspBXWx+3psbmUTJWeq1nBxXbFoI7qoRC8ChqrXKZpAeGKkVZZNKLo41Sev mMyfZ6Li4TABrmE6ZqyHj4yTgrEuem8oKu3pJZtIgiuQELaWAqkr2u5n825CcBLfm98cnS Y6HyHzSD1vS5gLSGuoN5RRATYfDV6HhlIw0LaCLwfDm0oMnPc7Fk2CcoUF+Upw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4d3Frz3fK8z5hW; Fri, 07 Nov 2025 23:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5A7NdVZX070904; Fri, 7 Nov 2025 23:39:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5A7NdVXY070901; Fri, 7 Nov 2025 23:39:31 GMT (envelope-from git) Date: Fri, 7 Nov 2025 23:39:31 GMT Message-Id: <202511072339.5A7NdVXY070901@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "David E. O'Brien" Subject: git: 068fea0aa15b - main - random: Have RANDOM_PURE_START be a cross-platform source List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: obrien X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 068fea0aa15bceb7b6b01687542b58ee81d1d887 Auto-Submitted: auto-generated The branch main has been updated by obrien: URL: https://cgit.FreeBSD.org/src/commit/?id=068fea0aa15bceb7b6b01687542b58ee81d1d887 commit 068fea0aa15bceb7b6b01687542b58ee81d1d887 Author: David E. O'Brien AuthorDate: 2025-10-23 23:20:54 +0000 Commit: David E. O'Brien CommitDate: 2025-11-07 23:28:16 +0000 random: Have RANDOM_PURE_START be a cross-platform source and one that will be with us in the long-term future. (this helps reduce diffs in the future and for down-stream users that trim entropy sources). Also, move deprecated (removed in 16.0) sources to the bottom of the list to reduce changes to 15.x. Reviewed by: glebius Obtained from: Juniper Networks Differential Revision: https://reviews.freebsd.org/D53311 --- sys/dev/random/fenestrasX/fx_pool.c | 14 +++++++------- sys/dev/random/random_harvestq.c | 6 +++--- sys/sys/random.h | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index b6ffc202769e..59273a0a3f9d 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,10 +167,7 @@ static const struct fxrng_ent_char { [RANDOM_RANDOMDEV] = { .entc_cls = &fxrng_lo_push, }, - [RANDOM_PURE_SAFE] = { - .entc_cls = &fxrng_hi_push, - }, - [RANDOM_PURE_GLXSB] = { + [RANDOM_PURE_TPM] = { .entc_cls = &fxrng_hi_push, }, [RANDOM_PURE_RDRAND] = { @@ -197,9 +194,6 @@ static const struct fxrng_ent_char { [RANDOM_PURE_DARN] = { .entc_cls = &fxrng_hi_pull, }, - [RANDOM_PURE_TPM] = { - .entc_cls = &fxrng_hi_push, - }, [RANDOM_PURE_VMGENID] = { .entc_cls = &fxrng_hi_push, }, @@ -212,6 +206,12 @@ static const struct fxrng_ent_char { [RANDOM_PURE_ARM_TRNG] = { .entc_cls = &fxrng_hi_pull, }, + [RANDOM_PURE_SAFE] = { + .entc_cls = &fxrng_hi_push, + }, + [RANDOM_PURE_GLXSB] = { + .entc_cls = &fxrng_hi_push, + }, }; CTASSERT(nitems(fxrng_ent_char) == ENTROPYSOURCE); diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index b591ffd3b544..296721d2c4e9 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -662,8 +662,7 @@ static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_UMA] = "UMA", [RANDOM_CALLOUT] = "CALLOUT", [RANDOM_RANDOMDEV] = "RANDOMDEV", /* ENVIRONMENTAL_END */ - [RANDOM_PURE_SAFE] = "PURE_SAFE", /* PURE_START */ - [RANDOM_PURE_GLXSB] = "PURE_GLXSB", + [RANDOM_PURE_TPM] = "PURE_TPM", /* PURE_START */ [RANDOM_PURE_RDRAND] = "PURE_RDRAND", [RANDOM_PURE_RDSEED] = "PURE_RDSEED", [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", @@ -672,11 +671,12 @@ static const char *random_source_descr[/*ENTROPYSOURCE*/] = { [RANDOM_PURE_BROADCOM] = "PURE_BROADCOM", [RANDOM_PURE_CCP] = "PURE_CCP", [RANDOM_PURE_DARN] = "PURE_DARN", - [RANDOM_PURE_TPM] = "PURE_TPM", [RANDOM_PURE_VMGENID] = "PURE_VMGENID", [RANDOM_PURE_QUALCOMM] = "PURE_QUALCOMM", [RANDOM_PURE_ARMV8] = "PURE_ARMV8", [RANDOM_PURE_ARM_TRNG] = "PURE_ARM_TRNG", + [RANDOM_PURE_SAFE] = "PURE_SAFE", + [RANDOM_PURE_GLXSB] = "PURE_GLXSB", /* "ENTROPYSOURCE" */ }; CTASSERT(nitems(random_source_descr) == ENTROPYSOURCE); diff --git a/sys/sys/random.h b/sys/sys/random.h index 803c07bbdfba..d801b04e5686 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,8 +89,7 @@ enum random_entropy_source { RANDOM_ENVIRONMENTAL_END = RANDOM_RANDOMDEV, /* Fast hardware random-number sources from here on. */ RANDOM_PURE_START, - RANDOM_PURE_SAFE = RANDOM_PURE_START, - RANDOM_PURE_GLXSB, + RANDOM_PURE_TPM = RANDOM_PURE_START, RANDOM_PURE_RDRAND, RANDOM_PURE_RDSEED, RANDOM_PURE_NEHEMIAH, @@ -99,11 +98,12 @@ enum random_entropy_source { RANDOM_PURE_BROADCOM, RANDOM_PURE_CCP, RANDOM_PURE_DARN, - RANDOM_PURE_TPM, RANDOM_PURE_VMGENID, RANDOM_PURE_QUALCOMM, RANDOM_PURE_ARMV8, RANDOM_PURE_ARM_TRNG, + RANDOM_PURE_SAFE, + RANDOM_PURE_GLXSB, ENTROPYSOURCE }; _Static_assert(ENTROPYSOURCE <= 32,