From eef87496cbdd79a32367c07311eb7867c9ae2e89 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@oath.com>
Date: Mon, 3 Dec 2018 15:17:47 +0100
Subject: Specify keystore with certificate chain

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

(limited to 'security-utils')

diff --git a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
index 17d425578ee..09a5a87138f 100644
--- a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
@@ -59,8 +59,12 @@ public class SslContextBuilder {
     }
 
     public SslContextBuilder withKeyStore(PrivateKey privateKey, X509Certificate certificate) {
+        return withKeyStore(privateKey, singletonList(certificate));
+    }
+
+    public SslContextBuilder withKeyStore(PrivateKey privateKey, List<X509Certificate> certificates) {
         char[] pwd = new char[0];
-        this.keyStoreSupplier = () -> KeyStoreBuilder.withType(KeyStoreType.JKS).withKeyEntry("default", privateKey, certificate).build();
+        this.keyStoreSupplier = () -> KeyStoreBuilder.withType(KeyStoreType.JKS).withKeyEntry("default", privateKey, certificates).build();
         this.keyStorePassword = pwd;
         return this;
     }
-- 
cgit v1.2.3