Skip to content

Commit 572fc6f

Browse files
Fix netty substitutions. (#845)
1 parent 2b05a54 commit 572fc6f

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import java.security.PrivateKey;
2828
import java.security.Provider;
2929
import java.security.cert.X509Certificate;
30+
import java.util.Map;
3031
import javax.net.ssl.KeyManagerFactory;
3132
import javax.net.ssl.SSLEngine;
3233
import javax.net.ssl.SSLException;
@@ -45,6 +46,7 @@
4546
import io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator;
4647
import io.netty.handler.ssl.JdkApplicationProtocolNegotiator;
4748
import io.netty.handler.ssl.SslContext;
49+
import io.netty.handler.ssl.SslContextOption;
4850
import io.netty.handler.ssl.SslProvider;
4951
import io.netty.util.concurrent.GlobalEventExecutor;
5052
import io.netty.util.internal.logging.InternalLoggerFactory;
@@ -179,7 +181,7 @@ static SslContext newServerContextInternal(SslProvider provider,
179181
X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory,
180182
Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn,
181183
long sessionCacheSize, long sessionTimeout, ClientAuth clientAuth, String[] protocols, boolean startTls,
182-
boolean enableOcsp, String keyStoreType)
184+
boolean enableOcsp, String keyStoreType, Map.Entry<SslContextOption<?>, Object>... ctxOptions)
183185
throws SSLException
184186
{
185187

@@ -200,7 +202,7 @@ static SslContext newClientContextInternal(
200202
X509Certificate[] trustCert, TrustManagerFactory trustManagerFactory,
201203
X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory,
202204
Iterable<String> ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, String[] protocols,
203-
long sessionCacheSize, long sessionTimeout, boolean enableOcsp, String keyStoreType) throws SSLException
205+
long sessionCacheSize, long sessionTimeout, boolean enableOcsp, String keyStoreType, Map.Entry<SslContextOption<?>, Object>... options) throws SSLException
204206
{
205207
if (enableOcsp) {
206208
throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider);

0 commit comments

Comments
 (0)