diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-07-12 17:17:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-12 17:17:02 +0200 |
| commit | ccb2515582ae7abec1bb2165991c10a36eb99978 (patch) | |
| tree | 42fb0c4121006008659b3cd55bcc92124f4198a5 /vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java | |
| parent | 97f0cf32edba5e6545dc027cdcdaaec125bad37d (diff) | |
| parent | 67a5606a5e5c21d3ba4ef5cb203842901da674d5 (diff) | |
Merge pull request #27751 from vespa-engine/bjorncs/vespa-feed-client
Bjorncs/vespa feed client
Diffstat (limited to 'vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java')
| -rw-r--r-- | vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java index 1855b657a75..85144ae3e8c 100644 --- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java +++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/SslContextBuilder.java @@ -85,7 +85,8 @@ class SslContextBuilder { } else if (hasCaCertificateInstance()) { addCaCertificates(keystore, caCertificates); } - SSLContext sslContext = SSLContext.getInstance("TLSv1.2"); // Protocol version must match TlsContext.SSL_CONTEXT_VERSION + // Protocol version must be equal to TlsContext.SSL_CONTEXT_VERSION or higher + SSLContext sslContext = SSLContext.getInstance("TLSv1.3"); sslContext.init( createKeyManagers(keystore).orElse(null), createTrustManagers(keystore).orElse(null), |