Merge "Fail early if supplementary info isn't populated" into main
diff --git a/keystore2/tests/keystore2_client_authorizations_tests.rs b/keystore2/tests/keystore2_client_authorizations_tests.rs
index 4202e82..a546799 100644
--- a/keystore2/tests/keystore2_client_authorizations_tests.rs
+++ b/keystore2/tests/keystore2_client_authorizations_tests.rs
@@ -1025,6 +1025,11 @@
// Module info is only populated if the flag is set.
return;
}
+
+ // Test should not run before MODULE_HASH supplementary info is populated.
+ assert!(rustutils::system_properties::read_bool("keystore.module_hash.sent", false)
+ .unwrap_or(false));
+
let sl = SecLevel::tee();
// Retrieve the input value that gets hashed into the attestation.