diff options
author | Brad King <brad.king@kitware.com> | 2016-08-04 13:56:39 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-08-04 13:56:39 (GMT) |
commit | 85d966dcd7a29a17e42fde7b1c109e642f063d82 (patch) | |
tree | 4a963906e6f83ad32d02adf681dfe1e1a7160d1d /Utilities/cmcurl/lib/x509asn1.h | |
parent | 2c0e87fff3347189db7454cf55669eec45819d9a (diff) | |
parent | f59ab43370dc9bff7e6480032c95505cdd00e3cd (diff) | |
download | CMake-85d966dcd7a29a17e42fde7b1c109e642f063d82.zip CMake-85d966dcd7a29a17e42fde7b1c109e642f063d82.tar.gz CMake-85d966dcd7a29a17e42fde7b1c109e642f063d82.tar.bz2 |
Merge topic 'update-curl'
f59ab433 curl: Remove CMake-specific README
f53f4a8a Merge branch 'upstream-curl' into update-curl
202adcfe curl 2016-08-03 (f2cb3a01)
e1c11352 curl: Update script to get curl 7.50.1
a51c6c53 Merge branch 'upstream-curl' into update-curl
7ec709d3 curl 2015-08-11 (1a7f66a3)
3e9b0343 Add script to update curl from upstream
Diffstat (limited to 'Utilities/cmcurl/lib/x509asn1.h')
-rw-r--r-- | Utilities/cmcurl/lib/x509asn1.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Utilities/cmcurl/lib/x509asn1.h b/Utilities/cmcurl/lib/x509asn1.h index eb23e50..0f2b930 100644 --- a/Utilities/cmcurl/lib/x509asn1.h +++ b/Utilities/cmcurl/lib/x509asn1.h @@ -12,7 +12,7 @@ * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms - * are also available at http://curl.haxx.se/docs/copyright.html. + * are also available at https://curl.haxx.se/docs/copyright.html. * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is @@ -26,7 +26,7 @@ #include "curl_setup.h" #if defined(USE_GSKIT) || defined(USE_NSS) || defined(USE_GNUTLS) || \ - defined(USE_CYASSL) + defined(USE_CYASSL) || defined(USE_SCHANNEL) #include "urldata.h" @@ -128,5 +128,5 @@ CURLcode Curl_extract_certinfo(struct connectdata * conn, int certnum, CURLcode Curl_verifyhost(struct connectdata * conn, const char * beg, const char * end); -#endif /* USE_GSKIT or USE_NSS or USE_GNUTLS or USE_CYASSL */ +#endif /* USE_GSKIT or USE_NSS or USE_GNUTLS or USE_CYASSL or USE_SCHANNEL */ #endif /* HEADER_CURL_X509ASN1_H */ |