2 files changed, 7 insertions, 0 deletions
diff --git a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java
index 8bb7e0e5ab9..6e69c36d69c 100644
--- a/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/KeyStoreBuilder.java
@@ -100,6 +100,9 @@ public class KeyStoreBuilder {
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
+        finally {
+            inputFilePassword = null;
+        }
     }
 
     private static class KeyEntry {
@@ -125,4 +128,5 @@ public class KeyStoreBuilder {
             this.certificate = certificate;
         }
     }
+
 }
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 221018122bf..d2b98fd20d9 100644
--- a/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
+++ b/security-utils/src/main/java/com/yahoo/security/SslContextBuilder.java
@@ -136,6 +136,9 @@ public class SslContextBuilder {
         } catch (IOException e) {
             throw new UncheckedIOException(e);
         }
+        finally {
+            keyStorePassword = null;
+        }
     }
 
     private static KeyStore createTrustStore(List<X509Certificate> caCertificates) {