diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-08 14:02:03 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-08 14:02:03 +0100 |
commit | 16be1b67d7ac753ac2ea842e41b98304e8018d74 (patch) | |
tree | 6b64b7017415e5bf97e055d241cb070ab98a9a42 /controller-server | |
parent | a6e47d2fb7162a9337db562bc7d41490823fa640 (diff) |
Update usage of AthenzSslContextBuilder
Diffstat (limited to 'controller-server')
-rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzSslContextProviderImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzSslContextProviderImpl.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzSslContextProviderImpl.java index afa630d8d9b..261c2c0f2ad 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzSslContextProviderImpl.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/athenz/impl/AthenzSslContextProviderImpl.java @@ -13,6 +13,8 @@ import java.time.Duration; import java.time.Instant; import java.util.concurrent.atomic.AtomicReference; +import static com.yahoo.vespa.athenz.tls.AthenzSslContextBuilder.KeyStoreType.JKS; + /** * @author bjorncs */ @@ -33,7 +35,7 @@ public class AthenzSslContextProviderImpl implements AthenzSslContextProvider { CachedSslContext currentCachedSslContext = this.cachedSslContext.get(); if (currentCachedSslContext == null || currentCachedSslContext.isExpired()) { SSLContext sslContext = new AthenzSslContextBuilder() - .withTrustStore(new File(config.athenzCaTrustStore()), "JKS") + .withTrustStore(new File(config.athenzCaTrustStore()), JKS) .withIdentityCertificate(clientFactory.createZtsClientWithServicePrincipal().getIdentityCertificate()) .build(); this.cachedSslContext.set(new CachedSslContext(sslContext)); |