diff --git a/.github/workflows/windows-arm64-tls.yml b/.github/workflows/windows-arm64-tls.yml new file mode 100644 index 000000000..aca97ce6b --- /dev/null +++ b/.github/workflows/windows-arm64-tls.yml @@ -0,0 +1,51 @@ +name: Windows ARM64 TLS + +on: + pull_request: + branches: [release] + +permissions: + contents: read + +jobs: + build: + runs-on: windows-11-vs2026-arm + timeout-minutes: 20 + + steps: + - uses: actions/checkout@v7 + with: + submodules: recursive + - name: Install stable Rust + run: rustup toolchain install stable --profile minimal --target aarch64-pc-windows-msvc + - name: Compile BoringSSL with the fork TLS extensions + shell: pwsh + run: | + $vswhere = Join-Path ([Environment]::GetFolderPath('ProgramFilesX86')) 'Microsoft Visual Studio\Installer\vswhere.exe' + $install = & $vswhere -latest -products '*' -requires Microsoft.VisualStudio.Component.VC.Tools.ARM64 -property installationPath + if (!$install) { throw 'Visual Studio ARM64 build tools were not found' } + & (Join-Path $install 'Common7\Tools\Launch-VsDevShell.ps1') -Arch arm64 -HostArch arm64 -SkipAutomaticLocation + + $clang = Get-Command clang-cl.exe -CommandType Application | Select-Object -First 1 -ExpandProperty Source + & $clang --version + Write-Host "MSVC tools $env:VCToolsVersion" + $env:LIBCLANG_PATH = Split-Path $clang + $env:CC_aarch64_pc_windows_msvc = $clang + $env:CXX_aarch64_pc_windows_msvc = $clang + $env:CMAKE_GENERATOR_aarch64_pc_windows_msvc = 'Ninja' + $env:CMAKE_TOOLCHAIN_FILE_aarch64_pc_windows_msvc = Join-Path $env:RUNNER_TEMP 'boring-arm64.cmake' + @' + set(CMAKE_SYSTEM_NAME Windows) + set(CMAKE_SYSTEM_PROCESSOR ARM64) + set(CMAKE_C_COMPILER "$ENV{CC_aarch64_pc_windows_msvc}") + set(CMAKE_CXX_COMPILER "$ENV{CXX_aarch64_pc_windows_msvc}") + set(CMAKE_ASM_COMPILER "$ENV{CC_aarch64_pc_windows_msvc}") + set(CMAKE_C_COMPILER_TARGET aarch64-pc-windows-msvc) + set(CMAKE_CXX_COMPILER_TARGET aarch64-pc-windows-msvc) + set(CMAKE_ASM_COMPILER_TARGET aarch64-pc-windows-msvc) + set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreadedDLL) + '@ | Set-Content -Encoding utf8 $env:CMAKE_TOOLCHAIN_FILE_aarch64_pc_windows_msvc + $env:RUSTFLAGS = '-C target-feature=-crt-static' + + if (!(Test-Path Cargo.lock)) { cargo +stable generate-lockfile } + cargo +stable check --locked --release -p boring-sys --target aarch64-pc-windows-msvc --no-default-features --features client-fingerprint,jls diff --git a/boring-sys/patches/reality-client.patch b/boring-sys/patches/reality-client.patch index f13544d48..5e7bc83b4 100644 --- a/boring-sys/patches/reality-client.patch +++ b/boring-sys/patches/reality-client.patch @@ -224,7 +224,7 @@ diff --git a/ssl/ssl_lib.cc b/ssl/ssl_lib.cc + ssl_impl->config->supported_group_list_flags = std::move(flags); + ssl_impl->config->client_key_share_selections.emplace(); + ssl_impl->config->client_key_share_selections->CopyFrom(shares); -+ ssl_impl->config->reality_client.emplace(); ++ ssl_impl->config->reality_client.emplace(SSL_CONFIG::RealityClient{}); + auto &reality = *ssl_impl->config->reality_client; + reality.allow_x25519mlkem768 = allow_hybrid; + reality.require_x25519mlkem768 = require_hybrid;