commit 6bfae7e4ab3fe21064095659f3f6a4e8083a2b7b
author Janis Danisevskis <jdanis@google.com> Thu Mar 04 15:38:48 2021 -0800
committer Janis Danisevskis <jdanis@google.com> Thu Mar 04 15:44:19 2021 -0800
tree 08dafe3b0384f6816bac32ffd665623c2d8d8cf8
parent 1f9505f133b7a3c929cbfedc35a12b83541b4df2

Keystore 2.0: Fix legacy wrapper updateAad.

updateAad passed the AAD both as AAD and cipher/plaintext.

Test: android.keystore.cts.AES256GCMNoPaddingCipherTest#testKatDecryptWithAadProvidedInChunks
Change-Id: Ic9af76eb00fd763d9355a104e62e15de53ad5ee9

keystore2/src/km_compat/km_compat.cpp

diff --git a/keystore2/src/km_compat/km_compat.cpp b/keystore2/src/km_compat/km_compat.cpp
index 3d43918..41d5232 100644
--- a/keystore2/src/km_compat/km_compat.cpp
+++ b/keystore2/src/km_compat/km_compat.cpp
@@ -658,8 +658,8 @@
 
     KMV1::ErrorCode errorCode;
     auto result = mDevice->update(
-        mOperationHandle, {V4_0::makeKeyParameter(V4_0::TAG_ASSOCIATED_DATA, input)}, input,
-        authToken, verificationToken,
+        mOperationHandle, {V4_0::makeKeyParameter(V4_0::TAG_ASSOCIATED_DATA, input)}, {}, authToken,
+        verificationToken,
         [&](V4_0_ErrorCode error, auto, auto, auto) { errorCode = convert(error); });
 
     if (!result.isOk()) {