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

Merge "Fix subject in self-signed certificates." am: a27ce04850

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619939

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6fe8bf267a7a8174ce9ef6e36408c3815b16b4eb
This commit is contained in:
Treehugger Robot
2021-03-05 04:56:31 +00:00
committed by Automerger Merge Worker
parent b81ca0dc24 a27ce04850
commit 19c771ec4e
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
keystore/java/android/security/keystore/KeyGenParameterSpec.java
View File

@@ -279,8 +279,10 @@ import javax.security.auth.x500.X500Principal;
* } * }
*/ */
public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAuthArgs { public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAuthArgs {
private static final X500Principal DEFAULT_CERT_SUBJECT = private static final X500Principal DEFAULT_ATTESTATION_CERT_SUBJECT =
new X500Principal("CN=Android Keystore Key"); new X500Principal("CN=Android Keystore Key");
private static final X500Principal DEFAULT_SELF_SIGNED_CERT_SUBJECT =
new X500Principal("CN=Fake");
private static final BigInteger DEFAULT_CERT_SERIAL_NUMBER = new BigInteger("1"); 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_BEFORE = new Date(0L); // Jan 1 1970
private static final Date DEFAULT_CERT_NOT_AFTER = new Date(2461449600000L); // Jan 1 2048 private static final Date DEFAULT_CERT_NOT_AFTER = new Date(2461449600000L); // Jan 1 2048
@@ -366,7 +368,11 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu
} }
if (certificateSubject == null) { if (certificateSubject == null) {
certificateSubject = DEFAULT_CERT_SUBJECT; if (attestationChallenge == null) {
certificateSubject = DEFAULT_SELF_SIGNED_CERT_SUBJECT;
} else {
certificateSubject = DEFAULT_ATTESTATION_CERT_SUBJECT;
}
} }
if (certificateNotBefore == null) { if (certificateNotBefore == null) {
certificateNotBefore = DEFAULT_CERT_NOT_BEFORE; certificateNotBefore = DEFAULT_CERT_NOT_BEFORE;