Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions tlsconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ var DefaultServerAcceptedCiphers = append(clientCipherSuites, acceptedCBCCiphers
func ServerDefault(ops ...func(*tls.Config)) *tls.Config {
tlsConfig := &tls.Config{
// Avoid fallback by default to SSL protocols < TLS1.2
MinVersion: tls.VersionTLS12,
PreferServerCipherSuites: true,
CipherSuites: DefaultServerAcceptedCiphers,
MinVersion: tls.VersionTLS12,
CipherSuites: DefaultServerAcceptedCiphers,
}

for _, op := range ops {
Expand Down
3 changes: 0 additions & 3 deletions tlsconfig/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ func TestConfigServerTLSServerCertsOnly(t *testing.T) {
if !reflect.DeepEqual(tlsConfig.CipherSuites, DefaultServerAcceptedCiphers) {
t.Fatal("Unexpected server cipher suites")
}
if !tlsConfig.PreferServerCipherSuites { //nolint:staticcheck // Ignore SA1019: tlsConfig.PreferServerCipherSuites has been deprecated since Go 1.18: PreferServerCipherSuites is ignored.
t.Fatal("Expected server to prefer cipher suites")
}
if tlsConfig.MinVersion != tls.VersionTLS12 {
t.Fatal("Unexpected server TLS version")
}
Expand Down
Loading