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 d003680e38175b604fbcf31720731a3992fddb47..453a1bf7fa0401c663e570a77bb6ca9422f3ab99 100644 (file)
--- 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 406ed1bde0f2b5ba126cc3bb2753b82be7c7b4e4..0966dfcdc3aad39e64807be9ce122653313b9be4 100755 (executable)
--- 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"