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

Handle odd sized buffers on backup import decrypt

Browse source 
Fixes #7701
This commit is contained in:
Moxie Marlinspike 2018-04-18 21:20:06 -07:00
parent 8b74e9a075
commit 2ac0179d65
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/org/thoughtcrime/securesms/backup/FullBackupImporter.java
View file

@ -204,11 +204,20 @@ public class FullBackupImporter extends FullBackupBase {
mac.update(buffer, 0, read);
byte[] plaintext = cipher.update(buffer, 0, read);
out.write(plaintext, 0, plaintext.length);
if (plaintext != null) {
out.write(plaintext, 0, plaintext.length);
}
length -= read;
}
byte[] plaintext = cipher.doFinal();
if (plaintext != null) {
out.write(plaintext, 0, plaintext.length);
}
out.close();
byte[] ourMac = mac.doFinal();
@ -225,7 +234,7 @@ public class FullBackupImporter extends FullBackupBase {
//destination.delete();
throw new IOException("Bad MAC");
}
} catch (InvalidKeyException | InvalidAlgorithmParameterException e) {
} catch (InvalidKeyException | InvalidAlgorithmParameterException | IllegalBlockSizeException | BadPaddingException e) {
throw new AssertionError(e);
}
}