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 /http-utils | |
| parent | a7e6903c3b894de22a400956dbfbf2f70983f88e (diff) | |
Change 'TlsContext' interface to return `X509SslContext'
Diffstat (limited to 'http-utils')
3 files changed, 3 insertions, 3 deletions
diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java b/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java index 91c5f6ec8f8..3c13cec7a66 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc4/SslConnectionSocketFactory.java @@ -29,7 +29,7 @@ public class SslConnectionSocketFactory { public static SSLConnectionSocketFactory of(TlsContext ctx, HostnameVerifier verifier) { return new SSLConnectionSocketFactory( - ctx.context(), ctx.parameters().getProtocols(), ctx.parameters().getCipherSuites(), verifier); + ctx.sslContext().context(), ctx.parameters().getProtocols(), ctx.parameters().getCipherSuites(), verifier); } public static SSLConnectionSocketFactory of(SSLSocketFactory fac, HostnameVerifier verifier) { diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java index 563d3e2a1c9..03d38f30a5e 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/SslConnectionSocketFactory.java @@ -31,7 +31,7 @@ public class SslConnectionSocketFactory { public static SSLConnectionSocketFactory of(TlsContext ctx, HostnameVerifier verifier) { return new SSLConnectionSocketFactory( - ctx.context(), ctx.parameters().getProtocols(), ctx.parameters().getCipherSuites(), verifier); + ctx.sslContext().context(), ctx.parameters().getProtocols(), ctx.parameters().getCipherSuites(), verifier); } public static SSLConnectionSocketFactory of(TlsContext ctx) { return of(ctx, defaultVerifier()); } diff --git a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java index 8078ffdec96..1bf7d56469e 100644 --- a/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java +++ b/http-utils/src/main/java/ai/vespa/util/http/hc5/VespaAsyncHttpClientBuilder.java @@ -49,7 +49,7 @@ public class VespaAsyncHttpClientBuilder { SSLParameters vespaTlsParameters = vespaTlsContext.parameters(); tlsStrategy = ClientTlsStrategyBuilder.create() .setHostnameVerifier(hostnameVerifier) - .setSslContext(vespaTlsContext.context()) + .setSslContext(vespaTlsContext.sslContext().context()) .setTlsVersions(vespaTlsParameters.getProtocols()) .setCiphers(vespaTlsParameters.getCipherSuites()) .build(); |