Snap for 8746144 from 82d8cbf40d5c033108ba44cfdd3d0989d119e00e to mainline-conscrypt-release
Change-Id: I25004505fcd8ac0ae07cc2fbff51f70a692c9978
diff --git a/nugget/proto/nugget/app/identity/identity.proto b/nugget/proto/nugget/app/identity/identity.proto
index 591a92a..a29aa16 100644
--- a/nugget/proto/nugget/app/identity/identity.proto
+++ b/nugget/proto/nugget/app/identity/identity.proto
@@ -29,8 +29,8 @@
option (nugget.protobuf.app_id) = "IDENTITY";
option (nugget.protobuf.app_name) = "Identity";
option (nugget.protobuf.app_version) = 1;
- option (nugget.protobuf.request_buffer_size) = 1024;
- option (nugget.protobuf.response_buffer_size) = 1024;
+ option (nugget.protobuf.request_buffer_size) = 2048;
+ option (nugget.protobuf.response_buffer_size) = 2048;
// RPCs for the Identity HAL
rpc WICinitialize (WICinitializeRequest) returns (WICinitializeResponse);
diff --git a/nugget/proto/nugget/app/keymaster/keymaster.options b/nugget/proto/nugget/app/keymaster/keymaster.options
index 4d99765..d6eb175 100644
--- a/nugget/proto/nugget/app/keymaster/keymaster.options
+++ b/nugget/proto/nugget/app/keymaster/keymaster.options
@@ -15,7 +15,7 @@
nugget.app.keymaster.ProvisionPresharedSecretRequest.preshared_secret max_size:32
nugget.app.keymaster.StartAttestKeyRequest.not_before max_size:15
nugget.app.keymaster.StartAttestKeyRequest.not_after max_size:15
-nugget.app.keymaster.StartAttestKeyRequest.caller_issuer_subj_name max_size:64
+nugget.app.keymaster.StartAttestKeyRequest.caller_issuer_subj_name max_size:100
nugget.app.keymaster.ProvisionPresharedSecretResponse.digest max_size:32
nugget.app.keymaster.ProvisionCertificatesRequest.cert_block max_size: 1024
nugget.app.keymaster.ProvisionCertificatesRequest.digest max_size: 32
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 {
