| commit | 5c079e73dce4fd893d92d54b6754d742dfb0eddc | [log] [tgz] |
|---|---|---|
| author | Karuna Wadhera <kwadhera@google.com> | Thu Jan 23 04:52:00 2025 -0800 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Jan 23 04:52:00 2025 -0800 |
| tree | 73650a76b07a54b829aba783b03b33fda1091d01 | |
| parent | 049f43c72b85ddf3d97760ad363ffd7d07a7bf21 [diff] | |
| parent | e181b7430eb29a63cf0cd05fa22c636123d0d70c [diff] |
Merge "Fail early if supplementary info isn't populated" into main am: e181b7430e Original change: https://android-review.googlesource.com/c/platform/system/security/+/3462439 Change-Id: I69098862898024f61daff2f3dac0bc80f0725467 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 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.