diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-30 17:04:35 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-01-30 17:04:35 +0100 |
commit | e271e0e06c2039667e72a3b7dc92cd15b1d5dcd2 (patch) | |
tree | 889f2ce8e566c7ce35d4e081653b780322d60793 | |
parent | 84e9014eb742431a40d36c8b4af8b6c49690a06e (diff) |
Ensure list of cipher suites has deterministic order.
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java index b7bacb34b05..e3aa5bd517f 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/http/ssl/HostedSslConnectorFactory.java @@ -10,7 +10,7 @@ import com.yahoo.vespa.model.container.http.ConnectorFactory; import java.time.Duration; import java.util.Collection; import java.util.List; -import java.util.Set; +import java.util.stream.Collectors; /** * Component specification for {@link com.yahoo.jdisc.http.server.jetty.ConnectorFactory} with hosted specific configuration. @@ -88,9 +88,9 @@ public class HostedSslConnectorFactory extends ConnectorFactory { connectorBuilder.ssl.enabledProtocols(List.of("TLSv1.2")); if (!tlsCiphersOverride.isEmpty()) { - connectorBuilder.ssl.enabledCipherSuites(tlsCiphersOverride); + connectorBuilder.ssl.enabledCipherSuites(tlsCiphersOverride.stream().sorted().collect(Collectors.toList())); } else { - connectorBuilder.ssl.enabledCipherSuites(Set.copyOf(TlsContext.ALLOWED_CIPHER_SUITES)); + connectorBuilder.ssl.enabledCipherSuites(TlsContext.ALLOWED_CIPHER_SUITES.stream().sorted().collect(Collectors.toList())); } connectorBuilder |