commit c2f3acfcb9fc9967333e01e632af994dd7cc6ed5
author Shawn Willden <swillden@google.com> Wed Feb 03 07:07:17 2021 -0700
committer Shawn Willden <swillden@google.com> Wed Feb 17 06:46:14 2021 -0700
tree e6e65906463bee0185e381612f2e58c3145b94a0
parent 80ace70572a2746221847ef2337e9ff93821e510

Stub out ATTEST_KEY support.

Bug: 171845787
Test: Build
Change-Id: I243d58f72a55af4b299ff48c419b0cde4e64cbce

keystore2/src/security_level.rs

diff --git a/keystore2/src/security_level.rs b/keystore2/src/security_level.rs
index c2170b6..b96aea8 100644
--- a/keystore2/src/security_level.rs
+++ b/keystore2/src/security_level.rs
@@ -389,7 +389,7 @@
         let km_dev: Strong<dyn IKeyMintDevice> = self.keymint.get_interface()?;
         map_km_error(km_dev.addRngEntropy(entropy))
             .context("In generate_key: Trying to add entropy.")?;
-        let creation_result = map_km_error(km_dev.generateKey(&params))
+        let creation_result = map_km_error(km_dev.generateKey(&params, None /* attestKey */))
             .context("In generate_key: While generating Key")?;
 
         let user_id = uid_to_android_user(caller_uid);
@@ -444,8 +444,9 @@
 
         let km_dev: Strong<dyn IKeyMintDevice> =
             self.keymint.get_interface().context("In import_key: Trying to get the KM device")?;
-        let creation_result = map_km_error(km_dev.importKey(&params, format, key_data))
-            .context("In import_key: Trying to call importKey")?;
+        let creation_result =
+            map_km_error(km_dev.importKey(&params, format, key_data, None /* attestKey */))
+                .context("In import_key: Trying to call importKey")?;
 
         let user_id = uid_to_android_user(caller_uid);
         self.store_new_key(key, creation_result, user_id).context("In import_key.")