diff options
| author | Seth Moore <sethmo@google.com> | 2022-04-19 17:05:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-19 17:05:55 +0000 |
| commit | a454b173344f61064eaa53e0cebb7b3fbaac8167 (patch) | |
| tree | b08cb5f7cf1208c9f8cb8537855de816f88caaac | |
| parent | 23a1b57bb2a18d6975ffbf8a58ff16267b66e148 (diff) | |
| parent | f16fb9f3a850ec24ce0811e8a3573b7329d8b7f3 (diff) | |
| download | security-a454b173344f61064eaa53e0cebb7b3fbaac8167.tar.gz | |
Merge "Ensure that "rkp only" forces checks for rkp keys" am: cd6b6a7ff8 am: f16fb9f3a8
Original change: https://android-review.googlesource.com/c/platform/system/security/+/2066831
Change-Id: Ida19f5b72990311f8bfe1d19a765f1539804017c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | keystore2/src/remote_provisioning.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/keystore2/src/remote_provisioning.rs b/keystore2/src/remote_provisioning.rs index afbf475c..8837d1c0 100644 --- a/keystore2/src/remote_provisioning.rs +++ b/keystore2/src/remote_provisioning.rs @@ -102,6 +102,9 @@ impl RemProvState { /// server, so unfortunately caching the presence or absence of the HAL is not enough to fully /// make decisions about the state of remote provisioning during runtime. fn check_rem_prov_enabled(&self, db: &mut KeystoreDB) -> Result<bool> { + if self.is_rkp_only { + return Ok(true); + } if !self.is_hal_present.load(Ordering::Relaxed) || get_remotely_provisioned_component(&self.security_level).is_err() { |