summaryrefslogtreecommitdiffstats
path: root/security-utils/src
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-12-03 15:17:47 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-12-05 16:35:35 +0100
commiteef87496cbdd79a32367c07311eb7867c9ae2e89 (patch)
treecf257411c3d6456fee079e01e8153ce4931cf620 /security-utils/src
parent7d59528f94fd292b0901aef2957507d71b796a72 (diff)
Specify keystore with certificate chain
Diffstat (limited to 'security-utils/src')
-rw-r--r--security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java6
1 files changed, 5 insertions, 1 deletions
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;
}