From c50f5d6abacb8afce3d1046dca086b1ee8981c77 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@oath.com>
Date: Mon, 10 Sep 2018 12:23:43 +0200
Subject: Allow multiple certificates in PEM file

---
 vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java b/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java
index 24f6c895e3c..75ab2417edf 100644
--- a/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java
+++ b/vespajlib/src/main/java/com/yahoo/security/SslContextBuilder.java
@@ -77,13 +77,13 @@ public class SslContextBuilder {
         return this;
     }
 
-    public SslContextBuilder withKeyStore(Path privateKeyPemFile, Path certificatePemFile) {
+    public SslContextBuilder withKeyStore(Path privateKeyPemFile, Path certificatesPemFile) {
         this.keyStoreSupplier =
                 () ->  {
                     PrivateKey privateKey = KeyUtils.fromPemEncodedPrivateKey(new String(Files.readAllBytes(privateKeyPemFile)));
-                    X509Certificate certificate = X509CertificateUtils.fromPem(new String(Files.readAllBytes(certificatePemFile)));
+                    List<X509Certificate> certificates = X509CertificateUtils.certificateListFromPem(new String(Files.readAllBytes(certificatesPemFile)));
                     return KeyStoreBuilder.withType(KeyStoreType.JKS)
-                            .withKeyEntry("default", privateKey, certificate)
+                            .withKeyEntry("default", privateKey, certificates)
                             .build();
                 };
         this.keyStorePassword = new char[0];
-- 
cgit v1.2.3