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 /jdisc_http_service | |
parent | 49277b330fea49f49df4563d534d572e73c2af1f (diff) |
Add withCertificateEntries() to KeyStoreBuilder
Diffstat (limited to 'jdisc_http_service')
-rw-r--r-- | jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java index 188fabc4841..facb54bc37a 100644 --- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java +++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/ssl/impl/ConfiguredSslContextFactoryProvider.java @@ -71,11 +71,9 @@ public class ConfiguredSslContextFactoryProvider implements SslContextFactoryPro private static KeyStore createTruststore(ConnectorConfig.Ssl sslConfig) { List<X509Certificate> caCertificates = X509CertificateUtils.certificateListFromPem(readToString(sslConfig.caCertificateFile())); - KeyStoreBuilder truststoreBuilder = KeyStoreBuilder.withType(KeyStoreType.JKS); - for (int i = 0; i < caCertificates.size(); i++) { - truststoreBuilder.withCertificateEntry("entry-" + i, caCertificates.get(i)); - } - return truststoreBuilder.build(); + return KeyStoreBuilder.withType(KeyStoreType.JKS) + .withCertificateEntries("entry", caCertificates) + .build(); } private static KeyStore createKeystore(ConnectorConfig.Ssl sslConfig) { |