From 6276364ef4e626d8eb65ddb0d9e39c7bb114cc0c Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Tue, 19 Jul 2022 17:35:12 +0200 Subject: Move generic crypto helpers from 'c.y.s.tls' to 'c.y.s' --- .../java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java | 2 +- .../yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'container-core/src/main/java/com/yahoo/jdisc') diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java index f559a368fe3..18490765576 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/server/jetty/HealthCheckProxyHandler.java @@ -6,7 +6,7 @@ import com.yahoo.jdisc.http.ConnectorConfig; import com.yahoo.security.SslContextBuilder; import com.yahoo.security.tls.TransportSecurityOptions; import com.yahoo.security.tls.TransportSecurityUtils; -import com.yahoo.security.tls.TrustAllX509TrustManager; +import com.yahoo.security.TrustAllX509TrustManager; import org.eclipse.jetty.client.HttpClient; import org.eclipse.jetty.client.ProxyProtocolClientConnectionFactory; import org.eclipse.jetty.client.api.ContentResponse; diff --git a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java index 05a013c036e..27c5aff22a9 100644 --- a/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java +++ b/container-core/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java @@ -6,7 +6,7 @@ import com.yahoo.jdisc.http.SslProvider; import com.yahoo.security.KeyUtils; import com.yahoo.security.SslContextBuilder; import com.yahoo.security.X509CertificateUtils; -import com.yahoo.security.tls.AutoReloadingX509KeyManager; +import com.yahoo.security.AutoReloadingX509KeyManager; import com.yahoo.security.tls.TlsContext; import javax.net.ssl.SSLContext; -- cgit v1.2.3