commit | 550bba7b6a0b4fa5705e6580787251d4563d7246 | [log] [tgz] |
---|---|---|
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 19:58:29 2016 -0700 |
tree | 564c5893ee75e1c0b8ddb5c3e6a79c8596b37d06 | |
parent | 87b44e33798faefca0d980abb9206fb92083da1c [diff] |
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
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];