From: Eugene Syromiatnikov <esyr@openssl.org>
Date: Tue, 31 Mar 2026 03:10:42 +0000 (+0200)
Subject: Update Windows CI workflow to supply correct DLLs to checkplatformsyms.pl
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c2948db961a77dd4f46b601b04b82e697d3bbdaa;p=thirdparty%2Fopenssl.git

Update Windows CI workflow to supply correct DLLs to checkplatformsyms.pl

The check was broken in several ways, which was concealed by the fact
that checkplatformsyms.pl returned success in many cases before:
  * Hard-coded file name suffixes (-3-x64) meant that the check
    was not performed on OpenSSL 4.0+ and never for 32-bit builds.
  * dumpbin also wasn't in PATH in some configurations, which also led
    to skipped checks.
Fix that by supplying proper file names based on OpenSSL major version
and ABI, add missing VCVars calls and working dir setups.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>

Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
MergeDate: Fri Apr  3 15:42:23 2026
(Merged from https://github.com/openssl/openssl/pull/30635)
---

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 309ff2bbdaa..8068c56080e 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -67,6 +67,7 @@ jobs:
         apps/openssl.exe version -v | %{($_ -split '\s+')[1]}
         apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'}
         echo "OSSL_VERSION=$(apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+\.[0-9]+)(\..*)','$1'})" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+        echo "OSSL_MAJOR=$(apps/openssl.exe version -v | %{($_ -split '\s+')[1] -replace '([0-9]+)\.[0-9]+(\..*)','$1'})" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
     - name: Set registry keys
       working-directory: _build
       run: |
@@ -83,7 +84,10 @@ jobs:
         ./apps/openssl.exe version -c
     - name: Check platform symbol usage
       working-directory: _build
-      run: perl ../util/checkplatformsyms.pl ../util/platform_symbols/windows-symbols.txt libcrypto-3-x64.dll ./libssl-3-x64.dll
+      shell: cmd
+      run: |
+        call "${{ matrix.platform.vcvars }}"
+        perl ../util/checkplatformsyms.pl ../util/platform_symbols/windows-symbols.txt libcrypto-%OSSL_MAJOR%${{ matrix.platform.arch == 'amd64' && '-x64' || '' }}.dll ./libssl-%OSSL_MAJOR%${{ matrix.platform.arch == 'amd64' && '-x64' : '' }}.dll
     - name: test
       working-directory: _build
       shell: cmd