commit f5c1ab0c5ecae25f8c4b2f159d8318015f08d780
author David Drysdale <drysdale@google.com> Mon Apr 19 19:08:14 2021 +0100
committer David Drysdale <drysdale@google.com> Thu Apr 22 15:55:57 2021 +0100
tree 66be4eeebc87335760de5ab433ea5d96b47ce5e7
parent 601733bc919e4798c6ed0779adb20c0b3dc2d6b7

Align KeyMint AIDL with usage

 - Make HardwareAuthToken nullable on begin()
 - Drop unused vestigial performOperation() entrypoint
 - Drop unused Tag::BLOB_USAGE_REQUIREMENTS

Test: TreeHugger, VtsKeyMintAidlTargetTest (CF)
Change-Id: Ief6a9c97456cdf7e7626ff26a875792584c40199

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index c654c02..e4af009 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -293,8 +293,6 @@
             )
             .context("In create_operation.")?;
 
-        let immediate_hat = immediate_hat.unwrap_or_default();
-
         let km_blob = SUPER_KEY
             .unwrap_key_if_required(&blob_metadata, km_blob)
             .context("In create_operation. Failed to handle super encryption.")?;
@@ -316,7 +314,7 @@
                         purpose,
                         blob,
                         &operation_parameters,
-                        &immediate_hat,
+                        immediate_hat.as_ref(),
                     )) {
                         Err(Error::Km(ErrorCode::TOO_MANY_OPERATIONS)) => {
                             self.operation_db.prune(caller_uid, forced)?;