From 41309be58143a9aeb3a3595d43022762a53b8253 Mon Sep 17 00:00:00 2001
From: Abhisit Sangjan <abhisit.sangjan@gmail.com>
Date: Thu, 19 Dec 2024 11:50:39 +0700
Subject: [PATCH] Support OpenSSL 3.4.0

Signed-off-by: Abhisit Sangjan <abhisit.sangjan@gmail.com>
---
 build-config/make/openssl.make     | 20 +++++++++++++++++++-
 upstream/openssl-3.4.0.tar.gz.sha1 |  1 +
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 upstream/openssl-3.4.0.tar.gz.sha1

diff --git a/build-config/make/openssl.make b/build-config/make/openssl.make
index 796db56b9..6591df9fc 100644
--- a/build-config/make/openssl.make
+++ b/build-config/make/openssl.make
@@ -10,7 +10,7 @@
 # This is a makefile fragment that defines the build of openssl
 #
 
-OPENSSL_VERSION		= 1.1.1g
+OPENSSL_VERSION		?= 1.1.1g
 OPENSSL_TARBALL		= openssl-$(OPENSSL_VERSION).tar.gz
 OPENSSL_TARBALL_URLS	+= $(ONIE_MIRROR) \
 			   https://www.openssl.org/source
@@ -31,10 +31,26 @@ PHONY += openssl openssl-download openssl-source \
 	 openssl-configure openssl-build openssl-install openssl-clean \
 	 openssl-download-clean
 
+ifeq ($(OPENSSL_VERSION),1.1.1g)
+OPENSSL_ARCH	=
 OPENSSL_LIBS	= \
 	engines-1.1 \
 	libcrypto.so libcrypto.so.1.1 \
 	libssl.so libssl.so.1.1
+else ifeq ($(OPENSSL_VERSION),3.4.0)
+ifeq ($(ARCH),arm64)
+OPENSSL_ARCH	= linux-aarch64
+else
+OPENSSL_ARCH	= linux-$(ARCH)
+endif
+
+OPENSSL_LIBS	= \
+	engines \
+	libcrypto.so libcrypto.so.3 \
+	libssl.so libssl.so.3
+else
+  $(error OPENSSL_LIBS: Unsupported OpenSSL version: $(OPENSSL_VERSION))
+endif
 
 OPENSSL_BINS	= openssl
 
@@ -63,7 +79,9 @@ $(OPENSSL_CONFIGURE_STAMP): $(OPENSSL_SOURCE_STAMP) $(ZLIB_BUILD_STAMP) \
 	$(Q) rm -f $@ && eval $(PROFILE_STAMP)
 	$(Q) echo "====  Configure openssl-$(OPENSSL_VERSION) ===="
 	$(Q) cd $(OPENSSL_DIR) && PATH='$(CROSSBIN):$(PATH)'	\
+		MACHINE=$(TARGET) RELEASE=$(LINUX_RELEASE)	\
 		$(OPENSSL_DIR)/config				\
+		$(OPENSSL_ARCH)					\
 		--prefix=/usr					\
 		--cross-compile-prefix=$(CROSSPREFIX)		\
 		shared						\
diff --git a/upstream/openssl-3.4.0.tar.gz.sha1 b/upstream/openssl-3.4.0.tar.gz.sha1
new file mode 100644
index 000000000..f1559a293
--- /dev/null
+++ b/upstream/openssl-3.4.0.tar.gz.sha1
@@ -0,0 +1 @@
+5c2f33c3f3601676f225109231142cdc30d44127  openssl-3.4.0.tar.gz