Merge pull request #1070 from FiloSottile/master

Actually set tls.Config.PreferServerCipherSuites
This commit is contained in:
Matt Holt 2016-08-25 16:33:12 -06:00 committed by GitHub
commit d4f4fcdb4c

View File

@ -350,6 +350,7 @@ func MakeTLSConfig(configs []*Config) (*tls.Config, error) {
if i > 0 && cfg.PreferServerCipherSuites != configs[i-1].PreferServerCipherSuites {
return nil, fmt.Errorf("cannot both use PreferServerCipherSuites and not use it")
}
config.PreferServerCipherSuites = cfg.PreferServerCipherSuites
// Go with the widest range of protocol versions
if config.MinVersion == 0 || cfg.ProtocolMinVersion < config.MinVersion {