From f884283cd6bebe61c7d745b561e3beb194cd6948 Mon Sep 17 00:00:00 2001
From: Max Bires <jbires@google.com>
Date: Wed, 26 May 2021 13:05:09 -0700
Subject: [PATCH] Fixing tests to reflect change in CDDL

This fixes up the tests to go along with the change to the signature
of the MAC key. Primarily, this adds the MAC tag from the MACing
operation over the public key set to be signed into the AAD of the
signature of said MAC key.

Bug: 189018262
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ibdcf242e0ae73dee1a08fe98d939130055e4492e
---
 .../aidl/vts/functional/VtsRemotelyProvisionedComponentTests.cpp | 1 +
 1 file changed, 1 insertion(+)

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