TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-12-25 01:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

whitespace cleanup

Browse Source 
//FREEBIE

Closes #1779
This commit is contained in:
agrajaghh 2014-12-01 18:45:37 +01:00 committed by Moxie Marlinspike
parent b7badec752
commit 0b62cf372b
11 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/org/thoughtcrime/securesms/crypto/DecryptingPartInputStream.java
View File

@ -100,7 +100,7 @@ public class DecryptingPartInputStream extends FileInputStream {
private int readFinal(byte[] buffer, int offset, int length) throws IOException { private int readFinal(byte[] buffer, int offset, int length) throws IOException {
try { try {
int flourish = cipher.doFinal(buffer, offset); int flourish = cipher.doFinal(buffer, offset);
// mac.update(buffer, offset, flourish); //mac.update(buffer, offset, flourish);
byte[] ourMac = mac.doFinal(); byte[] ourMac = mac.doFinal();
byte[] theirMac = new byte[mac.getMacLength()]; byte[] theirMac = new byte[mac.getMacLength()];
@ -185,7 +185,7 @@ public class DecryptingPartInputStream extends FileInputStream {
private Cipher initializeCipher(SecretKeySpec key) private Cipher initializeCipher(SecretKeySpec key)
throws InvalidKeyException, InvalidAlgorithmParameterException, throws InvalidKeyException, InvalidAlgorithmParameterException,
NoSuchAlgorithmException, NoSuchPaddingException, IOException NoSuchAlgorithmException, NoSuchPaddingException, IOException
{ {
Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
IvParameterSpec iv = readIv(cipher.getBlockSize()); IvParameterSpec iv = readIv(cipher.getBlockSize());
@ -209,7 +209,7 @@ public class DecryptingPartInputStream extends FileInputStream {
int read = super.read(buffer, offset, buffer.length-offset); int read = super.read(buffer, offset, buffer.length-offset);
if (read + offset < buffer.length) offset += read; if (read + offset < buffer.length) offset += read;
else return; else return;
} }
} }
} }