fixing tests for MinimumTLSVersion

Author: ocZio

tls.go

@@ -40,6 +40,26 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
 	tlsConfig.Certificates = make([]tls.Certificate, 1)
 	tlsConfig.InsecureSkipVerify = insecureSkipVerify
 
+	minVersion := "TLS12"
+	if settings.HasSetting(config.SocketMinimumTLSVersion) {
+		minVersion, err = settings.Setting(config.SocketMinimumTLSVersion)
+		if err != nil {
+			return
+		}
+
+		switch minVersion {
+		case "SSL30":
+			tlsConfig.MinVersion = tls.VersionSSL30
+		case "TLS10":
+			tlsConfig.MinVersion = tls.VersionTLS10
+		case "TLS11":
+			tlsConfig.MinVersion = tls.VersionTLS11
+		case "TLS12":
+			tlsConfig.MinVersion = tls.VersionTLS12
+		}
+	}
+
+
 	if tlsConfig.Certificates[0], err = tls.LoadX509KeyPair(certificateFile, privateKeyFile); err != nil {
 		return
 	}
@@ -68,25 +88,6 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
 	tlsConfig.ClientCAs = certPool
 	tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
 
-	minVersion := "TLS12"
-	if settings.HasSetting(config.SocketMinimumTLSVersion) {
-		minVersion, err = settings.Setting(config.SocketMinimumTLSVersion)
-		if err != nil {
-			return
-		}
-
-		switch minVersion {
-		case "SSL30":
-			tlsConfig.MinVersion = tls.VersionSSL30
-		case "TLS10":
-			tlsConfig.MinVersion = tls.VersionTLS10
-		case "TLS11":
-			tlsConfig.MinVersion = tls.VersionTLS11
-		case "TLS12":
-			tlsConfig.MinVersion = tls.VersionTLS12
-		}
-	}
-
 	return
 }
 

tls_test.go

@@ -120,29 +120,29 @@ func (s *TLSTestSuite) TestMinimumTLSVersion() {
 
 	s.Nil(err)
 	s.NotNil(tlsConfig)
-	s.Equal(tlsConfig.MinVersion, tls.VersionSSL30)
+	s.Equal(tlsConfig.MinVersion, uint16(tls.VersionSSL30))
 
 	// TLS10
 	s.settings.GlobalSettings().Set(config.SocketMinimumTLSVersion, "TLS10")
 	tlsConfig, err = loadTLSConfig(s.settings.GlobalSettings())
 
 	s.Nil(err)
 	s.NotNil(tlsConfig)
-	s.Equal(tlsConfig.MinVersion, tls.VersionTLS10)
+	s.Equal(tlsConfig.MinVersion, uint16(tls.VersionTLS10))
 
 	// TLS11
 	s.settings.GlobalSettings().Set(config.SocketMinimumTLSVersion, "TLS11")
 	tlsConfig, err = loadTLSConfig(s.settings.GlobalSettings())
 
 	s.Nil(err)
 	s.NotNil(tlsConfig)
-	s.Equal(tlsConfig.MinVersion, tls.VersionTLS11)
+	s.Equal(tlsConfig.MinVersion, uint16(tls.VersionTLS11))
 
 	// TLS12
 	s.settings.GlobalSettings().Set(config.SocketMinimumTLSVersion, "TLS12")
 	tlsConfig, err = loadTLSConfig(s.settings.GlobalSettings())
 
 	s.Nil(err)
 	s.NotNil(tlsConfig)
-	s.Equal(tlsConfig.MinVersion, tls.VersionTLS12)
+	s.Equal(tlsConfig.MinVersion, uint16(tls.VersionTLS12))
 }