Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-24 11:45:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Close input streams on failed resource decryption.

Browse Source
This commit is contained in:
Clark
2023-01-24 13:40:07 -05:00
committed by Greyson Parrelli
parent 17849e20bd
commit 25aa4f39a3
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/glide/cache/EncryptedCoder.java vendored
View File

@@ -6,6 +6,7 @@ import androidx.annotation.NonNull;
import org.signal.core.util.StreamUtil;
import org.thoughtcrime.securesms.util.Util;
import java.io.Closeable;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
@@ -59,11 +60,15 @@ class EncryptedCoder {
}
CipherInputStream createEncryptedInputStream(@NonNull byte[] masterKey, @NonNull File file) throws IOException {
Closeable cleanupFinally = null;
try {
Mac mac = Mac.getInstance("HmacSHA256");
mac.init(new SecretKeySpec(masterKey, "HmacSHA256"));
FileInputStream fileInputStream = new FileInputStream(file);
FileInputStream fileInputStream = new FileInputStream(file);
cleanupFinally = fileInputStream;
byte[] theirMagic = new byte[MAGIC_BYTES.length];
byte[] theirRandom = new byte[32];
byte[] theirEncryptedMagic = new byte[MAGIC_BYTES.length];
@@ -82,15 +87,19 @@ class EncryptedCoder {
cipher.init(Cipher.DECRYPT_MODE, new SecretKeySpec(key, "AES"), new IvParameterSpec(iv));
CipherInputStream inputStream = new CipherInputStream(fileInputStream, cipher);
StreamUtil.readFully(inputStream, theirEncryptedMagic);
cleanupFinally = inputStream;
StreamUtil.readFully(inputStream, theirEncryptedMagic);
if (!MessageDigest.isEqual(theirEncryptedMagic, MAGIC_BYTES)) {
throw new IOException("Key change on encrypted cache file!");
}
cleanupFinally = null;
return inputStream;
} catch (NoSuchAlgorithmException | InvalidKeyException | NoSuchPaddingException | InvalidAlgorithmParameterException e) {
throw new AssertionError(e);
} finally {
StreamUtil.close(cleanupFinally);
}
}