Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make specifying self-signed cert parameters optional."

Browse Source
This commit is contained in:
Alex Klyubin
2015-04-14 19:59:02 +00:00
committed by Gerrit Code Review
parent e38ee9df26 67d21aef98
commit ecfda06461
2 changed files with 64 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
keystore/java/android/security/KeyPairGeneratorSpec.java
View File

@@ -52,6 +52,11 @@ import javax.security.auth.x500.X500Principal;
*/ */
public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec { public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
private static final X500Principal DEFAULT_CERT_SUBJECT = new X500Principal("CN=fake");
private static final BigInteger DEFAULT_CERT_SERIAL_NUMBER = new BigInteger("1");
private static final Date DEFAULT_CERT_NOT_BEFORE = new Date(0L); // Jan 1 1970
private static final Date DEFAULT_CERT_NOT_AFTER = new Date(2461449600000L); // Jan 1 2048
private final Context mContext; private final Context mContext;
private final String mKeystoreAlias; private final String mKeystoreAlias;
@@ -144,22 +149,29 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
throw new IllegalArgumentException("context == null"); throw new IllegalArgumentException("context == null");
} else if (TextUtils.isEmpty(keyStoreAlias)) { } else if (TextUtils.isEmpty(keyStoreAlias)) {
throw new IllegalArgumentException("keyStoreAlias must not be empty"); throw new IllegalArgumentException("keyStoreAlias must not be empty");
} else if (subjectDN == null) {
throw new IllegalArgumentException("subjectDN == null");
} else if (serialNumber == null) {
throw new IllegalArgumentException("serialNumber == null");
} else if (startDate == null) {
throw new IllegalArgumentException("startDate == null");
} else if (endDate == null) {
throw new IllegalArgumentException("endDate == null");
} else if (endDate.before(startDate)) {
throw new IllegalArgumentException("endDate < startDate");
} else if ((userAuthenticationValidityDurationSeconds < 0) } else if ((userAuthenticationValidityDurationSeconds < 0)
&& (userAuthenticationValidityDurationSeconds != -1)) { && (userAuthenticationValidityDurationSeconds != -1)) {
throw new IllegalArgumentException( throw new IllegalArgumentException(
"userAuthenticationValidityDurationSeconds must not be negative"); "userAuthenticationValidityDurationSeconds must not be negative");
} }
if (subjectDN == null) {
subjectDN = DEFAULT_CERT_SUBJECT;
}
if (startDate == null) {
startDate = DEFAULT_CERT_NOT_BEFORE;
}
if (endDate == null) {
endDate = DEFAULT_CERT_NOT_AFTER;
}
if (serialNumber == null) {
serialNumber = DEFAULT_CERT_SERIAL_NUMBER;
}
if (endDate.before(startDate)) {
throw new IllegalArgumentException("endDate < startDate");
}
mContext = context; mContext = context;
mKeystoreAlias = keyStoreAlias; mKeystoreAlias = keyStoreAlias;
mKeyType = keyType; mKeyType = keyType;
@@ -559,6 +571,10 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
/** /**
* Sets the subject used for the self-signed certificate of the * Sets the subject used for the self-signed certificate of the
* generated key pair. * generated key pair.
*
* <p>The subject must be specified on API Level
* {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1 LOLLIPOP_MR1} and older platforms. On
* newer platforms the subject defaults to {@code CN=fake} if not specified.
*/ */
public Builder setSubject(X500Principal subject) { public Builder setSubject(X500Principal subject) {
if (subject == null) { if (subject == null) {
@@ -571,6 +587,10 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
/** /**
* Sets the serial number used for the self-signed certificate of the * Sets the serial number used for the self-signed certificate of the
* generated key pair. * generated key pair.
*
* <p>The serial number must be specified on API Level
* {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1 LOLLIPOP_MR1} and older platforms. On
* newer platforms the serial number defaults to {@code 1} if not specified.
*/ */
public Builder setSerialNumber(BigInteger serialNumber) { public Builder setSerialNumber(BigInteger serialNumber) {
if (serialNumber == null) { if (serialNumber == null) {
@@ -583,6 +603,10 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
/** /**
* Sets the start of the validity period for the self-signed certificate * Sets the start of the validity period for the self-signed certificate
* of the generated key pair. * of the generated key pair.
*
* <p>The date must be specified on API Level
* {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1 LOLLIPOP_MR1} and older platforms. On
* newer platforms the date defaults to {@code Jan 1 1970} if not specified.
*/ */
public Builder setStartDate(Date startDate) { public Builder setStartDate(Date startDate) {
if (startDate == null) { if (startDate == null) {
@@ -595,6 +619,10 @@ public final class KeyPairGeneratorSpec implements AlgorithmParameterSpec {
/** /**
* Sets the end of the validity period for the self-signed certificate * Sets the end of the validity period for the self-signed certificate
* of the generated key pair. * of the generated key pair.
*
* <p>The date must be specified on API Level
* {@link android.os.Build.VERSION_CODES#LOLLIPOP_MR1 LOLLIPOP_MR1} and older platforms. On
* newer platforms the date defaults to {@code Jan 1 2048} if not specified.
*/ */
public Builder setEndDate(Date endDate) { public Builder setEndDate(Date endDate) {
if (endDate == null) { if (endDate == null) {

52
keystore/tests/src/android/security/KeyPairGeneratorSpecTest.java
View File

@@ -24,6 +24,11 @@ import java.util.Date;
import javax.security.auth.x500.X500Principal; import javax.security.auth.x500.X500Principal;
public class KeyPairGeneratorSpecTest extends AndroidTestCase { public class KeyPairGeneratorSpecTest extends AndroidTestCase {
private static final X500Principal DEFAULT_CERT_SUBJECT = new X500Principal("CN=fake");
private static final BigInteger DEFAULT_CERT_SERIAL_NUMBER = new BigInteger("1");
private static final Date DEFAULT_CERT_NOT_BEFORE = new Date(0L); // Jan 1 1980
private static final Date DEFAULT_CERT_NOT_AFTER = new Date(2461449600000L); // Jan 1 2048
private static final String TEST_ALIAS_1 = "test1"; private static final String TEST_ALIAS_1 = "test1";
private static final X500Principal TEST_DN_1 = new X500Principal("CN=test1"); private static final X500Principal TEST_DN_1 = new X500Principal("CN=test1");
@@ -105,46 +110,37 @@ public class KeyPairGeneratorSpecTest extends AndroidTestCase {
} }
} }
public void testConstructor_NullSubjectDN_Failure() throws Exception { public void testConstructor_NullSubjectDN_Success() throws Exception {
try { KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec(
new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, null, SERIAL_1, NOW, getContext(), TEST_ALIAS_1, "RSA", 1024, null, null, SERIAL_1, NOW,
NOW_PLUS_10_YEARS, 0); NOW_PLUS_10_YEARS, 0);
fail("Should throw IllegalArgumentException when subjectDN is null"); assertEquals(DEFAULT_CERT_SUBJECT, spec.getSubjectDN());
} catch (IllegalArgumentException success) {
}
} }
public void testConstructor_NullSerial_Failure() throws Exception { public void testConstructor_NullSerial_Success() throws Exception {
try { KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec(
new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, null, NOW, getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, null, NOW,
NOW_PLUS_10_YEARS, 0); NOW_PLUS_10_YEARS, 0);
fail("Should throw IllegalArgumentException when startDate is null"); assertEquals(DEFAULT_CERT_SERIAL_NUMBER, spec.getSerialNumber());
} catch (IllegalArgumentException success) {
}
} }
public void testConstructor_NullStartDate_Failure() throws Exception { public void testConstructor_NullStartDate_Success() throws Exception {
try { KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec(
new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1, getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1, null,
null, NOW_PLUS_10_YEARS, 0); NOW_PLUS_10_YEARS, 0);
fail("Should throw IllegalArgumentException when startDate is null"); assertEquals(DEFAULT_CERT_NOT_BEFORE, spec.getStartDate());
} catch (IllegalArgumentException success) {
}
} }
public void testConstructor_NullEndDate_Failure() throws Exception { public void testConstructor_NullEndDate_Success() throws Exception {
try { KeyPairGeneratorSpec spec = new KeyPairGeneratorSpec(
new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1, getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1, NOW, null, 0);
NOW, null, 0); assertEquals(DEFAULT_CERT_NOT_AFTER, spec.getEndDate());
fail("Should throw IllegalArgumentException when keystoreAlias is null");
} catch (IllegalArgumentException success) {
}
} }
public void testConstructor_EndBeforeStart_Failure() throws Exception { public void testConstructor_EndBeforeStart_Failure() throws Exception {
try { try {
new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1, SERIAL_1, new KeyPairGeneratorSpec(getContext(), TEST_ALIAS_1, "RSA", 1024, null, TEST_DN_1,
NOW_PLUS_10_YEARS, NOW, 0); SERIAL_1, NOW_PLUS_10_YEARS, NOW, 0);
fail("Should throw IllegalArgumentException when end is before start"); fail("Should throw IllegalArgumentException when end is before start");
} catch (IllegalArgumentException success) { } catch (IllegalArgumentException success) {
} }