diff --git a/src/biz/bokhorst/xprivacy/Util.java b/src/biz/bokhorst/xprivacy/Util.java index a02113735..5a9961174 100644 --- a/src/biz/bokhorst/xprivacy/Util.java +++ b/src/biz/bokhorst/xprivacy/Util.java @@ -431,14 +431,10 @@ private static boolean verifyData(byte[] data, byte[] signature, PublicKey publi return verifier.verify(signature); } - private static String getSalt() { - return (Build.SERIAL == null ? "" : Build.SERIAL); - } - public static String sha1(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException { // SHA1 int userId = Util.getUserId(Process.myUid()); - String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, getSalt(), true); + String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, Build.SERIAL, true); MessageDigest digest = MessageDigest.getInstance("SHA-1"); byte[] bytes = (text + salt).getBytes("UTF-8"); digest.update(bytes, 0, bytes.length); @@ -452,7 +448,7 @@ public static String sha1(String text) throws NoSuchAlgorithmException, Unsuppor public static String md5(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException { // MD5 int userId = Util.getUserId(Process.myUid()); - String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, getSalt(), true); + String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, Build.SERIAL, true); byte[] bytes = MessageDigest.getInstance("MD5").digest((text + salt).getBytes("UTF-8")); StringBuilder sb = new StringBuilder(); for (byte b : bytes)