Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Keystore 2.0 SPI: Move keymint spec to security ...""

Browse Source
This commit is contained in:
Treehugger Robot
2020-12-12 00:14:21 +00:00
committed by Gerrit Code Review
parent 32e1818fb1 f5a002c222
commit dd8891acbe
16 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/java/android/security/keymaster/KeymasterDefs.java
View File

@@ -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;

2
keystore/java/android/security/KeyStoreOperation.java
View File

@@ -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;

2
keystore/java/android/security/KeyStoreSecurityLevel.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStore3DESCipherSpi.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreAuthenticatedAESCipherSpi.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreCipherSpiBase.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreECDSASignatureSpi.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreHmacSpi.java
View File

@@ -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;

4
keystore/java/android/security/keystore2/AndroidKeyStoreKeyGeneratorSpi.java
View File

@@ -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;

4
keystore/java/android/security/keystore2/AndroidKeyStoreKeyPairGeneratorSpi.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreRSACipherSpi.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreRSASignatureSpi.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreSignatureSpiBase.java
View File

@@ -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;

6
keystore/java/android/security/keystore2/AndroidKeyStoreSpi.java
View File

@@ -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;

2
keystore/java/android/security/keystore2/AndroidKeyStoreUnauthenticatedAESCipherSpi.java
View File

@@ -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;

4
keystore/java/android/security/keystore2/KeyStore2ParameterUtils.java
View File

@@ -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;