Unverified Commit 180501cb authored Jan 29, 2019 by Daniel Stenberg

schannel: stop calling it "winssl"

Stick to "Schannel" everywhere. The configure option --with-winssl is
kept to allow existing builds to work but --with-schannel is added as an
alias.

Closes #3504

parent 6f61933a

configure.ac

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1480,6 +1480,11 @@ AC_HELP_STRING([--with-winssl],[enable Windows native SSL/TLS])
	AC_HELP_STRING([--without-winssl], [disable Windows native SSL/TLS]),		AC_HELP_STRING([--without-winssl], [disable Windows native SSL/TLS]),
	OPT_WINSSL=$withval)		OPT_WINSSL=$withval)

			AC_ARG_WITH(schannel,dnl
			AC_HELP_STRING([--with-schannel],[enable Windows native SSL/TLS])
			AC_HELP_STRING([--without-schannel], [disable Windows native SSL/TLS]),
			OPT_WINSSL=$withval)

	AC_MSG_CHECKING([whether to enable Windows native SSL/TLS (Windows native builds only)])		AC_MSG_CHECKING([whether to enable Windows native SSL/TLS (Windows native builds only)])
	if test -z "$ssl_backends" -o "x$OPT_WINSSL" != xno; then		if test -z "$ssl_backends" -o "x$OPT_WINSSL" != xno; then
	ssl_msg=		ssl_msg=

docs/cmdline-opts/cacert.d

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -25,9 +25,9 @@ should not be set. If the option is not set, then curl will use the
	certificates in the system and user Keychain to verify the peer, which is the		certificates in the system and user Keychain to verify the peer, which is the
	preferred method of verifying the peer's certificate chain.		preferred method of verifying the peer's certificate chain.

	(Schannel/WinSSL only) This option is supported for WinSSL in Windows 7 or		(Schannel only) This option is supported for Schannel in Windows 7 or later with
	later with libcurl 7.60 or later. This option is supported for backward		libcurl 7.60 or later. This option is supported for backward compatibility
	compatibility with other SSL engines; instead it is recommended to use Windows'		with other SSL engines; instead it is recommended to use Windows' store of
	store of root certificates (the default for WinSSL).		root certificates (the default for Schannel).

	If this option is used several times, the last one will be used.		If this option is used several times, the last one will be used.

docs/cmdline-opts/cert.d

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -36,7 +36,7 @@ system or user keychain, or the path to a PKCS#12-encoded certificate and
	private key. If you want to use a file from the current directory, please		private key. If you want to use a file from the current directory, please
	precede it with "./" prefix, in order to avoid confusion with a nickname.		precede it with "./" prefix, in order to avoid confusion with a nickname.

	(Schannel/WinSSL only) Client certificates must be specified by a path		(Schannel only) Client certificates must be specified by a path
	expression to a certificate store. (Loading PFX is not supported; you can		expression to a certificate store. (Loading PFX is not supported; you can
	import it to a store first). You can use		import it to a store first). You can use
	"<store location>\\<store name>\\<thumbprint>" to refer to a certificate		"<store location>\\<store name>\\<thumbprint>" to refer to a certificate

docs/cmdline-opts/ssl-no-revoke.d

+2 −2

Original line number	Original line	Diff line number	Diff line
	Long: ssl-no-revoke		Long: ssl-no-revoke
	Help: Disable cert revocation checks (WinSSL)		Help: Disable cert revocation checks (Schannel)
	Added: 7.44.0		Added: 7.44.0
	---		---
	(WinSSL) This option tells curl to disable certificate revocation checks.		(Schannel) This option tells curl to disable certificate revocation checks.
	WARNING: this option loosens the SSL security, and by using this flag you ask		WARNING: this option loosens the SSL security, and by using this flag you ask
	for exactly that.		for exactly that.

docs/libcurl/curl_version_info.3

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,7 +5,7 @@
	.\" * \| (__\| \|_\| \| _ <\| \|___		.\" * \| (__\| \|_\| \| _ <\| \|___
	.\" * \___\|\___/\|_\| \_\_____\|		.\" * \___\|\___/\|_\| \_\_____\|
	.\" *		.\" *
	.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.		.\" * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
	.\" *		.\" *
	.\" * This software is licensed as described in the file COPYING, which		.\" * This software is licensed as described in the file COPYING, which
	.\" * you should have received as part of this distribution. The terms		.\" * you should have received as part of this distribution. The terms
	@@ -170,7 +170,7 @@ libcurl was built with multiple SSL backends. For details, see
	supports HTTP Brotli content encoding using libbrotlidec (Added in 7.57.0)		supports HTTP Brotli content encoding using libbrotlidec (Added in 7.57.0)
	.RE		.RE
	\fIssl_version\fP is an ASCII string for the TLS library name + version		\fIssl_version\fP is an ASCII string for the TLS library name + version
	used. If libcurl has no SSL support, this is NULL. For example "WinSSL",		used. If libcurl has no SSL support, this is NULL. For example "Schannel",
	\&"SecureTransport" or "OpenSSL/1.1.0g".		\&"SecureTransport" or "OpenSSL/1.1.0g".

	\fIssl_version_num\fP is always 0.		\fIssl_version_num\fP is always 0.