summaryrefslogtreecommitdiffstats
path: root/jdisc_http_service
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2019-12-05 13:34:40 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2019-12-05 13:34:40 +0100
commit2977d26a9bb4a4f378195c32e3a6f67fe43d575e (patch)
tree45ef50c543d61868ab87c46a517bb00782f47acb /jdisc_http_service
parent0f0149ec0e74ad8f2178f1869645ba7fb595bcab (diff)
Only enable ciphers supported by current JVM
Diffstat (limited to 'jdisc_http_service')
-rw-r--r--jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
index b2e7ba1be67..90848f1dfd4 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java
@@ -70,12 +70,12 @@ public class ConfiguredSslContextFactoryProvider implements SslContextFactoryPro
List<String> protocols = !sslConfig.enabledProtocols().isEmpty()
? sslConfig.enabledProtocols()
- : new ArrayList<>(TlsContext.ALLOWED_PROTOCOLS);
+ : new ArrayList<>(TlsContext.getAllowedProtocols(sslContext));
setEnabledProtocols(factory, sslContext, protocols);
List<String> ciphers = !sslConfig.enabledCipherSuites().isEmpty()
? sslConfig.enabledCipherSuites()
- : new ArrayList<>(TlsContext.ALLOWED_CIPHER_SUITES);
+ : new ArrayList<>(TlsContext.getAllowedCipherSuites(sslContext));
setEnabledCipherSuites(factory, sslContext, ciphers);
return factory;