diff --git a/.github/workflows/c-cpp-Windows.yml b/.github/workflows/c-cpp-Windows.yml index 382dd88..7407cf0 100644 --- a/.github/workflows/c-cpp-Windows.yml +++ b/.github/workflows/c-cpp-Windows.yml @@ -39,5 +39,5 @@ jobs: cd "D:/a/3proxy/3proxy" set "LIB=%LIB%;c:/vcpkg/installed/x64-windows-static/lib;c:/vcpkg/installed/x64-windows/lib" set "INCLUDE=%INCLUDE%;c:/vcpkg/installed/x64-windows-static/include;c:/vcpkg/installed/x64-windows/include" - nmake /F Makefile.msvc WOLFSSL=1 + nmake /F Makefile.msvc WOLFSSL=1 || exit /b 1 nmake /F Makefile.msvc clean diff --git a/Dockerfile.busybox b/Dockerfile.busybox index ca73f97..a2f7c95 100644 --- a/Dockerfile.busybox +++ b/Dockerfile.busybox @@ -29,7 +29,7 @@ RUN TAG=$(curl -s https://api.github.com/repos/wolfSSL/wolfssl/releases/latest \ mkdir /src && tar -xzf /tmp/w.tar.gz -C /src --strip-components=1 && \ cd /src && \ autoreconf -i && \ - ./configure --enable-opensslextra --enable-opensslall --enable-certgen \ + ./configure --enable-opensslextra --enable-certgen \ --enable-tls13 --enable-sni --enable-session-ticket \ --enable-static --disable-shared --prefix=/usr/local && \ make -j$(nproc) && make install diff --git a/Dockerfile.minimal b/Dockerfile.minimal index 2ef052f..241dd82 100644 --- a/Dockerfile.minimal +++ b/Dockerfile.minimal @@ -35,7 +35,7 @@ RUN TAG=$(curl -s https://api.github.com/repos/wolfSSL/wolfssl/releases/latest \ mkdir /src && tar -xzf /tmp/w.tar.gz -C /src --strip-components=1 && \ cd /src && \ autoreconf -i && \ - ./configure --enable-opensslextra --enable-opensslall --enable-certgen \ + ./configure --enable-opensslextra --enable-certgen \ --enable-tls13 --enable-sni --enable-session-ticket \ --enable-static --disable-shared --prefix=/usr/local && \ make -j$(nproc) && make install diff --git a/src/ssl.c b/src/ssl.c index 455e07a..3b2a19f 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -27,6 +27,10 @@ #define WINAPI #endif +#if defined(WITH_WOLFSSL) && !defined(SSL_set_mode) +#define SSL_set_mode(ssl,op) ((void)0) +#endif + #ifndef isnumber #define isnumber(i_n_arg) ((i_n_arg>='0')&&(i_n_arg<='9')) #endif