From nobody Tue Mar 25 21:09:55 2025 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 4ZMjH82QjHz5rnZZ; Tue, 25 Mar 2025 21:09:56 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZMjH74GJMz3T5q; Tue, 25 Mar 2025 21:09:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742936995; 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=/7Naj1g9UV2aNH2B6J8xCawOwRg7ZG4sWwGn8nkClGM=; b=BU9KykydMY5L67m2l1P/zcnBklIoMbBJaX6Awg7lzGtZQJgNv4khqhRLN6HXMPf6JHXSEp VNQEhfXNYzQYQBz8r0Ifn6LY0DRv0Q5CFeEoZYkoTXBAG+FU+BFKPD8lhRwrVpg24c/lOw N6odp27FVyZqWm2qLOwgFzZQwuZTn3JSfIxrrFmRrpjJoUlIDv71nnPQLHbqotXo9kB/d8 MIuoujC26CDz+g3irZq5IT0Fj3EgbyYhhuTLP9O2ClBoUFRAQtk9Edu9Aov3661JObkbPK L3yM1EIhDGHrjDxfsIhw11Qd22NV7CBRmmua6YNgm6Gcc6Y51CQLacYqpF1siQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742936995; a=rsa-sha256; cv=none; b=nN8lm+bEEpr8kI/qEzmpOjZKNiGTgfYlxZWPisj2aK5ME0ru10Uf+IUm6KQ9tBCPNmyTEX PJA7Qy4nu3vd0bQKaTlUBnGn4NXupqebayEznZE2yr5Mzp03uK8NS/K0rocd24kqxOgKbp exe2leYNzeLklE9imFTYKVedtlfToy4Vzbvw/PUUbqxOkei9jQ2fhYW7r8FYZ4XUhtjrsk MiUKIjg+geZueKYLJzo8SQNIVKeAV0uV1BYPMmoijhTzaHZ081gUre2+6i4e+jTzACVeQh r8xlVHJqaTxSG/WKMzaWcxV5We3GgixWBa+WGTLT1PzUV7Pe8zXI9ga6/J5dzQ== 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=1742936995; 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=/7Naj1g9UV2aNH2B6J8xCawOwRg7ZG4sWwGn8nkClGM=; b=Cm1M2/EBel7yegtlpc+8XGpWfvLEi/Vu6p42vNmLoYYtXpMibigfTuXLZQZrGqgHamK42d YcBbWGUavW5YFbuG+VEjsUldM/AP/rQr7l/49JEJfSydTSZTnd78cUxJzcyqfdEPHfs98O nOBnH3bE3EUcz+DKZcInXtfYfm+YO+R9S9eFCkAXwBHPSHkNCxcIsSfSg9RhlFCSGtzXVk HiRh0JACRkoGfvGNJU8aT9Uo/ovRnqRPb3vjYc+PxWJeIKOnq8aAUBKT5hZLITJ7ielPaL 0VhEx7AWCTQ0YNXFjmMfyZSgDnKgLiLLaOn70psiz65M2/savg0f8O+pSuJEVA== 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 4ZMjH73sBQzwt1; Tue, 25 Mar 2025 21:09:55 +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 52PL9teX060264; Tue, 25 Mar 2025 21:09:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52PL9tld060261; Tue, 25 Mar 2025 21:09:55 GMT (envelope-from git) Date: Tue, 25 Mar 2025 21:09:55 GMT Message-Id: <202503252109.52PL9tld060261@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: 0d61082e3c64 - stable/14 - openssl: update ASM and version info for 3.0.16 import 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 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/14 X-Git-Reftype: branch X-Git-Commit: 0d61082e3c64a43f52ec5f1bf3d85671d97d9514 Auto-Submitted: auto-generated The branch stable/14 has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0d61082e3c64a43f52ec5f1bf3d85671d97d9514 commit 0d61082e3c64a43f52ec5f1bf3d85671d97d9514 Author: Enji Cooper AuthorDate: 2025-03-06 18:07:54 +0000 Commit: Enji Cooper CommitDate: 2025-03-25 21:07:59 +0000 openssl: update ASM and version info for 3.0.16 import MFC after: 1 week MFC with: 0d0c8621fd181e507f0fb50ffcca606faf66a8c2 Differential Revision: https://reviews.freebsd.org/D49297 (cherry picked from commit d2a55e6a9348bb55038dbc6b727ab041085f22db) --- crypto/openssl/include/openssl/opensslv.h | 10 +++++----- secure/lib/libcrypto/Makefile.inc | 4 ++-- sys/crypto/openssl/aarch64/armv8-mont.S | 2 ++ 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/crypto/openssl/include/openssl/opensslv.h b/crypto/openssl/include/openssl/opensslv.h index dd0aece423cd..8e11963343e9 100644 --- a/crypto/openssl/include/openssl/opensslv.h +++ b/crypto/openssl/include/openssl/opensslv.h @@ -29,7 +29,7 @@ extern "C" { */ # define OPENSSL_VERSION_MAJOR 3 # define OPENSSL_VERSION_MINOR 0 -# define OPENSSL_VERSION_PATCH 15 +# define OPENSSL_VERSION_PATCH 16 /* * Additional version information @@ -74,21 +74,21 @@ extern "C" { * longer variant with OPENSSL_VERSION_PRE_RELEASE_STR and * OPENSSL_VERSION_BUILD_METADATA_STR appended. */ -# define OPENSSL_VERSION_STR "3.0.15" -# define OPENSSL_FULL_VERSION_STR "3.0.15" +# define OPENSSL_VERSION_STR "3.0.16" +# define OPENSSL_FULL_VERSION_STR "3.0.16" /* * SECTION 3: ADDITIONAL METADATA * * These strings are defined separately to allow them to be parsable. */ -# define OPENSSL_RELEASE_DATE "3 Sep 2024" +# define OPENSSL_RELEASE_DATE "11 Feb 2025" /* * SECTION 4: BACKWARD COMPATIBILITY */ -# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.15 3 Sep 2024" +# define OPENSSL_VERSION_TEXT "OpenSSL 3.0.16 11 Feb 2025" /* Synthesize OPENSSL_VERSION_NUMBER with the layout 0xMNN00PPSL */ # ifdef OPENSSL_VERSION_PRE_RELEASE diff --git a/secure/lib/libcrypto/Makefile.inc b/secure/lib/libcrypto/Makefile.inc index 174dd5c5bf2e..8a20f1478bd5 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -2,8 +2,8 @@ .include # OpenSSL version used for manual page generation -OPENSSL_VER= 3.0.15 -OPENSSL_DATE= 2024-09-03 +OPENSSL_VER= 3.0.16 +OPENSSL_DATE= 2025-02-11 LCRYPTO_SRC= ${SRCTOP}/crypto/openssl LCRYPTO_DOC= ${LCRYPTO_SRC}/doc diff --git a/sys/crypto/openssl/aarch64/armv8-mont.S b/sys/crypto/openssl/aarch64/armv8-mont.S index 8b85fb080aba..b429f39ee326 100644 --- a/sys/crypto/openssl/aarch64/armv8-mont.S +++ b/sys/crypto/openssl/aarch64/armv8-mont.S @@ -17,10 +17,12 @@ bn_mul_mont: cmp x5,#32 b.le .Lscalar_impl #ifndef __KERNEL__ +#ifndef __AARCH64EB__ adrp x17,OPENSSL_armv8_rsa_neonized ldr w17,[x17,#:lo12:OPENSSL_armv8_rsa_neonized] cbnz w17, bn_mul8x_mont_neon #endif +#endif .Lscalar_impl: tst x5,#7