commit 50d0447566db4a77d78d592f1c1b5d31096fac8f
author Kenny Root <kroot@google.com> Thu Feb 25 23:19:45 2016 -0800
committer The Android Automerger <android-build@google.com> Fri Mar 25 17:46:36 2016 -0700
tree 564c5893ee75e1c0b8ddb5c3e6a79c8596b37d06
parent 4bdc877ba02469916cc8c865083f6523b222c28f

OpenSSLCipher: reset AAD when necessary

AAD was not being reset correctly during init or doFinal calls thus
leading to incorrect output.

(cherry picked from commit 0bab7f3b89ea13eb0d0c39d9c7b60c6112f0d6a8)

Bug: 27324690
Change-Id: If7806a9d7847814b60719637abceb94d8fbc8831

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 47de94a..305f174 100644
--- a/src/main/java/org/conscrypt/OpenSSLCipher.java
+++ b/src/main/java/org/conscrypt/OpenSSLCipher.java
@@ -891,6 +891,7 @@
         }
 
         private void reset() {
+            aad = null;
             final int lastBufSize = lastGlobalMessageSize;
             if (buf == null) {
                 buf = new byte[lastBufSize];