From f5a002c222467430c25a1ad042defde7c8962754 Mon Sep 17 00:00:00 2001 From: Shawn Willden Date: Fri, 11 Dec 2020 13:05:27 +0000 Subject: [PATCH] Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ..." 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: I694e677e4e20419440f12cb7981f0c0c4ca29e08 --- .../security/keymaster/KeymasterDefs.java | 24 +++++++++---------- .../android/security/KeyStoreOperation.java | 2 +- .../security/KeyStoreSecurityLevel.java | 2 +- .../AndroidKeyStore3DESCipherSpi.java | 2 +- ...roidKeyStoreAuthenticatedAESCipherSpi.java | 2 +- .../AndroidKeyStoreCipherSpiBase.java | 2 +- .../AndroidKeyStoreECDSASignatureSpi.java | 2 +- .../keystore2/AndroidKeyStoreHmacSpi.java | 2 +- .../AndroidKeyStoreKeyGeneratorSpi.java | 4 ++-- .../AndroidKeyStoreKeyPairGeneratorSpi.java | 4 ++-- .../AndroidKeyStoreRSACipherSpi.java | 2 +- .../AndroidKeyStoreRSASignatureSpi.java | 2 +- .../AndroidKeyStoreSignatureSpiBase.java | 2 +- .../keystore2/AndroidKeyStoreSpi.java | 6 ++--- ...idKeyStoreUnauthenticatedAESCipherSpi.java | 2 +- .../keystore2/KeyStore2ParameterUtils.java | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/core/java/android/security/keymaster/KeymasterDefs.java b/core/java/android/security/keymaster/KeymasterDefs.java index 6ef9e7e3d9b8a..017f40521a812 100644 --- a/core/java/android/security/keymaster/KeymasterDefs.java +++ b/core/java/android/security/keymaster/KeymasterDefs.java @@ -16,18 +16,18 @@ package android.security.keymaster; -import android.hardware.keymint.Algorithm; -import android.hardware.keymint.BlockMode; -import android.hardware.keymint.Digest; -import android.hardware.keymint.ErrorCode; -import android.hardware.keymint.HardwareAuthenticatorType; -import android.hardware.keymint.KeyFormat; -import android.hardware.keymint.KeyOrigin; -import android.hardware.keymint.KeyPurpose; -import android.hardware.keymint.PaddingMode; -import android.hardware.keymint.SecurityLevel; -import android.hardware.keymint.Tag; -import android.hardware.keymint.TagType; +import android.hardware.security.keymint.Algorithm; +import android.hardware.security.keymint.BlockMode; +import android.hardware.security.keymint.Digest; +import android.hardware.security.keymint.ErrorCode; +import android.hardware.security.keymint.HardwareAuthenticatorType; +import android.hardware.security.keymint.KeyFormat; +import android.hardware.security.keymint.KeyOrigin; +import android.hardware.security.keymint.KeyPurpose; +import android.hardware.security.keymint.PaddingMode; +import android.hardware.security.keymint.SecurityLevel; +import android.hardware.security.keymint.Tag; +import android.hardware.security.keymint.TagType; import java.util.HashMap; import java.util.Map; diff --git a/keystore/java/android/security/KeyStoreOperation.java b/keystore/java/android/security/KeyStoreOperation.java index 49a48871fd305..7ea9e14388457 100644 --- a/keystore/java/android/security/KeyStoreOperation.java +++ b/keystore/java/android/security/KeyStoreOperation.java @@ -17,7 +17,7 @@ package android.security; import android.annotation.NonNull; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.os.RemoteException; import android.os.ServiceSpecificException; import android.security.keymaster.KeymasterDefs; diff --git a/keystore/java/android/security/KeyStoreSecurityLevel.java b/keystore/java/android/security/KeyStoreSecurityLevel.java index 7c3de8bee475b..3ef4aa5b7ec30 100644 --- a/keystore/java/android/security/KeyStoreSecurityLevel.java +++ b/keystore/java/android/security/KeyStoreSecurityLevel.java @@ -18,7 +18,7 @@ package android.security; import android.annotation.NonNull; import android.app.compat.CompatChanges; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.os.RemoteException; import android.os.ServiceSpecificException; import android.security.keystore.BackendBusyException; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStore3DESCipherSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStore3DESCipherSpi.java index 69c7a2589d6fd..0775a1a99886e 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStore3DESCipherSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStore3DESCipherSpi.java @@ -17,7 +17,7 @@ package android.security.keystore2; import android.annotation.NonNull; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.keymaster.KeymasterDefs; import android.security.keystore.ArrayUtils; import android.security.keystore.KeyProperties; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreAuthenticatedAESCipherSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreAuthenticatedAESCipherSpi.java index 2b5f6c31607bf..bc56f015f3bd2 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreAuthenticatedAESCipherSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreAuthenticatedAESCipherSpi.java @@ -18,7 +18,7 @@ package android.security.keystore2; import android.annotation.NonNull; import android.annotation.Nullable; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.KeyStoreException; import android.security.KeyStoreOperation; import android.security.keymaster.KeymasterDefs; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java b/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java index 18d26922f1aed..a3b04abfba3f0 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java @@ -19,7 +19,7 @@ package android.security.keystore2; import android.annotation.CallSuper; import android.annotation.NonNull; import android.annotation.Nullable; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.KeyStoreException; import android.security.KeyStoreOperation; import android.security.keymaster.KeymasterDefs; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java index 2250c89aac41e..d1ef1df817e68 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java @@ -17,7 +17,7 @@ package android.security.keystore2; import android.annotation.NonNull; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.KeyStoreException; import android.security.KeyStoreOperation; import android.security.keymaster.KeymasterDefs; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreHmacSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreHmacSpi.java index eea45c2876221..8475ad9fd57bd 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreHmacSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreHmacSpi.java @@ -16,7 +16,7 @@ package android.security.keystore2; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.KeyStoreException; import android.security.KeyStoreOperation; import android.security.keymaster.KeymasterDefs; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyGeneratorSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyGeneratorSpi.java index 479fd8a6a73a1..233f352989ab7 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyGeneratorSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyGeneratorSpi.java @@ -16,8 +16,8 @@ package android.security.keystore2; -import android.hardware.keymint.KeyParameter; -import android.hardware.keymint.SecurityLevel; +import android.hardware.security.keymint.KeyParameter; +import android.hardware.security.keymint.SecurityLevel; import android.security.KeyStore2; import android.security.KeyStoreSecurityLevel; import android.security.keymaster.KeymasterArguments; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java index 61725e3e8c24c..df0e1462a4925 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java @@ -18,8 +18,8 @@ package android.security.keystore2; import android.annotation.NonNull; import android.annotation.Nullable; -import android.hardware.keymint.KeyParameter; -import android.hardware.keymint.SecurityLevel; +import android.hardware.security.keymint.KeyParameter; +import android.hardware.security.keymint.SecurityLevel; import android.os.Build; import android.security.KeyPairGeneratorSpec; import android.security.KeyStore2; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreRSACipherSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreRSACipherSpi.java index 2686ddc20c1d7..951f91887894c 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreRSACipherSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreRSACipherSpi.java @@ -18,7 +18,7 @@ package android.security.keystore2; import android.annotation.NonNull; import android.annotation.Nullable; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.keymaster.KeymasterDefs; import android.security.keystore.KeyProperties; import android.security.keystore.KeymasterUtils; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java index 444dad4cffbea..ab7559116a416 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java @@ -17,7 +17,7 @@ package android.security.keystore2; import android.annotation.NonNull; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.keymaster.KeymasterDefs; import android.security.keystore.KeyProperties; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSignatureSpiBase.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSignatureSpiBase.java index a168f8feb3dbb..9b4f01e744f7c 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreSignatureSpiBase.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSignatureSpiBase.java @@ -18,7 +18,7 @@ package android.security.keystore2; import android.annotation.CallSuper; import android.annotation.NonNull; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.KeyStoreException; import android.security.KeyStoreOperation; import android.security.keymaster.KeymasterDefs; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java index 9790a4ae5b652..aca5314583829 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java @@ -18,9 +18,9 @@ package android.security.keystore2; import android.annotation.NonNull; import android.hardware.biometrics.BiometricManager; -import android.hardware.keymint.HardwareAuthenticatorType; -import android.hardware.keymint.KeyParameter; -import android.hardware.keymint.SecurityLevel; +import android.hardware.security.keymint.HardwareAuthenticatorType; +import android.hardware.security.keymint.KeyParameter; +import android.hardware.security.keymint.SecurityLevel; import android.security.GateKeeper; import android.security.KeyStore2; import android.security.KeyStoreParameter; diff --git a/keystore/java/android/security/keystore2/AndroidKeyStoreUnauthenticatedAESCipherSpi.java b/keystore/java/android/security/keystore2/AndroidKeyStoreUnauthenticatedAESCipherSpi.java index a2d4528b99fd0..4d4b0d8f183b1 100644 --- a/keystore/java/android/security/keystore2/AndroidKeyStoreUnauthenticatedAESCipherSpi.java +++ b/keystore/java/android/security/keystore2/AndroidKeyStoreUnauthenticatedAESCipherSpi.java @@ -18,7 +18,7 @@ package android.security.keystore2; import android.annotation.NonNull; import android.annotation.Nullable; -import android.hardware.keymint.KeyParameter; +import android.hardware.security.keymint.KeyParameter; import android.security.keymaster.KeymasterDefs; import android.security.keystore.ArrayUtils; import android.security.keystore.KeyProperties; diff --git a/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java b/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java index 8fa532b6e1887..18c786aa3093c 100644 --- a/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java +++ b/keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java @@ -18,8 +18,8 @@ package android.security.keystore2; import android.annotation.NonNull; import android.hardware.biometrics.BiometricManager; -import android.hardware.keymint.KeyParameter; -import android.hardware.keymint.SecurityLevel; +import android.hardware.security.keymint.KeyParameter; +import android.hardware.security.keymint.SecurityLevel; import android.security.GateKeeper; import android.security.keymaster.KeymasterDefs; import android.security.keystore.KeyProperties;