removing default handler

ocZio · ocZio · commit fcf29fb21cd6 · 2017-02-21T12:15:28.000Z
diff --git a/tls.go b/tls.go
@@ -68,8 +68,9 @@ 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)
+		minVersion, err = settings.Setting(config.SocketMinimumTLSVersion)
 		if err != nil {
 			return
 		}
@@ -83,8 +84,6 @@ func loadTLSConfig(settings *SessionSettings) (tlsConfig *tls.Config, err error)
 			tlsConfig.MinVersion = tls.VersionTLS11
 		case "TLS12":
 			tlsConfig.MinVersion = tls.VersionTLS12
-		default:
-			tlsConfig.MinVersion = tls.VersionTLS12
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -68,8 +68,9 @@ func loadTLSConfig(settings SessionSettings) (tlsConfig tls.Config, err error)`
`68`	`68`	`tlsConfig.ClientCAs = certPool`
`69`	`69`	`tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert`
`70`	`70`
	`71`	`+ minVersion := "TLS12"`
`71`	`72`	`if settings.HasSetting(config.SocketMinimumTLSVersion) {`
`72`		`- minVersion, err := settings.Setting(config.SocketMinimumTLSVersion)`
	`73`	`+ minVersion, err = settings.Setting(config.SocketMinimumTLSVersion)`
`73`	`74`	`if err != nil {`
`74`	`75`	`return`
`75`	`76`	`}`
`@@ -83,8 +84,6 @@ func loadTLSConfig(settings SessionSettings) (tlsConfig tls.Config, err error)`
`83`	`84`	`tlsConfig.MinVersion = tls.VersionTLS11`
`84`	`85`	`case "TLS12":`
`85`	`86`	`tlsConfig.MinVersion = tls.VersionTLS12`
`86`		`- default:`
`87`		`- tlsConfig.MinVersion = tls.VersionTLS12`
`88`	`87`	`}`
`89`	`88`	`}`
`90`	`89`