From 1d3e059ec8303bb2a7fb2f5d52e8552c4a6a4da2 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Fri, 5 Jul 2019 11:09:12 +0200 Subject: Specify correct file format for truststore --- .../instanceproviderservice/ConfigserverSslContextFactoryProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java index 1ca9b2e3678..a117d283146 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/ConfigserverSslContextFactoryProvider.java @@ -111,7 +111,7 @@ public class ConfigserverSslContextFactoryProvider extends TlsContextBasedProvid .orElseGet(() -> updateKeystore(configserverIdentity, generateKeystorePassword(), keyProvider, ztsClient, zoneConfig)); keyManager.updateKeystore(keyStore, new char[0]); SSLContext sslContext = new SslContextBuilder() - .withTrustStore(trustStoreFile) + .withTrustStore(trustStoreFile, KeyStoreType.JKS) .withKeyManager(keyManager) .build(); return new DefaultTlsContext(sslContext, PeerAuthentication.WANT); -- cgit v1.2.3