Skip to content

C
caddy
Commit d4f4fcdb authored by Matt Holt's avatar Matt Holt Committed by GitHub
Browse files
Options

Merge pull request #1070 from FiloSottile/master 

Actually set tls.Config.PreferServerCipherSuites
parents 17709a7d ef585367
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
caddytls/config.go
View file @ d4f4fcdb
...@@ -350,6 +350,7 @@ func MakeTLSConfig(configs []*Config) (*tls.Config, error) { ...@@ -350,6 +350,7 @@ func MakeTLSConfig(configs []*Config) (*tls.Config, error) {
if i > 0 && cfg.PreferServerCipherSuites != configs[i-1].PreferServerCipherSuites { if i > 0 && cfg.PreferServerCipherSuites != configs[i-1].PreferServerCipherSuites {
return nil, fmt.Errorf("cannot both use PreferServerCipherSuites and not use it") return nil, fmt.Errorf("cannot both use PreferServerCipherSuites and not use it")
} }
config.PreferServerCipherSuites = cfg.PreferServerCipherSuites
// Go with the widest range of protocol versions // Go with the widest range of protocol versions
if config.MinVersion == 0 || cfg.ProtocolMinVersion < config.MinVersion { if config.MinVersion == 0 || cfg.ProtocolMinVersion < config.MinVersion {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7