Update CA certs to NSS_3_91_RTM.
Had to manually delete TrustCor & E-Tugra certs because those were still included by Mozilla.
INIT Store initialized from /usr/local/google/home/miguelaranda/aosp4/system/ca-certificates/files
REMOVE expired
SHA1 : D6:DA:A8:20:8D:09:D2:15:4D:24:B5:2F:CB:34:6E:B2:58:B2:8A:58
Subject : C=HK, O=Hongkong Post, CN=Hongkong Post Root CA 1
Not Before: May 15 05:13:14 2003 GMT
Not After : May 15 04:52:29 2023 GMT
IMPORT Starting import from /usr/local/google/home/miguelaranda/aosp4/vendor/google/tools/cacerts/certdata.txt
ADDED Repository imported
SHA1 : D5:EC:8D:7B:4C:BA:79:F4:E7:E8:CB:9D:6B:AE:77:83:10:03:21:6A
Subject : C=CN, O=BEIJING CERTIFICATE AUTHORITY, CN=BJCA Global Root CA1
Not Before: Dec 19 03:16:17 2019 GMT
Not After : Dec 12 03:16:17 2044 GMT
None
ADDED Repository imported
SHA1 : F4:27:86:EB:6E:B8:6D:88:31:67:02:FB:BA:66:A4:53:00:AA:7A:A6
Subject : C=CN, O=BEIJING CERTIFICATE AUTHORITY, CN=BJCA Global Root CA2
Not Before: Dec 19 03:18:21 2019 GMT
Not After : Dec 12 03:18:21 2044 GMT
None
PROCESS Handling 153 cert requests
EXPIRING Cert is expiring on Sep 30 04:20:49 2023 GMT
SHA1 : 36:B1:2B:49:F9:81:9E:D7:4C:9E:BC:38:0F:C6:56:8F:5D:AC:B2:F7
Subject : C=JP, O=SECOM Trust.net, OU=Security Communication RootCA1
Not Before: Sep 30 04:20:49 2003 GMT
Not After : Sep 30 04:20:49 2023 GMT
SUMMARY
CertRequest
total count: 153
add count: 30
remove count: 119
trust count: 0
Repository
total trusted: 139
roots for import: 140
intermediate for import: 0
Store (before import)
total count: 133
expired: 0
expiring with 1 year: 1
Store (after import)
total count: 140
newly imported: 7
existing matched by import: 133
other trusted: 0
expired: 0
expiring with 1 year: 1
Store (after cert requests)
total count: 140
newly imported: 7
existing matched by import: 133
other trusted: 0
expired: 0
expiring with 1 year: 1
Test: atest CertificateTest
(cherry picked from https://android-review.googlesource.com/q/commit:e08d57b67dfcce3b21e172866471c47df1e59e1f)
Bug: 328061431
Merged-In: Id8b8669d7209e3c5cd678fbe4aa70c623321820a
Change-Id: Id8b8669d7209e3c5cd678fbe4aa70c623321820a
diff --git a/tests/tests/security/src/android/security/cts/CertificateData.java b/tests/tests/security/src/android/security/cts/CertificateData.java
index 47bf552..01639fa 100644
--- a/tests/tests/security/src/android/security/cts/CertificateData.java
+++ b/tests/tests/security/src/android/security/cts/CertificateData.java
@@ -98,11 +98,14 @@
"59:22:A1:E1:5A:EA:16:35:21:F8:98:39:6A:46:46:B0:44:1B:0F:A9",
"8F:6B:F2:A9:27:4A:DA:14:A0:C4:F4:8E:61:27:F9:C0:1E:78:5D:D1",
"26:F9:93:B4:ED:3D:28:27:B0:B9:4B:A7:E9:15:1D:A3:8D:92:E5:32",
- "99:9A:64:C3:7F:F4:7D:9F:AB:95:F1:47:69:89:14:60:EE:C4:C3:C5",
+ "99:9A:64:C3:7F:F4:7D:9F:AB:95:F1:47:69:89:14:60:EE:C4:C3:C5",
"73:A5:E6:4A:3B:FF:83:16:FF:0E:DC:CC:61:8A:90:6E:4E:AE:4D:74",
"E7:F3:A3:C8:CF:6F:C3:04:2E:6D:0E:67:32:C5:9E:68:95:0D:5E:D2",
"89:D4:83:03:4F:9E:9A:48:80:5F:72:37:D4:A9:A6:EF:CB:7C:1F:D1",
"F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2",
+ "D6:DA:A8:20:8D:09:D2:15:4D:24:B5:2F:CB:34:6E:B2:58:B2:8A:58",
+ "D5:EC:8D:7B:4C:BA:79:F4:E7:E8:CB:9D:6B:AE:77:83:10:03:21:6A",
+ "F4:27:86:EB:6E:B8:6D:88:31:67:02:FB:BA:66:A4:53:00:AA:7A:A6",
"E1:C9:50:E6:EF:22:F8:4C:56:45:72:8B:92:20:60:D7:D5:A7:A3:E8",
"57:73:A5:61:5D:80:B2:E6:AC:38:82:FC:68:07:31:AC:9F:B5:92:5A",
"18:52:3B:0D:06:37:E4:D6:3A:DF:23:E4:98:FB:5B:16:FB:86:74:48",
@@ -171,7 +174,6 @@
"9F:F1:71:8D:92:D5:9A:F3:7D:74:97:B4:BC:6F:84:68:0B:BA:B6:66",
"B5:61:EB:EA:A4:DE:E4:25:4B:69:1A:98:A5:57:47:C2:34:C7:D9:71",
"07:E0:32:E0:20:B7:2C:3F:19:2F:06:28:A2:59:3A:19:A7:0F:06:9E",
- "D6:DA:A8:20:8D:09:D2:15:4D:24:B5:2F:CB:34:6E:B2:58:B2:8A:58",
"80:94:64:0E:B5:A7:A1:CA:11:9C:1F:DD:D5:9F:81:02:63:A7:FB:D1",
"67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0",
"DD:FB:16:CD:49:31:C9:73:A2:03:7D:3F:C8:3A:4D:7D:77:5D:05:E4",
@@ -215,7 +217,7 @@
"8A:C7:AD:8F:73:AC:4E:C1:B5:75:4D:A5:40:F4:FC:CF:7C:B5:8E:8C",
"5A:8C:EF:45:D7:A6:98:59:76:7A:8C:8B:44:96:B5:78:CF:47:4B:1A",
"8D:A7:F9:65:EC:5E:FC:37:91:0F:1C:6E:59:FD:C1:CC:6A:6E:DE:16",
- "B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97",
+ "B1:2E:13:63:45:86:A4:6F:1A:B2:60:68:37:58:2D:C4:AC:FD:94:97"
};
static final String[] WFA_CERTIFICATE_DATA = {
