diff --git a/ports/openssl/vcpkg.json b/ports/openssl/vcpkg.json index 32ff26c6ca9ad9..d222c35eafbc56 100644 --- a/ports/openssl/vcpkg.json +++ b/ports/openssl/vcpkg.json @@ -1,6 +1,7 @@ { "name": "openssl", "version": "3.6.5", + "port-version": 1, "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/portfile.cmake b/ports/openssl/windows/portfile.cmake index e02db484bd73c2..f89956eede9406 100644 --- a/ports/openssl/windows/portfile.cmake +++ b/ports/openssl/windows/portfile.cmake @@ -24,6 +24,12 @@ elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") else() set(OPENSSL_ARCH VC-WIN64-CLANGASM-ARM) endif() +elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64ec") + # OpenSSL has no ARM64EC target (https://github.com/openssl/openssl/issues/16482). + # The toolchain flags (/arm64EC, /machine:ARM64EC) make this ARM64 target build ARM64EC code. + # OpenSSL's ARM64 assembly uses registers that the ARM64EC ABI reserves, so it must stay disabled. + set(OPENSSL_ARCH VC-WIN64-ARM) + vcpkg_list(APPEND CONFIGURE_OPTIONS no-asm) else() message(FATAL_ERROR "Unsupported target architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() diff --git a/versions/baseline.json b/versions/baseline.json index b7b86604a71640..b95eb3bb870a34 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7586,7 +7586,7 @@ }, "openssl": { "baseline": "3.6.5", - "port-version": 0 + "port-version": 1 }, "opensubdiv": { "baseline": "3.5.0", diff --git a/versions/o-/openssl.json b/versions/o-/openssl.json index 1a5f7536431b45..7d98c20f9d00d3 100644 --- a/versions/o-/openssl.json +++ b/versions/o-/openssl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e4315229b7682bd886132fa1b1d68217db887098", + "version": "3.6.5", + "port-version": 1 + }, { "git-tree": "ab6768c10c3809e9b2b97612fe84566ad1c7f4a7", "version": "3.6.5",