moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-25 09:38:54 -05:00
Code Issues Releases Wiki Activity

schannel: disable client cert option if APIs not available

Browse Source 
Original MinGW targets Windows 2000 by default, which lacks some APIs and
definitions for this feature. Disable it if these APIs are not available.

Closes https://github.com/curl/curl/pull/2522
This commit is contained in:
Archangel_SDY 2018-04-23 22:12:43 +08:00 committed by Jay Satiro
parent cb01383038
commit 1592ea9792
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/vtls/schannel.c
View File

@ -90,11 +90,17 @@
#endif #endif
#endif #endif
#if defined(CryptStringToBinary) && defined(CRYPT_STRING_HEX)
#define HAS_CLIENT_CERT_PATH
#endif
#ifdef HAS_CLIENT_CERT_PATH
#ifdef UNICODE #ifdef UNICODE
#define CURL_CERT_STORE_PROV_SYSTEM CERT_STORE_PROV_SYSTEM_W #define CURL_CERT_STORE_PROV_SYSTEM CERT_STORE_PROV_SYSTEM_W
#else #else
#define CURL_CERT_STORE_PROV_SYSTEM CERT_STORE_PROV_SYSTEM_A #define CURL_CERT_STORE_PROV_SYSTEM CERT_STORE_PROV_SYSTEM_A
#endif #endif
#endif
#ifndef SP_PROT_SSL2_CLIENT #ifndef SP_PROT_SSL2_CLIENT
#define SP_PROT_SSL2_CLIENT 0x00000008 #define SP_PROT_SSL2_CLIENT 0x00000008
@ -199,6 +205,7 @@ set_ssl_version_min_max(SCHANNEL_CRED *schannel_cred, struct connectdata *conn)
return CURLE_OK; return CURLE_OK;
} }
#ifdef HAS_CLIENT_CERT_PATH
static CURLcode static CURLcode
get_cert_location(TCHAR *path, DWORD *store_name, TCHAR **store_path, get_cert_location(TCHAR *path, DWORD *store_name, TCHAR **store_path,
TCHAR **thumbprint) TCHAR **thumbprint)
@ -248,6 +255,7 @@ get_cert_location(TCHAR *path, DWORD *store_name, TCHAR **store_path,
return CURLE_OK; return CURLE_OK;
} }
#endif
static CURLcode static CURLcode
schannel_connect_step1(struct connectdata *conn, int sockindex) schannel_connect_step1(struct connectdata *conn, int sockindex)
@ -401,6 +409,7 @@ schannel_connect_step1(struct connectdata *conn, int sockindex)
return CURLE_SSL_CONNECT_ERROR; return CURLE_SSL_CONNECT_ERROR;
} }
#ifdef HAS_CLIENT_CERT_PATH
/* client certificate */ /* client certificate */
if(data->set.ssl.cert) { if(data->set.ssl.cert) {
DWORD cert_store_name; DWORD cert_store_name;
@ -453,6 +462,12 @@ schannel_connect_step1(struct connectdata *conn, int sockindex)
CertCloseStore(cert_store, 0); CertCloseStore(cert_store, 0);
} }
#else
if(data->set.ssl.cert) {
failf(data, "schannel: client cert support not built in");
return CURLE_NOT_BUILT_IN;
}
#endif
/* allocate memory for the re-usable credential handle */ /* allocate memory for the re-usable credential handle */
BACKEND->cred = (struct curl_schannel_cred *) BACKEND->cred = (struct curl_schannel_cred *)