summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2021-10-12 16:12:57 +0000
committerIgor Drozdov <idrozdov@gitlab.com>2021-10-12 16:12:57 +0000
commitd244c446f9dbd86e36e77992ebc69bef910c89dc (patch)
tree3967395ea8130ed9a0a9a3abedae5151390dd26c
parent2ccc5ab15ba57f98a3af70757e24c0a7992b9ac8 (diff)
parentf6e0eb75f4505ab0c94e73337f2f12a62cd22207 (diff)
downloadgitlab-shell-d244c446f9dbd86e36e77992ebc69bef910c89dc.tar.gz
Merge branch 'fix/name-certificate' into 'main'
refactor: remove call to BuildNameToCertificate (deprecated) See merge request gitlab-org/gitlab-shell!515
-rw-r--r--client/httpclient.go1
-rw-r--r--client/testserver/testserver.go1
2 files changed, 0 insertions, 2 deletions
diff --git a/client/httpclient.go b/client/httpclient.go
index cdf5665..7b8a35c 100644
--- a/client/httpclient.go
+++ b/client/httpclient.go
@@ -173,7 +173,6 @@ func buildHttpsTransport(hcc httpClientCfg, selfSignedCert bool, gitlabURL strin
return nil, "", err
}
tlsConfig.Certificates = []tls.Certificate{cert}
- tlsConfig.BuildNameToCertificate()
}
transport := &http.Transport{
diff --git a/client/testserver/testserver.go b/client/testserver/testserver.go
index c263aa0..6344415 100644
--- a/client/testserver/testserver.go
+++ b/client/testserver/testserver.go
@@ -73,7 +73,6 @@ func StartHttpsServer(t *testing.T, handlers []TestRequestHandler, clientCAPath
Certificates: []tls.Certificate{cer},
MinVersion: tls.VersionTLS12,
}
- server.TLS.BuildNameToCertificate()
if clientCAPath != "" {
caCert, err := os.ReadFile(clientCAPath)