diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-02-22 15:44:42 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2019-02-25 12:46:17 +0100 |
commit | 9fa6c26665ad8ea33d69327a169149593363012a (patch) | |
tree | f380f15ad63eb414ba598304bb26a83a7fe3c31e /security-utils/src/main/java/com/yahoo/security/tls/ReloadingTlsContext.java | |
parent | 49277b330fea49f49df4563d534d572e73c2af1f (diff) |
Add withCertificateEntries() to KeyStoreBuilder
Diffstat (limited to 'security-utils/src/main/java/com/yahoo/security/tls/ReloadingTlsContext.java')
-rw-r--r-- | security-utils/src/main/java/com/yahoo/security/tls/ReloadingTlsContext.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/tls/ReloadingTlsContext.java b/security-utils/src/main/java/com/yahoo/security/tls/ReloadingTlsContext.java index f1fc62de56a..debf14a27f8 100644 --- a/security-utils/src/main/java/com/yahoo/security/tls/ReloadingTlsContext.java +++ b/security-utils/src/main/java/com/yahoo/security/tls/ReloadingTlsContext.java @@ -18,9 +18,7 @@ import java.io.UncheckedIOException; import java.nio.file.Files; import java.nio.file.Path; import java.security.KeyStore; -import java.security.cert.X509Certificate; import java.time.Duration; -import java.util.List; import java.util.Set; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; @@ -79,12 +77,9 @@ public class ReloadingTlsContext implements TlsContext { private static KeyStore loadTruststore(Path caCertificateFile) { try { - List<X509Certificate> caCertificates = X509CertificateUtils.certificateListFromPem(Files.readString(caCertificateFile)); - KeyStoreBuilder trustStoreBuilder = KeyStoreBuilder.withType(KeyStoreType.PKCS12); - for (int i = 0; i < caCertificates.size(); i++) { - trustStoreBuilder.withCertificateEntry("cert-" + i, caCertificates.get(i)); - } - return trustStoreBuilder.build(); + return KeyStoreBuilder.withType(KeyStoreType.PKCS12) + .withCertificateEntries("cert", X509CertificateUtils.certificateListFromPem(Files.readString(caCertificateFile))) + .build(); } catch (IOException e) { throw new UncheckedIOException(e); } |