From e1d64af578a7270ac30dbd6eade1ca57aa79a1b5 Mon Sep 17 00:00:00 2001 From: Joakim Erdfelt Date: Mon, 2 Dec 2019 12:00:21 -0600 Subject: [PATCH] Issue #4385 - Minimize impact of deprecated SNI mode on base class Signed-off-by: Joakim Erdfelt --- .../java/org/eclipse/jetty/util/ssl/SslContextFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 e75b1486bd3..f707b050bd3 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 @@ -1271,7 +1271,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable protected X509ExtendedKeyManager newSniX509ExtendedKeyManager(X509ExtendedKeyManager keyManager) { LOG.warn("Using Deprecated SslContextFactory implementation, SNI does not work in this context, use SslContextFactory.Server instead."); - return null; + return keyManager; } protected TrustManager[] getTrustManagers(KeyStore trustStore, Collection crls) throws Exception @@ -2184,7 +2184,7 @@ public class SslContextFactory extends AbstractLifeCycle implements Dumpable protected X509ExtendedKeyManager newSniX509ExtendedKeyManager(X509ExtendedKeyManager keyManager) { // Overriding base implementation, as this context should have no WARN message. - return null; + return keyManager; } }