commit 915fe666605b0ba5ec8a8fcde2d6dc55fb0b6bdb
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Fri Jan 03 02:44:52 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 03 02:44:52 2025 -0800
tree db3ba283b47cfc75e105ee486fdd7efc700f7bb0
parent 62fbc976ba573956b6187cdbb0e8cbeb73ba0c87
parent 46b2665467921524c163bfa2153a5312b729c41e

Merge "Allow any mode when checking DICE chain" into main am: 46b2665467

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

Change-Id: Iea66dfcbda659c2dc80aaa77c0cc9520d65001e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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 eaeec32..6973f8d 100644
--- a/security/keymint/support/remote_prov_utils.cpp
+++ b/security/keymint/support/remote_prov_utils.cpp
@@ -870,7 +870,7 @@
     }
 
     auto csr = hwtrust::Csr::validate(encodedCsr, *diceChainKind, false /*isFactory*/,
-                                      false /*allowAnyMode*/, deviceSuffix(instanceName));
+                                      true /*allowAnyMode*/, deviceSuffix(instanceName));
     if (!csr.ok()) {
         return csr.error().message();
     }