diff options
| author | Bjørn Christian Seime <bjorncs@vespa.ai> | 2023-11-23 14:46:37 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@vespa.ai> | 2023-11-23 14:47:29 +0100 |
| commit | 5565708e94a13aab1875ec4c341ea2c930b9ee3c (patch) | |
| tree | e52a0ac789db63aff70b7bf5eba42ee97cc9bdd5 /container-core | |
| parent | a7e6903c3b894de22a400956dbfbf2f70983f88e (diff) | |
Change 'TlsContext' interface to return `X509SslContext'
Diffstat (limited to 'container-core')
2 files changed, 4 insertions, 3 deletions
diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java index 33b765284cc..1f35415b167 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProvider.java @@ -21,7 +21,7 @@ public abstract class TlsContextBasedProvider extends AbstractComponent implemen public void configureSsl(ConnectorSsl ssl, String name, int port) { TlsContext tlsContext = getTlsContext(name, port); SSLParameters parameters = tlsContext.parameters(); - ssl.setSslContext(tlsContext.context()); + ssl.setSslContext(tlsContext.sslContext().context()); ssl.setEnabledProtocolVersions(List.of(parameters.getProtocols())); ssl.setEnabledCipherSuites(List.of(parameters.getCipherSuites())); if (parameters.getNeedClientAuth()) { diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java index 19481c412b0..6ddbb65e012 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/ssl/impl/TlsContextBasedProviderTest.java @@ -49,8 +49,9 @@ public class TlsContextBasedProviderTest { SHA256_WITH_ECDSA, BigInteger.ONE) .build(); - return new DefaultTlsContext( - List.of(certificate), keyPair.getPrivate(), List.of(certificate), new AuthorizedPeers(Set.of()), AuthorizationMode.ENFORCE, PeerAuthentication.NEED, HostnameVerification.ENABLED); + return DefaultTlsContext.of( + List.of(certificate), keyPair.getPrivate(), List.of(certificate), new AuthorizedPeers(Set.of()), + AuthorizationMode.ENFORCE, PeerAuthentication.NEED, HostnameVerification.ENABLED); } private static class SimpleTlsContextBasedProvider extends TlsContextBasedProvider { |