Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/github/jopenlibs/vault/SslConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ private SSLContext buildSslContextFromJks() throws VaultException {
}

try {
final SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
final SSLContext sslContext = SSLContext.getInstance("TLSv1.3");
sslContext.init(keyManagers, trustManagers, null);
return sslContext;
} catch (NoSuchAlgorithmException | KeyManagementException e) {
Expand Down Expand Up @@ -643,7 +643,7 @@ private SSLContext buildSslContextFromPem() throws VaultException {
keyManagers = keyManagerFactory.getKeyManagers();
}

final SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
final SSLContext sslContext = SSLContext.getInstance("TLSv1.3");
sslContext.init(keyManagers, trustManagers, null);
return sslContext;
} catch (CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException |
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/github/jopenlibs/vault/rest/Rest.java
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public class Rest {

static {
try {
DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLSv1.2");
DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLSv1.3");
DISABLED_SSL_CONTEXT.init(null, new TrustManager[]{new X509ExtendedTrustManager() {
@Override
public void checkClientTrusted(X509Certificate[] chain, String authType,
Expand Down
14 changes: 14 additions & 0 deletions src/test/java/io/github/jopenlibs/vault/SSLTests.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
import org.eclipse.jetty.server.Server;
import org.junit.Test;

import java.util.Arrays;
import javax.net.ssl.SSLContext;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;

/**
* Unit tests for the Vault driver, having no dependency on an actual Vault server instance being
Expand Down Expand Up @@ -279,4 +282,15 @@ public void testSslJks_loadKeyStoreAndTrustStore() throws Exception {
VaultTestUtils.shutdownMockVault(server);
}

@Test
public void testSslContextFromPemSupportsTls13() throws Exception {
final SslConfig sslConfig = new SslConfig().pemResource("/cert.pem").build();
final SSLContext sslContext = sslConfig.getSslContext();
final java.util.List<String> supported = Arrays.asList(
sslContext.getSupportedSSLParameters().getProtocols());
assertTrue("SSLContext from PEM must support TLSv1.3", supported.contains("TLSv1.3"));
assertTrue("SSLContext from PEM must support TLSv1.2", supported.contains("TLSv1.2"));
}


}
Loading