Merge branch 'nuumio-KeyMaterialSanitation'

Author: developernotes

android-database-sqlcipher/src/main/java/net/sqlcipher/database/SQLiteDatabase.java

@@ -37,6 +37,7 @@
 import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -118,9 +119,7 @@ public void changePassword(String password) throws SQLiteException {
         if (password != null) {
           byte[] keyMaterial = getBytes(password.toCharArray());
           rekey(keyMaterial);
-          for(byte data : keyMaterial) {
-            data = 0;
-          }
+          Arrays.fill(keyMaterial, (byte) 0);
         }
     }
 
@@ -143,9 +142,7 @@ public void changePassword(char[] password) throws SQLiteException {
         if (password != null) {
           byte[] keyMaterial = getBytes(password);
           rekey(keyMaterial);
-          for(byte data : keyMaterial) {
-            data = 0;
-          }
+          Arrays.fill(keyMaterial, (byte) 0);
         }     
     }
 
@@ -2537,9 +2534,7 @@ public void run() {
         }
       }
       if(keyMaterial != null && keyMaterial.length > 0) {
-        for(byte data : keyMaterial) {
-          data = 0;
-        }
+        Arrays.fill(keyMaterial, (byte) 0);
       }
     }