1 files changed, 5 insertions, 0 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12Key.java b/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12Key.java
index db63ecdb..856b3e5b 100644
--- a/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12Key.java
+++ b/bcprov/src/main/java/org/bouncycastle/jcajce/PKCS12Key.java
@@ -29,6 +29,11 @@ public class PKCS12Key
      */
     public PKCS12Key(char[] password, boolean useWrongZeroLengthConversion)
     {
+        if (password == null)
+        {
+            password = new char[0];
+        }
+
         this.password = new char[password.length];
         this.useWrongZeroLengthConversion = useWrongZeroLengthConversion;