commit a53c9cf7980fa3bcc924a3f5ce53df194c421084
author Janis Danisevskis <jdanis@google.com> Mon Oct 26 11:52:33 2020 -0700
committer Janis Danisevskis <jdanis@google.com> Tue Nov 17 12:17:10 2020 -0800
tree 217349ce3093428a906474596ed6de656428a272
parent 45c5c97665a5ce647cfa53283f838ff2f5bca3be

Keystore 2.0: Add back dependency on KeyMint AIDL spec.

We are using SecurityLevel, KeyParameter, and HardwareAuthenticatorType
from the KeyMint spec now, instead of defining our own versions of these
types.

Test: keystore2_test
Change-Id: I0080382cb3619f7153ea3a6e49bb7b5f4b23f15b

keystore2/src/service.rs

diff --git a/keystore2/src/service.rs b/keystore2/src/service.rs
index d0c44e0..e17a2ef 100644
--- a/keystore2/src/service.rs
+++ b/keystore2/src/service.rs
@@ -32,7 +32,6 @@
     Domain::Domain, IKeystoreSecurityLevel::IKeystoreSecurityLevel,
     IKeystoreService::BnKeystoreService, IKeystoreService::IKeystoreService,
     KeyDescriptor::KeyDescriptor, KeyEntryResponse::KeyEntryResponse, KeyMetadata::KeyMetadata,
-    SecurityLevel::SecurityLevel as KsSecurityLevel,
 };
 use anyhow::{anyhow, Context, Result};
 use binder::{IBinder, Interface, ThreadState};
@@ -98,7 +97,7 @@
                     nspace: key_entry.id(),
                     ..Default::default()
                 },
-                keySecurityLevel: KsSecurityLevel(key_entry.sec_level().0),
+                keySecurityLevel: key_entry.sec_level(),
                 certificate: key_entry.take_cert(),
                 certificateChain: key_entry.take_cert_chain(),
                 authorizations: key_parameters_to_authorizations(key_entry.into_key_parameters()),
@@ -194,7 +193,7 @@
 impl IKeystoreService for KeystoreService {
     fn getSecurityLevel(
         &self,
-        security_level: KsSecurityLevel,
+        security_level: SecurityLevel,
     ) -> binder::public_api::Result<Box<dyn IKeystoreSecurityLevel>> {
         map_or_log_err(self.get_security_level(SecurityLevel(security_level.0)), Ok)
     }