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

Merge "Use consistent name for KeyPairGeneratorSpi." into mnc-dev

Browse Source
This commit is contained in:
Alex Klyubin
2015-05-19 18:07:21 +00:00
committed by Android (Google) Code Review
parent 0b878e496f e21f023176
commit 8ec2bed833
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
keystore/java/android/security/keystore/AndroidKeyPairGeneratorSpi.java → keystore/java/android/security/keystore/AndroidKeyStoreKeyPairGeneratorSpi.java
View File

@@ -52,19 +52,19 @@ import java.util.Locale;
* <p> * <p>
* This class can not be directly instantiated and must instead be used via the * This class can not be directly instantiated and must instead be used via the
* {@link KeyPairGenerator#getInstance(String) * {@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() { public RSA() {
super(KeyProperties.KEY_ALGORITHM_RSA); super(KeyProperties.KEY_ALGORITHM_RSA);
} }
} }
public static class EC extends AndroidKeyPairGeneratorSpi { public static class EC extends AndroidKeyStoreKeyPairGeneratorSpi {
public EC() { public EC() {
super(KeyProperties.KEY_ALGORITHM_EC); super(KeyProperties.KEY_ALGORITHM_EC);
} }
@@ -94,7 +94,7 @@ public abstract class AndroidKeyPairGeneratorSpi extends KeyPairGeneratorSpi {
private int mKeyType; private int mKeyType;
private int mKeySize; private int mKeySize;
protected AndroidKeyPairGeneratorSpi(@KeyProperties.KeyAlgorithmEnum String algorithm) { protected AndroidKeyStoreKeyPairGeneratorSpi(@KeyProperties.KeyAlgorithmEnum String algorithm) {
mAlgorithm = algorithm; mAlgorithm = algorithm;
} }
@@ -283,7 +283,8 @@ public abstract class AndroidKeyPairGeneratorSpi extends KeyPairGeneratorSpi {
@Override @Override
public void initialize(int keysize, SecureRandom random) { 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 @Override

4
keystore/java/android/security/keystore/AndroidKeyStoreProvider.java
View File

@@ -49,8 +49,8 @@ public class AndroidKeyStoreProvider extends Provider {
put("KeyStore.AndroidKeyStore", PACKAGE_NAME + ".AndroidKeyStoreSpi"); put("KeyStore.AndroidKeyStore", PACKAGE_NAME + ".AndroidKeyStoreSpi");
// java.security.KeyPairGenerator // java.security.KeyPairGenerator
put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyPairGeneratorSpi$EC"); put("KeyPairGenerator.EC", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$EC");
put("KeyPairGenerator.RSA", PACKAGE_NAME + ".AndroidKeyPairGeneratorSpi$RSA"); put("KeyPairGenerator.RSA", PACKAGE_NAME + ".AndroidKeyStoreKeyPairGeneratorSpi$RSA");
// javax.crypto.KeyGenerator // javax.crypto.KeyGenerator
put("KeyGenerator.AES", PACKAGE_NAME + ".AndroidKeyStoreKeyGeneratorSpi$AES"); put("KeyGenerator.AES", PACKAGE_NAME + ".AndroidKeyStoreKeyGeneratorSpi$AES");