diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-03-05 05:20:50 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-05 05:20:50 +0000 |
| commit | a615e5ecebbf8b090ca5965f96af2df2044e3ea6 (patch) | |
| tree | 9b9eb9ab519f4d97914f5ede6bda15e6ee60a841 /keystore | |
| parent | 9c2effce2497a40ef0d84458b90ce31c8da91cc6 (diff) | |
| parent | 508469a1fe5f584b797cc94e587507f17e5b2360 (diff) | |
Merge "Fix subject in self-signed certificates." am: a27ce04850 am: 19c771ec4e am: 508469a1fe
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1619939
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: If94978b20c4bb2e8364021779c2808e4ef1f227d
Diffstat (limited to 'keystore')
| -rw-r--r-- | keystore/java/android/security/keystore/KeyGenParameterSpec.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/keystore/java/android/security/keystore/KeyGenParameterSpec.java b/keystore/java/android/security/keystore/KeyGenParameterSpec.java index c79c12cd3343..72735a787b7f 100644 --- a/keystore/java/android/security/keystore/KeyGenParameterSpec.java +++ b/keystore/java/android/security/keystore/KeyGenParameterSpec.java @@ -279,8 +279,10 @@ import javax.security.auth.x500.X500Principal; * } */ 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"); + 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 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 @@ -366,7 +368,11 @@ public final class KeyGenParameterSpec implements AlgorithmParameterSpec, UserAu } 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) { certificateNotBefore = DEFAULT_CERT_NOT_BEFORE; |