am 0b486da6: Merge "Remove DSA support from Android KeyStore and KeyChain." (950974e4) · Commits · e / os / android_frameworks_base

keystore/java/android/security/KeyChain.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

keystore/java/android/security/KeyPairGeneratorSpec.java

+5 −7

Original line number	Diff line number	Diff line
		@@ -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) {

keystore/tests/src/android/security/AndroidKeyPairGeneratorTest.java

+1 −175

Original line number	Diff line number	Diff line
		@@ -27,12 +27,9 @@ import java.security.SecureRandom;
		import java.security.cert.Certificate;
		import java.security.cert.CertificateFactory;
		import java.security.cert.X509Certificate;
		import java.security.interfaces.DSAParams;
		import java.security.interfaces.DSAPublicKey;
		import java.security.interfaces.ECPublicKey;
		import java.security.interfaces.RSAPublicKey;
		import java.security.spec.AlgorithmParameterSpec;
		import java.security.spec.DSAParameterSpec;
		import java.security.spec.RSAKeyGenParameterSpec;
		import java.text.SimpleDateFormat;
		import java.util.Date;
		@@ -155,167 +152,6 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase {
		NOW_PLUS_10_YEARS);
		}

		public void testKeyPairGenerator_GenerateKeyPair_DSA_Unencrypted_Success() throws Exception {
		mGenerator.initialize(new KeyPairGeneratorSpec.Builder(getContext())
		.setAlias(TEST_ALIAS_1)
		.setKeyType("DSA")
		.setSubject(TEST_DN_1)
		.setSerialNumber(TEST_SERIAL_1)
		.setStartDate(NOW)
		.setEndDate(NOW_PLUS_10_YEARS)
		.build());

		final KeyPair pair = mGenerator.generateKeyPair();
		assertNotNull("The KeyPair returned should not be null", pair);

		assertKeyPairCorrect(pair, TEST_ALIAS_1, "DSA", 1024, null, TEST_DN_1, TEST_SERIAL_1, NOW,
		NOW_PLUS_10_YEARS);
		}

		public void testKeyPairGenerator_GenerateKeyPair_DSA_2048_Unencrypted_Success()
		throws Exception {
		mGenerator.initialize(new KeyPairGeneratorSpec.Builder(getContext())
		.setAlias(TEST_ALIAS_1)
		.setKeyType("DSA")
		.setKeySize(2048)
		.setSubject(TEST_DN_1)
		.setSerialNumber(TEST_SERIAL_1)
		.setStartDate(NOW)
		.setEndDate(NOW_PLUS_10_YEARS)
		.build());

		final KeyPair pair = mGenerator.generateKeyPair();
		assertNotNull("The KeyPair returned should not be null", pair);

		assertKeyPairCorrect(pair, TEST_ALIAS_1, "DSA", 2048, null, TEST_DN_1, TEST_SERIAL_1, NOW,
		NOW_PLUS_10_YEARS);
		}

		public void testKeyPairGenerator_GenerateKeyPair_DSA_SpecifiedParams_Unencrypted_Success()
		throws Exception {
		/*
		* generated using: openssl dsaparam -C 2048
		*/
		BigInteger p = new BigInteger(1, new byte[] {
		(byte) 0xC0, (byte) 0x3D, (byte) 0x86, (byte) 0x09, (byte) 0xCA, (byte) 0x8C,
		(byte) 0x37, (byte) 0xCA, (byte) 0xCC, (byte) 0x4A, (byte) 0x81, (byte) 0xBD,
		(byte) 0xD8, (byte) 0x50, (byte) 0x77, (byte) 0xCD, (byte) 0xDD, (byte) 0x32,
		(byte) 0x0B, (byte) 0x43, (byte) 0xBF, (byte) 0x42, (byte) 0x06, (byte) 0x5A,
		(byte) 0x3D, (byte) 0x18, (byte) 0x50, (byte) 0x47, (byte) 0x79, (byte) 0xE1,
		(byte) 0x5B, (byte) 0x86, (byte) 0x03, (byte) 0xB9, (byte) 0x28, (byte) 0x9C,
		(byte) 0x18, (byte) 0xA9, (byte) 0xF5, (byte) 0xD6, (byte) 0xF4, (byte) 0x94,
		(byte) 0x5B, (byte) 0x87, (byte) 0x58, (byte) 0xCA, (byte) 0xB2, (byte) 0x1E,
		(byte) 0xFC, (byte) 0xED, (byte) 0x37, (byte) 0xC3, (byte) 0x49, (byte) 0xAC,
		(byte) 0xFA, (byte) 0x46, (byte) 0xDB, (byte) 0x7A, (byte) 0x50, (byte) 0x96,
		(byte) 0xCF, (byte) 0x52, (byte) 0xD7, (byte) 0x4E, (byte) 0xEB, (byte) 0x26,
		(byte) 0x41, (byte) 0xA2, (byte) 0x6F, (byte) 0x99, (byte) 0x80, (byte) 0x9F,
		(byte) 0x0F, (byte) 0x0A, (byte) 0xA8, (byte) 0x0D, (byte) 0xAC, (byte) 0xAB,
		(byte) 0xEF, (byte) 0x7D, (byte) 0xE7, (byte) 0x4C, (byte) 0xF1, (byte) 0x88,
		(byte) 0x44, (byte) 0xC9, (byte) 0x17, (byte) 0xD0, (byte) 0xBB, (byte) 0xE2,
		(byte) 0x01, (byte) 0x8C, (byte) 0xC1, (byte) 0x02, (byte) 0x1D, (byte) 0x3C,
		(byte) 0x15, (byte) 0xB7, (byte) 0x41, (byte) 0x30, (byte) 0xD8, (byte) 0x11,
		(byte) 0xBD, (byte) 0x6A, (byte) 0x2A, (byte) 0x0D, (byte) 0x36, (byte) 0x44,
		(byte) 0x9C, (byte) 0x3F, (byte) 0x32, (byte) 0xE2, (byte) 0x1C, (byte) 0xFB,
		(byte) 0xE3, (byte) 0xFF, (byte) 0xCC, (byte) 0x1A, (byte) 0x72, (byte) 0x38,
		(byte) 0x37, (byte) 0x69, (byte) 0x5E, (byte) 0x35, (byte) 0x73, (byte) 0xE1,
		(byte) 0x1E, (byte) 0x74, (byte) 0x35, (byte) 0x44, (byte) 0x07, (byte) 0xB5,
		(byte) 0x2F, (byte) 0x0B, (byte) 0x60, (byte) 0xF4, (byte) 0xA9, (byte) 0xE0,
		(byte) 0x81, (byte) 0xB2, (byte) 0xCD, (byte) 0x8B, (byte) 0x82, (byte) 0x76,
		(byte) 0x7F, (byte) 0xD4, (byte) 0x17, (byte) 0x32, (byte) 0x86, (byte) 0x98,
		(byte) 0x7C, (byte) 0x85, (byte) 0x66, (byte) 0xF6, (byte) 0x77, (byte) 0xED,
		(byte) 0x8B, (byte) 0x1A, (byte) 0x52, (byte) 0x16, (byte) 0xDA, (byte) 0x1C,
		(byte) 0xA7, (byte) 0x16, (byte) 0x79, (byte) 0x20, (byte) 0x1C, (byte) 0x99,
		(byte) 0x5F, (byte) 0x12, (byte) 0x66, (byte) 0x15, (byte) 0x9F, (byte) 0xE5,
		(byte) 0x73, (byte) 0xA9, (byte) 0x61, (byte) 0xBA, (byte) 0xA7, (byte) 0x23,
		(byte) 0x93, (byte) 0x77, (byte) 0xB5, (byte) 0xF6, (byte) 0xEC, (byte) 0x13,
		(byte) 0xBF, (byte) 0x95, (byte) 0x60, (byte) 0x78, (byte) 0x84, (byte) 0xE3,
		(byte) 0x44, (byte) 0xEC, (byte) 0x74, (byte) 0xC2, (byte) 0xCB, (byte) 0xD4,
		(byte) 0x70, (byte) 0xC5, (byte) 0x7B, (byte) 0xF8, (byte) 0x07, (byte) 0x3B,
		(byte) 0xEB, (byte) 0x9F, (byte) 0xC9, (byte) 0x7D, (byte) 0xE0, (byte) 0xA5,
		(byte) 0xBA, (byte) 0x68, (byte) 0x7B, (byte) 0xF4, (byte) 0x70, (byte) 0x40,
		(byte) 0xAE, (byte) 0xE9, (byte) 0x65, (byte) 0xEE, (byte) 0x5B, (byte) 0x71,
		(byte) 0x36, (byte) 0x0B, (byte) 0xB0, (byte) 0xA2, (byte) 0x98, (byte) 0x7D,
		(byte) 0xE3, (byte) 0x24, (byte) 0x95, (byte) 0x2B, (byte) 0xC2, (byte) 0x0A,
		(byte) 0x78, (byte) 0x3D, (byte) 0xCC, (byte) 0x3A, (byte) 0xEE, (byte) 0xED,
		(byte) 0x48, (byte) 0xEB, (byte) 0xA3, (byte) 0x78, (byte) 0xA8, (byte) 0x9D,
		(byte) 0x0A, (byte) 0x8F, (byte) 0x9E, (byte) 0x59, (byte) 0x2C, (byte) 0x44,
		(byte) 0xB5, (byte) 0xF9, (byte) 0x53, (byte) 0x43,
		});

		BigInteger q = new BigInteger(1, new byte[] {
		(byte) 0xA1, (byte) 0x9B, (byte) 0x1D, (byte) 0xC0, (byte) 0xE3, (byte) 0xF6,
		(byte) 0x4A, (byte) 0x35, (byte) 0xE1, (byte) 0x8A, (byte) 0x43, (byte) 0xC2,
		(byte) 0x9C, (byte) 0xF9, (byte) 0x52, (byte) 0x8F, (byte) 0x94, (byte) 0xA1,
		(byte) 0x12, (byte) 0x11, (byte) 0xDB, (byte) 0x9A, (byte) 0xB6, (byte) 0x35,
		(byte) 0x56, (byte) 0x26, (byte) 0x60, (byte) 0x89, (byte) 0x11, (byte) 0xAC,
		(byte) 0xA8, (byte) 0xE5,
		});

		BigInteger g = new BigInteger(1, new byte[] {
		(byte) 0xA1, (byte) 0x5C, (byte) 0x57, (byte) 0x15, (byte) 0xC3, (byte) 0xD9,
		(byte) 0xD7, (byte) 0x41, (byte) 0x89, (byte) 0xD6, (byte) 0xB8, (byte) 0x7B,
		(byte) 0xF3, (byte) 0xE0, (byte) 0xB3, (byte) 0xC5, (byte) 0xD1, (byte) 0xAA,
		(byte) 0xF9, (byte) 0x55, (byte) 0x48, (byte) 0xF1, (byte) 0xDA, (byte) 0xE8,
		(byte) 0x6F, (byte) 0x51, (byte) 0x05, (byte) 0xB2, (byte) 0xC9, (byte) 0x64,
		(byte) 0xDA, (byte) 0x5F, (byte) 0xD4, (byte) 0xAA, (byte) 0xFD, (byte) 0x67,
		(byte) 0xE0, (byte) 0x10, (byte) 0x2C, (byte) 0x1F, (byte) 0x03, (byte) 0x10,
		(byte) 0xD4, (byte) 0x4B, (byte) 0x20, (byte) 0x82, (byte) 0x2B, (byte) 0x04,
		(byte) 0xF9, (byte) 0x09, (byte) 0xAE, (byte) 0x28, (byte) 0x3D, (byte) 0x9B,
		(byte) 0xFF, (byte) 0x87, (byte) 0x76, (byte) 0xCD, (byte) 0xF0, (byte) 0x11,
		(byte) 0xB7, (byte) 0xEA, (byte) 0xE6, (byte) 0xCD, (byte) 0x60, (byte) 0xD3,
		(byte) 0x8C, (byte) 0x74, (byte) 0xD3, (byte) 0x45, (byte) 0x63, (byte) 0x69,
		(byte) 0x3F, (byte) 0x1D, (byte) 0x31, (byte) 0x25, (byte) 0x49, (byte) 0x97,
		(byte) 0x4B, (byte) 0x73, (byte) 0x34, (byte) 0x12, (byte) 0x73, (byte) 0x27,
		(byte) 0x4C, (byte) 0xDA, (byte) 0xF3, (byte) 0x08, (byte) 0xA8, (byte) 0xA9,
		(byte) 0x27, (byte) 0xE4, (byte) 0xB8, (byte) 0xD6, (byte) 0xB5, (byte) 0xC4,
		(byte) 0x18, (byte) 0xED, (byte) 0xBD, (byte) 0x6F, (byte) 0xA2, (byte) 0x36,
		(byte) 0xA2, (byte) 0x9C, (byte) 0x27, (byte) 0x62, (byte) 0x7F, (byte) 0x93,
		(byte) 0xD7, (byte) 0x52, (byte) 0xA9, (byte) 0x76, (byte) 0x55, (byte) 0x99,
		(byte) 0x00, (byte) 0x5B, (byte) 0xC2, (byte) 0xB9, (byte) 0x18, (byte) 0xAC,
		(byte) 0x6B, (byte) 0x83, (byte) 0x0D, (byte) 0xA1, (byte) 0xC5, (byte) 0x01,
		(byte) 0x1A, (byte) 0xE5, (byte) 0x4D, (byte) 0x2F, (byte) 0xCF, (byte) 0x5D,
		(byte) 0xB2, (byte) 0xE7, (byte) 0xC7, (byte) 0xCB, (byte) 0x2C, (byte) 0xFF,
		(byte) 0x51, (byte) 0x1B, (byte) 0x9D, (byte) 0xA4, (byte) 0x05, (byte) 0xEB,
		(byte) 0x17, (byte) 0xD8, (byte) 0x97, (byte) 0x9D, (byte) 0x0C, (byte) 0x59,
		(byte) 0x92, (byte) 0x8A, (byte) 0x03, (byte) 0x34, (byte) 0xFD, (byte) 0x16,
		(byte) 0x0F, (byte) 0x2A, (byte) 0xF9, (byte) 0x7D, (byte) 0xC3, (byte) 0x41,
		(byte) 0x0D, (byte) 0x06, (byte) 0x5A, (byte) 0x4B, (byte) 0x34, (byte) 0xD5,
		(byte) 0xF5, (byte) 0x09, (byte) 0x1C, (byte) 0xCE, (byte) 0xA7, (byte) 0x19,
		(byte) 0x6D, (byte) 0x04, (byte) 0x53, (byte) 0x71, (byte) 0xCC, (byte) 0x84,
		(byte) 0xA0, (byte) 0xB2, (byte) 0xA0, (byte) 0x68, (byte) 0xA3, (byte) 0x40,
		(byte) 0xC0, (byte) 0x67, (byte) 0x38, (byte) 0x96, (byte) 0x73, (byte) 0x2E,
		(byte) 0x8E, (byte) 0x2A, (byte) 0x9D, (byte) 0x56, (byte) 0xE9, (byte) 0xAC,
		(byte) 0xC7, (byte) 0xEC, (byte) 0x84, (byte) 0x7F, (byte) 0xFC, (byte) 0xE0,
		(byte) 0x69, (byte) 0x03, (byte) 0x8B, (byte) 0x48, (byte) 0x64, (byte) 0x76,
		(byte) 0x85, (byte) 0xA5, (byte) 0x10, (byte) 0xD9, (byte) 0x31, (byte) 0xC3,
		(byte) 0x8B, (byte) 0x07, (byte) 0x48, (byte) 0x62, (byte) 0xF6, (byte) 0x68,
		(byte) 0xF2, (byte) 0x96, (byte) 0xB2, (byte) 0x18, (byte) 0x5B, (byte) 0xFF,
		(byte) 0x6D, (byte) 0xD1, (byte) 0x6B, (byte) 0xF5, (byte) 0xFD, (byte) 0x81,
		(byte) 0xF1, (byte) 0xFD, (byte) 0x04, (byte) 0xF0, (byte) 0x9F, (byte) 0xB7,
		(byte) 0x08, (byte) 0x95, (byte) 0x57, (byte) 0x48, (byte) 0x07, (byte) 0x00,
		(byte) 0x52, (byte) 0xEC, (byte) 0x75, (byte) 0x91, (byte) 0x02, (byte) 0x11,
		(byte) 0xA3, (byte) 0x64, (byte) 0x26, (byte) 0xCA,
		});

		AlgorithmParameterSpec spec = new DSAParameterSpec(p, q, g);
		mGenerator.initialize(new KeyPairGeneratorSpec.Builder(getContext())
		.setAlias(TEST_ALIAS_1)
		.setKeyType("DSA")
		.setKeySize(2048)
		.setAlgorithmParameterSpec(spec)
		.setSubject(TEST_DN_1)
		.setSerialNumber(TEST_SERIAL_1)
		.setStartDate(NOW)
		.setEndDate(NOW_PLUS_10_YEARS)
		.build());

		final KeyPair pair = mGenerator.generateKeyPair();
		assertNotNull("The KeyPair returned should not be null", pair);

		assertKeyPairCorrect(pair, TEST_ALIAS_1, "DSA", 2048, spec, TEST_DN_1, TEST_SERIAL_1, NOW,
		NOW_PLUS_10_YEARS);
		}

		public void testKeyPairGenerator_GenerateKeyPair_EC_Unencrypted_Success() throws Exception {
		mGenerator.initialize(new KeyPairGeneratorSpec.Builder(getContext())
		.setAlias(TEST_ALIAS_1)
		@@ -469,17 +305,7 @@ public class AndroidKeyPairGeneratorTest extends AndroidTestCase {
		assertNotNull("The PublicKey for the KeyPair should be not null", pubKey);
		assertEquals(keyType, pubKey.getAlgorithm());

		if ("DSA".equalsIgnoreCase(keyType)) {
		DSAPublicKey dsaPubKey = (DSAPublicKey) pubKey;
		DSAParams actualParams = dsaPubKey.getParams();
		assertEquals(keySize, (actualParams.getP().bitLength() + 7) & ~7);
		if (spec != null) {
		DSAParameterSpec expectedParams = (DSAParameterSpec) spec;
		assertEquals(expectedParams.getP(), actualParams.getP());
		assertEquals(expectedParams.getQ(), actualParams.getQ());
		assertEquals(expectedParams.getG(), actualParams.getG());
		}
		} else if ("EC".equalsIgnoreCase(keyType)) {
		if ("EC".equalsIgnoreCase(keyType)) {
		assertEquals("Curve should be what was specified during initialization", keySize,
		((ECPublicKey) pubKey).getParams().getCurve().getField().getFieldSize());
		} else if ("RSA".equalsIgnoreCase(keyType)) {

keystore/tests/src/android/security/AndroidKeyStoreTest.java

+1 −417

File changed.

Preview size limit exceeded, changes collapsed.