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
diff --git a/keystore2/src/key_parameter.rs b/keystore2/src/key_parameter.rs
index 5355d93..5698c96 100644
--- a/keystore2/src/key_parameter.rs
+++ b/keystore2/src/key_parameter.rs
@@ -25,9 +25,7 @@
KeyParameter::KeyParameter as KmKeyParameter, KeyPurpose::KeyPurpose, PaddingMode::PaddingMode,
SecurityLevel::SecurityLevel, Tag::Tag,
};
-use android_system_keystore2::aidl::android::system::keystore2::{
- Authorization::Authorization, SecurityLevel::SecurityLevel as KsSecurityLevel,
-};
+use android_system_keystore2::aidl::android::system::keystore2::Authorization::Authorization;
use anyhow::{Context, Result};
use rusqlite::types::{FromSql, Null, ToSql, ToSqlOutput};
use rusqlite::{Result as SqlResult, Row};
@@ -241,10 +239,8 @@
/// an internal KeyParameter representation to produce the Authorization wire type.
pub fn into_authorization(self) -> Authorization {
Authorization {
- securityLevel: KsSecurityLevel(self.security_level.0),
- keyParameter: crate::utils::keyparam_km_to_ks(
- &self.key_parameter_value.convert_to_wire(),
- ),
+ securityLevel: self.security_level,
+ keyParameter: self.key_parameter_value.convert_to_wire(),
}
}
}