From 9771c6d1e7b8a201ba61606a88a789b7ff8c52fd Mon Sep 17 00:00:00 2001 From: Sebastian Stenzel Date: Sat, 25 Jul 2015 16:18:02 +0200 Subject: [PATCH] don't decrypt file size obfucscation padding --- .../main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java index c1fc549da..79b568e79 100644 --- a/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java +++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java @@ -426,7 +426,7 @@ public class Aes256Cryptor implements Cryptor, AesCryptographicConfiguration { byte[] buffer = new byte[CONTENT_MAC_BLOCK + 32]; int n = 0; long blockNum = 0; - while ((n = IOUtils.read(in, buffer)) > 0) { + while ((n = IOUtils.read(in, buffer)) > 0 && bytesDecrypted < fileSize) { if (n < 32) { throw new DecryptFailedException("Invalid file content, missing MAC."); }