Fail early if supplementary info isn't populated
Bug: 389926006
Bug: 369375199
Test: atest keystore2_client_tests
Change-Id: I2613fd71116b75a8fdbd691f751ed0a17e65a565
diff --git a/keystore2/tests/keystore2_client_authorizations_tests.rs b/keystore2/tests/keystore2_client_authorizations_tests.rs
index 6fa3d64..377dcbe 100644
--- a/keystore2/tests/keystore2_client_authorizations_tests.rs
+++ b/keystore2/tests/keystore2_client_authorizations_tests.rs
@@ -1007,6 +1007,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.