diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-19 15:33:20 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-22 13:01:05 +0100 |
commit | 5c90846359928bb75478a03943e0b992f60f7263 (patch) | |
tree | 2a72e39f8f18620b8095ed4e7abf621d8ef6e4a5 /athenz-identity-provider-service/src | |
parent | dfd6e2948d6630c573a835ba695cfebad980ae6b (diff) |
Use X509CertificateUtils
Diffstat (limited to 'athenz-identity-provider-service/src')
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/AthenzCertificateClient.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/AthenzCertificateClient.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/AthenzCertificateClient.java index ca5c776bf3c..35b483affae 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/AthenzCertificateClient.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/AthenzCertificateClient.java @@ -1,10 +1,10 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl; -import com.yahoo.athenz.auth.util.Crypto; import com.yahoo.athenz.zts.InstanceRefreshRequest; import com.yahoo.athenz.zts.ZTSClient; import com.yahoo.container.jdisc.athenz.AthenzIdentityProvider; +import com.yahoo.vespa.athenz.tls.X509CertificateUtils; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.config.AthenzProviderServiceConfig; import javax.net.ssl.SSLContext; @@ -34,7 +34,7 @@ public class AthenzCertificateClient { req.setKeyId(Integer.toString(zoneConfig.secretVersion())); String pemEncoded = ztsClient.postInstanceRefreshRequest(zoneConfig.domain(), zoneConfig.serviceName(), req) .getCertificate(); - return Crypto.loadX509Certificate(pemEncoded); + return X509CertificateUtils.fromPem(pemEncoded); } } |