From e7807404ba160216dbcc359d563a0c812b548dc1 Mon Sep 17 00:00:00 2001 From: gjmwoods <42248895+gjmwoods@users.noreply.github.com> Date: Fri, 5 Mar 2021 08:52:49 +0000 Subject: [PATCH] Fix netty substitutions. (#843) (#844) Co-authored-by: Michael Simons --- .../org/neo4j/driver/internal/svm/NettySubstitutions.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java b/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java index 7a6713a6bf..d8f92fc02f 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java +++ b/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java @@ -27,6 +27,7 @@ import java.security.PrivateKey; import java.security.Provider; import java.security.cert.X509Certificate; +import java.util.Map; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLEngine; import javax.net.ssl.SSLException; @@ -45,6 +46,7 @@ import io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator; import io.netty.handler.ssl.JdkApplicationProtocolNegotiator; import io.netty.handler.ssl.SslContext; +import io.netty.handler.ssl.SslContextOption; import io.netty.handler.ssl.SslProvider; import io.netty.util.concurrent.GlobalEventExecutor; import io.netty.util.internal.logging.InternalLoggerFactory; @@ -179,7 +181,7 @@ static SslContext newServerContextInternal(SslProvider provider, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout, ClientAuth clientAuth, String[] protocols, boolean startTls, - boolean enableOcsp, String keyStoreType) + boolean enableOcsp, String keyStoreType, Map.Entry, Object>... ctxOptions) throws SSLException { @@ -200,7 +202,7 @@ static SslContext newClientContextInternal( X509Certificate[] trustCert, TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, String[] protocols, - long sessionCacheSize, long sessionTimeout, boolean enableOcsp, String keyStoreType) throws SSLException + long sessionCacheSize, long sessionTimeout, boolean enableOcsp, String keyStoreType, Map.Entry, Object>... options) throws SSLException { if (enableOcsp) { throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider);