[openssl] Update to 3.1.3, disable asm on arm32 neon (#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 a451e6e0be.

* Trace

* Revert "Trace"

This reverts commit 91e6428688.

* [openssl] Disable asm also on arm32 neon

* Revert "WIP"

This reverts commit b7c3a6d961.

---------

Co-authored-by: Carsten Grimm <carsten.grimm@ipolog.ai>

ports/openssl/arm64-asm.patch

@@ -1,16 +0,0 @@
-diff --git a/crypto/sm4/asm/vpsm4-armv8.pl b/crypto/sm4/asm/vpsm4-armv8.pl
-index edb6b04c9a..a945056ab9 100755
---- a/crypto/sm4/asm/vpsm4-armv8.pl
-+++ b/crypto/sm4/asm/vpsm4-armv8.pl
-@@ -470,9 +470,9 @@ _vpsm4_consts:
- 	.long 0xA0A7AEB5, 0xBCC3CAD1, 0xD8DFE6ED, 0xF4FB0209
- 	.long 0x10171E25, 0x2C333A41, 0x484F565D, 0x646B7279
- .Lfk:
--	.dword 0x56aa3350a3b1bac6,0xb27022dc677d9197
-+	.quad 0x56aa3350a3b1bac6,0xb27022dc677d9197
- .Lshuffles:
--	.dword 0x0B0A090807060504,0x030201000F0E0D0C
-+	.quad 0x0B0A090807060504,0x030201000F0E0D0C
- 
- .size	_vpsm4_consts,.-_vpsm4_consts
- ___

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

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)

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",

ports/openssl/windows/perlasm-scheme.patch

@@ -1,39 +0,0 @@
-diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
-index e8084ab..263ecd0 100644
---- a/Configurations/10-main.conf
-+++ b/Configurations/10-main.conf
-@@ -9,19 +9,22 @@ sub vc_win64a_info {
-             $vc_win64a_info = { AS        => "nasm",
-                                 ASFLAGS   => "-g",
-                                 asflags   => "-Ox -f win64 -DNEAR",
--                                asoutflag => "-o " };
-+                                asoutflag => "-o ",
-+                                perlasm_scheme => "nasm" };
-         } elsif ($disabled{asm}) {
-             # assembler is still used to compile uplink shim
-             $vc_win64a_info = { AS        => "ml64",
-                                 ASFLAGS   => "/nologo /Zi",
-                                 asflags   => "/c /Cp /Cx",
--                                asoutflag => "/Fo" };
-+                                asoutflag => "/Fo",
-+                                perlasm_scheme => "masm" };
-         } else {
-             $die->("NASM not found - make sure it's installed and available on %PATH%\n");
-             $vc_win64a_info = { AS        => "{unknown}",
-                                 ASFLAGS   => "",
-                                 asflags   => "",
--                                asoutflag => "" };
-+                                asoutflag => "",
-+                                perlasm_scheme => "auto" };
-         }
-     }
-     return $vc_win64a_info;
-@@ -1493,7 +1496,7 @@ my %targets = (
-         sys_id           => "WIN64A",
-         uplink_arch      => 'x86_64',
-         asm_arch         => 'x86_64',
--        perlasm_scheme   => "auto",
-+        perlasm_scheme   => sub { vc_win64a_info()->{perlasm_scheme} },
-         multilib         => "-x64",
-     },
-     "VC-WIN32" => {

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",

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",