From nobody Wed Sep 24 22:17:08 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 4cXB6D30hSz68X3M; Wed, 24 Sep 2025 22:17:08 +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 4cXB6D2HBwz3LX9; Wed, 24 Sep 2025 22:17:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758752228; 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=k8Gr02X4WNgCSJfjCZs46FSA65BKW+qRxFSEKvOnzp0=; b=dTLPUjmJil5HgxcBmPLyo+OrHuaoW75ayWdJl9fVcaK54/ssd7KjEEwgGmnkl/35aFnJV4 ASU4UA2qbdDu8zSZJVEDg7JJwHWK9gEMGP7SWUlwn9cGp7ryvrQTThJltnYBpoNZoWjhKq RZcMxpKt2eOqCGdmfT0x/bmHucQmWvoVAbN/nK9Ed1YVLZweh5+Oa5Eav8pBVAVUlmjd+h scx8BftvokQ4n+uBIXzngoQtHy4DiWeAq+FYMr4/1YvuAVOMAUU08As86KEGO+2vUgOY1K SJ5PoPNcbEQ4TtaQtIW584j3QtYNduuOgQ2ba7OAiVyWnL1Yj8sZnox3EA/rGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758752228; 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=k8Gr02X4WNgCSJfjCZs46FSA65BKW+qRxFSEKvOnzp0=; b=Pz5uwzUqHJJk3yTGtc3fl9bMnSm18Q53h5DrbkNI5zaicb+9YLW01WQ+4nRtW/B2tExOL3 9U1932Zz7tKhosE+Q7UbHe851AkKy/tcICsC8UAFThnuDAYukfiJdfca8/fvZIZT+rJU4I egpXYH0ie0/V6BW906nkF6GQ5q8KnHAP4U5hAkSnW6o1TYqbEEibzqbbRCS8gvzL3cjxrw qgLgzH+ashmYkgMvC7iD+qmqpb7X60NiGyAeGBuxNtzDOUtgYPIkV6dGdSUPGpPG5D2ZR3 jNbor39ZJbI3sTiWPmB454ybyBoxbmtFlrC0iNgFLXI7qy1KL/u8EG2P/B9iCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758752228; a=rsa-sha256; cv=none; b=NvCib/ZnfIMqN7CWHhSWYb02ww/V9TG5XBpzjuf55J/BefLMDd9YRc+6+VW6XyxzQpax0t TY1uIsKTiSiut4RR4SHgfRjPZUXtEEfr06HzD+4n6KUXPX3anNj/17ALUtxtHqh3SoSMvs muzG1ZsPzwYCdKILIU2IsI5T5e0BJ85sujYDCTqZN3MhMG7+A2shzqn6OUpcazZxpEr5av 49LHYI5cqpKZp5zelQ7ZDtOcZbU9tKlLToY7sGWCh41fLXwZoS+7ULYx6bmS4Aq3ZfG5gb ed/44q9H+YFRJ3z56K14EI03L2uleTK21s6FxVjQm8BtSABmrLsdma57f7nhRg== 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 4cXB6D1L1dzqhh; Wed, 24 Sep 2025 22:17:08 +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 58OMH813070845; Wed, 24 Sep 2025 22:17:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58OMH88x070842; Wed, 24 Sep 2025 22:17:08 GMT (envelope-from git) Date: Wed, 24 Sep 2025 22:17:08 GMT Message-Id: <202509242217.58OMH88x070842@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: a694dad26ba5 - stable/13 - factor: support OpenSSL 3 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: a694dad26ba59b815ce22e0d1b82c94e0467126d Auto-Submitted: auto-generated The branch stable/13 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=a694dad26ba59b815ce22e0d1b82c94e0467126d commit a694dad26ba59b815ce22e0d1b82c94e0467126d Author: Enji Cooper AuthorDate: 2023-05-27 04:55:12 +0000 Commit: Enji Cooper CommitDate: 2025-09-24 05:36:59 +0000 factor: support OpenSSL 3 This change ports the BN APIs to an OpenSSL 3 compatible set of APIs. This removes the need for requesting OpenSSL 1.1 compatible APIs. MFC after: 1 week Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40298 (cherry picked from commit 537cd766435c80e61e72bb9369f77aa9630a1537) --- usr.bin/factor/factor.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/usr.bin/factor/factor.c b/usr.bin/factor/factor.c index 279028572fe3..523547086f6d 100644 --- a/usr.bin/factor/factor.c +++ b/usr.bin/factor/factor.c @@ -206,7 +206,11 @@ 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); @@ -279,7 +283,11 @@ 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); @@ -288,8 +296,13 @@ newbase: BN_div(num, NULL, val, x, ctx); if (BN_is_one(num)) return; - if (BN_is_prime_ex(num, PRIME_CHECKS, NULL, - NULL) == 1) { +#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 + { pr_print(num); fflush(stdout); return;