Not storing salt into database anymore for increased privacy

Fixed #1661
M66B · May 17, 2014 · 89f3a23 · 89f3a23
1 parent e064e3e
commit 89f3a23
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ Changelog
 
 * Fixed displaying contacts without display name ([issue](/../../issues/1660))
 * Fixed on demand restricting for dangerous methods with whitelists ([issue](/../../issues/1653))
+* Not storing salt into database anymore for increased privacy ([issue](/../../issues/1661))
 
 [Open issues](https://github.com/M66B/XPrivacy/issues?state=open)
 

diff --git a/src/biz/bokhorst/xprivacy/ActivityMain.java b/src/biz/bokhorst/xprivacy/ActivityMain.java
@@ -166,12 +166,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
 		// Salt should be the same when exporting/importing
 		String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, null, false);
-		if (salt == null) {
-			salt = Build.SERIAL;
-			if (salt == null)
-				salt = "";
-			PrivacyManager.setSetting(userId, PrivacyManager.cSettingSalt, salt);
-		}
+		if (salt != null && salt.equals(Build.SERIAL))
+			PrivacyManager.setSetting(userId, PrivacyManager.cSettingSalt, null);
 
 		// Set layout
 		setContentView(R.layout.mainlist);

diff --git a/src/biz/bokhorst/xprivacy/Util.java b/src/biz/bokhorst/xprivacy/Util.java
@@ -429,7 +429,7 @@ private static boolean verifyData(byte[] data, byte[] signature, PublicKey publi
 	public static String sha1(String text) throws NoSuchAlgorithmException, UnsupportedEncodingException {
 		// SHA1
 		int userId = Util.getUserId(Process.myUid());
-		String salt = PrivacyManager.getSetting(userId, PrivacyManager.cSettingSalt, "", 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);
@@ -443,7 +443,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, "", 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)