From 35a64828fb0967baabb3280ca1e046ce828999a6 Mon Sep 17 00:00:00 2001 From: Greg Wilkins Date: Thu, 14 Jul 2016 15:17:42 +1000 Subject: [PATCH] Fix #708 SslContextFactory: newSslServerSocket/newSslSocket are not customized --- .../org/eclipse/jetty/util/ssl/SslContextFactory.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java index 316dbd68e1b..82f1ed20cdd 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/ssl/SslContextFactory.java @@ -399,15 +399,16 @@ public class SslContextFactory extends AbstractLifeCycle } // select the protocols and ciphers - SSLEngine sslEngine=context.createSSLEngine(); - selectCipherSuites(sslEngine.getEnabledCipherSuites(),sslEngine.getSupportedCipherSuites()); - selectProtocols(sslEngine.getEnabledProtocols(),sslEngine.getSupportedProtocols()); + SSLParameters enabled=context.getDefaultSSLParameters(); + SSLParameters supported=context.getSupportedSSLParameters(); + selectCipherSuites(enabled.getCipherSuites(),supported.getCipherSuites()); + selectProtocols(enabled.getProtocols(),enabled.getProtocols()); _factory = new Factory(keyStore,trustStore,context); if (LOG.isDebugEnabled()) { - LOG.debug("Selected Protocols {} of {}",Arrays.asList(_selectedProtocols),Arrays.asList(sslEngine.getSupportedProtocols())); - LOG.debug("Selected Ciphers {} of {}",Arrays.asList(_selectedCipherSuites),Arrays.asList(sslEngine.getSupportedCipherSuites())); + LOG.debug("Selected Protocols {} of {}",Arrays.asList(_selectedProtocols),Arrays.asList(supported.getProtocols())); + LOG.debug("Selected Ciphers {} of {}",Arrays.asList(_selectedCipherSuites),Arrays.asList(supported.getCipherSuites())); } }