From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 26 Jan 2021 09:25:03 +0000 (+0100)
Subject: appveyor: Also build against newer OpenSSL versions
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5f4b996bfeb3546e3a3bbdb79be00111a801275;p=people%2Fms%2Fstrongswan.git

appveyor: Also build against newer OpenSSL versions

The original version is 1.0.2, which we keep as that version is not in
use on other platforms anymore.
---

diff --git a/.appveyor.yml b/.appveyor.yml
index d003680e3..453a1bf7f 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -22,6 +22,12 @@ install:
   - set MSYS_SH=C:\msys%BITS%\usr\bin\sh.exe
   - set MSYSTEM=MINGW%BITS%
   - set TEST=win%BITS%
+  - |
+      set IMG=%APPVEYOR_BUILD_WORKER_IMAGE:~-4%
+      set OPENSSL=OpenSSL
+      IF "%IMG%" == "2017" set OPENSSL=OpenSSL-v11
+      IF "%IMG%" == "2019" set OPENSSL=OpenSSL-v111
+      set OPENSSL_DIR=/c/%OPENSSL%-%TEST%
 
 build_script:
   - '%MSYS_SH% --login -c ". /etc/profile && cd $APPVEYOR_BUILD_FOLDER && ./scripts/test.sh deps"'
diff --git a/scripts/test.sh b/scripts/test.sh
index 406ed1bde..0966dfcdc 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -184,8 +184,8 @@ win*)
 		TARGET=
 	else
 		CONFIG="$CONFIG --enable-openssl"
-		CFLAGS="$CFLAGS -I/c/OpenSSL-$TEST/include"
-		LDFLAGS="-L/c/OpenSSL-$TEST"
+		CFLAGS="$CFLAGS -I$OPENSSL_DIR/include"
+		LDFLAGS="-L$OPENSSL_DIR"
 		export LDFLAGS
 	fi
 	CFLAGS="$CFLAGS -mno-ms-bitfields"