Skip to content

Commit 6913410

Browse files
authored
Updated minimum TLS version (#49)
1 parent e62bd9d commit 6913410

5 files changed

Lines changed: 11 additions & 6 deletions

File tree

.github/workflows/gradle.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ jobs:
1717
java:
1818
- 11
1919
vault:
20-
- 1.11.12
2120
- 1.12.0
2221
- 1.12.1
2322
- 1.12.2
@@ -33,6 +32,7 @@ jobs:
3332
- 1.13.3
3433
- 1.13.4
3534
- 1.14.0
35+
- 1.14.1
3636
- latest
3737
os:
3838
- ubuntu-latest

build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,11 @@ artifacts {
130130
archives javadocJar, sourcesJar
131131
}
132132

133+
java {
134+
withSourcesJar()
135+
withJavadocJar()
136+
}
137+
133138
if (hasProperty("publish")) {
134139

135140
publishing {

src/main/java/io/github/jopenlibs/vault/SslConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ private SSLContext buildSslContextFromJks() throws VaultException {
578578
}
579579

580580
try {
581-
final SSLContext sslContext = SSLContext.getInstance("TLS");
581+
final SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
582582
sslContext.init(keyManagers, trustManagers, null);
583583
return sslContext;
584584
} catch (NoSuchAlgorithmException | KeyManagementException e) {
@@ -643,7 +643,7 @@ private SSLContext buildSslContextFromPem() throws VaultException {
643643
keyManagers = keyManagerFactory.getKeyManagers();
644644
}
645645

646-
final SSLContext sslContext = SSLContext.getInstance("TLS");
646+
final SSLContext sslContext = SSLContext.getInstance("TLSv1.2");
647647
sslContext.init(keyManagers, trustManagers, null);
648648
return sslContext;
649649
} catch (CertificateException | IOException | NoSuchAlgorithmException | KeyStoreException |

src/main/java/io/github/jopenlibs/vault/rest/Rest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class Rest {
7676

7777
static {
7878
try {
79-
DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLS");
79+
DISABLED_SSL_CONTEXT = SSLContext.getInstance("TLSv1.2");
8080
DISABLED_SSL_CONTEXT.init(null, new TrustManager[]{new X509TrustManager() {
8181
@Override
8282
public void checkClientTrusted(final X509Certificate[] x509Certificates,

src/test/java/io/github/jopenlibs/vault/ConnectionReUsageTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ public void readShouldReuseConnectionAfterSuccessfulRequestByHttp() throws Excep
5252
int readNum = 10;
5353

5454
HttpClient httpClient = HttpClient.newBuilder()
55-
.connectTimeout(Duration.of(5, ChronoUnit.SECONDS))
55+
.connectTimeout(Duration.of(10, ChronoUnit.SECONDS))
5656
.build();
5757

5858
Logical vault = Vault.create(new VaultConfig()
5959
.httpClient(httpClient)
6060
.address("http://localhost:8999")
6161
.token(TOKEN)
62-
.readTimeout(1)
62+
.readTimeout(10)
6363
.engineVersion(1)
6464
.build()).logical();
6565

0 commit comments

Comments
 (0)