commit dbd58a89f5aaebee5b49da039851dc8ce588cd07
author Max Bires <jbires@google.com> Thu Jun 03 00:49:04 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jun 03 00:49:04 2021 +0000
tree c45b374141c9cadcabaa33ea89cc6d1a9d7ca8f1
parent 7ef6e10ce0e7edc4cdf4c5582a2eb9f8bf644183
parent 995bbe52a3779b765e077f8c107e25ca660caffb

Merge "Fixing tests to reflect change in CDDL" into sc-dev am: 09c9ab7c9a am: 995bbe52a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14739444

Change-Id: Id75b609f19966255d39a16797c5aedc3838e7982

security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp

diff --git a/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp b/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
index a2071c2..a177317 100644
--- a/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
+++ b/security/keymint/aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp
@@ -340,6 +340,7 @@
                                               cppbor::Array()  // SignedMacAad
                                                       .add(challenge_)
                                                       .add(std::move(deviceInfoMap))
+                                                      .add(keysToSignMac)
                                                       .encode());
         ASSERT_TRUE(macKey) << macKey.message();