diff options
| author | Tommy Chiu <tommychiu@google.com> | 2022-05-26 08:39:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-05-26 08:39:33 +0000 |
| commit | b4b69e959dafca190b6c599277726c9e7cb02350 (patch) | |
| tree | adbeb2aabcf43b95ec981bfde8278d08ded9c799 | |
| parent | 9e44c7608c787ad0e7f6a138c90093271cbcd43e (diff) | |
| parent | a26287fe486ea315ee50a139532497fb44c63e62 (diff) | |
| download | generic-b4b69e959dafca190b6c599277726c9e7cb02350.tar.gz | |
Merge remote-tracking branch 'goog/upstream-master' into D2-TM-008a am: 9b38d2e14c am: a26287fe48
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/nos/host/generic/+/18495175
Change-Id: Ifd7174794f86b6bc501423475bf3ede23f67d78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | nugget/proto/nugget/app/keymaster/keymaster.proto | 1 | ||||
| -rw-r--r-- | nugget/proto/nugget/app/keymaster/keymaster_defs.proto | 1 |
2 files changed, 2 insertions, 0 deletions
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 @@ message SetBootStateRequest { 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 @@ enum ChipFusing { 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 { |