diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-20 12:42:53 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2018-04-20 13:18:40 +0200 |
| commit | 4cd945c27ffcd10c0fd52f83bcbcbfb96fd3499e (patch) | |
| tree | b196bffd100c8ae9cec5ac68c8bf9ca60e129258 /vespa-athenz | |
| parent | cf7ed5e3c459cd1b3811700c9e7c35900b34810b (diff) | |
Remove method withIdentityCertificate
Diffstat (limited to 'vespa-athenz')
2 files changed, 1 insertions, 7 deletions
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java index e2b35c2f47c..e41eab025d5 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImpl.java @@ -97,9 +97,7 @@ public final class AthenzIdentityProviderImpl extends AbstractComponent implemen @Override public SSLContext getIdentitySslContext() { return new SslContextBuilder() - .withIdentityCertificate(new AthenzIdentityCertificate( - credentials.getCertificate(), - credentials.getKeyPair().getPrivate())) + .withKeyStore(credentials.getKeyPair().getPrivate(), credentials.getCertificate()) .withTrustStore(new File(Defaults.getDefaults().underVespaHome("share/ssl/certs/yahoo_certificate_bundle.jks")), JKS) .build(); } diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java index cd261ad4134..54413a47815 100644 --- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java +++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/tls/SslContextBuilder.java @@ -36,10 +36,6 @@ public class SslContextBuilder { return this; } - public SslContextBuilder withIdentityCertificate(AthenzIdentityCertificate certificate) { - return withKeyStore(certificate.getPrivateKey(), certificate.getCertificate()); - } - public SslContextBuilder withKeyStore(PrivateKey privateKey, X509Certificate certificate) { char[] pwd = new char[0]; this.keyStoreSupplier = () -> KeyStoreBuilder.withType(KeyStoreType.JKS).withKeyEntry("default", privateKey, certificate).build(); |