Unhide functions to allow ECDSA support (c222ddd0) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −0

keystore/java/android/security/KeyPairGeneratorSpec.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -233,7 +233,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
	/**		/**
	* Returns the key type (e.g., "RSA", "DSA", "EC") specified by this		* Returns the key type (e.g., "RSA", "DSA", "EC") specified by this
	* parameter.		* parameter.
	* @hide
	*/		*/
	public String getKeyType() {		public String getKeyType() {
	return mKeyType;		return mKeyType;
	@@ -243,7 +242,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
	* Returns the key size specified by this parameter. For instance, for RSA		* 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		* this will return the modulus size and for EC it will return the field
	* size.		* size.
	* @hide
	*/		*/
	public int getKeySize() {		public int getKeySize() {
	return mKeySize;		return mKeySize;
	@@ -252,7 +250,6 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
	/**		/**
	* Returns the {@link AlgorithmParameterSpec} that will be used for creation		* Returns the {@link AlgorithmParameterSpec} that will be used for creation
	* of the key pair.		* of the key pair.
	* @hide
	*/		*/
	public AlgorithmParameterSpec getAlgorithmParameterSpec() {		public AlgorithmParameterSpec getAlgorithmParameterSpec() {
	return mSpec;		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.		* Sets the key type (e.g., RSA, DSA, EC) of the keypair to be created.
	* @hide
	*/		*/
	public Builder setKeyType(String keyType) throws NoSuchAlgorithmException {		public Builder setKeyType(String keyType) throws NoSuchAlgorithmException {
	if (keyType == null) {		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		* 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		* 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.		* EC it will select a curve with a matching field size.
	* @hide
	*/		*/
	public Builder setKeySize(int keySize) {		public Builder setKeySize(int keySize) {
	if (keySize < 0) {		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		* Sets the underlying key type's parameters. This is required for DSA
	* where you must set this to an instance of		* where you must set this to an instance of
	* {@link java.security.spec.DSAParameterSpec}.		* {@link java.security.spec.DSAParameterSpec}.
	* @hide
	*/		*/
	public Builder setAlgorithmParameterSpec(AlgorithmParameterSpec spec) {		public Builder setAlgorithmParameterSpec(AlgorithmParameterSpec spec) {
	if (spec == null) {		if (spec == null) {

Original line number	Original line	Diff line number	Diff line
	@@ -22577,8 +22577,11 @@ package android.security {
	}		}

	public final class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec {		public final class KeyPairGeneratorSpec implements java.security.spec.AlgorithmParameterSpec {
			method public java.security.spec.AlgorithmParameterSpec getAlgorithmParameterSpec();
	method public android.content.Context getContext();		method public android.content.Context getContext();
	method public java.util.Date getEndDate();		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.lang.String getKeystoreAlias();
	method public java.math.BigInteger getSerialNumber();		method public java.math.BigInteger getSerialNumber();
	method public java.util.Date getStartDate();		method public java.util.Date getStartDate();
	@@ -22589,9 +22592,12 @@ package android.security {
	public static final class KeyPairGeneratorSpec.Builder {		public static final class KeyPairGeneratorSpec.Builder {
	ctor public KeyPairGeneratorSpec.Builder(android.content.Context);		ctor public KeyPairGeneratorSpec.Builder(android.content.Context);
	method public android.security.KeyPairGeneratorSpec build();		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 setAlias(java.lang.String);
	method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired();		method public android.security.KeyPairGeneratorSpec.Builder setEncryptionRequired();
	method public android.security.KeyPairGeneratorSpec.Builder setEndDate(java.util.Date);		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 setSerialNumber(java.math.BigInteger);
	method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date);		method public android.security.KeyPairGeneratorSpec.Builder setStartDate(java.util.Date);
	method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal);		method public android.security.KeyPairGeneratorSpec.Builder setSubject(javax.security.auth.x500.X500Principal);