oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

Disable best-effort memory cleaner for MasterSecrets. 

The best-effort memory cleaning logic for MasterSecrets
is no longer accurate, since they are being passed through
both Binder calls as well as Intents, blurring whether an
activity is using a MasterSecret which is a reference to
shared memory in the KeyCachingService or not.
This commit is contained in:
Moxie Marlinspike 2011-12-21 01:36:50 -05:00
parent 8a6a1a5f03
commit 6bd229b8a1
1 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/org/thoughtcrime/securesms/util/MemoryCleaner.java
View File

@ -34,30 +34,43 @@ import android.util.Log;
public class MemoryCleaner {
// XXX This is basically not happening for now.
// The problem is that now secrets are moving
// through both Intents and binder calls, which
// means sometimes they're shared memory and sometimes
// they're not. We're going to need to do a lot more
// work in order to accurately keep track of when to
// wipe this within an Activity lifecycle. =(
public static void clean(MasterSecret masterSecret) {
try {
SecretKeySpec cipherKey = masterSecret.getEncryptionKey();
SecretKeySpec macKey = masterSecret.getMacKey();
Field keyField = SecretKeySpec.class.getDeclaredField("key");
keyField.setAccessible(true);
byte[] cipherKeyField = (byte[]) keyField.get(cipherKey);
byte[] macKeyField = (byte[]) keyField.get(macKey);
Arrays.fill(cipherKeyField, (byte)0x00);
Arrays.fill(macKeyField, (byte)0x00);
} catch (NoSuchFieldException nsfe) {
Log.w("MemoryCleaner", nsfe);
} catch (IllegalArgumentException e) {
Log.w("MemoryCleaner", e);
} catch (IllegalAccessException e) {
Log.w("MemoryCleaner", e);
}
// if (masterSecret == null)
// return;
//
// try {
// SecretKeySpec cipherKey = masterSecret.getEncryptionKey();
// SecretKeySpec macKey = masterSecret.getMacKey();
//
// Field keyField = SecretKeySpec.class.getDeclaredField("key");
// keyField.setAccessible(true);
//
// byte[] cipherKeyField = (byte[]) keyField.get(cipherKey);
// byte[] macKeyField = (byte[]) keyField.get(macKey);
//
// Arrays.fill(cipherKeyField, (byte)0x00);
// Arrays.fill(macKeyField, (byte)0x00);
//
// } catch (NoSuchFieldException nsfe) {
// Log.w("MemoryCleaner", nsfe);
// } catch (IllegalArgumentException e) {
// Log.w("MemoryCleaner", e);
// } catch (IllegalAccessException e) {
// Log.w("MemoryCleaner", e);
// }
}
public static void clean(String string) {
if (string == null)
return;
try {
Field charArrayField = String.class.getDeclaredField("value");
charArrayField.setAccessible(true);