Skip to content

Commit dfb4a60

Browse files
committed
Merge branch 'http-ssl-backend'
This topic branch brings support for choosing cURL's SSL backend at runtime via http.sslBackend, based on patches already submitted to the cURL project and backported to cURL 7.54.1 as used in Git for Windows' SDK. Signed-off-by: Johannes Schindelin <[email protected]>
2 parents 1c113d5 + dc8f921 commit dfb4a60

File tree

2 files changed

+40
-0
lines changed

2 files changed

+40
-0
lines changed

Documentation/config.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2020,6 +2020,11 @@ http.sslCAPath::
20202020
with when fetching or pushing over HTTPS. Can be overridden
20212021
by the `GIT_SSL_CAPATH` environment variable.
20222022

2023+
http.sslBackend::
2024+
Name of the SSL backend to use (e.g. "openssl" or "schannel").
2025+
This option is ignored if cURL lacks support for choosing the SSL
2026+
backend at runtime.
2027+
20232028
http.pinnedpubkey::
20242029
Public key of the https service. It may either be the filename of
20252030
a PEM or DER encoded public key file or a string starting with

http.c

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,8 @@ static struct active_request_slot *active_queue_head;
146146

147147
static char *cached_accept_language;
148148

149+
static char *http_ssl_backend;
150+
149151
size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
150152
{
151153
size_t size = eltsize * nmemb;
@@ -293,6 +295,12 @@ static int http_options(const char *var, const char *value, void *cb)
293295
curl_ssl_try = git_config_bool(var, value);
294296
return 0;
295297
}
298+
if (!strcmp("http.sslbackend", var)) {
299+
free(http_ssl_backend);
300+
http_ssl_backend = xstrdup_or_null(value);
301+
return 0;
302+
}
303+
296304
if (!strcmp("http.minsessions", var)) {
297305
min_curl_sessions = git_config_int(var, value);
298306
#ifndef USE_CURL_MULTI
@@ -938,6 +946,33 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
938946
git_config(urlmatch_config_entry, &config);
939947
free(normalized_url);
940948

949+
#if LIBCURL_VERSION_NUM >= 0x073800
950+
if (http_ssl_backend) {
951+
const curl_ssl_backend **backends;
952+
struct strbuf buf = STRBUF_INIT;
953+
int i;
954+
955+
switch (curl_global_sslset(-1, http_ssl_backend, &backends)) {
956+
case CURLSSLSET_UNKNOWN_BACKEND:
957+
strbuf_addf(&buf, _("Unsupported SSL backend '%s'. "
958+
"Supported SSL backends:"),
959+
http_ssl_backend);
960+
for (i = 0; backends[i]; i++)
961+
strbuf_addf(&buf, "\n\t%s", backends[i]->name);
962+
die("%s", buf.buf);
963+
case CURLSSLSET_NO_BACKENDS:
964+
die(_("Could not set SSL backend to '%s': "
965+
"cURL was built without SSL backends"),
966+
http_ssl_backend);
967+
case CURLSSLSET_TOO_LATE:
968+
die(_("Could not set SSL backend to '%s': already set"),
969+
http_ssl_backend);
970+
case CURLSSLSET_OK:
971+
break; /* Okay! */
972+
}
973+
}
974+
#endif
975+
941976
if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK)
942977
die("curl_global_init failed");
943978

0 commit comments

Comments
 (0)