From nobody Fri Mar 14 06:43:19 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 4ZDZZH3FF9z5qfKV; Fri, 14 Mar 2025 06:43:19 +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 4ZDZZH2W8Nz3fwF; Fri, 14 Mar 2025 06:43:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741934599; 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=YouOHXoMh04W96qawTRnKNLXPqf+bONj++rIS62Q5NI=; b=EqA+WqJIGfZSuk0oZvSCOvEXIQ/P6mCsxwrxDI0ZG96rUQ9N1dihMK0r6Lyepmqdu8V3R1 AZDj2YJxpuMeN1VuyEucBXEPQRfrG5XQG5qR9NoG+mBuDcrtKZafjX47eirl8fPiL08NCo tSky5eRky+SQO50DruoYE+3oJSQI5WghH74U5RdGtSryZEH4zN67tDyQZPAsXqgoiar4wB 7e3X1B5fHFtl8s9J2l/4P3g8KQdsGvCYVLbOnz9+qF0lOGo7S8I/53NfS7kGys9qw2BBwt rItTOd8faq1iBg77tVcuPUS44TBDe13Nu8ufQY2NyopKetx3ue8w4SFjJCan/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741934599; a=rsa-sha256; cv=none; b=GnKbL45Pv8vhUr2OA4o0ZVE2u6TBtTWtwBGjN3VY0zcOY+Lz0IgmxHw9Cugkh5MzcQIE0O aXFPvNH7JKmLJMBNlAoGsMUD17GNlEYZeB63fVZhnjQYBP/TGKHrQuY/8hO1VhWN1gIiGi GP+SoC8nIo4yjkaj8WelSf7RmR6EI56yANykpIEqr3lg63PVUyxLu766CzW0FwpujnDeJT GehidueSMwvxhy7K0/JPoQiVUsl21mBqIescHEOl9sNsHslgEz4ar0akwtwfyeRMTlXZdW UX9/S9fiaJR8mFTFfkN9PUNgBfRiGv8o0XC7igozlE70g6S7MIR1i/FUmubSQg== 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=1741934599; 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=YouOHXoMh04W96qawTRnKNLXPqf+bONj++rIS62Q5NI=; b=jofZqUq1gLCYGDRk6//xyPWfLW93Oa108WkIykoSeGossNlCddpg462fOPS/Wc6c4yzPeH eOpGNctjrQ/RV6yMDmTy//g/q47sN3q4w6XXBeS8O1MgVw4mMVjdscguvIgzI6+cUFpPUk tSl0ahqEpMs5H250V+eLbGktyBD+X28efALXFKK1mExd9ocZC5kSdHpt1MwLyce2CEuhC1 Ts3cIl6MV5YGqvC0F34IuvQGhnlEKUFPjEMtjcnK7/84F00ZRgALV9CzGpPbcf++13SwRB 3/746K4ZI0ExVj3LLALReG5V8Ti4nT+MNp+T6ayGuziUYlWLYkfs85JvbqhJEw== 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 4ZDZZH1pPfzYwY; Fri, 14 Mar 2025 06:43:19 +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 52E6hJII098780; Fri, 14 Mar 2025 06:43:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52E6hJsx098777; Fri, 14 Mar 2025 06:43:19 GMT (envelope-from git) Date: Fri, 14 Mar 2025 06:43:19 GMT Message-Id: <202503140643.52E6hJsx098777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: d2a55e6a9348 - main - openssl: update ASM and version info for 3.0.16 import 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/main X-Git-Reftype: branch X-Git-Commit: d2a55e6a9348bb55038dbc6b727ab041085f22db Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=d2a55e6a9348bb55038dbc6b727ab041085f22db commit d2a55e6a9348bb55038dbc6b727ab041085f22db Author: Enji Cooper AuthorDate: 2025-03-06 18:07:54 +0000 Commit: Enji Cooper CommitDate: 2025-03-14 06:42:02 +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 --- 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 e7072213d509..39ba90842525 100644 --- a/secure/lib/libcrypto/Makefile.inc +++ b/secure/lib/libcrypto/Makefile.inc @@ -1,8 +1,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