Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-23 04:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't assert on bad padding.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-09-05 10:07:16 -07:00
parent 9dce376780
commit c4209a65e3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libaxolotl/src/main/java/org/whispersystems/libaxolotl/SessionCipher.java
View File

@@ -328,7 +328,9 @@ public class SessionCipher {
} }
} }
private byte[] getPlaintext(int version, MessageKeys messageKeys, byte[] cipherText) { private byte[] getPlaintext(int version, MessageKeys messageKeys, byte[] cipherText)
throws InvalidMessageException
{
try { try {
Cipher cipher; Cipher cipher;
@@ -340,7 +342,7 @@ public class SessionCipher {
return cipher.doFinal(cipherText); return cipher.doFinal(cipherText);
} catch (IllegalBlockSizeException | BadPaddingException e) { } catch (IllegalBlockSizeException | BadPaddingException e) {
throw new AssertionError(e); throw new InvalidMessageException(e);
} }
} }