commit c71a8d0ef162564648a6552e46a2b82bcd417e7f
author Andrew Scull <ascull@google.com> Thu Mar 30 09:36:31 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 30 09:36:31 2023 +0000
tree 79dc6e098023d7867a953de83458721816f36031
parent a2f63439c779f694dde87c5a24e97bbe09d1dccd
parent 2b1e5d9fc81d76fe25905ca9835fe48b5fb0652f

Merge "Use VSR to tell libhwtrust_cxx how to validate"

security/keymint/support/remote_prov_utils.cpp

diff --git a/security/keymint/support/remote_prov_utils.cpp b/security/keymint/support/remote_prov_utils.cpp
index 23e2192..ffcaa95 100644
--- a/security/keymint/support/remote_prov_utils.cpp
+++ b/security/keymint/support/remote_prov_utils.cpp
@@ -619,7 +619,7 @@
     }
 
     // BCC is [ pubkey, + BccEntry]
-    auto bccContents = validateBcc(bcc->asArray(), hwtrust::DiceChain::Kind::kProtectedData);
+    auto bccContents = validateBcc(bcc->asArray(), hwtrust::DiceChain::Kind::kVsr13);
     if (!bccContents) {
         return bccContents.message() + "\n" + prettyPrint(bcc.get());
     }
@@ -910,7 +910,7 @@
     }
 
     // DICE chain is [ pubkey, + DiceChainEntry ].
-    auto diceContents = validateBcc(diceCertChain, hwtrust::DiceChain::Kind::kAuthenticatedMessage);
+    auto diceContents = validateBcc(diceCertChain, hwtrust::DiceChain::Kind::kVsr14);
     if (!diceContents) {
         return diceContents.message() + "\n" + prettyPrint(diceCertChain);
     }