commit 1638945d4ed9403790962ec7abed1b7a232a9ff8
author Kenny Root <kroot@google.com> Wed Mar 16 16:27:18 2016 -0700
committer The Android Automerger <android-build@google.com> Tue Mar 29 15:59:28 2016 -0700
tree 1076bd26face81c54a4912f881a56f41ae0281ca
parent 8bec47d2184fca7e8b7337d2a65b2b75a9bc8f54

Fix updateAAD when offset is not 0

Due to AAD data not being reset when a Cipher instance was re-used, this
bug was never uncovered by tests that actually exercise this case.

(cherry picked from commit 95cf7b9b7fbabb77cd341f17da79c947bcc934ab)

Bug: 27696681
Bug: 27324690
Change-Id: Iae9b5794f212a8fc4eeff2a651332e7490f5cada

src/main/java/org/conscrypt/OpenSSLCipher.java

diff --git a/src/main/java/org/conscrypt/OpenSSLCipher.java b/src/main/java/org/conscrypt/OpenSSLCipher.java
index 571c8cb..fa174d6 100644
--- a/src/main/java/org/conscrypt/OpenSSLCipher.java
+++ b/src/main/java/org/conscrypt/OpenSSLCipher.java
@@ -1053,7 +1053,7 @@
         /* @Override */
         protected void engineUpdateAAD(byte[] input, int inputOffset, int inputLen) {
             if (aad == null) {
-                aad = Arrays.copyOfRange(input, inputOffset, inputLen);
+                aad = Arrays.copyOfRange(input, inputOffset, inputOffset + inputLen);
             } else {
                 int newSize = aad.length + inputLen;
                 byte[] newaad = new byte[newSize];