git: 0d61082e3c64 - stable/14 - openssl: update ASM and version info for 3.0.16 import

From: Enji Cooper <ngie_at_FreeBSD.org>
Date: Tue, 25 Mar 2025 21:09:55 UTC
The branch stable/14 has been updated by ngie:

URL: https://cgit.FreeBSD.org/src/commit/?id=0d61082e3c64a43f52ec5f1bf3d85671d97d9514

commit 0d61082e3c64a43f52ec5f1bf3d85671d97d9514
Author:     Enji Cooper <ngie@FreeBSD.org>
AuthorDate: 2025-03-06 18:07:54 +0000
Commit:     Enji Cooper <ngie@FreeBSD.org>
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 <bsd.own.mk>
 
 # 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