aboutsummaryrefslogtreecommitdiffstats
path: root/http.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-04-11 13:09:57 +0900
committerJunio C Hamano <gitster@pobox.com>2018-04-11 13:09:57 +0900
commit9b59d8869de2fdb63b1ac4cbd68c42b15bda2a19 (patch)
tree08c48ad6c3051a613a9dadb3b4cd559d298571b5 /http.c
parentc40c1a0df23203f9e05e7c5c01a157d414b37720 (diff)
parentd81b651f56060038a1547f4beb949122533a8165 (diff)
downloadgit-9b59d8869de2fdb63b1ac4cbd68c42b15bda2a19.tar.gz
Merge branch 'lv/tls-1.3'
When built with more recent cURL, GIT_SSL_VERSION can now specify "tlsv1.3" as its value. * lv/tls-1.3: http: allow use of TLS 1.3
Diffstat (limited to 'http.c')
-rw-r--r--http.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/http.c b/http.c
index 833321a340..3034d10b68 100644
--- a/http.c
+++ b/http.c
@@ -63,6 +63,9 @@ static struct {
{ "tlsv1.1", CURL_SSLVERSION_TLSv1_1 },
{ "tlsv1.2", CURL_SSLVERSION_TLSv1_2 },
#endif
+#if LIBCURL_VERSION_NUM >= 0x073400
+ { "tlsv1.3", CURL_SSLVERSION_TLSv1_3 },
+#endif
};
#if LIBCURL_VERSION_NUM >= 0x070903
static const char *ssl_key;