From nobody Fri Jun 12 05:51:21 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 4gc7tK4wH0z6hXY5 for ; Fri, 12 Jun 2026 05:51:21 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gc7tK3Fdlz3TwL for ; Fri, 12 Jun 2026 05:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781243481; 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=sdTRXxh/CQw3ucFDOfXnK5nnqdAZZ/ddC9WtxYyLmN0=; b=I8b13xTqItEV5JbtohmWJDuKuwyblVuLZcq1Seukr9EZ1s7LO8kEy/mW/Me4G3vOAINSUX L13jXCQHf0UPsCfoSvEgdzCqiHVnMVzGdZ9Gj9Z2VXyrxGlI4rUFiMWlV+lsTqirenBgjS U8dKeQepTISkObO7QzpwFy7yjkoRHQoE00uayNP7YarTYuDdpvPeAh7IuNPipnKp8Ouc3U 15cVNHbgSxg+7HP/nFmTyEevZsUmIcSw+cUXRJST2v9hm9RrOBTtmNhM18YWfa+zNHyx8J VUdwiRzSPpf3QM6EGOzpTD8vcAQhjYiwH7YMbIH+zORNk5xST0ZZr8yk+A0m1w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781243481; a=rsa-sha256; cv=none; b=lwpgc1guSRA+FW12pQk11tcsxXTTbwVpEkhNjU2E7E1apJJK9/kcSw/G39II6ptmUAbP7X S0YehSohU/dWyaog47jvi7itrs7+IAgy9mX1eqGKyzpnmtK8gqlT8w7dBt4NBLiiO0O/Yg eDGkSgZwrBeRNAQNaZ9XoBAI6CTS2vNgwAOW647Yt2LVswypb7NpAZE1AKU3dZf1IM7Vyf Z7O5zd20NK1b3ijpdZ8nASktw5DGMAUin33EZPJLr8t9avSmeCcl85jpjOHztSEuhzXce2 pOSITuFz9dczz30qNyb+lUd6kbQsI15uuss+JBPFA3NcQKIs7r/w8r5wRWXL3g== 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=1781243481; 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=sdTRXxh/CQw3ucFDOfXnK5nnqdAZZ/ddC9WtxYyLmN0=; b=XACByjVMg4YUyVlYtBkwCmIqcy0aIk6clkOefj5TLAApu6et08lh0YNIacIQWCXTs2LJt2 PxJVY2WJq87KOq0O3MJ9uR8hep/1G9tRnfOgb0X2hZ6hVEStA/xlFbf7upWMi5Lm0MoxqX QFR4ZtiJs1KxokTpaxHQ8ISPfOEOQS3lFh8inOgJNXY+fvWepGhTAbsg6lCTx+WcL4/Rp+ t22VQcvu8l3YWfv1AOZiEpyQ0dacysmmofneOqK7bk+i/8FV7F/CIo4/kMjZxbXhNXnHzh PqzxgX5HnJY5TUvVKrV0gVFEicXHk+dd8OdzyBQ1fXDY6tKJiWOJgUTh/nHSRA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gc7tK2ZH0z7r2 for ; Fri, 12 Jun 2026 05:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 45a52 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 12 Jun 2026 05:51:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: d6e3662bc1f5 - main - Remove fips-module related diff List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d6e3662bc1f5054d81b1ceab641396047c2cad94 Auto-Submitted: auto-generated Date: Fri, 12 Jun 2026 05:51:21 +0000 Message-Id: <6a2b9e59.45a52.32d7df75@gitrepo.freebsd.org> The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d6e3662bc1f5054d81b1ceab641396047c2cad94 commit d6e3662bc1f5054d81b1ceab641396047c2cad94 Author: Enji Cooper AuthorDate: 2026-06-12 05:48:19 +0000 Commit: Enji Cooper CommitDate: 2026-06-12 05:50:52 +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 --- 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.