Commit 89963002 authored by Dan McNulty's avatar Dan McNulty Committed by Jay Satiro
Browse files

schannel: add support for CURLOPT_CAINFO 

- Move verify_certificate functionality in schannel.c into a new
  file called schannel_verify.c. Additionally, some structure defintions
  from schannel.c have been moved to schannel.h to allow them to be
  used in schannel_verify.c.

- Make verify_certificate functionality for Schannel available on
  all versions of Windows instead of just Windows CE. verify_certificate
  will be invoked on Windows CE or when the user specifies
  CURLOPT_CAINFO and CURLOPT_SSL_VERIFYPEER.

- In verify_certificate, create a custom certificate chain engine that
  exclusively trusts the certificate store backed by the CURLOPT_CAINFO
  file.

- doc updates of --cacert/CAINFO support for schannel

- Use CERT_NAME_SEARCH_ALL_NAMES_FLAG when invoking CertGetNameString
  when available. This implements a TODO in schannel.c to improve
  handling of multiple SANs in a certificate. In particular, all SANs
  will now be searched instead of just the first name.

- Update tool_operate.c to not search for the curl-ca-bundle.crt file
  when using Schannel to maintain backward compatibility. Previously,
  any curl-ca-bundle.crt file found in that search would have been
  ignored by Schannel. But, with CAINFO support, the file found by
  that search would have been used as the certificate store and
  could cause issues for any users that have curl-ca-bundle.crt in
  the search path.

- Update url.c to not set the build time CURL_CA_BUNDLE if the selected
  SSL backend is Schannel. We allow setting CA location for schannel
  only when explicitly specified by the user via CURLOPT_CAINFO /
  --cacert.

- Add new test cases 3000 and 3001. These test cases check that the first
  and last SAN, respectively, matches the connection hostname. New test
  certificates have been added for these cases. For 3000, the certificate
  prefix is Server-localhost-firstSAN and for 3001, the certificate
  prefix is Server-localhost-secondSAN.

- Remove TODO 15.2 (Add support for custom server certificate
  validation), this commit addresses it.

Closes https://github.com/curl/curl/pull/1325
parent 4d660fdc

docs/TODO

+0 −12
Original line number Diff line number Diff line
@@ -121,7 +121,6 @@ 


 15. WinSSL/SChannel

 15.1 Add support for client certificate authentication

 15.2 Add support for custom server certificate validation

 15.3 Add support for the --ciphers option



 16. SASL
@@ -823,17 +822,6 @@ that doesn't exist on the server, just like --ftp-create-dirs. 
 - Getting a Certificate for Schannel

   https://msdn.microsoft.com/en-us/library/windows/desktop/aa375447.aspx



15.2 Add support for custom server certificate validation



 WinSSL/SChannel currently makes use of the OS-level system and user

 certificate trust store. This does not allow the application or user to

 customize the server certificate validation process using curl or libcurl.



 Therefore support for the existing --cacert or --capath options should be

 implemented by supplying a custom certificate to the SChannel APIs, see:

 - Getting a Certificate for Schannel

   https://msdn.microsoft.com/en-us/library/windows/desktop/aa375447.aspx



15.3 Add support for the --ciphers option



 The cipher suites used by WinSSL/SChannel are configured on an OS-level

docs/cmdline-opts/cacert.d

+5 −0
Original line number Diff line number Diff line
@@ -25,4 +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

preferred method of verifying the peer's certificate chain.



(Schannel/WinSSL only) This option is supported for WinSSL in Windows 7 or

later with libcurl 7.60 or later. This option is supported for backward

compatibility with other SSL engines; instead it is recommended to use Windows'

store of root certificates (the default for WinSSL).



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

docs/libcurl/opts/CURLOPT_CAINFO.3

+5 −0
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ 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

preferred method of verifying the peer's certificate chain.



(Schannel/WinSSL only) This option is supported for WinSSL in Windows 7 or

later with libcurl 7.60 or later. This option is supported for backward

compatibility with other SSL engines; instead it is recommended to use Windows'

store of root certificates (the default for WinSSL).



The application does not have to keep the string around after setting this

option.

.SH DEFAULT

lib/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ LIB_VAUTH_HFILES = vauth/vauth.h vauth/digest.h vauth/ntlm.h 


LIB_VTLS_CFILES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c     \

  vtls/polarssl.c vtls/polarssl_threadlock.c vtls/axtls.c               \

  vtls/cyassl.c vtls/schannel.c vtls/darwinssl.c vtls/gskit.c           \

  vtls/mbedtls.c

  vtls/cyassl.c vtls/schannel.c vtls/schannel_verify.c                  \

  vtls/darwinssl.c vtls/gskit.c vtls/mbedtls.c



LIB_VTLS_HFILES = vtls/openssl.h vtls/vtls.h vtls/gtls.h                \

  vtls/nssg.h vtls/polarssl.h vtls/polarssl_threadlock.h vtls/axtls.h   \

lib/hostcheck.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#if defined(USE_OPENSSL)                                \

  || defined(USE_AXTLS)                                 \

  || defined(USE_GSKIT)                                 \

  || (defined(USE_SCHANNEL) && defined(_WIN32_WCE))

  || defined(USE_SCHANNEL)

/* these backends use functions from this file */



#ifdef HAVE_NETINET_IN_H