commit 708744a964a99fb407a48b0ddebf62f0354d6483
author Shawn Willden <swillden@google.com> Fri Dec 11 13:05:27 2020 +0000
committer Shawn Willden <swillden@google.com> Fri Dec 11 20:36:49 2020 +0000
tree 7db19422ac675a5ee712313af931579286e3f34c
parent 594bea1b4838f5bfe4f51b1590810ae4f593471a

Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert "Revert "Keystore 2.0: Move keymint spec to security name..."

Revert^2 "Remove references to keymint1"

34536a352803a08776cc4f373d93a94e1fcbf98e

Bug: 175345910
Bug: 171429297
Change-Id: Ib500ff822958804b4aa031c114b7520fa70cd84d

keystore2/src/key_parameter.rs

diff --git a/keystore2/src/key_parameter.rs b/keystore2/src/key_parameter.rs
index 5698c96..7f2dc56 100644
--- a/keystore2/src/key_parameter.rs
+++ b/keystore2/src/key_parameter.rs
@@ -19,7 +19,7 @@
 use crate::error::Error as KeystoreError;
 use crate::error::ResponseCode;
 
-pub use android_hardware_keymint::aidl::android::hardware::keymint::{
+pub use android_hardware_security_keymint::aidl::android::hardware::security::keymint::{
     Algorithm::Algorithm, BlockMode::BlockMode, Digest::Digest, EcCurve::EcCurve,
     HardwareAuthenticatorType::HardwareAuthenticatorType, KeyOrigin::KeyOrigin,
     KeyParameter::KeyParameter as KmKeyParameter, KeyPurpose::KeyPurpose, PaddingMode::PaddingMode,