diff options
author | Max Bires <jbires@google.com> | 2023-03-23 02:17:29 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-23 02:17:29 +0000 |
commit | e8c600c4b1286b161f8cfb771beecf8f33208640 (patch) | |
tree | 65a68a7111693bbb647af66863582b1f7005f1d2 | |
parent | 3ba4c56dcab581ff31c295db5242dfb032fe8deb (diff) | |
parent | 25924fca88b34419adb9a123928931721d21c36a (diff) | |
download | keymaster-e8c600c4b1286b161f8cfb771beecf8f33208640.tar.gz |
Set a maximum accepted challenge size. am: 25924fca88
Original change: https://android-review.googlesource.com/c/platform/system/keymaster/+/2504175
Change-Id: I57ca2678ce637e69327aa9caa8e6b27b22993923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-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); |