getlantern/lantern#1941 Actually not sending ServerName when sendServ…

…erName is false
getlantern · Nov 3, 2014 · 40b0002 · 40b0002
1 parent e94cf53
commit 40b0002
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tlsdialer.go b/tlsdialer.go
@@ -152,7 +152,7 @@ func DialForTimings(dialer *net.Dialer, network, addr string, sendServerName boo
 
 	if !sendServerName && err == nil && !config.InsecureSkipVerify {
 		log.Trace("Manually verifying certificates")
-		err = verifyServerCerts(conn, serverName, configCopy)
+		err = verifyServerCerts(conn, serverName, config)
 	}
 	if err != nil {
 		log.Trace("Handshake or verification error, closing underlying connection")

diff --git a/tlsdialer_test.go b/tlsdialer_test.go
@@ -77,7 +77,7 @@ func TestOKWithServerName(t *testing.T) {
 func TestOKWithoutServerName(t *testing.T) {
 	config := &tls.Config{
 		RootCAs:    cert.PoolContainingCert(),
-		ServerName: "localhost",
+		ServerName: "localhost", // we manually set a ServerName to make sure it doesn't get sent
 	}
 	_, err := Dial("tcp", ADDR, false, config)
 	if err != nil {