From a7d7df86fdb3ee80061c93e5108e7b8794254fb0 Mon Sep 17 00:00:00 2001 From: Bjørn Christian Seime Date: Thu, 9 Nov 2017 17:16:32 +0100 Subject: Simplify SslKeyStore interface --- .../src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java') diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java index 9cede37caaa..9f0a635f7c1 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/pem/PemSslKeyStore.java @@ -21,7 +21,7 @@ import java.security.cert.CertificateException; * @author Tony Vaagenes * @author bjorncs */ -public class PemSslKeyStore extends SslKeyStore { +public class PemSslKeyStore implements SslKeyStore { static { Security.addProvider(new PemKeyStoreProvider()); @@ -42,10 +42,6 @@ public class PemSslKeyStore extends SslKeyStore { @Override public KeyStore loadJavaKeyStore() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException { - if (getKeyStorePassword().isPresent()) { - throw new UnsupportedOperationException("PEM key store with password is currently not supported. Please file a feature request."); - } - //cached since Reader(in loadParameter) can only be used one time. if (keyStore == null) { keyStore = KeyStore.getInstance(KEY_STORE_TYPE); -- cgit v1.2.3