Merge "Expect module hash in attestations only for KM V4+" into main
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()