| commit | 155e1805f9e57a767dd5e71dbc5a5b71a71e7b25 | [log] [tgz] |
|---|---|---|
| author | Tommy Chiu <tommychiu@google.com> | Thu May 26 08:39:35 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 26 08:39:35 2022 +0000 |
| tree | adbeb2aabcf43b95ec981bfde8278d08ded9c799 | |
| parent | 6edf2a90427f19cf6219e9222efe43eacf4a254c [diff] | |
| parent | 0c97200cfaced9cd6632fce6ebfdd2713add9cb8 [diff] |
Merge remote-tracking branch 'goog/upstream-master' into D2-TM-008a am: 9b38d2e14c am: 0c97200cfa Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/18495175 Change-Id: I72634969ffdd41a2ec5579e10d0cea9495efe654 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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
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 {