summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-09-03 17:28:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-09-03 17:28:41 +0000
commit7e0609eb67d97cb0bdae4c18d8401a3abc446198 (patch)
tree798aa5b5cd29dce5cee54b48afe637be854af61b /api
parentdd592e2a0d731c061d316a2286084a6a59633390 (diff)
parentc222ddd07ff9c65c682fd82f8534a9d7dea796cd (diff)
downloadframeworks_base-7e0609eb67d97cb0bdae4c18d8401a3abc446198.zip
frameworks_base-7e0609eb67d97cb0bdae4c18d8401a3abc446198.tar.gz
frameworks_base-7e0609eb67d97cb0bdae4c18d8401a3abc446198.tar.bz2
Merge changes Ic710807d,I88dfcc8c into klp-dev
* changes: Unhide functions to allow ECDSA support Add support for DSA and ECDSA key types
Diffstat (limited to 'api')
-rw-r--r--api/current.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 0ccb1ea..c0455fc 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -22593,8 +22593,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();
@@ -22605,9 +22608,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);