From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 11 Apr 2018 04:09:57 +0000 (+0900)
Subject: Merge branch 'lv/tls-1.3'
X-Git-Tag: v2.18.0-rc0~139
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/9b59d8869de2fdb63b1ac4cbd68c42b15bda2a19?hp=c40c1a0df23203f9e05e7c5c01a157d414b37720

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
---

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 4e0cff87f6..2659153cb3 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1957,6 +1957,7 @@ http.sslVersion::
 	- tlsv1.0
 	- tlsv1.1
 	- tlsv1.2
+	- tlsv1.3
 
 +
 Can be overridden by the `GIT_SSL_VERSION` environment variable.
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;