diff --git a/Documentation/config.txt b/Documentation/config.txt index f8565941b0142c..a0b6b59ac94d8e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2124,15 +2124,15 @@ http.sslBackend:: This option is ignored if cURL lacks support for choosing the SSL backend at runtime. -http.schannel.checkRevoke:: +http.schannelCheckRevoke:: Used to enforce or disable certificate revocation checks in cURL when http.sslBackend is set to "schannel". Defaults to `true` if unset. Only necessary to disable this if Git consistently errors and the message is about checking the revocation status of a - certificate. This option is ignored if cURL lacks support for + certificate. This option is ignored if cURL lacks support for setting the relevant SSL option at runtime. -http.schannel.useSSLCAInfo:: +http.schannelUseSSLCAInfo:: As of cURL v7.60.0, the Secure Channel backend can use the certificate bundle provided via `http.sslCAInfo`, but that would override the Windows Certificate Store. Since this is not desirable diff --git a/http.c b/http.c index 57a889a13cdfa8..34b8634c656997 100644 --- a/http.c +++ b/http.c @@ -318,12 +318,12 @@ static int http_options(const char *var, const char *value, void *cb) return 0; } - if (!strcmp("http.schannel.checkrevoke", var)) { + if (!strcmp("http.schannelcheckrevoke", var)) { http_schannel_check_revoke = git_config_bool(var, value); return 0; } - if (!strcmp("http.schannel.usesslcainfo", var)) { + if (!strcmp("http.schannelusesslcainfo", var)) { http_schannel_use_ssl_cainfo = git_config_bool(var, value); return 0; } @@ -831,7 +831,7 @@ static CURL *get_curl_handle(void) if (http_ssl_backend && !strcmp("schannel", http_ssl_backend) && !http_schannel_check_revoke) { -#if LIBCURL_VERSION_NUM >= 0x074400 +#if LIBCURL_VERSION_NUM >= 0x072c00 curl_easy_setopt(result, CURLOPT_SSL_OPTIONS, CURLSSLOPT_NO_REVOKE); #else warning("CURLSSLOPT_NO_REVOKE not applied to curl SSL options because\n"