diff options
author | Max Bires <jbires@google.com> | 2023-03-22 15:32:05 -0700 |
---|---|---|
committer | Max Bires <jbires@google.com> | 2023-03-22 15:47:11 -0700 |
commit | 25924fca88b34419adb9a123928931721d21c36a (patch) | |
tree | 65a68a7111693bbb647af66863582b1f7005f1d2 | |
parent | 4d768643e929c56ea7578c154b24bbe463fc9f46 (diff) | |
download | keymaster-25924fca88b34419adb9a123928931721d21c36a.tar.gz |
Set a maximum accepted challenge size.
This is in accordance with the maximum challenge size specified in the
generateCsrV2 request defined in the IRemotelyProvisionedComponent v3
HAL.
Test: atest VtsHalRemotelyProvisionedComponentTargetTest
Change-Id: Ie3ef223ec49f83736813c9206c49fef5de5c10ca
-rw-r--r-- | android_keymaster/android_keymaster.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/android_keymaster/android_keymaster.cpp b/android_keymaster/android_keymaster.cpp index 94b3e99..4a97bad 100644 --- a/android_keymaster/android_keymaster.cpp +++ b/android_keymaster/android_keymaster.cpp @@ -134,6 +134,7 @@ std::pair<const uint8_t*, size_t> blob2Pair(const keymaster_blob_t& blob) { return {blob.data, blob.data_length}; } +constexpr int kMaxChallengeSizeV2 = 64; constexpr int kP256AffinePointSize = 32; constexpr int kRoTVersion1 = 40001; @@ -525,6 +526,14 @@ void AndroidKeymaster::GenerateCsrV2(const GenerateCsrV2Request& request, if (response == nullptr) return; + if (request.challenge.size() > kMaxChallengeSizeV2) { + LOG_E("Challenge is too large. %zu expected. %zu actual.", + kMaxChallengeSizeV2, // + request.challenge.size()); // + response->error = static_cast<keymaster_error_t>(kStatusFailed); + return; + } + auto rem_prov_ctx = context_->GetRemoteProvisioningContext(); if (rem_prov_ctx == nullptr) { LOG_E("Couldn't get a pointer to the remote provisioning context, returned null.", 0); |