diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-19 15:54:32 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-03-19 16:03:33 +0100 |
commit | 36909a522751c5dbb2c8b6ba8499e2e637720e3d (patch) | |
tree | 010fc23dee50a841206d5c93ed9c1980950236b1 /athenz-identity-provider-service | |
parent | 81cf404f49be4c745fba2ef7aab6bc655d138f14 (diff) |
Remove direct use of Crypto
Diffstat (limited to 'athenz-identity-provider-service')
-rw-r--r-- | athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java index 2f2cd5a8495..41aee29d761 100644 --- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java +++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/impl/CkmsKeyProvider.java @@ -2,9 +2,9 @@ package com.yahoo.vespa.hosted.athenz.instanceproviderservice.impl; import com.google.inject.Inject; -import com.yahoo.athenz.auth.util.Crypto; import com.yahoo.config.provision.Zone; import com.yahoo.container.jdisc.Ckms; +import com.yahoo.vespa.athenz.tls.KeyUtils; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.KeyProvider; import com.yahoo.vespa.hosted.athenz.instanceproviderservice.config.AthenzProviderServiceConfig; @@ -58,10 +58,9 @@ public class CkmsKeyProvider implements KeyProvider { } } - // TODO: Consider moving to cryptoutils private KeyPair readKeyPair(int version) { - PrivateKey privateKey = Crypto.loadPrivateKey(ckms.getSecret(secretName, version)); - PublicKey publicKey = Crypto.extractPublicKey(privateKey); + PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(ckms.getSecret(secretName, version)); + PublicKey publicKey = KeyUtils.extractPublicKey(privateKey); return new KeyPair(publicKey, privateKey); } } |