1 files changed, 12 insertions, 7 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java b/bcprov/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
index dbf550d..2543b59 100644
--- a/bcprov/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
+++ b/bcprov/src/main/java/org/bouncycastle/crypto/PBEParametersGenerator.java
@@ -103,14 +103,21 @@ public abstract class PBEParametersGenerator
     public static byte[] PKCS5PasswordToBytes(
         char[]  password)
     {
-        byte[]  bytes = new byte[password.length];
+        if (password != null)
+        {
+            byte[]  bytes = new byte[password.length];
 
-        for (int i = 0; i != bytes.length; i++)
+            for (int i = 0; i != bytes.length; i++)
+            {
+                bytes[i] = (byte)password[i];
+            }
+
+            return bytes;
+        }
+        else
         {
-            bytes[i] = (byte)password[i];
+            return new byte[0];
         }
-
-        return bytes;
     }
 
     /**
@@ -136,7 +143,6 @@ public abstract class PBEParametersGenerator
     public static byte[] PKCS12PasswordToBytes(
         char[]  password)
     {
-        // BEGIN android-changed
         if (password != null && password.length > 0)
         {
                                        // +1 for extra 2 pad bytes.
@@ -154,6 +160,5 @@ public abstract class PBEParametersGenerator
         {
             return new byte[0];
         }
-        // END android-changed
     }
 }