Merge remote-tracking branch 'goog/upstream-master' into D2-TM-009
* goog/upstream-master:
identity: Increase protobuf buffer size by 1024 bytes
KM: Bump the issuer_subject_name size to 100byte maximum
Bug: 233323901
Bug: 234395804
Bug: 234413909
Bug: 235895350
Test: release tests, QMC
Signed-off-by: Bill Richardson <wfrichar@google.com>
Change-Id: I9d1c66b62932c2e974c35979b66ea3807b438fea
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