From nobody Wed Sep 24 22:17:09 2025 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 4cXB6F5Jt6z68X7d; Wed, 24 Sep 2025 22:17:09 +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 4cXB6F2sV5z3LSM; Wed, 24 Sep 2025 22:17:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758752229; 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=UjLV1xgPY+ml4tTycRZnJP+HnRI0VU7QxDsL07+qcaY=; b=DkJB9zfKWCUbkq6QHS4Ws+eOO8oSR4ZyN/0RkZP2ZNafrFGCbAYTHrQvmWP6gVMXT/aVGE LHgD1U+cKgCSx862vxvDsYCJvl3w4ESICcHMZLatrK16sfqaQP3D/4VpBaNuvoOIurE88d b0BKBi0OmCPvSNeEqStiNb4JYwXDaqJ9m90q9iRriixLhxbWwWkinPxos2esSZLUJ2nnyJ MrgDKqHxpzAQTt4w1fll/Hb1bHbaXvokyQIVND5c49CEaktnZFaXcYe5Jf7rgtHwFvfIef 2I20u1PelukF9qs9r2FtiYO24HU1VyjB4dJPjndCVHnobc8acmybXLqR+FPUGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758752229; 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=UjLV1xgPY+ml4tTycRZnJP+HnRI0VU7QxDsL07+qcaY=; b=gGpae+SC6w3Y8qfctjogVSVM1qy03EXAq0V4T7srvQPobTp1z9zDWvDyesrYuTJAsrIA9Y 04KyvBLao1HIL1pupLoxDZCqdU4kLxSGYk+aZ9WCaGS226V5JorUoWYRKA6Jq4VejcH2xX Iuypk1XOCZi0l/HSixwcM0+LV7UF3li0JdPp3m+DaeF+dlGcylX/EshWqenCAJJbSwz9r1 ar7qfWpLVCvtunTZFwnGhKQqWiZsyduzjD7g5HJFhXnTwHQMzvsZCg08PP1Rm2bP85kJnj KbqQXRX7Nvd6iPRbr0Yu3QbFzHOCCIU/d9pSI0xvPxlcWhXHeiAloDq6EwXumA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758752229; a=rsa-sha256; cv=none; b=BTp4pFUI/uer7+77sI7IZwO1Xw9ddCjaBXnx/VUZmcrHLJuj4CskiQU9mUObaEcNVopvyq CN9cLANpcZsSgBy72EzzGiCSeVp0swNTgLXXyagl+plBvOOKaT9b264gyPrRnKEGlunqNr eXZcDvAQXKofQ/9z/qwCX2LX9h5E+djEqT66Z4GO6Z/vjKdgpkebmHc2ozjr8EUD7pgMXF /TgTENGJ8Z6mB9Z1/o0a4vq7s3UpV5df8lLCRWMI0ho/p3+UzJk0eT83lbIKkx0L0XdwB7 URFQAZxtwZUKEg62rvP65jlZTkyh43dyBDmse3d4c1rvpTKp3V+VhGQXBNpk2g== 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 4cXB6F1zTvzr6l; Wed, 24 Sep 2025 22:17:09 +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 58OMH9TE070877; Wed, 24 Sep 2025 22:17:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58OMH9SI070874; Wed, 24 Sep 2025 22:17:09 GMT (envelope-from git) Date: Wed, 24 Sep 2025 22:17:09 GMT Message-Id: <202509242217.58OMH9SI070874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Enji Cooper Subject: git: 8782ceb94273 - stable/13 - Reduce ifdef soup by adding pre-3.0 compat support 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 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/13 X-Git-Reftype: branch X-Git-Commit: 8782ceb94273915fd726cd1a62d7cc080837d397 Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=8782ceb94273915fd726cd1a62d7cc080837d397 commit 8782ceb94273915fd726cd1a62d7cc080837d397 Author: Enji Cooper AuthorDate: 2023-05-27 21:07:45 +0000 Commit: Enji Cooper CommitDate: 2025-09-24 05:36:59 +0000 Reduce ifdef soup by adding pre-3.0 compat support This change creates a static inline function, BN_check_prime, for pre-3.0 use which is implemented with the previous (1.1) compatible call under the covers, `BN_is_prime_ex`. The `nchecks` parameter value is maintained, even though it has no noticable behavior change, given that the documentation clearly states that at least 64 or 128 rounds are executed on the backend, depending on how many bits there are in the given number being factored out. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40305 (cherry picked from commit dcf5d5603b3af831002caa7b2f64aec8bda14071) --- usr.bin/factor/factor.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c index 523547086f6d..c183a6980edd 100644 --- a/usr.bin/factor/factor.c +++ b/usr.bin/factor/factor.c @@ -79,7 +79,15 @@ __RCSID("$NetBSD: factor.c,v 1.19 2009/08/12 05:54:31 dholland Exp $"); #include -#define PRIME_CHECKS 5 +#if OPENSSL_VERSION_NUMBER < 0x30000000L +static inline int +BN_check_prime(BN *p, BN_CTX *ctx, BN_GENCB *cb) +{ + const int nchecks = 5; + + return BN_is_prime_ex(val, nchecks, ctx, cb); +} +#endif static void pollard_pminus1(BIGNUM *); /* print factors for big numbers */ @@ -206,11 +214,7 @@ pr_fact(BIGNUM *val) if (!BN_sqr(bnfact, bnfact, ctx)) errx(1, "error in BN_sqr()"); if (BN_cmp(bnfact, val) > 0 || -#if OPENSSL_VERSION_NUMBER >= 0x30000000L BN_check_prime(val, NULL, NULL) == 1) -#else - BN_is_prime_ex(val, PRIME_CHECKS, NULL, NULL) == 1) -#endif pr_print(val); else pollard_pminus1(val); @@ -283,11 +287,7 @@ newbase: errx(1, "error in BN_gcd()"); if (!BN_is_one(x)) { -#if OPENSSL_VERSION_NUMBER >= 0x30000000L if (BN_check_prime(x, NULL, NULL) == 1) -#else - if (BN_is_prime_ex(x, PRIME_CHECKS, NULL, NULL) == 1) -#endif pr_print(x); else pollard_pminus1(x); @@ -296,13 +296,7 @@ newbase: BN_div(num, NULL, val, x, ctx); if (BN_is_one(num)) return; -#if OPENSSL_VERSION_NUMBER >= 0x30000000L - if (BN_check_prime(num, NULL, NULL) == 1) -#else - if (BN_is_prime_ex(num, PRIME_CHECKS, NULL, NULL) - == 1) -#endif - { + if (BN_check_prime(num, NULL, NULL) == 1) { pr_print(num); fflush(stdout); return;