Merge pull request #6212 from vespa-engine/bjorncs/fix-keystore-password

Set password when creating key entry

1 files changed, 3 insertions, 2 deletions

diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java
index 3437dea9ece..2e0cf04ae4f 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/AthenzSslKeyStoreConfigurator.java
@@ -92,10 +92,11 @@ public class AthenzSslKeyStoreConfigurator extends AbstractComponent implements
         boolean isExpired = certificate.get().getNotAfter().toInstant().isBefore(minimumExpiration);
         if (isExpired) return Optional.empty();
 
+        char[] password = generateKeystorePassword();
         KeyStore keyStore = KeyStoreBuilder.withType(KeyStoreType.JKS)
-                .withKeyEntry(CERTIFICATE_ALIAS, privateKey.get(), certificate.get())
+                .withKeyEntry(CERTIFICATE_ALIAS, privateKey.get(), password, certificate.get())
                 .build();
-        return Optional.of(new KeyStoreAndPassword(keyStore, generateKeystorePassword()));
+        return Optional.of(new KeyStoreAndPassword(keyStore, password));
     }
 
     @Override