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