From nobody Fri Jul 17 02:47:39 2026 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 4h1Z8C5QPgz6mHty for ; Fri, 17 Jul 2026 02:47:39 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h1Z8C4mD5z3PvM for ; Fri, 17 Jul 2026 02:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784256459; 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=eNli75NLRp+dbmSgxXyjr+yX4u0R1h/8mWXDfayUmWM=; b=pS1IC5wSSRK6B0gomdZ3AS90N0kJYKx0rTTmEywYOwM61dJZ89+EPYRb8wUy6MdU67K4Ti 8hd2Kxgu+C8DVrB3h+y1EhdjIvfEv8W/Fo+/Tot/owKxLUinSvAQUPyAbuTU7Zt72Up3ts bcCS32GaLpZ/ONmFytl2Jmjkbxfh2e70OS8FtN16LV60Uuo6w6R28fNC1AxyNpE2EwJetS UztB/E+sRXDbzS8H1bNSLwbjkQoCJ6+F/Fr5mIGBxTuk+SemWhnGSCJra8MAModu364gAC cVAOI4gPG4/OtzBc7kHRnC2IDAgahRljOaCl4KPOOKdgcphOskiaXsGDwFm3Ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784256459; a=rsa-sha256; cv=none; b=wLBUCT7xo8feWhXYQBP7gsKc9V4Gpd0p9PK4vz1W3jCUiHBPa6E9QpOiAB30U9NiANhyJQ RQZC3Ofg4gd2VlhZVtKKVOcIuv42SsBSjSjRYhVDwIYLfFCU4asBmM0VKVfKUfuzEiB4AD 8cSKevw5fWvGlcrxvMvokmHIGhu1qv3TmlZ8EbMrTIpoI5Ew7FpJVydDaU9OHsgikzrkWL AJu/PyEBPysQ1jWtkXN5RKc/UbTLOLUI7Lk7pEMnWhhLOnO75gR0H01kZzheRZ3fs3421j jVJA+Tni7zGHVynd5yJbSU4cCPh5W3zW93ZHRx920FjszfuIahu6m/OTOvgYgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784256459; 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=eNli75NLRp+dbmSgxXyjr+yX4u0R1h/8mWXDfayUmWM=; b=rnS968RPXVoRp8x8whPElbaA3pzTAIE1QMqknSeEGRolwmVOuDydCiaCHYMPD9Ou4qNd3R 30yXlvgQt1SZ45IKpTfgdQ3yLXRV1l6UpZzC+NwcXU5ChXX0fM7ipNtyclrXD+qzXwPxqX IMib6xGDnM45UML5ajVz5im4LV+CsHbKltNwzIfnyCODhQ41ztz1D5DAEpU5an1K6HVbVI Q8bRFmavbReTfPpgXyhJT84ZyzVXiufg/rV1STAvDVRZ6Lc9DY8JpO6BG04KYHs2ZL2V6F zlHDObajnImaKcBryeLqNWA7WMqK0woxGoTdmfbbRteZw7uW2vZd2JjeibIn8g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h1Z8C3ZbFzD4f for ; Fri, 17 Jul 2026 02:47:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e09f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 17 Jul 2026 02:47:39 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 993fbb604c9f - stable/15 - Remove fips-module related diff 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 993fbb604c9fa0624b22f78ea3a7a3829102c22d Auto-Submitted: auto-generated Date: Fri, 17 Jul 2026 02:47:39 +0000 Message-Id: <6a5997cb.1e09f.6c990c4a@gitrepo.freebsd.org> The branch stable/15 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=993fbb604c9fa0624b22f78ea3a7a3829102c22d commit 993fbb604c9fa0624b22f78ea3a7a3829102c22d Author: Enji Cooper AuthorDate: 2026-06-12 05:48:19 +0000 Commit: Enji Cooper CommitDate: 2026-07-17 02:47:24 +0000 Remove fips-module related diff This particular change didn't come from upstream. It was added locally in 7a991ecd1 when attempting to enable the fips provider with 3.0. Given the fact that we no longer build the fips provider and the fips provider build process (including sources) is very prescribed to specific build steps and source versions, there's no reason why we need to continue carrying around this diff anymore. MFC after: 1 week Signed-off-by: Enji Cooper (cherry picked from commit d6e3662bc1f5054d81b1ceab641396047c2cad94) --- crypto/openssl/crypto/bn/bn_const.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/crypto/openssl/crypto/bn/bn_const.c b/crypto/openssl/crypto/bn/bn_const.c index 5e0f470663b3..07a3a4a7c380 100644 --- a/crypto/openssl/crypto/bn/bn_const.c +++ b/crypto/openssl/crypto/bn/bn_const.c @@ -76,12 +76,10 @@ BIGNUM *BN_get_rfc2409_prime_1024(BIGNUM *bn) * RFC2312 specifies a generator of 22. */ -#ifndef FIPS_MODULE BIGNUM *BN_get_rfc3526_prime_1536(BIGNUM *bn) { return COPY_BN(bn, ossl_bignum_modp_1536_p); } -#endif /*- * "2048-bit MODP Group" from RFC3526, Section 3.