Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-05-03 15:11:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Only close AttachmentCipher streams if using incremental MAC.

Browse Source
This commit is contained in:
Nicholas Tinsley
2023-06-30 11:06:51 -04:00
parent 4572ae5886
commit 8b8d62f598
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/http/DigestingRequestBody.kt
View File

@@ -41,8 +41,9 @@ class DigestingRequestBody(
override fun writeTo(sink: BufferedSink) {
val digestStream = ByteArrayOutputStream()
val inner = SkippingOutputStream(contentStart, sink.outputStream())
val outputStream: DigestingOutputStream = if (outputStreamFactory is AttachmentCipherOutputStreamFactory) {
outputStreamFactory.createIncrementalFor(inner, contentLength, digestStream)
val isIncremental = outputStreamFactory is AttachmentCipherOutputStreamFactory
val outputStream: DigestingOutputStream = if (isIncremental) {
(outputStreamFactory as AttachmentCipherOutputStreamFactory).createIncrementalFor(inner, contentLength, digestStream)
} else {
outputStreamFactory.createFor(inner)
}
@@ -61,10 +62,11 @@ class DigestingRequestBody(
}
outputStream.flush()
outputStream.close()
digestStream.close()
incrementalDigest = digestStream.toByteArray()
if (isIncremental) {
outputStream.close()
digestStream.close()
incrementalDigest = digestStream.toByteArray()
}
transmittedDigest = outputStream.transmittedDigest
}