commit aad31138b84f504a05e18bac6e92d8c9c1eb930a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 09 07:06:24 2022 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Thu Jun 09 07:06:24 2022 +0000
tree adbeb2aabcf43b95ec981bfde8278d08ded9c799
parent b815aaa2d2446ee0e8b20d4ef1f7ac75091d7835
parent 0fd235d7056cf7f92bc2d829d2464814ca7e4302

Snap for 8701348 from 0fd235d7056cf7f92bc2d829d2464814ca7e4302 to mainline-wifi-release

Change-Id: Ic7d3af8a5b17016c93531c0357867815a76f5205

nugget/proto/nugget/app/keymaster/keymaster.proto

diff --git a/nugget/proto/nugget/app/keymaster/keymaster.proto b/nugget/proto/nugget/app/keymaster/keymaster.proto
index 67f464a..89710e6 100644
--- a/nugget/proto/nugget/app/keymaster/keymaster.proto
+++ b/nugget/proto/nugget/app/keymaster/keymaster.proto
@@ -413,6 +413,7 @@
   uint32 system_version = 4;         // Deprecated.
   uint32 system_security_level = 5;  // Patch level of the boot partition.
   bytes boot_hash = 6;               // This is a SHA256 digest.
+  uint32 boot_security_level = 7;
 }
 message SetBootStateResponse {
   // Specified in keymaster_defs.proto:ErrorCode

nugget/proto/nugget/app/keymaster/keymaster_defs.proto

diff --git a/nugget/proto/nugget/app/keymaster/keymaster_defs.proto b/nugget/proto/nugget/app/keymaster/keymaster_defs.proto
index 66d1801..dfdfeeb 100644
--- a/nugget/proto/nugget/app/keymaster/keymaster_defs.proto
+++ b/nugget/proto/nugget/app/keymaster/keymaster_defs.proto
@@ -321,6 +321,7 @@
     FUSING_PVT_1 = 3;   // Strongbox gen v1 certs.
     FUSING_D_PVT = 4;   // Dauntless gen v0 certs.
     FUSING_D_PVT_1 = 5; // Dauntless gen v1 certs.
+    FUSING_D_PVT_2 = 6; // Dauntless gen v2 certs (D3M2).
 }
 
 enum CertificateStatus {