commit 3af57cab3a70d2142e1da217c9ce73d373541570
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jan 15 22:12:45 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 15 22:12:45 2021 +0000
tree 7709fb5fa25bedfd0f6724d7e8a3605f4096e1c9
parent 2ccc6dfb02f7be78269442c0d3ef127a7e4bfe47
parent adeebe5e382c4b0e1d6edbe70ebc0eed3f016cba

Merge "Keystore 2.0 SPI: Fix bug in chunked streamer."

keystore/java/android/security/keystore2/KeyStoreCryptoOperationChunkedStreamer.java

diff --git a/keystore/java/android/security/keystore2/KeyStoreCryptoOperationChunkedStreamer.java b/keystore/java/android/security/keystore2/KeyStoreCryptoOperationChunkedStreamer.java
index 6c733ba..33e8ded 100644
--- a/keystore/java/android/security/keystore2/KeyStoreCryptoOperationChunkedStreamer.java
+++ b/keystore/java/android/security/keystore2/KeyStoreCryptoOperationChunkedStreamer.java
@@ -139,7 +139,9 @@
             int inputConsumed = ArrayUtils.copy(input, inputOffset, mChunk, mChunkLength,
                     inputLength);
             inputLength -= inputConsumed;
-            inputOffset += inputOffset;
+            inputOffset += inputConsumed;
+            mChunkLength += inputConsumed;
+            if (mChunkLength < mChunkSizeMax) return output;
             byte[] o = mKeyStoreStream.update(mChunk);
             if (o != null) {
                 output = ArrayUtils.concat(output, o);