diff options
author | Alex Klyubin <klyubin@google.com> | 2015-05-19 09:41:17 -0700 |
---|---|---|
committer | Alex Klyubin <klyubin@google.com> | 2015-05-19 09:50:53 -0700 |
commit | e21f0231765492718f1284442136c2ae45e6dd93 (patch) | |
tree | 485c6dad5f2ddfe3126058da512a8e06f4dc9869 /keystore | |
parent | beda8613ad7bc01affa17857faed04d9589db34c (diff) | |
download | frameworks_base-e21f0231765492718f1284442136c2ae45e6dd93.zip frameworks_base-e21f0231765492718f1284442136c2ae45e6dd93.tar.gz frameworks_base-e21f0231765492718f1284442136c2ae45e6dd93.tar.bz2 |
Use consistent name for KeyPairGeneratorSpi.
This renames AndroidKeyPairGeneratorSpi to
AndroidKeyStoreKeyPairGeneratorSpi for consistency with other SPI
implementations of AndroidKeyStore provider.
Bug: 18088752
Change-Id: Iea1c4d35987b3e64f92dd1706273ffb75a6addd6
Diffstat (limited to 'keystore')
-rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java (renamed from keystore/java/android/security/keystore/AndroidKeyPairGeneratorSpi.java) | 15 | ||||
-rw-r--r-- | keystore/java/android/security/keystore/AndroidKeyStoreProvider.java | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/keystore/java/android/security/keystore/AndroidKeyPairGeneratorSpi.java b/keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java index 2c393fd..4b45fd7 100644 --- a/keystore/java/android/security/keystore/AndroidKeyPairGeneratorSpi.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java @@ -52,19 +52,19 @@ import java.util.Locale; * <p> * This class can not be directly instantiated and must instead be used via the * {@link KeyPairGenerator#getInstance(String) - * KeyPairGenerator.getInstance("AndroidKeyPairGenerator")} API. + * KeyPairGenerator.getInstance("AndroidKeyStore")} API. * - * {@hide} + * @hide */ -public abstract class AndroidKeyPairGeneratorSpi extends KeyPairGeneratorSpi { +public abstract class AndroidKeyStoreKeyPairGeneratorSpi extends KeyPairGeneratorSpi { - public static class RSA extends AndroidKeyPairGeneratorSpi { + public static class RSA extends AndroidKeyStoreKeyPairGeneratorSpi { public RSA() { super(KeyProperties.KEY_ALGORITHM_RSA); } } - public static class EC extends AndroidKeyPairGeneratorSpi { + public static class EC extends AndroidKeyStoreKeyPairGeneratorSpi { public EC() { super(KeyProperties.KEY_ALGORITHM_EC); } @@ -94,7 +94,7 @@ public abstract class AndroidKeyPairGeneratorSpi extends KeyPairGeneratorSpi { private int mKeyType; private int mKeySize; - protected AndroidKeyPairGeneratorSpi(@KeyProperties.KeyAlgorithmEnum String algorithm) { + protected AndroidKeyStoreKeyPairGeneratorSpi(@KeyProperties.KeyAlgorithmEnum String algorithm) { mAlgorithm = algorithm; } @@ -283,7 +283,8 @@ public abstract class AndroidKeyPairGeneratorSpi extends KeyPairGeneratorSpi { @Override public void initialize(int keysize, SecureRandom random) { - throw new IllegalArgumentException("cannot specify keysize with AndroidKeyPairGenerator"); + throw new IllegalArgumentException( + "cannot specify keysize with AndroidKeyStore KeyPairGenerator"); } @Override diff --git a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java index b20a122..3f7919c 100644 --- a/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java +++ b/keystore/java/android/security/keystore/AndroidKeyStoreProvider.java @@ -49,8 +49,8 @@ public class AndroidKeyStoreProvider extends Provider { put("KeyStore.AndroidKeyStore", PACKAGE_NAME + ".AndroidKeyStoreSpi"); // java.security.KeyPairGenerator - put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyPairGeneratorSpi$EC"); - put("KeyPairGenerator.RSA", PACKAGE_NAME + ".AndroidKeyPairGeneratorSpi$RSA"); + put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$EC"); + put("KeyPairGenerator.RSA", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$RSA"); // javax.crypto.KeyGenerator put("KeyGenerator.AES", PACKAGE_NAME + ".AndroidKeyStoreKeyGeneratorSpi$AES"); |