From nobody Mon Nov 10 18:54:47 2025 X-Original-To: dev-commits-src-branches@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 4d4zP32rpSz6H6QK; Mon, 10 Nov 2025 18:54:47 +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 4d4zP32DDpz3L9t; Mon, 10 Nov 2025 18:54:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800887; 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=HHiAGDiUIF+0j3cJ02c44zoow184HmF5iDeKM5hWCwM=; b=rjbA10J/fvFN5VJBiK6G0hNpalLBL22ARuVNcrg7RtrbAaPyqjCZe/VF47NUWMMBF5dvp2 gLlNP72jAGdiEQUcqjs1xS0S//W/cD0naW4L8YCUlYTnBffuReezidmXmZQ0TFgM3dJ0ok eD8LxKOgG3xEOmdgcXB4BkEm3WV2jEnILYtUP8ibf23dMq/VO8rDZPmIZjCV9TNTqZsEet jTGqcqXHwmOTc0Qe/k4EcnO0LhvdnhOFVot16nyG9YHEoO00jL0SNRORu2s1mTyRol2oXu QjtT8o8aO273obXDXAPiln3FkWKukfmjmDL4zmQcMoydLPv3VG6URuWK54dFdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1762800887; 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=HHiAGDiUIF+0j3cJ02c44zoow184HmF5iDeKM5hWCwM=; b=a01Z9Zu+FyRacgC0y3ommUrv0Nt4LY9SmkYXmGR9NVcKfNveSwhdrnqptaDK4Qn4zuB0vv FVBwiWFcL16xx61YoAzkpH0H5vzGbWBs+o3Hrhgn3MLNmt3qWW67lD3sRJYXiFeEDRsWCo kfc65x3sA1DUWGu6/cYeJjK9gmQSld6aDjdLBdtChPX0ivYOUKzRuTOnuy31ELh0PV2970 wgGMUc6SMqOJkiPqtyAtp0/GJShwOvzKfyw3qI50+uLV2F9iZHkPbiHHhWLwiM168sqmjO MqlZq+qBlYubrsmqZBTT0KcHWti1IXr55LbNgcFI+y0vDaZv9Ww18P9Z0lrRcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1762800887; a=rsa-sha256; cv=none; b=hDG/9YZtgVOwfkIa5NCcGWaSKgCzge8QS71UaaqpcrNS68S9D8k6IPLS+xIXcv71YaGuhN aV8HHyYwOEma60v7wkob72m9rAgJpIyRwwhbdKI+i62KAPvVMSq0Ad1RcftBDJXL/6w70m yGLTfkPt9pd2gwoBaj7wzzOgfHsOUUquBpWp+DTwA7Pc6bklvA1LOmQCv12dXFVfRjKPMM CP2sv5RpUqqd0wmwaxxj5U+eYp7PxykM3Mze+DlraHamNpfPHG++DxD+xbn5qp4uH1cWSf 73aBXwwglbpViD3chooLgTTqtnYt5SPZn99jB7UPrvaT9n0IQAYuuN1o/+7APA== 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 4d4zP31hBRzVS9; Mon, 10 Nov 2025 18:54:47 +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 5AAIsltI093489; Mon, 10 Nov 2025 18:54:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AAIsl9O093486; Mon, 10 Nov 2025 18:54:47 GMT (envelope-from git) Date: Mon, 10 Nov 2025 18:54:47 GMT Message-Id: <202511101854.5AAIsl9O093486@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 0339b24f8d30 - releng/15.0 - random: Have RANDOM_PURE_START be a cross-platform source List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.0 X-Git-Reftype: branch X-Git-Commit: 0339b24f8d30f92979c4ec5ba2556cd83cce9e98 Auto-Submitted: auto-generated The branch releng/15.0 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0339b24f8d30f92979c4ec5ba2556cd83cce9e98 commit 0339b24f8d30f92979c4ec5ba2556cd83cce9e98 Author: David E. O'Brien AuthorDate: 2025-11-08 02:18:13 +0000 Commit: Colin Percival CommitDate: 2025-11-10 18:54:37 +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. Approved by: re (cperciva) Reviewed by: glebius Obtained from: Juniper Networks Differential Revision: https://reviews.freebsd.org/D53311 (cherry picked from commit 9f3886347c1750cf80a82314470fc7186088eb9a) (cherry picked from commit e224f2c1b98ba065942c83d322cdb8e3987d0c81) --- sys/dev/random/fenestrasX/fx_pool.c | 20 ++++++++++---------- sys/dev/random/random_harvestq.c | 8 ++++---- sys/sys/random.h | 8 ++++---- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/sys/dev/random/fenestrasX/fx_pool.c b/sys/dev/random/fenestrasX/fx_pool.c index 3aefe17a045a..35d06c2a9df1 100644 --- a/sys/dev/random/fenestrasX/fx_pool.c +++ b/sys/dev/random/fenestrasX/fx_pool.c @@ -167,13 +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] = { - .entc_cls = &fxrng_hi_push, - }, - [RANDOM_PURE_HIFN] = { + [RANDOM_PURE_TPM] = { .entc_cls = &fxrng_hi_push, }, [RANDOM_PURE_RDRAND] = { @@ -200,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, }, @@ -215,6 +206,15 @@ 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, + }, + [RANDOM_PURE_HIFN] = { + .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 f2206044fe7d..0e90b4d6ef9b 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -662,9 +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_HIFN] = "PURE_HIFN", + [RANDOM_PURE_TPM] = "PURE_TPM", /* PURE_START */ [RANDOM_PURE_RDRAND] = "PURE_RDRAND", [RANDOM_PURE_RDSEED] = "PURE_RDSEED", [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH", @@ -673,11 +671,13 @@ 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", + [RANDOM_PURE_HIFN] = "PURE_HIFN", /* "ENTROPYSOURCE" */ }; CTASSERT(nitems(random_source_descr) == ENTROPYSOURCE); diff --git a/sys/sys/random.h b/sys/sys/random.h index af6b1e117423..64f2a1e1b40c 100644 --- a/sys/sys/random.h +++ b/sys/sys/random.h @@ -89,9 +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_HIFN, + RANDOM_PURE_TPM = RANDOM_PURE_START, RANDOM_PURE_RDRAND, RANDOM_PURE_RDSEED, RANDOM_PURE_NEHEMIAH, @@ -100,11 +98,13 @@ 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, + RANDOM_PURE_HIFN, ENTROPYSOURCE }; _Static_assert(ENTROPYSOURCE <= 32,