Skip to content

Commit 4f13731

Browse files
committed
Merge branch 'lv/tls-1.3' into next
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
2 parents 4f3df09 + d81b651 commit 4f13731

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

Documentation/config.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1957,6 +1957,7 @@ http.sslVersion::
19571957
- tlsv1.0
19581958
- tlsv1.1
19591959
- tlsv1.2
1960+
- tlsv1.3
19601961

19611962
+
19621963
Can be overridden by the `GIT_SSL_VERSION` environment variable.

http.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ static struct {
6262
{ "tlsv1.1", CURL_SSLVERSION_TLSv1_1 },
6363
{ "tlsv1.2", CURL_SSLVERSION_TLSv1_2 },
6464
#endif
65+
#if LIBCURL_VERSION_NUM >= 0x073400
66+
{ "tlsv1.3", CURL_SSLVERSION_TLSv1_3 },
67+
#endif
6568
};
6669
#if LIBCURL_VERSION_NUM >= 0x070903
6770
static const char *ssl_key;

0 commit comments

Comments
 (0)