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

3 files changed, 28 insertions, 28 deletions

diff --git a/winbuild/BUILD.WINDOWS.txt b/winbuild/BUILD.WINDOWS.txt
index 0e88e6449..5b63bdcd7 100644
--- a/winbuild/BUILD.WINDOWS.txt
+++ b/winbuild/BUILD.WINDOWS.txt
@@ -91,7 +91,7 @@ where <options> is one or many of:
   ENABLE_IPV6=<yes or no>        - Enable IPv6, defaults to yes

   ENABLE_IDN=<yes or no>         - Enable use of Windows IDN APIs, defaults to yes

                                    Requires Windows Vista or later

-  ENABLE_WINSSL=<yes or no>      - Enable native Windows SSL support, defaults to yes

+  ENABLE_SCHANNEL=<yes or no>      - Enable native Windows SSL support, defaults to yes

   GEN_PDB=<yes or no>            - Generate Program Database (debug symbols for release build)

   DEBUG=<yes or no>              - Debug builds

   MACHINE=<x86 or x64>           - Target architecture (default is x86)

@@ -123,8 +123,8 @@ import symbols.
 Legacy Windows and SSL

 ======================

 When you build curl using the build files in this directory the default SSL

-backend will be WinSSL (Windows SSPI, more specifically Schannel), the native

-SSL library that comes with the Windows OS. WinSSL in Windows <= XP is not able

-to connect to servers that no longer support the legacy handshakes and

-algorithms used by those versions. If you will be using curl in one of those

-earlier versions of Windows you should choose another SSL backend like OpenSSL.

+backend will be Schannel (Windows SSPI), the native SSL library that comes

+with the Windows OS. Schannel in Windows <= XP is not able to connect to

+servers that no longer support the legacy handshakes and algorithms used by

+those versions. If you will be using curl in one of those earlier versions of

+Windows you should choose another SSL backend like OpenSSL.

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 7ad49f09f..54cbf0c2a 100644
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1999 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1999 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -56,7 +56,7 @@ CFGSET=true
 !MESSAGE                                    Requires Windows Vista or later
 !MESSAGE   ENABLE_IPV6=<yes or no>        - Enable IPv6, defaults to yes
 !MESSAGE   ENABLE_SSPI=<yes or no>        - Enable SSPI support, defaults to yes
-!MESSAGE   ENABLE_WINSSL=<yes or no>      - Enable native Windows SSL support, defaults to yes
+!MESSAGE   ENABLE_SCHANNEL=<yes or no>      - Enable native Windows SSL support, defaults to yes
 !MESSAGE   ENABLE_OPENSSL_AUTO_LOAD_CONFIG=<yes or no>
 !MESSAGE                                  - Whether the OpenSSL configuration will be loaded automatically, defaults to yes
 !MESSAGE   ENABLE_UNICODE=<yes or no>     - Enable UNICODE support, defaults to no
@@ -125,16 +125,16 @@ USE_SSPI = true
 USE_SSPI = false
 !ENDIF
 
-!IFNDEF ENABLE_WINSSL
+!IFNDEF ENABLE_SCHANNEL
 !IF DEFINED(WITH_SSL) || DEFINED(WITH_MBEDTLS)
-USE_WINSSL = false
+USE_SCHANNEL = false
 !ELSE
-USE_WINSSL = $(USE_SSPI)
+USE_SCHANNEL = $(USE_SSPI)
 !ENDIF
-!ELSEIF "$(ENABLE_WINSSL)"=="yes"
-USE_WINSSL = true
-!ELSEIF "$(ENABLE_WINSSL)"=="no"
-USE_WINSSL = false
+!ELSEIF "$(ENABLE_SCHANNEL)"=="yes"
+USE_SCHANNEL = true
+!ELSEIF "$(ENABLE_SCHANNEL)"=="no"
+USE_SCHANNEL = false
 !ENDIF
 
 !IFNDEF ENABLE_OPENSSL_AUTO_LOAD_CONFIG
@@ -253,8 +253,8 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6
 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi
 !ENDIF
 
-!IF "$(USE_WINSSL)"=="true"
-CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl
+!IF "$(USE_SCHANNEL)"=="true"
+CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-schannel
 !ENDIF
 
 !IF "$(USE_NGHTTP2)"=="true"
@@ -285,7 +285,7 @@ $(MODE):
 	@SET USE_IDN=$(USE_IDN)
 	@SET USE_IPV6=$(USE_IPV6)
 	@SET USE_SSPI=$(USE_SSPI)
-	@SET USE_WINSSL=$(USE_WINSSL)
+	@SET USE_SCHANNEL=$(USE_SCHANNEL)
 	@SET USE_UNICODE=$(USE_UNICODE)
 # compatibility bit
 	@SET WITH_NGHTTP2=$(WITH_NGHTTP2)
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)