Move doHandshake to client.go

The doHandshake function was split off to separate files to support different implementations for Go < 1.16 and Go >= 1.17. The separate files are not needed now that Go 1.20 is the minimum supported version of Go for the project.
gorilla · Jul 2, 2024 · 682b25f · 682b25f
1 parent 8915bad
commit 682b25f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 42 deletions.
diff --git a/client.go b/client.go
@@ -409,3 +409,15 @@ func cloneTLSConfig(cfg *tls.Config) *tls.Config {
 	}
 	return cfg.Clone()
 }
+
+func doHandshake(ctx context.Context, tlsConn *tls.Conn, cfg *tls.Config) error {
+	if err := tlsConn.HandshakeContext(ctx); err != nil {
+		return err
+	}
+	if !cfg.InsecureSkipVerify {
+		if err := tlsConn.VerifyHostname(cfg.ServerName); err != nil {
+			return err
+		}
+	}
+	return nil
+}
diff --git a/tls_handshake.go b/tls_handshake.go
diff --git a/tls_handshake_116.go b/tls_handshake_116.go