diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-05-22 19:41:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 19:41:45 (GMT) |
| commit | 39fa79178feb1ce72050ebd21b9e34f158e8befa (patch) | |
| tree | 2d260dcc6491537e26df4d3d8b8ada0b448eb41f /http.c | |
| parent | b54301bdadfd3195d64e95ef6f58dfdf102e3d26 (diff) | |
| parent | f6f2a9e42d14e61429af418d8038aa67049b3821 (diff) | |
| download | git-39fa79178feb1ce72050ebd21b9e34f158e8befa.zip git-39fa79178feb1ce72050ebd21b9e34f158e8befa.tar.gz git-39fa79178feb1ce72050ebd21b9e34f158e8befa.tar.bz2 | |
Merge branch 'ls/http-ssl-cipher-list'
Introduce http.<url>.SSLCipherList configuration variable to tweak
the list of cipher suite to be used with libcURL when talking with
https:// sites.
* ls/http-ssl-cipher-list:
http: add support for specifying an SSL cipher list
Diffstat (limited to 'http.c')
| -rw-r--r-- | http.c | 10 |
1 files changed, 10 insertions, 0 deletions
@@ -36,6 +36,7 @@ char curl_errorstr[CURL_ERROR_SIZE]; static int curl_ssl_verify = -1; static int curl_ssl_try; static const char *ssl_cert; +static const char *ssl_cipherlist; #if LIBCURL_VERSION_NUM >= 0x070903 static const char *ssl_key; #endif @@ -187,6 +188,8 @@ static int http_options(const char *var, const char *value, void *cb) curl_ssl_verify = git_config_bool(var, value); return 0; } + if (!strcmp("http.sslcipherlist", var)) + return git_config_string(&ssl_cipherlist, var, value); if (!strcmp("http.sslcert", var)) return git_config_string(&ssl_cert, var, value); #if LIBCURL_VERSION_NUM >= 0x070903 @@ -361,6 +364,13 @@ static CURL *get_curl_handle(void) if (http_proactive_auth) init_curl_http_auth(result); + if (getenv("GIT_SSL_CIPHER_LIST")) + ssl_cipherlist = getenv("GIT_SSL_CIPHER_LIST"); + + if (ssl_cipherlist != NULL && *ssl_cipherlist) + curl_easy_setopt(result, CURLOPT_SSL_CIPHER_LIST, + ssl_cipherlist); + if (ssl_cert != NULL) curl_easy_setopt(result, CURLOPT_SSLCERT, ssl_cert); if (has_cert_password()) |