Skip to content

Commit 3322444

Browse files
committed
http: add support for selecting SSL backends at runtime
The Pull Request at curl/curl#1601 adds support for choosing the SSL backend at runtime to cURL, and will hopefully be merged before version 7.56.0 comes out. Git for Windows will ship with those patches backported to 7.54.1 (and come August 9th, 2017, 7.55.0 and later). This patch adds the Git side of that feature: by setting http.sslBackend to "openssl" or "schannel", Git for Windows can now choose the SSL backend at runtime. This comes in handy because Secure Channel ("schannel") is the native Windows solution, accessing the Windows Credential Store, thereby allowing for enterprise-wide management of certificates. For historical reasons, Git for Windows needs to support OpenSSL still, as it has previously been the only supported SSL backend in Git for Windows for almost a decade. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b9451fb commit 3322444

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
@@ -1984,6 +1984,11 @@ http.sslCAPath::
19841984
with when fetching or pushing over HTTPS. Can be overridden
19851985
by the `GIT_SSL_CAPATH` environment variable.
19861986

1987+
http.sslBackend::
1988+
Name of the SSL backend to use (e.g. "openssl" or "schannel").
1989+
This option is ignored if cURL lacks support for choosing the SSL
1990+
backend at runtime.
1991+
19871992
http.pinnedpubkey::
19881993
Public key of the https service. It may either be the filename of
19891994
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
@@ -145,6 +145,8 @@ static struct active_request_slot *active_queue_head;
145145

146146
static char *cached_accept_language;
147147

148+
static char *http_ssl_backend;
149+
148150
size_t fread_buffer(char *ptr, size_t eltsize, size_t nmemb, void *buffer_)
149151
{
150152
size_t size = eltsize * nmemb;
@@ -292,6 +294,12 @@ static int http_options(const char *var, const char *value, void *cb)
292294
curl_ssl_try = git_config_bool(var, value);
293295
return 0;
294296
}
297+
if (!strcmp("http.sslbackend", var)) {
298+
free(http_ssl_backend);
299+
http_ssl_backend = xstrdup_or_null(value);
300+
return 0;
301+
}
302+
295303
if (!strcmp("http.minsessions", var)) {
296304
min_curl_sessions = git_config_int(var, value);
297305
#ifndef USE_CURL_MULTI
@@ -917,6 +925,33 @@ void http_init(struct remote *remote, const char *url, int proactive_auth)
917925
git_config(urlmatch_config_entry, &config);
918926
free(normalized_url);
919927

928+
#if LIBCURL_VERSION_NUM >= 0x073800
929+
if (http_ssl_backend) {
930+
const curl_ssl_backend **backends;
931+
struct strbuf buf = STRBUF_INIT;
932+
int i;
933+
934+
switch (curl_global_sslset(-1, http_ssl_backend, &backends)) {
935+
case CURLSSLSET_UNKNOWN_BACKEND:
936+
strbuf_addf(&buf, _("Unsupported SSL backend '%s'. "
937+
"Supported SSL backends:"),
938+
http_ssl_backend);
939+
for (i = 0; backends[i]; i++)
940+
strbuf_addf(&buf, "\n\t%s", backends[i]->name);
941+
die("%s", buf.buf);
942+
case CURLSSLSET_NO_BACKENDS:
943+
die(_("Could not set SSL backend to '%s': "
944+
"cURL was built without SSL backends"),
945+
http_ssl_backend);
946+
case CURLSSLSET_TOO_LATE:
947+
die(_("Could not set SSL backend to '%s': already set"),
948+
http_ssl_backend);
949+
case CURLSSLSET_OK:
950+
break; /* Okay! */
951+
}
952+
}
953+
#endif
954+
920955
if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK)
921956
die("curl_global_init failed");
922957

0 commit comments

Comments
 (0)