feat: add support arm64 [windows-libssh] [tun2socks] [xray] [cloak] [openvpn] [windows-openssl]

NickVs2015 · NickVs2015 · commit 5953b180c496 · 2025-12-05T14:23:28.000+03:00
diff --git a/.github/workflows/build_awg_windows.yml b/.github/workflows/build_awg_windows.yml
@@ -27,6 +27,7 @@ jobs:
         mkdir build
         move x64 build\x64
         move x86 build\x86
+        move arm64 build\arm64
 
     - name: 'Archive artifacts'
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build_cloak.yml b/.github/workflows/build_cloak.yml
@@ -46,12 +46,15 @@ jobs:
     - name: 'Build desktop Cloak plugin'
       working-directory: Cloak
       run: |
-        sudo apt-get install gcc-mingw-w64
-        mkdir ./release/plugin
-        mkdir ./release/plugin/linux
+        sudo apt-get update
+        sudo apt-get install -y gcc-mingw-w64 gcc-mingw-w64-x86-64 gcc-mingw-w64-aarch64
+        mkdir -p ./release/plugin
+        mkdir -p ./release/plugin/linux
         CGO_ENABLED=1 GOOS="linux" GOARCH="amd64" go build -v -o ./release/plugin/linux/ck-ovpn-plugin.a -buildmode=c-archive ./cmd/ck-ovpn-plugin/
-        mkdir ./release/plugin/windows
-        CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc  GOOS="windows" GOARCH="amd64" go build -v -o ./release/plugin/windows/ck-ovpn-plugin.dll -buildmode=c-shared ./cmd/ck-ovpn-plugin/
+        mkdir -p ./release/plugin/windows
+        CGO_ENABLED=1 CC=x86_64-w64-mingw32-gcc GOOS="windows" GOARCH="amd64" go build -v -o ./release/plugin/windows/ck-ovpn-plugin.dll -buildmode=c-shared ./cmd/ck-ovpn-plugin/
+        mkdir -p ./release/plugin/windows-arm64
+        CGO_ENABLED=1 CC=aarch64-w64-mingw32-gcc GOOS="windows" GOARCH="arm64" go build -v -o ./release/plugin/windows-arm64/ck-ovpn-plugin.dll -buildmode=c-shared ./cmd/ck-ovpn-plugin/
 
     - name: Archive Linux client binary
       uses: actions/upload-artifact@v4
diff --git a/.github/workflows/build_libssh_windows.yml b/.github/workflows/build_libssh_windows.yml
@@ -21,7 +21,7 @@ jobs:
       contains(github.event.head_commit.message, '[libssh]')    
     strategy:
       matrix:
-        arch: [x86, x86_64]
+        arch: [x86, x86_64, arm64]
         # no-crypto=yes: builds version with all crypto disabled
         # no-crypto=no: builds version with all crypto enabled (where required dependencies are available)
         no_crypto:
@@ -35,13 +35,14 @@ jobs:
       # uses: ilammy/msvc-dev-cmd@d8610e2b41c6d0f0c3b4c46dad8df0fd826c68e1
       uses: ilammy/msvc-dev-cmd@v1.10.0
       with:
-        arch: ${{ matrix.arch }}
+        arch: ${{ matrix.arch == 'arm64' && 'amd64_arm64' || matrix.arch }}
         toolset: ${{ matrix.toolset }}
         #sdk:   # use the latest
         #spectre: # set true to use VC libraries with sepctre mitigations
 
     - uses: ilammy/setup-nasm@v1.2.1
       name: Install NASM
+      if: matrix.arch != 'arm64'
     - uses: shogo82148/actions-setup-perl@v1
       name: Install PERL
       with:
@@ -87,13 +88,20 @@ jobs:
         
       shell: powershell
 
-    - name: Build zlib
+    - name: Build zlib x86/x64
+      if: matrix.arch != 'arm64'
       shell: cmd
       run: |
         cd zlib\${{env.ZLIB_VERSION}}
-        cmake .
         nmake -f win32\Makefile.msc
 
+    - name: Build zlib ARM64
+      if: matrix.arch == 'arm64'
+      shell: cmd
+      run: |
+        cd zlib\${{env.ZLIB_VERSION}}
+        nmake -f win32\Makefile.msc zlib.lib
+
     - name: Build openssl x86
       if: matrix.arch == 'x86'
       shell: powershell
@@ -114,6 +122,14 @@ jobs:
         perl Configure VC-WIN64A no-tests no-shared --with-zlib-include=${{github.workspace}}\zlib\${{env.ZLIB_VERSION}}     
         nmake
 
+    - name: Build openssl ARM64
+      if: matrix.arch == 'arm64'
+      shell: powershell
+      run: |
+        cd openssl\${{env.OPENSSL_VERSION}}
+        perl Configure VC-WIN64-ARM no-tests no-shared no-asm --with-zlib-include=${{github.workspace}}\zlib\${{env.ZLIB_VERSION}}     
+        nmake
+
     - name: Build libssh
       shell: powershell
       run: |
@@ -122,7 +138,7 @@ jobs:
         nmake ssh
 
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2.2.4
+      uses: actions/upload-artifact@v4
       with:
         name: libssh-win-${{ matrix.arch }}
         path: ${{ github.workspace }}\libssh\${{env.LIBSSH_VERSION}}\build
diff --git a/.github/workflows/build_openssl_windows.yml b/.github/workflows/build_openssl_windows.yml
@@ -17,6 +17,7 @@ jobs:
         arch:
           - amd64
           - amd64_x86
+          - amd64_arm64
         shared:
           - shared
           - no-shared
@@ -83,6 +84,29 @@ jobs:
           mkdir build/win64          
           move libcrypto-3-x64.dll build/win64
           move libssl-3-x64.dll build/win64    
+      - name: Build OpenSSL ARM64
+        if: matrix.arch == 'amd64_arm64' && matrix.shared == 'no-shared'
+        run: |
+          cd openssl
+
+          perl Configure no-tests no-shared VC-WIN64-ARM
+          nmake
+          mkdir build
+          mkdir build/arm64
+          move libcrypto.lib build/arm64
+          move libssl.lib build/arm64
+          move include build/include
+      - name: Build Shared OpenSSL ARM64
+        if: matrix.arch == 'amd64_arm64' && matrix.shared == 'shared'
+        run: |
+          cd openssl
+
+          perl Configure no-tests VC-WIN64-ARM
+          nmake
+          mkdir build
+          mkdir build/arm64
+          move libcrypto-3-arm64.dll build/arm64
+          move libssl-3-arm64.dll build/arm64    
       - name: Archive Windows OpenSSL libs
         uses: actions/upload-artifact@v4
         with:
diff --git a/.github/workflows/build_openvpn_windows.yml b/.github/workflows/build_openvpn_windows.yml
@@ -31,10 +31,10 @@ jobs:
         contains(github.event.head_commit.message, '[openvpn]')
       
       steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       
       - name: 'Get openvpn'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: OpenVPN/openvpn
           ref: release/2.5
@@ -70,7 +70,7 @@ jobs:
           msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} /p:Platform="${{ matrix.plat }}" .
 
       - name: Archive artifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: openvpn-win-${{ matrix.plat }}
           path: |
@@ -82,7 +82,12 @@ jobs:
   openvpn3-msvc:
     strategy:
       matrix:
-        arch: [amd64]
+        arch: [amd64, amd64_arm64]
+        include:
+          - arch: amd64
+            platform: x64
+          - arch: amd64_arm64
+            platform: ARM64
 
     env:
       VCPKG_ROOT: ${{ github.workspace }}/openvpn3/vcpkg
@@ -96,7 +101,7 @@ jobs:
       contains(github.event.head_commit.message, '[windows-openvpn]') ||
       contains(github.event.head_commit.message, '[openvpn]')
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       
       - uses: lukka/get-cmake@latest
       - uses: ilammy/msvc-dev-cmd@v1
@@ -105,7 +110,7 @@ jobs:
           arch: ${{ matrix.arch }}
 
       - name: 'Get openvpn3'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: amnezia-vpn/openvpn3
           ref: win-amezia
@@ -116,12 +121,12 @@ jobs:
         run: |
           git clone https://github.com/Microsoft/vcpkg.git
           ./vcpkg/bootstrap-vcpkg.bat
-          cmake -B build -S . -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/openvpn3/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="${{ github.workspace }}/openvpn3/deps/vcpkg-ports"
+          cmake -B build -S . -A ${{ matrix.platform }} -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}/openvpn3/vcpkg/scripts/buildsystems/vcpkg.cmake" -DVCPKG_OVERLAY_PORTS="${{ github.workspace }}/openvpn3/deps/vcpkg-ports"
           cmake --build build --config Release --target ovpncli    
           
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
-          name: openvpn3-win
+          name: openvpn3-win-${{ matrix.platform }}
           path: |
               ${{ env.buildDir }}/**/*.exe
               ${{ env.buildDir }}/**/*.dll
@@ -138,10 +143,10 @@ jobs:
 
     steps:
       - name: Setup | Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup | Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
 
       - name: Setup | Checksums
         run: for file in $(find ./ -name '*.exe' -or -name '*.dll' ); do openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"; done
@@ -184,10 +189,10 @@ jobs:
 
     steps:
       - name: Setup | Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup | Artifacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4
 
       - name: Setup | Checksums
         run: for file in $(find ./ -name '*.exe' -or -name '*.dll' ); do openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"; done
@@ -199,7 +204,7 @@ jobs:
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: openvpn3-win.zip
+          file: openvpn3-win-*.zip
           tag: ${{ github.ref }}
           overwrite: true
           file_glob: true                     
diff --git a/.github/workflows/build_tun2socks.yml b/.github/workflows/build_tun2socks.yml
@@ -6,7 +6,34 @@ jobs:
   Build-Tun2Socks:
     permissions:
       contents: write
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - os: ubuntu-latest
+            goarch: amd64
+            goos: linux
+            name: linux-amd64
+          - os: ubuntu-latest
+            goarch: arm64
+            goos: linux
+            name: linux-arm64
+          - os: ubuntu-latest
+            goarch: amd64
+            goos: windows
+            name: windows-amd64
+          - os: ubuntu-latest
+            goarch: arm64
+            goos: windows
+            name: windows-arm64
+          - os: ubuntu-latest
+            goarch: amd64
+            goos: darwin
+            name: macos-amd64
+          - os: ubuntu-latest
+            goarch: arm64
+            goos: darwin
+            name: macos-arm64
+    runs-on: ${{ matrix.os }}
     if: |
       contains(github.event.head_commit.message, '[all]') ||
       contains(github.event.head_commit.message, '[windows]') ||
@@ -37,43 +64,40 @@ jobs:
           cd tun2socks
           go mod download
       
-      - name: Build Tun2Socks
+      - name: Build Tun2Socks for ${{ matrix.name }}
+        env:
+          GOOS: ${{ matrix.goos }}
+          GOARCH: ${{ matrix.goarch }}
+          CGO_ENABLED: 0
         run: |
           cd tun2socks
-          make -j releases
-          cd build
-          unzip \*.zip
-          rm *.zip
-
-      - name: Upload files to Artifacts
-        uses: actions/upload-artifact@v4
-        with:
-          name: tun2socks
-          path: tun2socks/build
+          mkdir -p build
+          if [ "${{ matrix.goos }}" = "windows" ]; then
+            go build -v -trimpath -ldflags "-s -w -buildid=" -o build/tun2socks-${{ matrix.goos }}-${{ matrix.goarch }}.exe
+          else
+            go build -v -trimpath -ldflags "-s -w -buildid=" -o build/tun2socks-${{ matrix.goos }}-${{ matrix.goarch }}
+          fi
 
       - name: Setup | Checksums
-        run: for file in $(find ./tun2socks/build -name '*' ); do openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"; done
-
-      - name: Create ZIP archive 
-        shell: bash
         run: |
-          cd tun2socks
-          pushd build || exit 1
-          touch -mt $(date +%Y01010000) *
-          zip -9vr ../tun2socks.zip .
-          popd || exit 1
-          FILE=./tun2socks.zip
-          DGST=$FILE.dgst
-          for METHOD in {"md5","sha1","sha256","sha512"}
-          do
-            openssl dgst -$METHOD $FILE | sed 's/([^)]*)//g' >>$DGST
+          cd tun2socks/build
+          for file in tun2socks-*; do 
+            openssl dgst -sha256 -r "$file" | awk '{print $1}' > "${file}.sha256"
           done
 
+      - name: Upload files to Artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: tun2socks-${{ matrix.name }}
+          path: |
+            tun2socks/build/tun2socks-*
+            tun2socks/build/*.sha256
+
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: tun2socks/tun2socks.zip*
+          file: tun2socks/build/tun2socks-*
           tag: ${{ github.ref }}
           file_glob: true
diff --git a/.github/workflows/build_xray.yml b/.github/workflows/build_xray.yml
@@ -86,9 +86,11 @@ jobs:
           - goos: android
             goarch: arm64
           # END Android ARM 8
+          # BEGIN Windows ARM64
+          - goos: windows
+            goarch: arm64
+          # END Windows ARM64
           # Windows ARM
-          #- goos: windows
-          #  goarch: arm64
           # - goos: windows
           #  goarch: arm
           #  goarm: 7
