mirror
/
Signal-Android
kopia lustrzana https://github.com/ryukoposting/Signal-Android
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

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.
fork-5.53.8
Moxie Marlinspike 2011-12-21 01:36:50 -05:00
rodzic 8a6a1a5f03
commit 6bd229b8a1
1 zmienionych plików z 33 dodań i 20 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

53
src/org/thoughtcrime/securesms/util/MemoryCleaner.java
Wyświetl plik

@ -34,30 +34,43 @@ import android.util.Log;
public class MemoryCleaner { 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) { public static void clean(MasterSecret masterSecret) {
try { // if (masterSecret == null)
SecretKeySpec cipherKey = masterSecret.getEncryptionKey(); // return;
SecretKeySpec macKey = masterSecret.getMacKey(); //
// try {
Field keyField = SecretKeySpec.class.getDeclaredField("key"); // SecretKeySpec cipherKey = masterSecret.getEncryptionKey();
keyField.setAccessible(true); // SecretKeySpec macKey = masterSecret.getMacKey();
//
byte[] cipherKeyField = (byte[]) keyField.get(cipherKey); // Field keyField = SecretKeySpec.class.getDeclaredField("key");
byte[] macKeyField = (byte[]) keyField.get(macKey); // keyField.setAccessible(true);
//
Arrays.fill(cipherKeyField, (byte)0x00); // byte[] cipherKeyField = (byte[]) keyField.get(cipherKey);
Arrays.fill(macKeyField, (byte)0x00); // byte[] macKeyField = (byte[]) keyField.get(macKey);
//
} catch (NoSuchFieldException nsfe) { // Arrays.fill(cipherKeyField, (byte)0x00);
Log.w("MemoryCleaner", nsfe); // Arrays.fill(macKeyField, (byte)0x00);
} catch (IllegalArgumentException e) { //
Log.w("MemoryCleaner", e); // } catch (NoSuchFieldException nsfe) {
} catch (IllegalAccessException e) { // Log.w("MemoryCleaner", nsfe);
Log.w("MemoryCleaner", e); // } catch (IllegalArgumentException e) {
} // Log.w("MemoryCleaner", e);
// } catch (IllegalAccessException e) {
// Log.w("MemoryCleaner", e);
// }
} }
public static void clean(String string) { public static void clean(String string) {
if (string == null)
return;
try { try {
Field charArrayField = String.class.getDeclaredField("value"); Field charArrayField = String.class.getDeclaredField("value");
charArrayField.setAccessible(true); charArrayField.setAccessible(true);