aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMorten Tokle <mortent@oath.com>2018-10-19 08:55:40 +0200
committerMorten Tokle <mortent@oath.com>2018-10-19 08:55:40 +0200
commit993b1de6236860684645e43ea2b3b4c8e5cfb9e2 (patch)
tree6892fe82c4d5a4e180b22a97dcb2b27f92f5615d /controller-server
parent1700fa27f85166c25af98316c4a695dd38c80ff8 (diff)
Read certificate chain
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tls/ControllerSslContextFactoryProvider.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tls/ControllerSslContextFactoryProvider.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tls/ControllerSslContextFactoryProvider.java
index 41523be07e4..332c440d18e 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tls/ControllerSslContextFactoryProvider.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/tls/ControllerSslContextFactoryProvider.java
@@ -17,6 +17,7 @@ import java.nio.file.Paths;
import java.security.PrivateKey;
import java.security.cert.X509Certificate;
import java.util.Arrays;
+import java.util.List;
import java.util.Objects;
/**
@@ -77,8 +78,8 @@ public class ControllerSslContextFactoryProvider extends AbstractComponent imple
}
/** Get certificate from secret store */
- private X509Certificate certificate() {
- return X509CertificateUtils.fromPem(secretStore.getSecret(config.certificateSecret()));
+ private List<X509Certificate> certificate() {
+ return X509CertificateUtils.certificateListFromPem(secretStore.getSecret(config.certificateSecret()));
}
}