romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 06:03:32 +03:00
Code Issues Projects Releases Packages Wiki Activity

projects: Fix Visual Studio wolfSSL configurations

Browse source 
- Change build-wolfssl.bat to disable SSLv3, enable TLSv1.3, enable
  wolfSSL_DES_ecb_encrypt (needed by NTLM) and enable alt cert chains.

- Disable warning C4214 'bit field types other than int'.

- Add include directory wolfssl\wolfssl.

wolfSSL offers OpenSSL API compatibility that libcurl uses, and some
recent change in libcurl included an include file for wolfSSL like
openssl/foo.h, which has a path like wolfssl\wolfssl\openssl\foo.h.

The include directory issue was reported in #8292 but it's currently
unclear whether this type of change is needed for other build systems.

Bug: https://github.com/curl/curl/issues/8292
Reported-by: Harry Sarson

Closes https://github.com/curl/curl/pull/8298
This commit is contained in:
Jay Satiro 2022-01-19 03:40:46 -05:00
parent d03cb7c14a
commit f74b6d8551
7 changed files with 195 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

20
projects/build-wolfssl.bat
View file

@ -31,9 +31,7 @@ rem ***************************************************************************
set SUCCESSFUL_BUILDS=
set VC_VER=
set BUILD_PLATFORM=
rem Ensure we have the required arguments
if /i "%~1" == "" goto syntax
set DEFAULT_START_DIR=..\..\wolfssl
rem Calculate the program files directory
if defined PROGRAMFILES (
@ -45,6 +43,9 @@ rem ***************************************************************************
set OS_PLATFORM=x64
)
rem Ensure we have the required arguments
if /i "%~1" == "" goto syntax
:parseArgs
if "%~1" == "" goto prerequisites
@ -125,7 +126,7 @@ rem ***************************************************************************
if not defined VC_VER goto syntax
rem Default the start directory if one isn't specified
if not defined START_DIR set START_DIR=..\..\wolfssl
if not defined START_DIR set "START_DIR=%DEFAULT_START_DIR%"
rem Check we have a program files directory
if not defined PF goto nopf
@ -318,6 +319,7 @@ rem ***************************************************************************
echo.
echo Usage: build-wolfssl ^<compiler^> [platform] [configuration] [directory]
echo.
echo.
echo Compiler:
echo.
echo vc10 - Use Visual Studio 2010
@ -327,19 +329,29 @@ rem ***************************************************************************
echo vc14.1 - Use Visual Studio 2017
echo vc14.2 - Use Visual Studio 2019
echo.
echo.
echo Platform:
echo.
echo x86 - Perform a 32-bit build
echo x64 - Perform a 64-bit build
echo.
echo If this parameter is unset the OS platform is used ^(%OS_PLATFORM%^).
echo.
echo.
echo Configuration:
echo.
echo debug - Perform a debug build
echo release - Perform a release build
echo.
echo If this parameter is unset both configurations are built.
echo.
echo.
echo Other:
echo.
echo directory - Specifies the wolfSSL source directory
echo.
echo If this parameter is unset the directory used is "%DEFAULT_START_DIR%".
echo.
goto error
:unknown