TLS naming: fix more Winssl and Darwinssl leftovers

The CMake option is now called CMAKE_USE_SCHANNEL

The winbuild flag is USE_SCHANNEL

The CI jobs and build scripts only use the new names and the new name
options

Tests now require 'Schannel' (when necessary)

Closes #5795

1 files changed, 10 insertions, 10 deletions

diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc
index 568fb11b6..eefc091a2 100644
--- a/winbuild/MakefileBuild.vc
+++ b/winbuild/MakefileBuild.vc
@@ -333,20 +333,20 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI
 !ENDIF

 

 

-!IFNDEF USE_WINSSL

+!IFNDEF USE_SCHANNEL

 !IF "$(USE_SSL)"=="true"

-USE_WINSSL  = false

+USE_SCHANNEL  = false

 !ELSE

-USE_WINSSL  = $(USE_SSPI)

+USE_SCHANNEL  = $(USE_SSPI)

 !ENDIF

-!ELSEIF "$(USE_WINSSL)"=="yes"

-USE_WINSSL  = true

+!ELSEIF "$(USE_SCHANNEL)"=="yes"

+USE_SCHANNEL  = true

 !ENDIF

 

 

-!IF "$(USE_WINSSL)"=="true"

+!IF "$(USE_SCHANNEL)"=="true"

 !IF "$(USE_SSPI)"!="true"

-!ERROR cannot build with WinSSL without SSPI

+!ERROR cannot build with Schannel without SSPI

 !ENDIF

 SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_SCHANNEL

 WIN_LIBS    = $(WIN_LIBS) Crypt32.lib

@@ -482,9 +482,9 @@ CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)"
 LFLAGS = $(LFLAGS) $(LFLAGS_PDB)

 !ENDIF

 

-!IF ( "$(USE_SSL)"=="true" && "$(USE_WINSSL)"=="true" ) \

+!IF ( "$(USE_SSL)"=="true" && "$(USE_SCHANNEL)"=="true" ) \

  || ( "$(USE_SSL)"=="true" && "$(USE_MBEDTLS)"=="true" ) \

- || ( "$(USE_MBEDTLS)"=="true" && "$(USE_WINSSL)"=="true" )

+ || ( "$(USE_MBEDTLS)"=="true" && "$(USE_SCHANNEL)"=="true" )

 CFLAGS = $(CFLAGS) /DCURL_WITH_MULTI_SSL

 !ENDIF

 

@@ -536,7 +536,7 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DIRDIST)
 	@echo Using IDN:  $(USE_IDN)

 	@echo Using IPv6: $(USE_IPV6)

 	@echo Using SSPI: $(USE_SSPI)

-	@echo Using WinSSL: $(USE_WINSSL)

+	@echo Using Schannel: $(USE_SCHANNEL)

 	@echo CFLAGS:     $(CFLAGS)

 	@echo LFLAGS:     $(LFLAGS)

 	@echo GenPDB:     $(GEN_PDB)