Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Keystore 2.0 SPI: Fix bug in chunked streamer." am: 3af57cab3a am: 4b1f565fc0

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1552674

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8c8004df6a99e86e80b0d6476ed70c28d13a6932
This commit is contained in:
Treehugger Robot
2021-01-15 23:29:18 +00:00
committed by Automerger Merge Worker
parent d595439212 4b1f565fc0
commit cbb3d15358
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
keystore/java/android/security/keystore2/KeyStoreCryptoOperationChunkedStreamer.java
View File

@@ -139,7 +139,9 @@ class KeyStoreCryptoOperationChunkedStreamer implements KeyStoreCryptoOperationS
int inputConsumed = ArrayUtils.copy(input, inputOffset, mChunk, mChunkLength, int inputConsumed = ArrayUtils.copy(input, inputOffset, mChunk, mChunkLength,
inputLength); inputLength);
inputLength -= inputConsumed; inputLength -= inputConsumed;
inputOffset += inputOffset; inputOffset += inputConsumed;
mChunkLength += inputConsumed;
if (mChunkLength < mChunkSizeMax) return output;
byte[] o = mKeyStoreStream.update(mChunk); byte[] o = mKeyStoreStream.update(mChunk);
if (o != null) { if (o != null) {
output = ArrayUtils.concat(output, o); output = ArrayUtils.concat(output, o);