diff options
Diffstat (limited to 'keystore/java')
| -rw-r--r-- | keystore/java/android/security/KeyChain.java | 4 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyPairGeneratorSpec.java | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/keystore/java/android/security/KeyChain.java b/keystore/java/android/security/KeyChain.java index 607817a..dfa41e8 100644 --- a/keystore/java/android/security/KeyChain.java +++ b/keystore/java/android/security/KeyChain.java @@ -242,7 +242,7 @@ public final class KeyChain { * @param response Callback to invoke when the request completes; * must not be null * @param keyTypes The acceptable types of asymmetric keys such as - * "RSA" or "DSA", or a null array. + * "EC" or "RSA", or a null array. * @param issuers The acceptable certificate issuers for the * certificate matching the private key, or null. * @param host The host name of the server requesting the @@ -263,7 +263,7 @@ public final class KeyChain { * * keyTypes would allow the list to be filtered and typically * will be set correctly by the server. In practice today, - * most all users will want only RSA, rarely DSA, and usually + * most all users will want only RSA or EC, and usually * only a small number of certs will be available. * * issuers is typically not useful. Some servers historically diff --git a/keystore/java/android/security/KeyPairGeneratorSpec.java b/keystore/java/android/security/KeyPairGeneratorSpec.java index 8196434..cc097aa 100644 --- a/keystore/java/android/security/KeyPairGeneratorSpec.java +++ b/keystore/java/android/security/KeyPairGeneratorSpec.java @@ -92,7 +92,7 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { * @param context Android context for the activity * @param keyStoreAlias name to use for the generated key in the Android * keystore - * @param keyType key algorithm to use (RSA, DSA, EC) + * @param keyType key algorithm to use (EC, RSA) * @param keySize size of key to generate * @param spec the underlying key type parameters * @param subjectDN X.509 v3 Subject Distinguished Name @@ -151,8 +151,7 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { } /** - * Returns the key type (e.g., "RSA", "DSA", "EC") specified by this - * parameter. + * Returns the key type (e.g., "EC", "RSA") specified by this parameter. */ public String getKeyType() { return mKeyType; @@ -291,7 +290,7 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { } /** - * Sets the key type (e.g., RSA, DSA, EC) of the keypair to be created. + * Sets the key type (e.g., EC, RSA) of the keypair to be created. */ public Builder setKeyType(String keyType) throws NoSuchAlgorithmException { if (keyType == null) { @@ -319,9 +318,8 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { } /** - * Sets the underlying key type's parameters. This is required for DSA - * where you must set this to an instance of - * {@link java.security.spec.DSAParameterSpec}. + * Sets the algorithm-specific key generation parameters. For example, for RSA keys + * this may be an instance of {@link java.security.spec.RSAKeyGenParameterSpec}. */ public Builder setAlgorithmParameterSpec(AlgorithmParameterSpec spec) { if (spec == null) { |