empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Move salt outside the loop

Browse source
This commit is contained in:
Moxie Marlinspike 2018-03-15 10:18:14 -07:00
parent 73233c01ba
commit b168e14985
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/org/thoughtcrime/securesms/backup/FullBackupBase.java
View file

@ -24,10 +24,11 @@ public abstract class FullBackupBase {
byte[] input = passphrase.replace(" ", "").getBytes(); byte[] input = passphrase.replace(" ", "").getBytes();
byte[] hash = input; byte[] hash = input;
if (salt != null) digest.update(salt);
for (int i=0;i<250000;i++) { for (int i=0;i<250000;i++) {
if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0)); if (i % 1000 == 0) EventBus.getDefault().post(new BackupEvent(BackupEvent.Type.PROGRESS, 0));
digest.update(hash); digest.update(hash);
if (salt != null) digest.update(salt);
hash = digest.digest(input); hash = digest.digest(input);
} }