| commit | 5a857d1f32c88bd3cc115fac665472d71370cf87 | [log] [tgz] |
|---|---|---|
| author | Karuna Wadhera <kwadhera@google.com> | Wed Jan 22 08:57:09 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 22 08:57:09 2025 -0800 |
| tree | 7dbb9fde8b6242a3b8973059d78425003b5e71ab | |
| parent | 02833d086619abb641b4d5f5f3c05f5d4cc41c0d [diff] | |
| parent | b6713588edab2639f39eb0c193da9236134c7351 [diff] |
Merge "Expect module hash in attestations only for KM V4+" into main am: b6713588ed Original change: https://android-review.googlesource.com/c/platform/system/security/+/3459579 Change-Id: I36301016c6134f8707cc7d0a9fe2c99b1dd2a4de Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/keystore2/tests/keystore2_client_authorizations_tests.rs b/keystore2/tests/keystore2_client_authorizations_tests.rs index 6fa3d64..ff4645c 100644 --- a/keystore2/tests/keystore2_client_authorizations_tests.rs +++ b/keystore2/tests/keystore2_client_authorizations_tests.rs
@@ -1025,6 +1025,11 @@ assert!(result.is_err()); assert_eq!(result.unwrap_err(), Error::Rc(ResponseCode::INVALID_ARGUMENT)); + if sl.get_keymint_version() < 400 { + // Module hash will only be populated in KeyMint if the underlying device is KeyMint V4+. + return; + } + // Generate an attestation. let alias = "ks_module_info_test"; let params = authorizations::AuthSetBuilder::new()