diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2020-12-16 23:38:18 +0000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2020-12-16 23:38:18 +0000 |
| commit | 33c12068ec9bd2422123c6f01406e588e3fead3c (patch) | |
| tree | 09c08b2fd16f56f4a0876dd17471a2fe8310b06b | |
| parent | 921712c8522d074afc8ba52d247f5165b5c26ec9 (diff) | |
| parent | 6339a20c9f06a4ef7d705ef198a9b46b41795e03 (diff) | |
| download | gitlab-shell-33c12068ec9bd2422123c6f01406e588e3fead3c.tar.gz | |
Merge branch 'Updating-min-TLS-version-to-12' into 'main'
Update httpclient.go with TLS 1.2 as minimum version
See merge request gitlab-org/gitlab-shell!435
| -rw-r--r-- | client/httpclient.go | 1 | ||||
| -rw-r--r-- | client/testserver/testserver.go | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/client/httpclient.go b/client/httpclient.go index 05c3032..1ae4420 100644 --- a/client/httpclient.go +++ b/client/httpclient.go @@ -137,6 +137,7 @@ func buildHttpsTransport(hcc httpClientCfg, selfSignedCert bool, gitlabURL strin tlsConfig := &tls.Config{ RootCAs: certPool, InsecureSkipVerify: selfSignedCert, + MinVersion: tls.VersionTLS12, } if hcc.HaveCertAndKey() { diff --git a/client/testserver/testserver.go b/client/testserver/testserver.go index 8130c7a..dee051b 100644 --- a/client/testserver/testserver.go +++ b/client/testserver/testserver.go @@ -63,6 +63,7 @@ func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath server.TLS = &tls.Config{ Certificates: []tls.Certificate{cer}, + MinVersion: tls.VersionTLS12, } server.TLS.BuildNameToCertificate() |