From b168e14985556ca0e3e6cd4e25c148e5c44c2fee Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Thu, 15 Mar 2018 10:18:14 -0700 Subject: [PATCH] Move salt outside the loop --- src/org/thoughtcrime/securesms/backup/FullBackupBase.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/thoughtcrime/securesms/backup/FullBackupBase.java b/src/org/thoughtcrime/securesms/backup/FullBackupBase.java index c6d881fdf2..431f60bd9b 100644 --- a/src/org/thoughtcrime/securesms/backup/FullBackupBase.java +++ b/src/org/thoughtcrime/securesms/backup/FullBackupBase.java @@ -24,10 +24,11 @@ public abstract class FullBackupBase { byte[] input = passphrase.replace(" ", "").getBytes(); byte[] hash = input; + if (salt != null) digest.update(salt); + for (int i=0;i<250000;i++) { if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0)); digest.update(hash); - if (salt != null) digest.update(salt); hash = digest.digest(input); }