diff options
author | jonmv <venstad@gmail.com> | 2023-11-23 15:27:27 +0100 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-11-23 15:27:27 +0100 |
commit | 5858fdc96779de4b8adf8fae3abd99851a8a95ce (patch) | |
tree | 0dde13b2af027e238da9bc14e1a73a0ed5b33327 /zookeeper-server/zookeeper-server-common | |
parent | 2790a62449b132a963ad3b391646c022d1a57e41 (diff) |
Expore key and trust manager to ZK
Diffstat (limited to 'zookeeper-server/zookeeper-server-common')
-rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java index a1b88635204..b50cbdbdbdf 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaSslContextProvider.java @@ -1,6 +1,7 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; +import com.yahoo.security.X509SslContext; import com.yahoo.security.tls.TlsContext; import javax.net.ssl.SSLContext; @@ -17,9 +18,13 @@ public class VespaSslContextProvider implements Supplier<SSLContext> { @Override public SSLContext get() { + return tlsContext().context(); + } + + public X509SslContext tlsContext() { synchronized (VespaSslContextProvider.class) { if (tlsContext == null) throw new IllegalStateException("Vespa TLS is not enabled"); - return tlsContext.sslContext().context(); + return tlsContext.sslContext(); } } |