diff options
author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-14 10:44:23 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-11-14 10:44:23 +0100 |
commit | c0b972c26f5e3b201c363928197ca81b694552b2 (patch) | |
tree | f0590ba9b9129a4c9898b8e164acb385409b4703 /jdisc_http_service/src/main/java | |
parent | fea33aaa04ad925e2af4387ec63f59f6d9531c3d (diff) |
Move JksKeyStore to test source directory
Diffstat (limited to 'jdisc_http_service/src/main/java')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/jks/JksKeyStore.java | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/jks/JksKeyStore.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/jks/JksKeyStore.java deleted file mode 100644 index 9cb040fb97d..00000000000 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/jks/JksKeyStore.java +++ /dev/null @@ -1,47 +0,0 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.jdisc.http.ssl.jks; - -import com.yahoo.jdisc.http.ssl.SslKeyStore; - -import java.io.IOException; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.NoSuchAlgorithmException; -import java.security.cert.CertificateException; - -/** - * @author Tony Vaagenes - * @author bjorncs - */ -public class JksKeyStore implements SslKeyStore { - - private static final String KEY_STORE_TYPE = "JKS"; - private final Path keyStoreFile; - private final String keyStorePassword; - - public JksKeyStore(Path keyStoreFile) { - this(keyStoreFile, null); - } - - public JksKeyStore(Path keyStoreFile, String keyStorePassword) { - this.keyStoreFile = keyStoreFile; - this.keyStorePassword = keyStorePassword; - } - - public String getKeyStorePassword() { - return keyStorePassword; - } - - @Override - public KeyStore loadJavaKeyStore() throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException { - try(InputStream stream = Files.newInputStream(keyStoreFile)) { - KeyStore keystore = KeyStore.getInstance(KEY_STORE_TYPE); - keystore.load(stream, keyStorePassword != null ? keyStorePassword.toCharArray() : null); - return keystore; - } - } - -} |