diff options
author | Shaquille Johnson <ssjohnson@google.com> | 2022-11-30 17:08:05 +0000 |
---|---|---|
committer | Shaquille Johnson <ssjohnson@google.com> | 2022-11-30 17:52:38 +0000 |
commit | aec2eca4ca712f5ca4cddf612063d3d28f95a1cf (patch) | |
tree | eff0f5a1111df811d10123040d24e5b07027b0b0 /keystore2/src/raw_device.rs | |
parent | b66eb7acb69310424838d8f86383f61b26c98975 (diff) | |
download | security-aec2eca4ca712f5ca4cddf612063d3d28f95a1cf.tar.gz |
Update logs to use ks_err in rust code
Test: Run and tested using `atest keystore2_test` for Rust test and CTS test with `atest CtsKeystoreTestCases`
Change-Id: Ic8e62f1c5d19c6203945fefeb18b066bf8a32ed7
Diffstat (limited to 'keystore2/src/raw_device.rs')
-rw-r--r-- | keystore2/src/raw_device.rs | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/keystore2/src/raw_device.rs b/keystore2/src/raw_device.rs index fe044ee4..d32d2104 100644 --- a/keystore2/src/raw_device.rs +++ b/keystore2/src/raw_device.rs @@ -66,8 +66,8 @@ impl KeyMintDevice { /// Get a [`KeyMintDevice`] for the given [`SecurityLevel`] pub fn get(security_level: SecurityLevel) -> Result<KeyMintDevice> { - let (km_dev, hw_info, km_uuid) = get_keymint_device(&security_level) - .context("In KeyMintDevice::get: get_keymint_device failed")?; + let (km_dev, hw_info, km_uuid) = + get_keymint_device(&security_level).context(ks_err!("get_keymint_device failed"))?; Ok(KeyMintDevice { km_dev, @@ -111,12 +111,11 @@ impl KeyMintDevice { where F: FnOnce(&Strong<dyn IKeyMintDevice>) -> Result<KeyCreationResult, binder::Status>, { - let creation_result = map_km_error(creator(&self.km_dev)) - .context("In create_and_store_key: creator failed")?; + let creation_result = + map_km_error(creator(&self.km_dev)).context(ks_err!("creator failed"))?; let key_parameters = key_characteristics_to_internal(creation_result.keyCharacteristics); - let creation_date = - DateTime::now().context("In create_and_store_key: DateTime::now() failed")?; + let creation_date = DateTime::now().context(ks_err!("DateTime::now() failed"))?; let mut key_metadata = KeyMetaData::new(); key_metadata.add(KeyMetaEntry::CreationDate(creation_date)); @@ -132,7 +131,7 @@ impl KeyMintDevice { &key_metadata, &self.km_uuid, ) - .context("In create_and_store_key: store_new_key failed")?; + .context(ks_err!("store_new_key failed"))?; Ok(()) } @@ -244,7 +243,7 @@ impl KeyMintDevice { .take_key_blob_info() .ok_or(Error::Rc(ResponseCode::KEY_NOT_FOUND)) .map(|(key_blob, _)| KeyBlob::NonSensitive(key_blob)) - .context("Missing key blob info.")?, + .context(ks_err!("Missing key blob info."))?, )) }) .context(ks_err!("second lookup failed")) |