diff options
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | keystore/java/android/security/KeyPairGeneratorSpec.java | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/api/current.txt b/api/current.txt index 7fbc484..b074aaa 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22577,8 +22577,11 @@ package android.security { } public final class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec { + method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec(); method public android.content.Context getContext(); method public java.util.Date getEndDate(); + method public int getKeySize(); + method public java.lang.String getKeyType(); method public java.lang.String getKeystoreAlias(); method public java.math.BigInteger getSerialNumber(); method public java.util.Date getStartDate(); @@ -22589,9 +22592,12 @@ package android.security { public static final class KeyPairGeneratorSpec.Builder { ctor public KeyPairGeneratorSpec.Builder(android.content.Context); method public android.security.KeyPairGeneratorSpec build(); + method public android.security.KeyPairGeneratorSpec.Builder setAlgorithmParameterSpec(java.security.spec.AlgorithmParameterSpec); method public android.security.KeyPairGeneratorSpec.Builder setAlias(java.lang.String); method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired(); method public android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date); + method public android.security.KeyPairGeneratorSpec.Builder setKeySize(int); + method public android.security.KeyPairGeneratorSpec.Builder setKeyType(java.lang.String) throws java.security.NoSuchAlgorithmException; method public android.security.KeyPairGeneratorSpec.Builder setSerialNumber(java.math.BigInteger); method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date); method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal); diff --git a/keystore/java/android/security/KeyPairGeneratorSpec.java b/keystore/java/android/security/KeyPairGeneratorSpec.java index da1abdc..21d6caa 100644 --- a/keystore/java/android/security/KeyPairGeneratorSpec.java +++ b/keystore/java/android/security/KeyPairGeneratorSpec.java @@ -233,7 +233,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { /** * Returns the key type (e.g., "RSA", "DSA", "EC") specified by this * parameter. - * @hide */ public String getKeyType() { return mKeyType; @@ -243,7 +242,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { * Returns the key size specified by this parameter. For instance, for RSA * this will return the modulus size and for EC it will return the field * size. - * @hide */ public int getKeySize() { return mKeySize; @@ -252,7 +250,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { /** * Returns the {@link AlgorithmParameterSpec} that will be used for creation * of the key pair. - * @hide */ public AlgorithmParameterSpec getAlgorithmParameterSpec() { return mSpec; @@ -375,7 +372,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { /** * Sets the key type (e.g., RSA, DSA, EC) of the keypair to be created. - * @hide */ public Builder setKeyType(String keyType) throws NoSuchAlgorithmException { if (keyType == null) { @@ -395,7 +391,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { * Sets the key size for the keypair to be created. For instance, for a * key type of RSA this will set the modulus size and for a key type of * EC it will select a curve with a matching field size. - * @hide */ public Builder setKeySize(int keySize) { if (keySize < 0) { @@ -409,7 +404,6 @@ 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}. - * @hide */ public Builder setAlgorithmParameterSpec(AlgorithmParameterSpec spec) { if (spec == null) { |