From 39c703eb010d36a76fc910fa89ebc0abf72b0120 Mon Sep 17 00:00:00 2001
From: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Date: Wed, 30 Aug 2023 12:56:38 -0700
Subject: [PATCH] [openssl] Fix compile error on arm64-android (#33421)

* [openssl] Fix compile error on arm64-android

* update version

---------

Co-authored-by: Zhao Liu <v-zhli17@microsoft.com>
---
 ports/openssl/unix/portfile.cmake | 2 +-
 ports/openssl/vcpkg.json          | 2 +-
 versions/baseline.json            | 2 +-
 versions/o-/openssl.json          | 5 +++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ports/openssl/unix/portfile.cmake b/ports/openssl/unix/portfile.cmake
index 9eff266edf..fe28d49576 100644
--- a/ports/openssl/unix/portfile.cmake
+++ b/ports/openssl/unix/portfile.cmake
@@ -45,7 +45,7 @@ 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)
+    if((VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm" OR VCPKG_DETECTED_CMAKE_ANDROID_ARCH STREQUAL "arm64") 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
index d8c8b824ca..1b761fb0fc 100644
--- a/ports/openssl/vcpkg.json
+++ b/ports/openssl/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openssl",
   "version": "3.1.2",
-  "port-version": 1,
+  "port-version": 2,
   "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/versions/baseline.json b/versions/baseline.json
index 87367446f5..bb7da5848b 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6094,7 +6094,7 @@
     },
     "openssl": {
       "baseline": "3.1.2",
-      "port-version": 1
+      "port-version": 2
     },
     "openssl-unix": {
       "baseline": "deprecated",
diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json
index acd5127c74..4b25465865 100644
--- a/versions/o-/openssl.json
+++ b/versions/o-/openssl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4e8e2c30ede50b2df35ecf5a0ee574076cfbe06f",
+      "version": "3.1.2",
+      "port-version": 2
+    },
     {
       "git-tree": "5a99562f8ac47a68a58efba5f0d40259fedeecc5",
       "version": "3.1.2",