From nobody Tue Nov 17 17:07:34 2026 X-Original-To: dev-commits-src-all@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 4jTWPg2qlxz71Rsx for ; Tue, 17 Nov 2026 17:07:35 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jTWPf2pQwz4LWH for ; Tue, 17 Nov 2026 17:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LxcrPHblbUdm8t+cacZOrHV+ZSficPq6ulggydF+4U=; b=sZoTpBygqbCgfjEWyIJVrjPk7fklv2W1eEVL8kfmW9613cGyWdKfeoCQ3i25BIXWwu73MS m/WUilKYrcKOQtFAgDu7jyksxsWPgfWK0SNM421LHwpC7E4m2BSKzfAdmN5nSlyRddiDBR WXwyn8LCaoc/ZQzj6vwzxDUd39xy6wh0o9gpp8ket7N8EuFaOGYa5ElBIf3xtqOw4oceQJ V2K2NF4VCys9Q/umrfj+UWoy/6Bb0mXk/T4E26MGhBWWuBjNZETlrewnax1eP8scyfrB1l OG5QFHQgZ5/q9MecYNBeygUEES0rrhvsIIBDGyeqlWK7AT2+MTBekNQPXzA7cg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1794935254; b=xwWBPD2d/M4oGcMJWMebbc6mO597F8P+PsjnXnHAFRQT9lHiTtMoy/i0HmjedqP/I50BW+ dIEzbAkW3Ue6zF0srPRe3fbddXDcSgy4BQcGeJTdGpYlMLni0WuxWU4EgMYSw0PWqAsw6/ 6L71kHRRP4NbOrzJ23fcRwhzZes8lxYpg6QF3p6KUT50My105Usq7L6a++QYm8jQQdYlkc DKrO0uUzaLOQJj5joRzRDlGS+Olg+jE+1aS6zFcE2PR9OVIIAgHd7NErYfrO23MYxA3viT GlRsGy9HPG7H/XgSDbkz41OgHRaBzRki3COGovcgQs3JfEXwENeN1MtNoys+VA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1794935254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4LxcrPHblbUdm8t+cacZOrHV+ZSficPq6ulggydF+4U=; b=A+/fuNls976GtTRSVzYp1p7bZB0CuuNYR7rfq8mjmOKtGik5FiJqk/uj9wfd6+PR+7HRRl 2SuwHDnupXu4AlCOkygl70n/7iLrK3i6FTIQ6CKVLN5sShlQOKEaGWdiXEQ1G1uZSRurfS BQpnHcJbcZj39UBzSL0NcSbL2QqsQ4pN4orf2U44H2HUhM06IcKncVF+PL8sUbMKPgqfEP 6E6dQTPVG2ynQa/T/+Jhk1P4/6f1YUuRhrmzbyQDXcF8m8L9PoVPqcag1kBjzb4PhX0tDd A6Ybn+Dvfe0cfrZSSdiw0w0EWWFcctE2q3qi3z2WlAjNPX2DipSnEUU99XlZvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jTWPf2TG2zrhP for ; Tue, 17 Nov 2026 17:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d80 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Nov 2026 17:07:34 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Enji Cooper From: Mark Johnston Subject: git: b3e9b999cc61 - releng/15.1 - Remove fips-module related diff List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/releng/15.1 X-Git-Reftype: branch X-Git-Commit: b3e9b999cc61460760532702f94048e459daffcd Auto-Submitted: auto-generated Date: Tue, 17 Nov 2026 17:07:34 +0000 Message-Id: <6afc89d6.d80.415d8f26@gitrepo.freebsd.org> The branch releng/15.1 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e9b999cc61460760532702f94048e459daffcd commit b3e9b999cc61460760532702f94048e459daffcd Author: Enji Cooper AuthorDate: 2026-06-12 05:48:19 +0000 Commit: Mark Johnston CommitDate: 2026-11-14 22:53:23 +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. Approved by: so Security: FreeBSD-EN-26:31.openssl (cherry picked from commit d6e3662bc1f5054d81b1ceab641396047c2cad94) (cherry picked from commit 993fbb604c9fa0624b22f78ea3a7a3829102c22d) --- 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.