[openssl] Update to 3.1.3, disable asm on arm32 neon (microsoft#33890)

* [openssl] update version to 3.1.3 * [openssl] removed patches that are already applied in version 3.1.3 for windows * [openssl] format vcpkg.json * [openssl] update version information * Revert armcap changes (WIP) * WIP * Revert "Revert armcap changes (WIP)" This reverts commit a451e6e. * Trace * Revert "Trace" This reverts commit 91e6428. * [openssl] Disable asm also on arm32 neon * Revert "WIP" This reverts commit b7c3a6d. --------- Co-authored-by: Carsten Grimm <[email protected]>
Cheney-W · Sep 24, 2023 · 5a38b5e · 5a38b5e
1 parent 930bd39
commit 5a38b5e
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 63 deletions.
diff --git a/ports/openssl/arm64-asm.patch b/ports/openssl/arm64-asm.patch
diff --git a/ports/openssl/portfile.cmake b/ports/openssl/portfile.cmake
@@ -19,15 +19,13 @@ vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO openssl/openssl
     REF "openssl-${VERSION}"
-    SHA512 c48ad86265b0fee18b23863b645a286d131a863a3418c7d2ed6c819eebb822ad0f2985ba3ecbf4def32515442f0eb40aba08f3146d113247e86ec80fbddca1c1
+    SHA512 248353b000ef6b9a3434bf808b147eb4672c82f36968b2995c159373680f80208183bb70c02effa36ae4a1705fe5a5e315960075e8899352c4e84069d6c651c2
     PATCHES
-        arm64-asm.patch
         disable-apps.patch
         disable-install-docs.patch
         script-prefix.patch
         windows/install-layout.patch
         windows/install-pdbs.patch
-        windows/perlasm-scheme.patch
         unix/android-cc.patch
         unix/move-openssldir.patch
         unix/no-empty-dirs.patch

diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake
@@ -45,7 +45,8 @@ vcpkg_list(SET MAKEFILE_OPTIONS)
 if(VCPKG_TARGET_IS_ANDROID)
     set(ENV{ANDROID_NDK_ROOT} "${VCPKG_DETECTED_CMAKE_ANDROID_NDK}")
     set(OPENSSL_ARCH "android-${VCPKG_DETECTED_CMAKE_ANDROID_ARCH}")
-    if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON)
+    # asm on arm32 NEON is broken, https://github.com/openssl/openssl/pull/21583#issuecomment-1727057735
+    if(VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" #[[AND NOT VCPKG_DETECTED_CMAKE_ANDROID_ARM_NEON]])
         vcpkg_list(APPEND CONFIGURE_OPTIONS no-asm)
     endif()
 elseif(VCPKG_TARGET_IS_LINUX)

diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "openssl",
-  "version": "3.1.2",
-  "port-version": 3,
+  "version": "3.1.3",
   "description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
   "homepage": "https://www.openssl.org",
   "license": "Apache-2.0",

diff --git a/ports/openssl/windows/perlasm-scheme.patch b/ports/openssl/windows/perlasm-scheme.patch
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -6161,8 +6161,8 @@
       "port-version": 3
     },
     "openssl": {
-      "baseline": "3.1.2",
-      "port-version": 3
+      "baseline": "3.1.3",
+      "port-version": 0
     },
     "openssl-unix": {
       "baseline": "deprecated",

diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e57c0f392fd8486892a91ca82b7bf2e34c59e374",
+      "version": "3.1.3",
+      "port-version": 0
+    },
     {
       "git-tree": "11cbc05950decb26474353fb9c0bfed3be3008c4",
       "version": "3.1.2",