Revert^2 "Update CA certificates for T"

This reverts commit ddd9ab3d3f6cde44302722774eab7e079b70993a.

INIT     Store initialized from master/system/ca-certificates/files
REMOVE   expired
         SHA1      : 37:F7:6D:E6:07:7C:90:C5:B1:3E:93:1A:B7:41:10:B4:F2:E4:9A:27
         Subject   : C=FI, O=Sonera, CN=Sonera Class2 CA
         Not Before: Apr  6 07:29:40 2001 GMT
         Not After : Apr  6 07:29:40 2021 GMT
REMOVE   expired
         SHA1      : 75:E0:AB:B6:13:85:12:27:1C:04:F8:5F:DD:DE:38:E4:B7:24:2E:FE
         Subject   : OU=GlobalSign Root CA - R2, O=GlobalSign, CN=GlobalSign
         Not Before: Dec 15 08:00:00 2006 GMT
         Not After : Dec 15 08:00:00 2021 GMT
REMOVE   expired
         SHA1      : 5F:43:E5:B1:BF:F8:78:8C:AC:1C:C7:CA:4A:9A:C6:22:2B:CC:34:C6
         Subject   : O=Cybertrust, Inc, CN=Cybertrust Global Root
         Not Before: Dec 15 08:00:00 2006 GMT
         Not After : Dec 15 08:00:00 2021 GMT
REMOVE   expired
         SHA1      : DE:3F:40:BD:50:93:D3:9B:6C:60:F6:DA:BC:07:62:01:00:89:76:C9
         Subject   : C=BM, O=QuoVadis Limited, OU=Root Certification Authority, CN=QuoVadis Root Certification Authority
         Not Before: Mar 19 18:33:33 2001 GMT
         Not After : Mar 17 18:33:33 2021 GMT
REMOVE   expired
         SHA1      : DA:C9:02:4F:54:D8:F6:DF:94:93:5F:B1:73:26:38:CA:6A:D7:7C:13
         Subject   : O=Digital Signature Trust Co., CN=DST Root CA X3
         Not Before: Sep 30 21:12:19 2000 GMT
         Not After : Sep 30 14:01:15 2021 GMT
REMOVE   CA requested replacement
         SHA1      : E1:C9:50:E6:EF:22:F8:4C:56:45:72:8B:92:20:60:D7:D5:A7:A3:E8
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R1
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
REMOVE   CA requested replacement
         SHA1      : D2:73:96:2A:2A:5E:39:9F:73:3F:E1:C7:1E:64:3F:03:38:34:FC:4D
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R2
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
REMOVE   CA requested replacement
         SHA1      : 30:D4:24:6F:07:FF:DB:91:89:8A:0B:E9:49:66:11:EB:8C:5E:46:E5
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R3
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
REMOVE   CA requested replacement
         SHA1      : 2A:1D:60:27:D9:4A:B1:0A:1C:4D:91:5C:CD:33:A0:CB:3E:2D:54:CB
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R4
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
REMOVE   CA requested removal
         SHA1      : 8D:17:84:D5:37:F3:03:7D:EC:70:FE:57:8B:51:9A:99:E6:10:D7:B0
         Subject   : C=US, O=GeoTrust Inc., OU=(c) 2007 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G2
         Not Before: Nov  5 00:00:00 2007 GMT
         Not After : Jan 18 23:59:59 2038 GMT
REMOVE   CA requested removal
         SHA1      : 36:79:CA:35:66:87:72:30:4D:30:A5:FB:87:3B:0F:A7:7B:B7:0D:54
         Subject   : C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2008 VeriSign, Inc. - For authorized use only, CN=VeriSign Universal Root Certification Authority
         Not Before: Apr  2 00:00:00 2008 GMT
         Not After : Dec  1 23:59:59 2037 GMT
REMOVE   CA requested removal
         SHA1      : 3B:C0:38:0B:33:C3:F6:A6:0C:86:15:22:93:D9:DF:F5:4B:81:C0:04
         Subject   : C=GB, O=Trustis Limited, OU=Trustis FPS Root CA
         Not Before: Dec 23 12:14:06 2003 GMT
         Not After : Jan 21 11:36:54 2024 GMT
REMOVE   CA requested replacement
         SHA1      : 69:69:56:2E:40:80:F4:24:A1:E7:19:9F:14:BA:F3:EE:58:AB:6A:BB
         Subject   : OU=GlobalSign ECC Root CA - R4, O=GlobalSign, CN=GlobalSign
         Not Before: Nov 13 00:00:00 2012 GMT
         Not After : Jan 19 03:14:07 2038 GMT
REMOVE   CA requested removal
         SHA1      : D8:EB:6B:41:51:92:59:E0:F3:E7:85:00:C0:3D:B6:88:97:C9:EE:FC
         Subject   : C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G3
         Not Before: Nov 14 11:28:42 2013 GMT
         Not After : Nov 13 23:00:00 2028 GMT
REMOVE   CA requested removal
         SHA1      : 78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C
         Subject   : C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Chambers of Commerce Root - 2008
         Not Before: Aug  1 12:29:50 2008 GMT
         Not After : Jul 31 12:29:50 2038 GMT
REMOVE   CA requested removal
         SHA1      : 4A:BD:EE:EC:95:0D:35:9C:89:AE:C7:52:A1:2C:5B:29:F6:D6:AA:0C
         Subject   : C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Global Chambersign Root - 2008
         Not Before: Aug  1 12:31:40 2008 GMT
         Not After : Jul 31 12:31:40 2038 GMT
IMPORT   Starting import from vendor/google/tools/cacerts/certdata.txt
ADDED    Repository imported
         SHA1      : 62:FF:D9:9E:C0:65:0D:03:CE:75:93:D2:ED:3F:2D:32:C9:E3:E5:4A
         Subject   : C=ES, O=FNMT-RCM, OU=Ceres/organizationIdentifier=VATES-Q2826004J, CN=AC RAIZ FNMT-RCM SERVIDORES SEGUROS
         Not Before: Dec 20 09:37:33 2018 GMT
         Not After : Dec 20 09:37:33 2043 GMT
         None
ADDED    Repository imported
         SHA1      : 5B:6E:68:D0:CC:15:B6:A0:5F:1E:C1:5F:AE:02:FC:6B:2F:5D:6F:74
         Subject   : serialNumber=G63287510, C=ES, O=ANF Autoridad de Certificacion, OU=ANF CA Raiz, CN=ANF Secure Server Root CA
         Not Before: Sep  4 10:00:38 2019 GMT
         Not After : Aug 30 10:00:38 2039 GMT
         None
ADDED    Repository imported
         SHA1      : 0B:BE:C2:27:22:49:CB:39:AA:DB:35:5C:53:E3:8C:AE:78:FF:B6:FE
         Subject   : C=ES, CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
         Not Before: Sep 23 15:22:07 2014 GMT
         Not After : May  5 15:22:07 2036 GMT
         None
ADDED    Repository imported
         SHA1      : F3:3E:78:3C:AC:DF:F4:A2:CC:AC:67:55:69:56:D7:E5:16:3C:E1:ED
         Subject   : C=PL, O=Asseco Data Systems S.A., OU=Certum Certification Authority, CN=Certum EC-384 CA
         Not Before: Mar 26 07:24:54 2018 GMT
         Not After : Mar 26 07:24:54 2043 GMT
         None
ADDED    Repository imported
         SHA1      : C8:83:44:C0:18:AE:9F:CC:F1:87:B7:8F:22:D1:C5:D7:45:84:BA:E5
         Subject   : C=PL, O=Asseco Data Systems S.A., OU=Certum Certification Authority, CN=Certum Trusted Root CA
         Not Before: Mar 16 12:10:13 2018 GMT
         Not After : Mar 16 12:10:13 2043 GMT
         None
ADDED    Repository imported
         SHA1      : D0:67:C1:13:51:01:0C:AA:D0:C7:6A:65:37:31:16:26:4F:53:71:A2
         Subject   : C=AT, O=e-commerce monitoring GmbH, CN=GLOBALTRUST 2020
         Not Before: Feb 10 00:00:00 2020 GMT
         Not After : Jun 10 00:00:00 2040 GMT
         None
ADDED    Repository imported
         SHA1      : E5:8C:1C:C4:91:3B:38:63:4B:E9:10:6E:E3:AD:8E:6B:9D:D9:81:4A
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R1
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
         None
ADDED    Repository imported
         SHA1      : 9A:44:49:76:32:DB:DE:FA:D0:BC:FB:5A:7B:17:BD:9E:56:09:24:94
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R2
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
         None
ADDED    Repository imported
         SHA1      : ED:E5:71:80:2B:C8:92:B9:5B:83:3C:D2:32:68:3F:09:CD:A0:1E:46
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R3
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
         None
ADDED    Repository imported
         SHA1      : 77:D3:03:67:B5:E0:0C:15:F6:0C:38:61:DF:7C:E1:3B:92:46:4D:47
         Subject   : C=US, O=Google Trust Services LLC, CN=GTS Root R4
         Not Before: Jun 22 00:00:00 2016 GMT
         Not After : Jun 22 00:00:00 2036 GMT
         None
ADDED    Repository imported
         SHA1      : 6B:A0:B0:98:E1:71:EF:5A:AD:FE:48:15:80:77:10:F4:BD:6F:0B:28
         Subject   : OU=GlobalSign ECC Root CA - R4, O=GlobalSign, CN=GlobalSign
         Not Before: Nov 13 00:00:00 2012 GMT
         Not After : Jan 19 03:14:07 2038 GMT
         None
ADDED    Repository imported
         SHA1      : 39:B4:6C:D5:FE:80:06:EB:E2:2F:4A:BB:08:33:A0:AF:DB:B9:DD:84
         Subject   : C=BE, O=GlobalSign nv-sa, CN=GlobalSign Root E46
         Not Before: Mar 20 00:00:00 2019 GMT
         Not After : Mar 20 00:00:00 2046 GMT
         None
ADDED    Repository imported
         SHA1      : 53:A2:B0:4B:CA:6B:D6:45:E6:39:8A:8E:C4:0D:D2:BF:77:C3:A2:90
         Subject   : C=BE, O=GlobalSign nv-sa, CN=GlobalSign Root R46
         Not Before: Mar 20 00:00:00 2019 GMT
         Not After : Mar 20 00:00:00 2046 GMT
         None
ADDED    Repository imported
         SHA1      : BC:B0:C1:9D:E9:98:92:70:19:38:57:E9:8D:A7:B4:5D:6E:EE:01:48
         Subject   : C=GR, O=Hellenic Academic and Research Institutions CA, CN=HARICA TLS ECC Root CA 2021
         Not Before: Feb 19 11:01:10 2021 GMT
         Not After : Feb 13 11:01:09 2045 GMT
         None
ADDED    Repository imported
         SHA1      : 02:2D:05:82:FA:88:CE:14:0C:06:79:DE:7F:14:10:E9:45:D7:A5:6D
         Subject   : C=GR, O=Hellenic Academic and Research Institutions CA, CN=HARICA TLS RSA Root CA 2021
         Not Before: Feb 19 10:55:38 2021 GMT
         Not After : Feb 13 10:55:37 2045 GMT
         None
ADDED    Repository imported
         SHA1      : 6A:92:E4:A8:EE:1B:EC:96:45:37:E3:29:57:49:CD:96:E3:E5:D2:60
         Subject   : C=TW, O=Chunghwa Telecom Co., Ltd., CN=HiPKI Root CA - G1
         Not Before: Feb 22 09:46:04 2019 GMT
         Not After : Dec 31 15:59:59 2037 GMT
         None
ADDED    Repository imported
         SHA1      : BD:B1:B9:3C:D5:97:8D:45:C6:26:14:55:F8:DB:95:C7:5A:D1:53:AF
         Subject   : C=US, O=Internet Security Research Group, CN=ISRG Root X2
         Not Before: Sep  4 00:00:00 2020 GMT
         Not After : Sep 17 16:00:00 2040 GMT
         None
ADDED    Repository imported
         SHA1      : CF:E9:70:84:0F:E0:73:0F:9D:F6:0C:7F:2C:4B:EE:20:46:34:9C:BB
         Subject   : C=TN, O=Agence Nationale de Certification Electronique, CN=TunTrust Root CA
         Not Before: Apr 26 08:57:56 2019 GMT
         Not After : Apr 26 08:57:56 2044 GMT
         None
ADDED    Repository imported
         SHA1      : F6:9C:DB:B0:FC:F6:02:13:B6:52:32:A6:A3:91:3F:16:70:DA:C3:E1
         Subject   : C=CN, O=iTrusChina Co.,Ltd., CN=vTrus ECC Root CA
         Not Before: Jul 31 07:26:44 2018 GMT
         Not After : Jul 31 07:26:44 2043 GMT
         None
ADDED    Repository imported
         SHA1      : 84:1A:69:FB:F5:CD:1A:25:34:13:3D:E3:F8:FC:B8:99:D0:C9:14:B7
         Subject   : C=CN, O=iTrusChina Co.,Ltd., CN=vTrus Root CA
         Not Before: Jul 31 07:24:05 2018 GMT
         Not After : Jul 31 07:24:05 2043 GMT
         None
PROCESS  Handling 152 cert requests
EXPIRING Cert is expiring on Mar  3 12:09:48 2023 GMT
         SHA1      : 51:C6:E7:08:49:06:6E:F3:92:D4:5C:A0:0D:6D:A3:62:8F:C3:52:39
         Subject   : C=TR, L=Ankara, O=E-Tu\xC4\x9Fra EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E., OU=E-Tugra Sertifikasyon Merkezi, CN=E-Tugra Certification Authority
         Not Before: Mar  5 12:09:48 2013 GMT
         Not After : Mar  3 12:09:48 2023 GMT
EXPIRING Cert is expiring on Dec  8 11:10:28 2022 GMT
         SHA1      : 76:E2:7E:C1:4F:DB:82:C1:C0:A6:75:B5:05:BE:3D:29:B4:ED:DB:BB
         Subject   : C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden EV Root CA
         Not Before: Dec  8 11:19:29 2010 GMT
         Not After : Dec  8 11:10:28 2022 GMT

SUMMARY

  CertRequest
                 total count: 152
                   add count:  30
                remove count: 118
                 trust count:   0

  Repository
               total trusted: 132
            roots for import: 133
     intermediate for import:   0

  Store (before import)
                 total count: 124
                     expired:   0
        expiring with 1 year:   2

  Store (after import)
                 total count: 133
              newly imported:  20
  existing matched by import: 113
               other trusted:   0
                     expired:   0
        expiring with 1 year:   2

  Store (after cert requests)
                 total count: 133
              newly imported:  20
  existing matched by import: 113
               other trusted:   0
                     expired:   0
        expiring with 1 year:   2

Bug: 222453876
Test: atest CtsKeystoreTestCases:android.keystore.cts.KeyStoreTest
Test: atest CtsSecurityTestCases:android.security.cts.CertificateTest
Test: atest CtsLibcoreTestCases:com.android.org.conscrypt.TrustedCertificateStoreTest
Change-Id: Ic64fd06a20485b85754296841cb692fa2c33d1b5
31 files changed
tree: 2020ba87562d031d3ec78f4044c6bb7d727ff2d7
  1. files/
  2. google/
  3. soong/
  4. wfa_certs/
  5. Android.bp
  6. METADATA
  7. OWNERS
  8. README.cacerts