[tools/depends][target] Bump openssl 3.0.13

4 files changed, 38 insertions, 23 deletions

diff --git a/tools/depends/target/openssl/001-android-getauxvalrevert.patch b/tools/depends/target/openssl/001-android-getauxvalrevert.patch
index 810a8e80bb..1e75c57374 100644
--- a/tools/depends/target/openssl/001-android-getauxvalrevert.patch
+++ b/tools/depends/target/openssl/001-android-getauxvalrevert.patch
@@ -1,6 +1,6 @@
 --- a/crypto/armcap.c
 +++ b/crypto/armcap.c
-@@ -68,12 +68,6 @@
+@@ -74,12 +74,6 @@
  #   include <sys/auxv.h>
  #   define OSSL_IMPLEMENT_GETAUXVAL
  #  endif
@@ -13,7 +13,7 @@
  # endif
  # if defined(__FreeBSD__)
  #  include <sys/param.h>
-@@ -94,15 +88,6 @@
+@@ -100,15 +94,6 @@
  # endif
  
  /*
@@ -31,7 +31,7 @@
   */
 --- a/crypto/ppccap.c
 +++ b/crypto/ppccap.c
-@@ -211,12 +211,6 @@
+@@ -89,12 +89,6 @@
  # if __GLIBC_PREREQ(2, 16)
  #  include <sys/auxv.h>
  #  define OSSL_IMPLEMENT_GETAUXVAL
diff --git a/tools/depends/target/openssl/16-kodi.conf b/tools/depends/target/openssl/16-kodi.conf
index eccb609a27..1855ed462c 100644
--- a/tools/depends/target/openssl/16-kodi.conf
+++ b/tools/depends/target/openssl/16-kodi.conf
@@ -5,28 +5,28 @@
 #
 my %targets = (
     "kodi-darwin64-x86_64" => {
-        inherit_from     => [ "darwin-common", asm("x86_64_asm") ],
-        cflags           => add("\$(CFLAGS)"),
+        inherit_from     => [ "darwin-common" ],
+        asm_arch         => 'x86_64',
         lib_cppflags     => add("-DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "macosx",
     },
     "kodi-darwin64-arm64" => {
-        inherit_from     => [ "darwin-common", asm("aarch64_asm") ],
-        cflags           => add("\$(CFLAGS)"),
+        inherit_from     => [ "darwin-common" ],
+        asm_arch         => 'aarch64',
         lib_cppflags     => add("-DL_ENDIAN"),
         bn_ops           => "SIXTY_FOUR_BIT_LONG",
         perlasm_scheme   => "ios64",
     },
     "kodi-iphoneos-arm64" => {
-        inherit_from     => [ "ios-common", asm("aarch64_asm") ],
-        cflags           => add("\$(CFLAGS)"),
+        inherit_from     => [ "ios-common" ],
+        asm_arch         => 'aarch64',
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "ios64",
     },
     "kodi-appletvos-arm64" => {
-        inherit_from     => [ "ios-common", asm("aarch64_asm") ],
-        cflags           => add("\$(CFLAGS)"),
+        inherit_from     => [ "ios-common"],
+        asm_arch         => 'aarch64',
         defines          => [ "HAVE_FORK=0" ],
         bn_ops           => "SIXTY_FOUR_BIT_LONG RC4_CHAR",
         perlasm_scheme   => "ios64",
diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile
index c03177e484..993b11bd2b 100644
--- a/tools/depends/target/openssl/Makefile
+++ b/tools/depends/target/openssl/Makefile
@@ -4,15 +4,27 @@ DEPS = ../../Makefile.include Makefile OPENSSL-VERSION ../../download-files.incl
 
 # configuration settings
 ifeq ($(OS), linux)
-  # Need to export our vars to override "default" conf data of openssl
   TARGETOPT=--with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib
-  CONFIGURE=MACHINE=$(PLATFORM) ./config no-shared zlib no-tests no-asm $(TARGETOPT) --prefix=$(PREFIX) --libdir=lib
+  CONFIGURE=./Configure no-shared zlib no-tests no-asm no-module  $(TARGETOPT) --prefix=$(PREFIX) --libdir=lib
+  ifeq ($(TARGET_PLATFORM),webos)
+    CONFIGURE+= linux-armv4
+  else
+    ifeq ($(CPU),aarch64)
+      CONFIGURE+= linux-aarch64
+    else ifeq ($(CPU),arm)
+      CONFIGURE+= linux-armv4
+    else ifeq ($(CPU),x86_64)
+      CONFIGURE+= linux-x86_64
+    else
+      # Fallback to base generic linux target
+      CONFIGURE+= linux-generic32
+    endif
+  endif
 else
   ifeq ($(OS), android)
-    TARGETOPT=--with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib -D__ANDROID_API__=$(NDK_LEVEL)
-    # openssl 1.x incorrectly uses ANDROID_NDK_HOME, when openssl 3.x.x comes in use ANDROID_NDK_ROOT
-    # see https://github.com/openssl/openssl/pull/11206
-    export ANDROID_NDK_HOME=$(NDKROOT)
+    TARGETOPT=--with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib
+
+    export ANDROID_NDK_ROOT=$(NDKROOT)
     export PATH:=$(TOOLCHAIN)/bin:$(PATH)
     ifeq ($(MESON_CPU), aarch64)
       OPENSSLPLATFORM=android-arm64
@@ -24,18 +36,21 @@ else
     # LLVM 15 has raised this to error by default. drop back to warning
     CFLAGS+= -Wno-error=implicit-int
     export SDKROOT CFLAGS
-    OPENSSLPLATFORM=kodi-$(TARGET_PLATFORM)-$(CPU)
+    OPENSSLPLATFORM=kodi-iphoneos-arm64
+
     ifeq ($(TARGET_PLATFORM),appletvos)
+      OPENSSLPLATFORM=kodi-appletvos-arm64
       # Need to add "no-async" to avoid "'setcontext' is unavailable: not available on tvOS" error
-      TARGETOPT=no-async
+      TARGETOPT+= no-async
     endif
   endif
   ifeq ($(OS), osx)
     OPENSSLPLATFORM=kodi-darwin64-$(CPU)
-    ASMFLAG=no-asm
   endif
 
-  CONFIGURE=./Configure $(OPENSSLPLATFORM) no-shared $(ASMFLAG) zlib no-tests $(TARGETOPT) --prefix=$(PREFIX)
+  # Openssl 3.2.0 allows no-apps no-docs as options. Use when we update further
+  # We explicitly use no-asm as there is a symbol clash with gnutls
+  CONFIGURE=./Configure no-shared zlib no-tests no-asm no-module  $(TARGETOPT) --prefix=$(PREFIX) $(OPENSSLPLATFORM)
 endif
 
 export CC CXX AR RANLIB
diff --git a/tools/depends/target/openssl/OPENSSL-VERSION b/tools/depends/target/openssl/OPENSSL-VERSION
index 1712a0c3da..424c6d4036 100644
--- a/tools/depends/target/openssl/OPENSSL-VERSION
+++ b/tools/depends/target/openssl/OPENSSL-VERSION
@@ -1,4 +1,4 @@
 LIBNAME=openssl
-VERSION=1.1.1w
+VERSION=3.0.13
 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-SHA512=b4c625fe56a4e690b57b6a011a225ad0cb3af54bd8fb67af77b5eceac55cc7191291d96a660c5b568a08a2fbf62b4612818e7cca1bb95b2b6b4fc649b0552b6d
+SHA512=22f4096781f0b075f5bf81bd39a0f97e111760dfa73b6f858f6bb54968a7847944d74969ae10f9a51cc21a2f4af20d9a4c463649dc824f5e439e196d6764c4f9