caroot: Regenerate

Regenerate using certificate data from NSS 3.123.1.

MFC after:	1 week
Reviewed by:	kevans

106 files changed, 3273 insertions, 5662 deletions

diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index f45e264b9bff..0073b4f13c6c 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,81 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20260426: Regenerate trust store
+OLD_FILES+=usr/share/certs/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
+OLD_FILES+=usr/share/certs/trusted/AffirmTrust_Premium.pem
+OLD_FILES+=usr/share/certs/trusted/Starfield_Class_2_CA.pem
+OLD_FILES+=usr/share/certs/trusted/GTS_Root_R2.pem
+OLD_FILES+=usr/share/certs/trusted/GLOBALTRUST_2020.pem
+OLD_FILES+=usr/share/certs/trusted/Secure_Global_CA.pem
+OLD_FILES+=usr/share/certs/trusted/GlobalSign_Root_CA.pem
+OLD_FILES+=usr/share/certs/trusted/CommScope_Public_Trust_RSA_Root-01.pem
+OLD_FILES+=usr/share/certs/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/trusted/SwissSign_Gold_CA_-_G2.pem
+OLD_FILES+=usr/share/certs/trusted/Go_Daddy_Class_2_CA.pem
+OLD_FILES+=usr/share/certs/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem
+OLD_FILES+=usr/share/certs/trusted/Trustwave_Global_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/trusted/CommScope_Public_Trust_ECC_Root-01.pem
+OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority_-_EC1.pem
+OLD_FILES+=usr/share/certs/trusted/Certigna.pem
+OLD_FILES+=usr/share/certs/trusted/AffirmTrust_Commercial.pem
+OLD_FILES+=usr/share/certs/trusted/DigiCert_Assured_ID_Root_CA.pem
+OLD_FILES+=usr/share/certs/trusted/Baltimore_CyberTrust_Root.pem
+OLD_FILES+=usr/share/certs/trusted/CommScope_Public_Trust_ECC_Root-02.pem
+OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/trusted/AffirmTrust_Premium_ECC.pem
+OLD_FILES+=usr/share/certs/trusted/CommScope_Public_Trust_RSA_Root-02.pem
+OLD_FILES+=usr/share/certs/trusted/TeliaSonera_Root_CA_v1.pem
+OLD_FILES+=usr/share/certs/trusted/QuoVadis_Root_CA_2.pem
+OLD_FILES+=usr/share/certs/trusted/COMODO_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/trusted/SecureTrust_CA.pem
+OLD_FILES+=usr/share/certs/trusted/Comodo_AAA_Services_root.pem
+OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority_-_G2.pem
+OLD_FILES+=usr/share/certs/trusted/QuoVadis_Root_CA_3.pem
+OLD_FILES+=usr/share/certs/trusted/DigiCert_High_Assurance_EV_Root_CA.pem
+OLD_FILES+=usr/share/certs/trusted/certSIGN_ROOT_CA.pem
+OLD_FILES+=usr/share/certs/trusted/DigiCert_Global_Root_CA.pem
+OLD_FILES+=usr/share/certs/trusted/AffirmTrust_Networking.pem
+OLD_FILES+=usr/share/certs/trusted/XRamp_Global_CA_Root.pem
+OLD_FILES+=usr/share/certs/untrusted/Security_Communication_RootCA3.pem
+OLD_FILES+=usr/share/certs/untrusted/GeoTrust_Primary_Certification_Authority_-_G3.pem
+OLD_FILES+=usr/share/certs/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem
+OLD_FILES+=usr/share/certs/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
+OLD_FILES+=usr/share/certs/untrusted/EE_Certification_Centre_Root_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/EC-ACC.pem
+OLD_FILES+=usr/share/certs/untrusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem
+OLD_FILES+=usr/share/certs/untrusted/GeoTrust_Universal_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/Global_Chambersign_Root_-_2008.pem
+OLD_FILES+=usr/share/certs/untrusted/Camerfirma_Global_Chambersign_Root.pem
+OLD_FILES+=usr/share/certs/untrusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
+OLD_FILES+=usr/share/certs/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
+OLD_FILES+=usr/share/certs/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
+OLD_FILES+=usr/share/certs/untrusted/TrustCor_RootCert_CA-2.pem
+OLD_FILES+=usr/share/certs/untrusted/GeoTrust_Universal_CA_2.pem
+OLD_FILES+=usr/share/certs/untrusted/Network_Solutions_Certificate_Authority.pem
+OLD_FILES+=usr/share/certs/untrusted/thawte_Primary_Root_CA.pem
+OLD_FILES+=usr/share/certs/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem
+OLD_FILES+=usr/share/certs/untrusted/GeoTrust_Primary_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/untrusted/Taiwan_GRCA.pem
+OLD_FILES+=usr/share/certs/untrusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
+OLD_FILES+=usr/share/certs/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
+OLD_FILES+=usr/share/certs/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
+OLD_FILES+=usr/share/certs/untrusted/SwissSign_Platinum_CA_-_G2.pem
+OLD_FILES+=usr/share/certs/untrusted/TrustCor_RootCert_CA-1.pem
+OLD_FILES+=usr/share/certs/untrusted/thawte_Primary_Root_CA_-_G3.pem
+OLD_FILES+=usr/share/certs/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem
+OLD_FILES+=usr/share/certs/untrusted/SwissSign_Silver_CA_-_G2.pem
+OLD_FILES+=usr/share/certs/untrusted/TrustCor_ECA-1.pem
+OLD_FILES+=usr/share/certs/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
+OLD_FILES+=usr/share/certs/untrusted/SecureSign_RootCA11.pem
+OLD_FILES+=usr/share/certs/untrusted/Chambers_of_Commerce_Root_-_2008.pem
+OLD_FILES+=usr/share/certs/untrusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
+OLD_FILES+=usr/share/certs/untrusted/VeriSign_Universal_Root_Certification_Authority.pem
+OLD_FILES+=usr/share/certs/untrusted/LuxTrust_Global_Root_2.pem
+OLD_FILES+=usr/share/certs/untrusted/thawte_Primary_Root_CA_-_G2.pem
+OLD_FILES+=usr/share/certs/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
+
 # 20260425: new clang import which bumps version from 19 to 21
 OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_builtin_vars.h
 OLD_FILES+=usr/lib/clang/19/include/__clang_cuda_cmath.h
diff --git a/secure/caroot/Makefile b/secure/caroot/Makefile
index c20499e52a76..fa4119034dd9 100644
--- a/secure/caroot/Makefile
+++ b/secure/caroot/Makefile
@@ -7,7 +7,7 @@ SUBDIR+=	untrusted
 
 # Set this to an upstream hash or tag
 # https://hg-edge.mozilla.org/projects/nss/tags
-HGVER = e71e3de47d4ca7a3efa7c11096ab2e20ae71683e
+HGVER = NSS_3_123_1_RTM
 
 # To be used by secteam@ to update the trusted certificates
 fetchcerts: .PHONY
diff --git a/secure/caroot/trusted/AffirmTrust_Commercial.pem b/secure/caroot/trusted/AffirmTrust_Commercial.pem
deleted file mode 100644
index b889d02ba6b7..000000000000
--- a/secure/caroot/trusted/AffirmTrust_Commercial.pem
+++ /dev/null
@@ -1,88 +0,0 @@
-##
-##  AffirmTrust Commercial
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 8608355977964138876 (0x7777062726a9b17c)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Commercial
-        Validity
-            Not Before: Jan 29 14:06:06 2010 GMT
-            Not After : Dec 31 14:06:06 2030 GMT
-        Subject: C=US, O=AffirmTrust, CN=AffirmTrust Commercial
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:f6:1b:4f:67:07:2b:a1:15:f5:06:22:cb:1f:01:
-                    b2:e3:73:45:06:44:49:2c:bb:49:25:14:d6:ce:c3:
-                    b7:ab:2c:4f:c6:41:32:94:57:fa:12:a7:5b:0e:e2:
-                    8f:1f:1e:86:19:a7:aa:b5:2d:b9:5f:0d:8a:c2:af:
-                    85:35:79:32:2d:bb:1c:62:37:f2:b1:5b:4a:3d:ca:
-                    cd:71:5f:e9:42:be:94:e8:c8:de:f9:22:48:64:c6:
-                    e5:ab:c6:2b:6d:ad:05:f0:fa:d5:0b:cf:9a:e5:f0:
-                    50:a4:8b:3b:47:a5:23:5b:7a:7a:f8:33:3f:b8:ef:
-                    99:97:e3:20:c1:d6:28:89:cf:94:fb:b9:45:ed:e3:
-                    40:17:11:d4:74:f0:0b:31:e2:2b:26:6a:9b:4c:57:
-                    ae:ac:20:3e:ba:45:7a:05:f3:bd:9b:69:15:ae:7d:
-                    4e:20:63:c4:35:76:3a:07:02:c9:37:fd:c7:47:ee:
-                    e8:f1:76:1d:73:15:f2:97:a4:b5:c8:7a:79:d9:42:
-                    aa:2b:7f:5c:fe:ce:26:4f:a3:66:81:35:af:44:ba:
-                    54:1e:1c:30:32:65:9d:e6:3c:93:5e:50:4e:7a:e3:
-                    3a:d4:6e:cc:1a:fb:f9:d2:37:ae:24:2a:ab:57:03:
-                    22:28:0d:49:75:7f:b7:28:da:75:bf:8e:e3:dc:0e:
-                    79:31
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                9D:93:C6:53:8B:5E:CA:AF:3F:9F:1E:0F:E5:99:95:BC:24:F6:94:8F
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        58:ac:f4:04:0e:cd:c0:0d:ff:0a:fd:d4:ba:16:5f:29:bd:7b:
-        68:99:58:49:d2:b4:1d:37:4d:7f:27:7d:46:06:5d:43:c6:86:
-        2e:3e:73:b2:26:7d:4f:93:a9:b6:c4:2a:9a:ab:21:97:14:b1:
-        de:8c:d3:ab:89:15:d8:6b:24:d4:f1:16:ae:d8:a4:5c:d4:7f:
-        51:8e:ed:18:01:b1:93:63:bd:bc:f8:61:80:9a:9e:b1:ce:42:
-        70:e2:a9:7d:06:25:7d:27:a1:fe:6f:ec:b3:1e:24:da:e3:4b:
-        55:1a:00:3b:35:b4:3b:d9:d7:5d:30:fd:81:13:89:f2:c2:06:
-        2b:ed:67:c4:8e:c9:43:b2:5c:6b:15:89:02:bc:62:fc:4e:f2:
-        b5:33:aa:b2:6f:d3:0a:a2:50:e3:f6:3b:e8:2e:44:c2:db:66:
-        38:a9:33:56:48:f1:6d:1b:33:8d:0d:8c:3f:60:37:9d:d3:ca:
-        6d:7e:34:7e:0d:9f:72:76:8b:1b:9f:72:fd:52:35:41:45:02:
-        96:2f:1c:b2:9a:73:49:21:b1:49:47:45:47:b4:ef:6a:34:11:
-        c9:4d:9a:cc:59:b7:d6:02:9e:5a:4e:65:b5:94:ae:1b:df:29:
-        b0:16:f1:bf:00:9e:07:3a:17:64:b5:04:b5:23:21:99:0a:95:
-        3b:97:7c:ef
-SHA1 Fingerprint=F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
-Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
-ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
-MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
-yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
-VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
-nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
-XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
-vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
-Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
-N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
-nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/AffirmTrust_Networking.pem b/secure/caroot/trusted/AffirmTrust_Networking.pem
deleted file mode 100644
index e4a201bc82ae..000000000000
--- a/secure/caroot/trusted/AffirmTrust_Networking.pem
+++ /dev/null
@@ -1,88 +0,0 @@
-##
-##  AffirmTrust Networking
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 8957382827206547757 (0x7c4f04391cd4992d)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Networking
-        Validity
-            Not Before: Jan 29 14:08:24 2010 GMT
-            Not After : Dec 31 14:08:24 2030 GMT
-        Subject: C=US, O=AffirmTrust, CN=AffirmTrust Networking
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b4:84:cc:33:17:2e:6b:94:6c:6b:61:52:a0:eb:
-                    a3:cf:79:94:4c:e5:94:80:99:cb:55:64:44:65:8f:
-                    67:64:e2:06:e3:5c:37:49:f6:2f:9b:84:84:1e:2d:
-                    f2:60:9d:30:4e:cc:84:85:e2:2c:cf:1e:9e:fe:36:
-                    ab:33:77:35:44:d8:35:96:1a:3d:36:e8:7a:0e:d8:
-                    d5:47:a1:6a:69:8b:d9:fc:bb:3a:ae:79:5a:d5:f4:
-                    d6:71:bb:9a:90:23:6b:9a:b7:88:74:87:0c:1e:5f:
-                    b9:9e:2d:fa:ab:53:2b:dc:bb:76:3e:93:4c:08:08:
-                    8c:1e:a2:23:1c:d4:6a:ad:22:ba:99:01:2e:6d:65:
-                    cb:be:24:66:55:24:4b:40:44:b1:1b:d7:e1:c2:85:
-                    c0:de:10:3f:3d:ed:b8:fc:f1:f1:23:53:dc:bf:65:
-                    97:6f:d9:f9:40:71:8d:7d:bd:95:d4:ce:be:a0:5e:
-                    27:23:de:fd:a6:d0:26:0e:00:29:eb:3c:46:f0:3d:
-                    60:bf:3f:50:d2:dc:26:41:51:9e:14:37:42:04:a3:
-                    70:57:a8:1b:87:ed:2d:fa:7b:ee:8c:0a:e3:a9:66:
-                    89:19:cb:41:f9:dd:44:36:61:cf:e2:77:46:c8:7d:
-                    f6:f4:92:81:36:fd:db:34:f1:72:7e:f3:0c:16:bd:
-                    b4:15
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                07:1F:D2:E7:9C:DA:C2:6E:A2:40:B4:B0:7A:50:10:50:74:C4:C8:BD
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        89:57:b2:16:7a:a8:c2:fd:d6:d9:9b:9b:34:c2:9c:b4:32:14:
-        4d:a7:a4:df:ec:be:a7:be:f8:43:db:91:37:ce:b4:32:2e:50:
-        55:1a:35:4e:76:43:71:20:ef:93:77:4e:15:70:2e:87:c3:c1:
-        1d:6d:dc:cb:b5:27:d4:2c:56:d1:52:53:3a:44:d2:73:c8:c4:
-        1b:05:65:5a:62:92:9c:ee:41:8d:31:db:e7:34:ea:59:21:d5:
-        01:7a:d7:64:b8:64:39:cd:c9:ed:af:ed:4b:03:48:a7:a0:99:
-        01:80:dc:65:a3:36:ae:65:59:48:4f:82:4b:c8:65:f1:57:1d:
-        e5:59:2e:0a:3f:6c:d8:d1:f5:e5:09:b4:6c:54:00:0a:e0:15:
-        4d:87:75:6d:b7:58:96:5a:dd:6d:d2:00:a0:f4:9b:48:be:c3:
-        37:a4:ba:36:e0:7c:87:85:97:1a:15:a2:de:2e:a2:5b:bd:af:
-        18:f9:90:50:cd:70:59:f8:27:67:47:cb:c7:a0:07:3a:7d:d1:
-        2c:5d:6c:19:3a:66:b5:7d:fd:91:6f:82:b1:be:08:93:db:14:
-        47:f1:a2:37:c7:45:9e:3c:c7:77:af:64:a8:93:df:f6:69:83:
-        82:60:f2:49:42:34:ed:5a:00:54:85:1c:16:36:92:0c:5c:fa:
-        a6:ad:bf:db
-SHA1 Fingerprint=29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F
------BEGIN CERTIFICATE-----
-MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
-dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
-MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
-cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
-YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
-kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
-QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
-6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
-yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
-QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
-KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
-tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
-QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
-Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
-olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
-x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/AffirmTrust_Premium.pem b/secure/caroot/trusted/AffirmTrust_Premium.pem
deleted file mode 100644
index 853f7dc0e2d3..000000000000
--- a/secure/caroot/trusted/AffirmTrust_Premium.pem
+++ /dev/null
@@ -1,130 +0,0 @@
-##
-##  AffirmTrust Premium
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 7893706540734352110 (0x6d8c1446b1a60aee)
-        Signature Algorithm: sha384WithRSAEncryption
-        Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Premium
-        Validity
-            Not Before: Jan 29 14:10:36 2010 GMT
-            Not After : Dec 31 14:10:36 2040 GMT
-        Subject: C=US, O=AffirmTrust, CN=AffirmTrust Premium
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:c4:12:df:a9:5f:fe:41:dd:dd:f5:9f:8a:e3:f6:
-                    ac:e1:3c:78:9a:bc:d8:f0:7f:7a:a0:33:2a:dc:8d:
-                    20:5b:ae:2d:6f:e7:93:d9:36:70:6a:68:cf:8e:51:
-                    a3:85:5b:67:04:a0:10:24:6f:5d:28:82:c1:97:57:
-                    d8:48:29:13:b6:e1:be:91:4d:df:85:0c:53:18:9a:
-                    1e:24:a2:4f:8f:f0:a2:85:0b:cb:f4:29:7f:d2:a4:
-                    58:ee:26:4d:c9:aa:a8:7b:9a:d9:fa:38:de:44:57:
-                    15:e5:f8:8c:c8:d9:48:e2:0d:16:27:1d:1e:c8:83:
-                    85:25:b7:ba:aa:55:41:cc:03:22:4b:2d:91:8d:8b:
-                    e6:89:af:66:c7:e9:ff:2b:e9:3c:ac:da:d2:b3:c3:
-                    e1:68:9c:89:f8:7a:00:56:de:f4:55:95:6c:fb:ba:
-                    64:dd:62:8b:df:0b:77:32:eb:62:cc:26:9a:9b:bb:
-                    aa:62:83:4c:b4:06:7a:30:c8:29:bf:ed:06:4d:97:
-                    b9:1c:c4:31:2b:d5:5f:bc:53:12:17:9c:99:57:29:
-                    66:77:61:21:31:07:2e:25:49:9d:18:f2:ee:f3:2b:
-                    71:8c:b5:ba:39:07:49:77:fc:ef:2e:92:90:05:8d:
-                    2d:2f:77:7b:ef:43:bf:35:bb:9a:d8:f9:73:a7:2c:
-                    f2:d0:57:ee:28:4e:26:5f:8f:90:68:09:2f:b8:f8:
-                    dc:06:e9:2e:9a:3e:51:a7:d1:22:c4:0a:a7:38:48:
-                    6c:b3:f9:ff:7d:ab:86:57:e3:ba:d6:85:78:77:ba:
-                    43:ea:48:7f:f6:d8:be:23:6d:1e:bf:d1:36:6c:58:
-                    5c:f1:ee:a4:19:54:1a:f5:03:d2:76:e6:e1:8c:bd:
-                    3c:b3:d3:48:4b:e2:c8:f8:7f:92:a8:76:46:9c:42:
-                    65:3e:a4:1e:c1:07:03:5a:46:2d:b8:97:f3:b7:d5:
-                    b2:55:21:ef:ba:dc:4c:00:97:fb:14:95:27:33:bf:
-                    e8:43:47:46:d2:08:99:16:60:3b:9a:7e:d2:e6:ed:
-                    38:ea:ec:01:1e:3c:48:56:49:09:c7:4c:37:00:9e:
-                    88:0e:c0:73:e1:6f:66:e9:72:47:30:3e:10:e5:0b:
-                    03:c9:9a:42:00:6c:c5:94:7e:61:c4:8a:df:7f:82:
-                    1a:0b:59:c4:59:32:77:b3:bc:60:69:56:39:fd:b4:
-                    06:7b:2c:d6:64:36:d9:bd:48:ed:84:1f:7e:a5:22:
-                    8f:2a:b8:42:f4:82:b7:d4:53:90:78:4e:2d:1a:fd:
-                    81:6f:44:d7:3b:01:74:96:42:e0:00:e2:2e:6b:ea:
-                    c5:ee:72:ac:bb:bf:fe:ea:aa:a8:f8:dc:f6:b2:79:
-                    8a:b6:67
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                9D:C0:67:A6:0C:22:D9:26:F5:45:AB:A6:65:52:11:27:D8:45:AC:63
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha384WithRSAEncryption
-    Signature Value:
-        b3:57:4d:10:62:4e:3a:e4:ac:ea:b8:1c:af:32:23:c8:b3:49:
-        5a:51:9c:76:28:8d:79:aa:57:46:17:d5:f5:52:f6:b7:44:e8:
-        08:44:bf:18:84:d2:0b:80:cd:c5:12:fd:00:55:05:61:87:41:
-        dc:b5:24:9e:3c:c4:d8:c8:fb:70:9e:2f:78:96:83:20:36:de:
-        7c:0f:69:13:88:a5:75:36:98:08:a6:c6:df:ac:ce:e3:58:d6:
-        b7:3e:de:ba:f3:eb:34:40:d8:a2:81:f5:78:3f:2f:d5:a5:fc:
-        d9:a2:d4:5e:04:0e:17:ad:fe:41:f0:e5:b2:72:fa:44:82:33:
-        42:e8:2d:58:f7:56:8c:62:3f:ba:42:b0:9c:0c:5c:7e:2e:65:
-        26:5c:53:4f:00:b2:78:7e:a1:0d:99:2d:8d:b8:1d:8e:a2:c4:
-        b0:fd:60:d0:30:a4:8e:c8:04:62:a9:c4:ed:35:de:7a:97:ed:
-        0e:38:5e:92:2f:93:70:a5:a9:9c:6f:a7:7d:13:1d:7e:c6:08:
-        48:b1:5e:67:eb:51:08:25:e9:e6:25:6b:52:29:91:9c:d2:39:
-        73:08:57:de:99:06:b4:5b:9d:10:06:e1:c2:00:a8:b8:1c:4a:
-        02:0a:14:d0:c1:41:ca:fb:8c:35:21:7d:82:38:f2:a9:54:91:
-        19:35:93:94:6d:6a:3a:c5:b2:d0:bb:89:86:93:e8:9b:c9:0f:
-        3a:a7:7a:b8:a1:f0:78:46:fa:fc:37:2f:e5:8a:84:f3:df:fe:
-        04:d9:a1:68:a0:2f:24:e2:09:95:06:d5:95:ca:e1:24:96:eb:
-        7c:f6:93:05:bb:ed:73:e9:2d:d1:75:39:d7:e7:24:db:d8:4e:
-        5f:43:8f:9e:d0:14:39:bf:55:70:48:99:57:31:b4:9c:ee:4a:
-        98:03:96:30:1f:60:06:ee:1b:23:fe:81:60:23:1a:47:62:85:
-        a5:cc:19:34:80:6f:b3:ac:1a:e3:9f:f0:7b:48:ad:d5:01:d9:
-        67:b6:a9:72:93:ea:2d:66:b5:b2:b8:e4:3d:3c:b2:ef:4c:8c:
-        ea:eb:07:bf:ab:35:9a:55:86:bc:18:a6:b5:a8:5e:b4:83:6c:
-        6b:69:40:d3:9f:dc:f1:c3:69:6b:b9:e1:6d:09:f4:f1:aa:50:
-        76:0a:7a:7d:7a:17:a1:55:96:42:99:31:09:dd:60:11:8d:05:
-        30:7e:e6:8e:46:d1:9d:14:da:c7:17:e4:05:96:8c:c4:24:b5:
-        1b:cf:14:07:b2:40:f8:a3:9e:41:86:bc:04:d0:6b:96:c8:2a:
-        80:34:fd:bf:ef:06:a3:dd:58:c5:85:3d:3e:8f:fe:9e:29:e0:
-        b6:b8:09:68:19:1c:18:43
-SHA1 Fingerprint=D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27
------BEGIN CERTIFICATE-----
-MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
-BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
-dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
-A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
-cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
-qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
-JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
-+jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
-s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
-HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
-70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
-V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
-qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
-5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
-C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
-OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
-FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
-BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
-KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
-Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
-8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
-MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
-0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
-u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
-u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
-YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
-GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
-RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
-KeC2uAloGRwYQw==
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem b/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem
deleted file mode 100644
index 68ce02904f4f..000000000000
--- a/secure/caroot/trusted/AffirmTrust_Premium_ECC.pem
+++ /dev/null
@@ -1,62 +0,0 @@
-##
-##  AffirmTrust Premium ECC
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 8401224907861490260 (0x7497258ac73f7a54)
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Premium ECC
-        Validity
-            Not Before: Jan 29 14:20:24 2010 GMT
-            Not After : Dec 31 14:20:24 2040 GMT
-        Subject: C=US, O=AffirmTrust, CN=AffirmTrust Premium ECC
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:0d:30:5e:1b:15:9d:03:d0:a1:79:35:b7:3a:3c:
-                    92:7a:ca:15:1c:cd:62:f3:9c:26:5c:07:3d:e5:54:
-                    fa:a3:d6:cc:12:ea:f4:14:5f:e8:8e:19:ab:2f:2e:
-                    48:e6:ac:18:43:78:ac:d0:37:c3:bd:b2:cd:2c:e6:
-                    47:e2:1a:e6:63:b8:3d:2e:2f:78:c4:4f:db:f4:0f:
-                    a4:68:4c:55:72:6b:95:1d:4e:18:42:95:78:cc:37:
-                    3c:91:e2:9b:65:2b:29
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                9A:AF:29:7A:C0:11:35:35:26:51:30:00:C3:6A:FE:40:D5:AE:D6:3C
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:64:02:30:17:09:f3:87:88:50:5a:af:c8:c0:42:bf:47:5f:
-        f5:6c:6a:86:e0:c4:27:74:e4:38:53:d7:05:7f:1b:34:e3:c6:
-        2f:b3:ca:09:3c:37:9d:d7:e7:b8:46:f1:fd:a1:e2:71:02:30:
-        42:59:87:43:d4:51:df:ba:d3:09:32:5a:ce:88:7e:57:3d:9c:
-        5f:42:6b:f5:07:2d:b5:f0:82:93:f9:59:6f:ae:64:fa:58:e5:
-        8b:1e:e3:63:be:b5:81:cd:6f:02:8c:79
-SHA1 Fingerprint=B8:23:6B:00:2F:1D:16:86:53:01:55:6C:11:A4:37:CA:EB:FF:C3:BB
------BEGIN CERTIFICATE-----
-MIIB/jCCAYWgAwIBAgIIdJclisc/elQwCgYIKoZIzj0EAwMwRTELMAkGA1UEBhMC
-VVMxFDASBgNVBAoMC0FmZmlybVRydXN0MSAwHgYDVQQDDBdBZmZpcm1UcnVzdCBQ
-cmVtaXVtIEVDQzAeFw0xMDAxMjkxNDIwMjRaFw00MDEyMzExNDIwMjRaMEUxCzAJ
-BgNVBAYTAlVTMRQwEgYDVQQKDAtBZmZpcm1UcnVzdDEgMB4GA1UEAwwXQWZmaXJt
-VHJ1c3QgUHJlbWl1bSBFQ0MwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQNMF4bFZ0D
-0KF5Nbc6PJJ6yhUczWLznCZcBz3lVPqj1swS6vQUX+iOGasvLkjmrBhDeKzQN8O9
-ss0s5kfiGuZjuD0uL3jET9v0D6RoTFVya5UdThhClXjMNzyR4ptlKymjQjBAMB0G
-A1UdDgQWBBSaryl6wBE1NSZRMADDav5A1a7WPDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNnADBkAjAXCfOHiFBar8jAQr9HX/Vs
-aobgxCd05DhT1wV/GzTjxi+zygk8N53X57hG8f2h4nECMEJZh0PUUd+60wkyWs6I
-flc9nF9Ca/UHLbXwgpP5WW+uZPpY5Yse42O+tYHNbwKMeQ==
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem b/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem
deleted file mode 100644
index 8f5973a12f5b..000000000000
--- a/secure/caroot/trusted/Baltimore_CyberTrust_Root.pem
+++ /dev/null
@@ -1,89 +0,0 @@
-##
-##  Baltimore CyberTrust Root
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 33554617 (0x20000b9)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=IE, O=Baltimore, OU=CyberTrust, CN=Baltimore CyberTrust Root
-        Validity
-            Not Before: May 12 18:46:00 2000 GMT
-            Not After : May 12 23:59:00 2025 GMT
-        Subject: C=IE, O=Baltimore, OU=CyberTrust, CN=Baltimore CyberTrust Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:a3:04:bb:22:ab:98:3d:57:e8:26:72:9a:b5:79:
-                    d4:29:e2:e1:e8:95:80:b1:b0:e3:5b:8e:2b:29:9a:
-                    64:df:a1:5d:ed:b0:09:05:6d:db:28:2e:ce:62:a2:
-                    62:fe:b4:88:da:12:eb:38:eb:21:9d:c0:41:2b:01:
-                    52:7b:88:77:d3:1c:8f:c7:ba:b9:88:b5:6a:09:e7:
-                    73:e8:11:40:a7:d1:cc:ca:62:8d:2d:e5:8f:0b:a6:
-                    50:d2:a8:50:c3:28:ea:f5:ab:25:87:8a:9a:96:1c:
-                    a9:67:b8:3f:0c:d5:f7:f9:52:13:2f:c2:1b:d5:70:
-                    70:f0:8f:c0:12:ca:06:cb:9a:e1:d9:ca:33:7a:77:
-                    d6:f8:ec:b9:f1:68:44:42:48:13:d2:c0:c2:a4:ae:
-                    5e:60:fe:b6:a6:05:fc:b4:dd:07:59:02:d4:59:18:
-                    98:63:f5:a5:63:e0:90:0c:7d:5d:b2:06:7a:f3:85:
-                    ea:eb:d4:03:ae:5e:84:3e:5f:ff:15:ed:69:bc:f9:
-                    39:36:72:75:cf:77:52:4d:f3:c9:90:2c:b9:3d:e5:
-                    c9:23:53:3f:1f:24:98:21:5c:07:99:29:bd:c6:3a:
-                    ec:e7:6e:86:3a:6b:97:74:63:33:bd:68:18:31:f0:
-                    78:8d:76:bf:fc:9e:8e:5d:2a:86:a7:4d:90:dc:27:
-                    1a:39
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                E5:9D:59:30:82:47:58:CC:AC:FA:08:54:36:86:7B:3A:B5:04:4D:F0
-            X509v3 Basic Constraints: critical
-                CA:TRUE, pathlen:3
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        85:0c:5d:8e:e4:6f:51:68:42:05:a0:dd:bb:4f:27:25:84:03:
-        bd:f7:64:fd:2d:d7:30:e3:a4:10:17:eb:da:29:29:b6:79:3f:
-        76:f6:19:13:23:b8:10:0a:f9:58:a4:d4:61:70:bd:04:61:6a:
-        12:8a:17:d5:0a:bd:c5:bc:30:7c:d6:e9:0c:25:8d:86:40:4f:
-        ec:cc:a3:7e:38:c6:37:11:4f:ed:dd:68:31:8e:4c:d2:b3:01:
-        74:ee:be:75:5e:07:48:1a:7f:70:ff:16:5c:84:c0:79:85:b8:
-        05:fd:7f:be:65:11:a3:0f:c0:02:b4:f8:52:37:39:04:d5:a9:
-        31:7a:18:bf:a0:2a:f4:12:99:f7:a3:45:82:e3:3c:5e:f5:9d:
-        9e:b5:c8:9e:7c:2e:c8:a4:9e:4e:08:14:4b:6d:fd:70:6d:6b:
-        1a:63:bd:64:e6:1f:b7:ce:f0:f2:9f:2e:bb:1b:b7:f2:50:88:
-        73:92:c2:e2:e3:16:8d:9a:32:02:ab:8e:18:dd:e9:10:11:ee:
-        7e:35:ab:90:af:3e:30:94:7a:d0:33:3d:a7:65:0f:f5:fc:8e:
-        9e:62:cf:47:44:2c:01:5d:bb:1d:b5:32:d2:47:d2:38:2e:d0:
-        fe:81:dc:32:6a:1e:b5:ee:3c:d5:fc:e7:81:1d:19:c3:24:42:
-        ea:63:39:a9
-SHA1 Fingerprint=D4:DE:20:D0:5E:66:FC:53:FE:1A:50:88:2C:78:DB:28:52:CA:E4:74
------BEGIN CERTIFICATE-----
-MIIDdzCCAl+gAwIBAgIEAgAAuTANBgkqhkiG9w0BAQUFADBaMQswCQYDVQQGEwJJ
-RTESMBAGA1UEChMJQmFsdGltb3JlMRMwEQYDVQQLEwpDeWJlclRydXN0MSIwIAYD
-VQQDExlCYWx0aW1vcmUgQ3liZXJUcnVzdCBSb290MB4XDTAwMDUxMjE4NDYwMFoX
-DTI1MDUxMjIzNTkwMFowWjELMAkGA1UEBhMCSUUxEjAQBgNVBAoTCUJhbHRpbW9y
-ZTETMBEGA1UECxMKQ3liZXJUcnVzdDEiMCAGA1UEAxMZQmFsdGltb3JlIEN5YmVy
-VHJ1c3QgUm9vdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKMEuyKr
-mD1X6CZymrV51Cni4eiVgLGw41uOKymaZN+hXe2wCQVt2yguzmKiYv60iNoS6zjr
-IZ3AQSsBUnuId9Mcj8e6uYi1agnnc+gRQKfRzMpijS3ljwumUNKoUMMo6vWrJYeK
-mpYcqWe4PwzV9/lSEy/CG9VwcPCPwBLKBsua4dnKM3p31vjsufFoREJIE9LAwqSu
-XmD+tqYF/LTdB1kC1FkYmGP1pWPgkAx9XbIGevOF6uvUA65ehD5f/xXtabz5OTZy
-dc93Uk3zyZAsuT3lySNTPx8kmCFcB5kpvcY67Oduhjprl3RjM71oGDHweI12v/ye
-jl0qhqdNkNwnGjkCAwEAAaNFMEMwHQYDVR0OBBYEFOWdWTCCR1jMrPoIVDaGezq1
-BE3wMBIGA1UdEwEB/wQIMAYBAf8CAQMwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3
-DQEBBQUAA4IBAQCFDF2O5G9RaEIFoN27TyclhAO992T9Ldcw46QQF+vaKSm2eT92
-9hkTI7gQCvlYpNRhcL0EYWoSihfVCr3FvDB81ukMJY2GQE/szKN+OMY3EU/t3Wgx
-jkzSswF07r51XgdIGn9w/xZchMB5hbgF/X++ZRGjD8ACtPhSNzkE1akxehi/oCr0
-Epn3o0WC4zxe9Z2etciefC7IpJ5OCBRLbf1wbWsaY71k5h+3zvDyny67G7fyUIhz
-ksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9HRCwBXbsdtTLS
-R9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem
deleted file mode 100644
index a88e88b1f0c7..000000000000
--- a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-01.pem
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-##  CommScope Public Trust ECC Root-01
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            43:70:82:77:cf:4d:5d:34:f1:ca:ae:32:2f:37:f7:f4:7f:75:a0:9e
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=CommScope, CN=CommScope Public Trust ECC Root-01
-        Validity
-            Not Before: Apr 28 17:35:43 2021 GMT
-            Not After : Apr 28 17:35:42 2046 GMT
-        Subject: C=US, O=CommScope, CN=CommScope Public Trust ECC Root-01
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:4b:36:e9:ae:57:5e:a8:70:d7:d0:8f:74:62:77:
-                    c3:5e:7a:aa:e5:b6:a2:f1:78:fd:02:7e:57:dd:91:
-                    79:9c:6c:b9:52:88:54:bc:2f:04:be:b8:cd:f6:10:
-                    d1:29:ec:b5:d0:a0:c3:f0:89:70:19:bb:51:65:c5:
-                    43:9c:c3:9b:63:9d:20:83:3e:06:0b:a6:42:44:85:
-                    11:a7:4a:3a:2d:e9:d6:68:2f:48:4e:53:2b:07:3f:
-                    4d:bd:b9:ac:77:39:57
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                8E:07:62:C0:50:DD:C6:19:06:00:46:74:04:F7:F3:AE:7D:75:4D:30
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:65:02:31:00:9c:33:df:41:e3:23:a8:42:36:26:97:35:5c:
-        7b:eb:db:4b:f8:aa:8b:73:55:15:5c:ac:78:29:0f:ba:21:d8:
-        c4:a0:d8:d1:03:dd:6d:d1:39:3d:c4:93:60:d2:e3:72:b2:02:
-        30:7c:c5:7e:88:d3:50:f5:1e:25:e8:fa:4e:75:e6:58:96:a4:
-        35:5f:1b:65:ea:61:9a:70:23:b5:0d:a3:9b:92:52:6f:69:a0:
-        8c:8d:4a:d0:ee:8b:0e:cb:47:8e:d0:8d:11
-SHA1 Fingerprint=07:86:C0:D8:DD:8E:C0:80:98:06:98:D0:58:7A:EF:DE:A6:CC:A2:5D
------BEGIN CERTIFICATE-----
-MIICHTCCAaOgAwIBAgIUQ3CCd89NXTTxyq4yLzf39H91oJ4wCgYIKoZIzj0EAwMw
-TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
-bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMTAeFw0yMTA0MjgxNzM1NDNa
-Fw00NjA0MjgxNzM1NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
-cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDEw
-djAQBgcqhkjOPQIBBgUrgQQAIgNiAARLNumuV16ocNfQj3Rid8NeeqrltqLxeP0C
-flfdkXmcbLlSiFS8LwS+uM32ENEp7LXQoMPwiXAZu1FlxUOcw5tjnSCDPgYLpkJE
-hRGnSjot6dZoL0hOUysHP029uax3OVejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSOB2LAUN3GGQYARnQE9/OufXVNMDAKBggq
-hkjOPQQDAwNoADBlAjEAnDPfQeMjqEI2Jpc1XHvr20v4qotzVRVcrHgpD7oh2MSg
-2NED3W3ROT3Ek2DS43KyAjB8xX6I01D1HiXo+k515liWpDVfG2XqYZpwI7UNo5uS
-Um9poIyNStDuiw7LR47QjRE=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem
deleted file mode 100644
index 3e5828e5f8fe..000000000000
--- a/secure/caroot/trusted/CommScope_Public_Trust_ECC_Root-02.pem
+++ /dev/null
@@ -1,64 +0,0 @@
-##
-##  CommScope Public Trust ECC Root-02
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            28:fd:99:60:41:47:a6:01:3a:ca:14:7b:1f:ef:f9:68:08:83:5d:7d
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=CommScope, CN=CommScope Public Trust ECC Root-02
-        Validity
-            Not Before: Apr 28 17:44:54 2021 GMT
-            Not After : Apr 28 17:44:53 2046 GMT
-        Subject: C=US, O=CommScope, CN=CommScope Public Trust ECC Root-02
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:78:30:81:e8:63:1e:e5:eb:71:51:0f:f7:07:07:
-                    ca:39:99:7c:4e:d5:0f:cc:30:30:0b:8f:66:93:3e:
-                    cf:bd:c5:86:bd:f9:b1:b7:b4:3e:b4:07:c8:f3:96:
-                    31:f3:ed:a4:4f:f8:a3:4e:8d:29:15:58:b8:d5:6f:
-                    7f:ee:6c:22:b5:b0:af:48:45:0a:bd:a8:49:94:bf:
-                    84:43:b0:db:84:4a:03:23:19:67:6a:6f:c1:6e:bc:
-                    06:39:37:d1:88:22:f7
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                E6:18:75:FF:EF:60:DE:84:A4:F5:46:C7:DE:4A:55:E3:32:36:79:F5
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:64:02:30:26:73:49:7a:b6:ab:e6:49:f4:7d:52:3f:d4:41:
-        04:ae:80:43:83:65:75:b9:85:80:38:3b:d6:6f:e4:93:86:ab:
-        8f:e7:89:c8:7f:9b:7e:6b:0a:12:55:61:aa:11:e0:79:02:30:
-        77:e8:31:71:ac:3c:71:03:d6:84:26:1e:14:b8:f3:3b:3b:de:
-        ed:59:fc:6b:4c:30:7f:59:ce:45:e9:73:60:15:9a:4c:f0:e6:
-        5e:25:22:15:6d:c2:87:59:d0:b2:8e:6a
-SHA1 Fingerprint=3C:3F:EF:57:0F:FE:65:93:86:9E:A0:FE:B0:F6:ED:8E:D1:13:C7:E5
------BEGIN CERTIFICATE-----
-MIICHDCCAaOgAwIBAgIUKP2ZYEFHpgE6yhR7H+/5aAiDXX0wCgYIKoZIzj0EAwMw
-TjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwiQ29t
-bVNjb3BlIFB1YmxpYyBUcnVzdCBFQ0MgUm9vdC0wMjAeFw0yMTA0MjgxNzQ0NTRa
-Fw00NjA0MjgxNzQ0NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21tU2Nv
-cGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgRUNDIFJvb3QtMDIw
-djAQBgcqhkjOPQIBBgUrgQQAIgNiAAR4MIHoYx7l63FRD/cHB8o5mXxO1Q/MMDAL
-j2aTPs+9xYa9+bG3tD60B8jzljHz7aRP+KNOjSkVWLjVb3/ubCK1sK9IRQq9qEmU
-v4RDsNuESgMjGWdqb8FuvAY5N9GIIvejQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYD
-VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTmGHX/72DehKT1RsfeSlXjMjZ59TAKBggq
-hkjOPQQDAwNnADBkAjAmc0l6tqvmSfR9Uj/UQQSugEODZXW5hYA4O9Zv5JOGq4/n
-ich/m35rChJVYaoR4HkCMHfoMXGsPHED1oQmHhS48zs73u1Z/GtMMH9ZzkXpc2AV
-mkzw5l4lIhVtwodZ0LKOag==
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem
deleted file mode 100644
index 6a4e2cfb42a4..000000000000
--- a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-01.pem
+++ /dev/null
@@ -1,131 +0,0 @@
-##
-##  CommScope Public Trust RSA Root-01
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            3e:03:49:81:75:16:74:31:8e:4c:ab:d5:c5:90:29:96:c5:39:10:dd
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=CommScope, CN=CommScope Public Trust RSA Root-01
-        Validity
-            Not Before: Apr 28 16:45:54 2021 GMT
-            Not After : Apr 28 16:45:53 2046 GMT
-        Subject: C=US, O=CommScope, CN=CommScope Public Trust RSA Root-01
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:b0:48:65:a3:0d:1d:42:e3:91:6d:9d:84:a4:61:
-                    96:12:c2:ed:c3:da:23:34:19:76:f6:ea:fd:55:5a:
-                    f6:55:01:53:0f:f2:cc:8c:97:4f:b9:50:cb:b3:01:
-                    44:56:96:fd:9b:28:ec:7b:74:0b:e7:42:6b:55:ce:
-                    c9:61:b2:e8:ad:40:3c:ba:b9:41:0a:05:4f:1b:26:
-                    85:8f:43:b5:40:b5:85:d1:d4:71:dc:83:41:f3:f6:
-                    45:c7:80:a2:84:50:97:46:ce:a0:0c:c4:60:56:04:
-                    1d:07:5b:46:a5:0e:b2:4b:a4:0e:a5:7c:ee:f8:d4:
-                    62:03:b9:93:6a:8a:14:b8:70:f8:2e:82:46:38:23:
-                    0e:74:c7:6b:41:b7:d0:29:a3:9d:80:b0:7e:77:93:
-                    63:42:fb:34:83:3b:73:a3:5a:21:36:eb:47:fa:18:
-                    17:d9:ba:66:c2:93:a4:8f:fc:5d:a4:ad:fc:50:6a:
-                    95:ac:bc:24:33:d1:bd:88:7f:86:f5:f5:b2:73:2a:
-                    8f:7c:af:08:f2:1a:98:3f:a9:81:65:3f:c1:8c:89:
-                    c5:96:30:9a:0a:cf:f4:d4:c8:34:ed:9d:2f:bc:8d:
-                    38:86:53:ee:97:9f:a9:b2:63:94:17:8d:0f:dc:66:
-                    2a:7c:52:51:75:cb:99:8e:e8:3d:5c:bf:9e:3b:28:
-                    8d:83:02:0f:a9:9f:72:e2:2c:2b:b3:dc:66:97:00:
-                    40:d0:a4:54:8e:9b:5d:7b:45:36:26:d6:72:43:eb:
-                    cf:c0:ea:0d:dc:ce:12:e6:7d:38:9f:05:27:a8:97:
-                    3e:e9:51:c6:6c:05:28:c1:02:0f:e9:18:6d:ec:bd:
-                    9c:06:d4:a7:49:f4:54:05:6b:6c:30:f1:eb:03:d5:
-                    ea:3d:6a:76:c2:cb:1a:28:49:4d:7f:64:e0:fa:2b:
-                    da:73:83:81:ff:91:03:bd:94:bb:e4:b8:8e:9c:32:
-                    63:cd:9f:bb:68:81:b1:84:5b:af:36:bf:77:ee:1d:
-                    7f:f7:49:9b:52:ec:d2:77:5a:7d:91:9d:4d:c2:39:
-                    2d:e4:ba:82:f8:6f:f2:4e:1e:0f:4e:e6:3f:59:a5:
-                    23:dc:3d:87:a8:28:58:28:d1:f1:1b:36:db:4f:c4:
-                    ff:e1:8c:5b:72:8c:c7:26:03:27:a3:39:0a:01:aa:
-                    c0:b2:31:60:83:22:a1:4f:12:09:01:11:af:34:d4:
-                    cf:d7:ae:62:d3:05:07:b4:31:75:e0:0d:6d:57:4f:
-                    69:87:f9:57:a9:ba:15:f6:c8:52:6d:a1:cb:9c:1f:
-                    e5:fc:78:a8:35:9a:9f:41:14:ce:a5:b4:ce:94:08:
-                    1c:09:ad:56:e5:da:b6:49:9a:4a:ea:63:18:53:9c:
-                    2c:2e:c3
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                37:5D:A6:9A:74:32:C2:C2:F9:C7:A6:15:10:59:B8:E4:FD:E5:B8:6D
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        af:a7:cf:de:ff:e0:bd:42:8d:4d:e5:22:96:df:68:ea:7d:4d:
-        2a:7d:d0:ad:3d:16:5c:43:e7:7d:c0:86:e8:7a:35:63:f1:cc:
-        81:c8:c6:0b:e8:2e:52:35:a4:a6:49:90:63:51:ac:34:ac:05:
-        3b:57:00:e9:d3:62:d3:d9:29:d5:54:be:1c:10:91:9c:b2:6d:
-        fe:59:fd:79:f7:ea:56:d0:9e:68:54:42:8f:26:52:e2:4c:df:
-        2f:97:a6:2f:d2:07:98:a8:f3:60:5d:4b:9a:58:57:88:ef:82:
-        e5:fa:af:6c:81:4b:92:8f:40:9a:93:46:59:cb:5f:78:16:b1:
-        67:3e:42:0b:df:28:d9:b0:ad:98:20:be:43:7c:d1:5e:1a:09:
-        17:24:8d:7b:5d:95:e9:ab:c1:60:ab:5b:18:64:80:fb:ad:e0:
-        06:7d:1d:ca:59:b8:f3:78:29:67:c6:56:1d:af:b6:b5:74:2a:
-        76:a1:3f:fb:75:30:9f:94:5e:3b:a5:60:f3:cb:5c:0c:e2:0e:
-        c9:60:f8:c9:1f:16:8a:26:dd:e7:27:7f:eb:25:a6:8a:bd:b8:
-        2d:36:10:9a:b1:58:4d:9a:68:4f:60:54:e5:f6:46:13:8e:88:
-        ac:bc:21:42:12:ad:c6:4a:89:7d:9b:c1:d8:2d:e9:96:03:f4:
-        a2:74:0c:bc:00:1d:bf:d6:37:25:67:b4:72:8b:af:85:bd:ea:
-        2a:03:8f:cc:fb:3c:44:24:82:e2:01:a5:0b:59:b6:34:8d:32:
-        0b:12:0d:eb:27:c2:fd:41:d7:40:3c:72:46:29:c0:8c:ea:ba:
-        0f:f1:06:93:2e:f7:9c:a8:f4:60:3e:a3:f1:38:5e:8e:13:c1:
-        b3:3a:97:87:3f:92:ca:78:a9:1c:af:d0:b0:1b:26:1e:be:70:
-        ec:7a:f5:33:98:ea:5c:ff:2b:0b:04:4e:43:dd:63:7e:0e:a7:
-        4e:78:03:95:3e:d4:2d:30:95:11:10:28:2e:bf:a0:02:3e:ff:
-        5e:59:d3:05:0e:95:5f:53:45:ef:6b:87:d5:48:cd:16:a6:96:
-        83:e1:df:b3:06:f3:c1:14:db:a7:ec:1c:8b:5d:90:90:0d:72:
-        51:e7:61:f9:14:ca:af:83:8f:bf:af:b1:0a:59:5d:dc:5c:d7:
-        e4:96:ad:5b:60:1d:da:ae:97:b2:39:d9:06:f5:76:00:13:f8:
-        68:4c:21:b0:35:c4:dc:55:b2:c9:c1:41:5a:1c:89:c0:8c:6f:
-        74:a0:6b:33:4d:b5:01:28:fd:ad:ad:89:17:3b:a6:9a:84:bc:
-        eb:8c:ea:c4:71:24:a8:ba:29:f9:08:b2:27:56:35:32:5f:ea:
-        39:fb:31:9a:d5:19:cc:f0
-SHA1 Fingerprint=6D:0A:5F:F7:B4:23:06:B4:85:B3:B7:97:64:FC:AC:75:F5:33:F2:93
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUPgNJgXUWdDGOTKvVxZAplsU5EN0wDQYJKoZIhvcNAQEL
-BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
-Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMTAeFw0yMTA0MjgxNjQ1
-NTRaFw00NjA0MjgxNjQ1NTNaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
-U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
-MDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCwSGWjDR1C45FtnYSk
-YZYSwu3D2iM0GXb26v1VWvZVAVMP8syMl0+5UMuzAURWlv2bKOx7dAvnQmtVzslh
-suitQDy6uUEKBU8bJoWPQ7VAtYXR1HHcg0Hz9kXHgKKEUJdGzqAMxGBWBB0HW0al
-DrJLpA6lfO741GIDuZNqihS4cPgugkY4Iw50x2tBt9Apo52AsH53k2NC+zSDO3Oj
-WiE260f6GBfZumbCk6SP/F2krfxQapWsvCQz0b2If4b19bJzKo98rwjyGpg/qYFl
-P8GMicWWMJoKz/TUyDTtnS+8jTiGU+6Xn6myY5QXjQ/cZip8UlF1y5mO6D1cv547
-KI2DAg+pn3LiLCuz3GaXAEDQpFSOm117RTYm1nJD68/A6g3czhLmfTifBSeolz7p
-UcZsBSjBAg/pGG3svZwG1KdJ9FQFa2ww8esD1eo9anbCyxooSU1/ZOD6K9pzg4H/
-kQO9lLvkuI6cMmPNn7togbGEW682v3fuHX/3SZtS7NJ3Wn2RnU3COS3kuoL4b/JO
-Hg9O5j9ZpSPcPYeoKFgo0fEbNttPxP/hjFtyjMcmAyejOQoBqsCyMWCDIqFPEgkB
-Ea801M/XrmLTBQe0MXXgDW1XT2mH+VepuhX2yFJtocucH+X8eKg1mp9BFM6ltM6U
-CBwJrVbl2rZJmkrqYxhTnCwuwwIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUN12mmnQywsL5x6YVEFm45P3luG0wDQYJ
-KoZIhvcNAQELBQADggIBAK+nz97/4L1CjU3lIpbfaOp9TSp90K09FlxD533Ahuh6
-NWPxzIHIxgvoLlI1pKZJkGNRrDSsBTtXAOnTYtPZKdVUvhwQkZyybf5Z/Xn36lbQ
-nmhUQo8mUuJM3y+Xpi/SB5io82BdS5pYV4jvguX6r2yBS5KPQJqTRlnLX3gWsWc+
-QgvfKNmwrZggvkN80V4aCRckjXtdlemrwWCrWxhkgPut4AZ9HcpZuPN4KWfGVh2v
-trV0KnahP/t1MJ+UXjulYPPLXAziDslg+MkfFoom3ecnf+slpoq9uC02EJqxWE2a
-aE9gVOX2RhOOiKy8IUISrcZKiX2bwdgt6ZYD9KJ0DLwAHb/WNyVntHKLr4W96ioD
-j8z7PEQkguIBpQtZtjSNMgsSDesnwv1B10A8ckYpwIzqug/xBpMu95yo9GA+o/E4
-Xo4TwbM6l4c/ksp4qRyv0LAbJh6+cOx69TOY6lz/KwsETkPdY34Op054A5U+1C0w
-lREQKC6/oAI+/15Z0wUOlV9TRe9rh9VIzRamloPh37MG88EU26fsHItdkJANclHn
-YfkUyq+Dj7+vsQpZXdxc1+SWrVtgHdqul7I52Qb1dgAT+GhMIbA1xNxVssnBQVoc
-icCMb3SgazNNtQEo/a2tiRc7ppqEvOuM6sRxJKi6KfkIsidWNTJf6jn7MZrVGczw
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem b/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem
deleted file mode 100644
index 8542b42a5234..000000000000
--- a/secure/caroot/trusted/CommScope_Public_Trust_RSA_Root-02.pem
+++ /dev/null
@@ -1,131 +0,0 @@
-##
-##  CommScope Public Trust RSA Root-02
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            54:16:bf:3b:7e:39:95:71:8d:d1:aa:00:a5:86:0d:2b:8f:7a:05:4e
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=CommScope, CN=CommScope Public Trust RSA Root-02
-        Validity
-            Not Before: Apr 28 17:16:43 2021 GMT
-            Not After : Apr 28 17:16:42 2046 GMT
-        Subject: C=US, O=CommScope, CN=CommScope Public Trust RSA Root-02
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:e1:fa:0e:fb:68:00:12:c8:4d:d5:ac:22:c4:35:
-                    01:3b:c5:54:e5:59:76:63:a5:7f:eb:c1:c4:6a:98:
-                    bd:32:8d:17:80:eb:5d:ba:d1:62:3d:25:23:19:35:
-                    14:e9:7f:89:a7:1b:62:3c:d6:50:e7:34:95:03:32:
-                    b1:b4:93:22:3d:a7:e2:b1:ed:e6:7b:4e:2e:87:9b:
-                    0d:33:75:0a:de:aa:35:e7:7e:e5:36:98:a2:ae:25:
-                    9e:95:b3:32:96:a4:2b:58:1e:ef:3f:fe:62:34:48:
-                    51:d1:b4:8d:42:ad:60:da:49:6a:95:70:dd:d2:00:
-                    e2:cc:57:63:02:7b:96:dd:49:97:5b:92:4e:95:d3:
-                    f9:cb:29:1f:18:4a:f8:01:2a:d2:63:09:6e:24:e9:
-                    89:d2:e5:c7:22:4c:dc:73:86:47:00:aa:0d:88:8e:
-                    ae:85:7d:4a:e9:bb:33:4f:0e:52:70:9d:95:e3:7c:
-                    6d:96:5b:2d:3d:5f:a1:83:46:5d:b6:e3:25:b8:7c:
-                    a7:19:80:1c:ea:65:43:dc:91:79:36:2c:74:7c:f2:
-                    67:06:c9:89:c9:db:bf:da:68:bf:23:ed:dc:6b:ad:
-                    28:83:79:2f:ec:38:a5:0d:37:01:67:27:9a:e9:33:
-                    d9:33:5f:37:a1:c5:f0:ab:3d:fa:78:b0:e7:2c:9f:
-                    f6:3e:9f:60:e0:ef:48:e9:90:45:1e:05:51:78:1a:
-                    2c:12:2c:5c:28:ac:0d:a2:23:9e:34:8f:05:e6:a2:
-                    33:ce:11:77:13:d4:0e:a4:1e:42:1f:86:cd:70:fe:
-                    d9:2e:15:3d:1d:bb:b8:f2:53:57:db:cc:c6:74:29:
-                    9c:18:b3:36:75:38:2e:0f:54:a1:f8:92:1f:89:96:
-                    4f:bb:d4:ee:9d:e9:3b:36:42:b5:0a:3b:2a:d4:64:
-                    79:36:10:e1:f9:91:03:2b:7b:20:54:cd:0d:19:1a:
-                    c8:41:32:34:d1:b0:99:e1:90:1e:01:40:36:b5:b7:
-                    fa:a9:e5:77:75:a4:22:81:5d:b0:8b:e4:27:12:0f:
-                    54:88:c6:db:85:74:e6:b7:c0:d7:a6:29:fa:db:de:
-                    f3:93:97:27:04:55:2f:0a:6f:37:c5:3d:13:af:0a:
-                    00:a9:2c:8b:1c:81:28:d7:ef:86:31:a9:ae:f2:6e:
-                    b8:ca:6a:2c:54:47:d8:2a:88:2e:af:c1:07:10:78:
-                    ac:11:a2:2f:42:f0:37:c5:f2:b8:56:dd:0e:62:2d:
-                    ce:2d:56:7e:55:f2:a7:44:f6:2b:32:f4:23:a8:47:
-                    e8:d4:2a:01:78:cf:6a:c3:37:a8:9e:65:d2:2c:e5:
-                    fa:ba:33:c1:06:44:f6:e6:cf:a5:0d:a7:66:08:34:
-                    8a:2c:f3
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                47:D0:E7:B1:22:FF:9D:2C:F5:D9:57:60:B3:B1:B1:70:95:EF:61:7A
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        86:69:b1:4d:2f:e9:9f:4f:22:93:68:8e:e4:21:99:a3:ce:45:
-        53:1b:73:44:53:00:81:61:cd:31:e3:08:ba:81:28:28:7a:92:
-        b9:b6:a8:c8:43:9e:c7:13:26:4d:c2:d8:e5:55:9c:92:5d:50:
-        d8:c2:2b:db:fe:e6:a8:97:cf:52:3a:24:c3:65:64:5c:47:31:
-        a3:65:35:13:c3:93:b9:f7:f9:51:97:bb:a4:f0:62:87:c5:d6:
-        06:d3:97:83:20:a9:7e:bb:b6:21:c2:a5:0d:84:00:e1:f2:27:
-        10:83:ba:dd:03:81:d5:dd:68:c3:66:10:c8:d1:76:b4:b3:6f:
-        29:9e:00:f9:c2:29:f5:b1:93:19:52:69:1a:2c:4c:a0:8b:e0:
-        15:9a:31:2f:d3:88:95:59:6e:e5:c4:b3:50:c8:14:08:4a:9b:
-        8b:13:83:b1:a4:72:b2:3b:76:33:41:dc:dc:aa:a6:07:6f:1d:
-        24:12:9f:c8:76:bd:2f:d9:8e:f4:2c:ee:b7:d2:38:10:24:36:
-        51:2f:e3:5c:5d:81:21:a7:da:bb:4e:ff:e6:07:a8:fe:b9:0d:
-        27:6c:bb:70:5a:55:7a:13:e9:f1:2a:49:69:c7:5f:87:57:4c:
-        43:79:6d:3a:65:e9:30:5c:41:ee:eb:77:a5:73:12:88:e8:bf:
-        7d:ae:e5:c4:a8:1f:0d:8e:1c:6d:50:02:4f:26:18:43:de:8f:
-        55:85:b1:0b:37:05:60:c9:55:39:12:04:a1:2a:cf:71:16:9f:
-        36:51:49:bf:70:3b:9e:67:9c:fb:7b:79:c9:39:1c:78:ac:77:
-        91:54:9a:b8:75:0a:81:52:97:e3:66:61:6b:ed:3e:38:1e:96:
-        61:55:e1:91:54:8c:ed:8c:24:1f:81:c9:10:9a:73:99:2b:16:
-        4e:72:00:3f:54:1b:f8:8d:ba:8b:e7:14:d6:b6:45:4f:60:ec:
-        96:ae:c3:2f:02:4e:5d:9d:96:49:72:00:b2:ab:75:5c:0f:68:
-        5b:1d:65:c2:5f:33:0f:1e:0f:f0:3b:86:f5:b0:4e:bb:9c:f7:
-        ea:25:05:dc:ad:a2:9b:4b:17:01:be:42:df:35:21:1d:ad:ab:
-        ae:f4:bf:ae:1f:1b:d3:e2:3b:fc:b3:72:73:1c:9b:28:90:89:
-        13:3d:1d:c1:00:47:09:96:9a:38:1b:dd:b1:cf:0d:c2:b4:44:
-        f3:96:95:ce:32:3a:8f:34:9c:e0:17:c7:5e:ce:ae:0d:db:87:
-        38:e5:3f:5b:fd:9b:19:e1:31:41:7a:70:aa:23:6b:01:e1:45:
-        4c:cd:94:ce:3b:9e:2d:e7:88:02:22:f4:6e:e8:c8:ec:d6:3c:
-        f3:b9:b2:d7:77:7a:ac:7b
-SHA1 Fingerprint=EA:B0:E2:52:1B:89:93:4C:11:68:F2:D8:9A:AC:22:4C:A3:8A:57:AE
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIUVBa/O345lXGN0aoApYYNK496BU4wDQYJKoZIhvcNAQEL
-BQAwTjELMAkGA1UEBhMCVVMxEjAQBgNVBAoMCUNvbW1TY29wZTErMCkGA1UEAwwi
-Q29tbVNjb3BlIFB1YmxpYyBUcnVzdCBSU0EgUm9vdC0wMjAeFw0yMTA0MjgxNzE2
-NDNaFw00NjA0MjgxNzE2NDJaME4xCzAJBgNVBAYTAlVTMRIwEAYDVQQKDAlDb21t
-U2NvcGUxKzApBgNVBAMMIkNvbW1TY29wZSBQdWJsaWMgVHJ1c3QgUlNBIFJvb3Qt
-MDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDh+g77aAASyE3VrCLE
-NQE7xVTlWXZjpX/rwcRqmL0yjReA61260WI9JSMZNRTpf4mnG2I81lDnNJUDMrG0
-kyI9p+Kx7eZ7Ti6Hmw0zdQreqjXnfuU2mKKuJZ6VszKWpCtYHu8//mI0SFHRtI1C
-rWDaSWqVcN3SAOLMV2MCe5bdSZdbkk6V0/nLKR8YSvgBKtJjCW4k6YnS5cciTNxz
-hkcAqg2Ijq6FfUrpuzNPDlJwnZXjfG2WWy09X6GDRl224yW4fKcZgBzqZUPckXk2
-LHR88mcGyYnJ27/aaL8j7dxrrSiDeS/sOKUNNwFnJ5rpM9kzXzehxfCrPfp4sOcs
-n/Y+n2Dg70jpkEUeBVF4GiwSLFworA2iI540jwXmojPOEXcT1A6kHkIfhs1w/tku
-FT0du7jyU1fbzMZ0KZwYszZ1OC4PVKH4kh+Jlk+71O6d6Ts2QrUKOyrUZHk2EOH5
-kQMreyBUzQ0ZGshBMjTRsJnhkB4BQDa1t/qp5Xd1pCKBXbCL5CcSD1SIxtuFdOa3
-wNemKfrb3vOTlycEVS8KbzfFPROvCgCpLIscgSjX74Yxqa7ybrjKaixUR9gqiC6v
-wQcQeKwRoi9C8DfF8rhW3Q5iLc4tVn5V8qdE9isy9COoR+jUKgF4z2rDN6ieZdIs
-5fq6M8EGRPbmz6UNp2YINIos8wIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUR9DnsSL/nSz12Vdgs7GxcJXvYXowDQYJ
-KoZIhvcNAQELBQADggIBAIZpsU0v6Z9PIpNojuQhmaPORVMbc0RTAIFhzTHjCLqB
-KCh6krm2qMhDnscTJk3C2OVVnJJdUNjCK9v+5qiXz1I6JMNlZFxHMaNlNRPDk7n3
-+VGXu6TwYofF1gbTl4MgqX67tiHCpQ2EAOHyJxCDut0DgdXdaMNmEMjRdrSzbyme
-APnCKfWxkxlSaRosTKCL4BWaMS/TiJVZbuXEs1DIFAhKm4sTg7GkcrI7djNB3Nyq
-pgdvHSQSn8h2vS/ZjvQs7rfSOBAkNlEv41xdgSGn2rtO/+YHqP65DSdsu3BaVXoT
-6fEqSWnHX4dXTEN5bTpl6TBcQe7rd6VzEojov32u5cSoHw2OHG1QAk8mGEPej1WF
-sQs3BWDJVTkSBKEqz3EWnzZRSb9wO55nnPt7eck5HHisd5FUmrh1CoFSl+NmYWvt
-PjgelmFV4ZFUjO2MJB+ByRCac5krFk5yAD9UG/iNuovnFNa2RU9g7Jauwy8CTl2d
-lklyALKrdVwPaFsdZcJfMw8eD/A7hvWwTruc9+olBdytoptLFwG+Qt81IR2tq670
-v64fG9PiO/yzcnMcmyiQiRM9HcEARwmWmjgb3bHPDcK0RPOWlc4yOo80nOAXx17O
-rg3bhzjlP1v9mxnhMUF6cKojawHhRUzNlM47ni3niAIi9G7oyOzWPPO5std3eqx7
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem b/secure/caroot/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem
deleted file mode 100644
index 057d5c9cd027..000000000000
--- a/secure/caroot/trusted/FIRMAPROFESIONAL_CA_ROOT-A_WEB.pem
+++ /dev/null
@@ -1,68 +0,0 @@
-##
-##  FIRMAPROFESIONAL CA ROOT-A WEB
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            31:97:21:ed:af:89:42:7f:35:41:87:a1:67:56:4c:6d
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=ES, O=Firmaprofesional SA, organizationIdentifier=VATES-A62634068, CN=FIRMAPROFESIONAL CA ROOT-A WEB
-        Validity
-            Not Before: Apr  6 09:01:36 2022 GMT
-            Not After : Mar 31 09:01:36 2047 GMT
-        Subject: C=ES, O=Firmaprofesional SA, organizationIdentifier=VATES-A62634068, CN=FIRMAPROFESIONAL CA ROOT-A WEB
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:47:53:ea:2c:11:a4:77:c7:2a:ea:f3:d6:5f:7b:
-                    d3:04:91:5c:fa:88:c6:22:b9:83:10:62:77:84:33:
-                    2d:e9:03:88:d4:e0:33:f7:ed:77:2c:4a:60:ea:e4:
-                    6f:ad:6d:b4:f8:4c:8a:a4:e4:1f:ca:ea:4f:38:4a:
-                    2e:82:73:2b:c7:66:9b:0a:8c:40:9c:7c:8a:f6:f2:
-                    39:60:b2:de:cb:ec:b8:e4:6f:ea:9b:5d:b7:53:90:
-                    18:32:55:c5:20:b7:94
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Authority Key Identifier: 
-                93:E1:43:63:5C:3C:9D:D6:27:F3:52:EC:17:B2:A9:AF:2C:F7:76:F8
-            X509v3 Subject Key Identifier: 
-                93:E1:43:63:5C:3C:9D:D6:27:F3:52:EC:17:B2:A9:AF:2C:F7:76:F8
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:65:02:30:1d:7c:a4:7b:c3:89:75:33:e1:3b:a9:45:bf:46:
-        e9:e9:a1:dd:c9:22:16:b7:47:11:0b:d8:9a:ba:f1:c8:0b:70:
-        50:53:02:91:70:85:59:a9:1e:a4:e6:ea:23:31:a0:00:02:31:
-        00:fd:e2:f8:b3:af:16:b9:1e:73:c4:96:e3:c1:30:19:d8:7e:
-        e6:c3:97:de:1c:4f:b8:89:2f:33:eb:48:0f:19:f7:87:46:5d:
-        26:90:a5:85:c5:b9:7a:94:3e:87:a8:bd:00
-SHA1 Fingerprint=A8:31:11:74:A6:14:15:0D:CA:77:DD:0E:E4:0C:5D:58:FC:A0:72:A5
------BEGIN CERTIFICATE-----
-MIICejCCAgCgAwIBAgIQMZch7a+JQn81QYehZ1ZMbTAKBggqhkjOPQQDAzBuMQsw
-CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
-YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
-IFJPT1QtQSBXRUIwHhcNMjIwNDA2MDkwMTM2WhcNNDcwMzMxMDkwMTM2WjBuMQsw
-CQYDVQQGEwJFUzEcMBoGA1UECgwTRmlybWFwcm9mZXNpb25hbCBTQTEYMBYGA1UE
-YQwPVkFURVMtQTYyNjM0MDY4MScwJQYDVQQDDB5GSVJNQVBST0ZFU0lPTkFMIENB
-IFJPT1QtQSBXRUIwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARHU+osEaR3xyrq89Zf
-e9MEkVz6iMYiuYMQYneEMy3pA4jU4DP37XcsSmDq5G+tbbT4TIqk5B/K6k84Si6C
-cyvHZpsKjECcfIr28jlgst7L7Ljkb+qbXbdTkBgyVcUgt5SjYzBhMA8GA1UdEwEB
-/wQFMAMBAf8wHwYDVR0jBBgwFoAUk+FDY1w8ndYn81LsF7Kpryz3dvgwHQYDVR0O
-BBYEFJPhQ2NcPJ3WJ/NS7Beyqa8s93b4MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjO
-PQQDAwNoADBlAjAdfKR7w4l1M+E7qUW/Runpod3JIha3RxEL2Jq68cgLcFBTApFw
-hVmpHqTm6iMxoAACMQD94vizrxa5HnPEluPBMBnYfubDl94cT7iJLzPrSA8Z94dG
-XSaQpYXFuXqUPoeovQA=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/GLOBALTRUST_2020.pem b/secure/caroot/trusted/GLOBALTRUST_2020.pem
deleted file mode 100644
index 48ef0cbb2c86..000000000000
--- a/secure/caroot/trusted/GLOBALTRUST_2020.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-##
-##  GLOBALTRUST 2020
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            5a:4b:bd:5a:fb:4f:8a:5b:fa:65:e5
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=AT, O=e-commerce monitoring GmbH, CN=GLOBALTRUST 2020
-        Validity
-            Not Before: Feb 10 00:00:00 2020 GMT
-            Not After : Jun 10 00:00:00 2040 GMT
-        Subject: C=AT, O=e-commerce monitoring GmbH, CN=GLOBALTRUST 2020
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:ae:2e:56:ad:1b:1c:ef:f6:95:8f:a0:77:1b:2b:
-                    d3:63:8f:84:4d:45:a2:0f:9f:5b:45:ab:59:7b:51:
-                    34:f9:ec:8b:8a:78:c5:dd:6b:af:bd:c4:df:93:45:
-                    1e:bf:91:38:0b:ae:0e:16:e7:41:73:f8:db:bb:d1:
-                    b8:51:e0:cb:83:3b:73:38:6e:77:8a:0f:59:63:26:
-                    cd:a7:2a:ce:54:fb:b8:e2:c0:7c:47:ce:60:7c:3f:
-                    b2:73:f2:c0:19:b6:8a:92:87:35:0d:90:28:a2:e4:
-                    15:04:63:3e:ba:af:ee:7c:5e:cc:a6:8b:50:b2:38:
-                    f7:41:63:ca:ce:ff:69:8f:68:0e:95:36:e5:cc:b9:
-                    8c:09:ca:4b:dd:31:90:96:c8:cc:1f:fd:56:96:34:
-                    db:8e:1c:ea:2c:be:85:2e:63:dd:aa:a9:95:d3:fd:
-                    29:95:13:f0:c8:98:93:d9:2d:16:47:90:11:83:a2:
-                    3a:22:a2:28:57:a2:eb:fe:c0:8c:28:a0:a6:7d:e7:
-                    2a:42:3b:82:80:63:a5:63:1f:19:cc:7c:b2:66:a8:
-                    c2:d3:6d:37:6f:e2:7e:06:51:d9:45:84:1f:12:ce:
-                    24:52:64:85:0b:48:80:4e:87:b1:22:22:30:aa:eb:
-                    ae:be:e0:02:e0:40:e8:b0:42:80:03:51:aa:b4:7e:
-                    aa:44:d7:43:61:f3:a2:6b:16:89:49:a4:a3:a4:2b:
-                    8a:02:c4:78:f4:68:8a:c1:e4:7a:36:b1:6f:1b:96:
-                    1b:77:49:8d:d4:c9:06:72:8f:cf:53:e3:dc:17:85:
-                    20:4a:dc:98:27:d3:91:26:2b:47:1e:69:07:af:de:
-                    a2:e4:e4:d4:6b:0b:b3:5e:7c:d4:24:80:47:29:69:
-                    3b:6e:e8:ac:fd:40:eb:d8:ed:71:71:2b:f2:e8:58:
-                    1d:eb:41:97:22:c5:1f:d4:39:d0:27:8f:87:e3:18:
-                    f4:e0:a9:46:0d:f5:74:3a:82:2e:d0:6e:2c:91:a3:
-                    31:5c:3b:46:ea:7b:04:10:56:5e:80:1d:f5:a5:65:
-                    e8:82:fc:e2:07:8c:62:45:f5:20:de:46:70:86:a1:
-                    bc:93:d3:1e:74:a6:6c:b0:2c:f7:03:0c:88:0c:cb:
-                    d4:72:53:86:bc:60:46:f3:98:6a:c2:f1:bf:43:f9:
-                    70:20:77:ca:37:41:79:55:52:63:8d:5b:12:9f:c5:
-                    68:c4:88:9d:ac:f2:30:ab:b7:a3:31:97:67:ad:8f:
-                    17:0f:6c:c7:73:ed:24:94:6b:c8:83:9a:d0:9a:37:
-                    49:04:ab:b1:16:c8:6c:49:49:2d:ab:a1:d0:8c:92:
-                    f2:41:4a:79:21:25:db:63:d7:b6:9c:a7:7e:42:69:
-                    fb:3a:63
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                DC:2E:1F:D1:61:37:79:E4:AB:D5:D5:B3:12:71:68:3D:6A:68:9C:22
-            X509v3 Authority Key Identifier: 
-                DC:2E:1F:D1:61:37:79:E4:AB:D5:D5:B3:12:71:68:3D:6A:68:9C:22
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        91:f0:42:02:68:40:ee:c3:68:c0:54:2f:df:ec:62:c3:c3:9e:
-        8a:a0:31:28:aa:83:8e:a4:56:96:12:10:86:56:ba:97:72:d2:
-        54:30:7c:ad:19:d5:1d:68:6f:fb:14:42:d8:8d:0e:f3:b5:d1:
-        a5:e3:02:42:5e:dc:e8:46:58:07:35:02:30:e0:bc:74:4a:c1:
-        43:2a:ff:db:1a:d0:b0:af:6c:c3:fd:cb:b3:f5:7f:6d:03:2e:
-        59:56:9d:2d:2d:35:8c:b2:d6:43:17:2c:92:0a:cb:5d:e8:8c:
-        0f:4b:70:43:d0:82:ff:a8:cc:bf:a4:94:c0:be:87:bd:8a:e3:
-        93:7b:c6:8f:9b:16:9d:27:65:bc:7a:c5:42:82:6c:5c:07:d0:
-        a9:c1:88:60:44:e9:98:85:16:5f:f8:8f:ca:01:10:ce:25:c3:
-        f9:60:1b:a0:c5:97:c3:d3:2c:88:31:a2:bd:30:ec:d0:d0:c0:
-        12:f1:c1:39:e3:e5:f5:f8:d6:4a:dd:34:cd:fb:6f:c1:4f:e3:
-        00:8b:56:e2:92:f7:28:b2:42:77:72:23:67:c7:3f:11:15:b2:
-        c4:03:05:be:bb:11:7b:0a:bf:a8:6e:e7:ff:58:43:cf:9b:67:
-        a0:80:07:b6:1d:ca:ad:6d:ea:41:11:7e:2d:74:93:fb:c2:bc:
-        be:51:44:c5:ef:68:25:27:80:e3:c8:a0:d4:12:ec:d9:a5:37:
-        1d:37:7c:b4:91:ca:da:d4:b1:96:81:ef:68:5c:76:10:49:af:
-        7e:a5:37:80:b1:1c:52:bd:33:81:4c:8f:f9:dd:65:d9:14:cd:
-        8a:25:58:f4:e2:c5:83:a5:09:90:d4:6c:14:63:b5:40:df:eb:
-        c0:fc:c4:58:7e:0d:14:16:87:54:27:6e:56:e4:70:84:b8:6c:
-        32:12:7e:82:31:43:be:d7:dd:7c:a1:ad:ae:d6:ab:20:12:ef:
-        0a:c3:10:8c:49:96:35:dc:0b:75:5e:b1:4f:d5:4f:34:0e:11:
-        20:07:75:43:45:e9:a3:11:da:ac:a3:99:c2:b6:79:27:e2:b9:
-        ef:c8:e2:f6:35:29:7a:74:fa:c5:7f:82:05:62:a6:0a:ea:68:
-        b2:79:47:06:6e:f2:57:a8:15:33:c6:f7:78:4a:3d:42:7b:6b:
-        7e:fe:f7:46:ea:d1:eb:8e:ef:88:68:5b:e8:c1:d9:71:7e:fd:
-        64:ef:ff:67:47:88:58:25:2f:3e:86:07:bd:fb:a8:e5:82:a8:
-        ac:a5:d3:69:43:cd:31:88:49:84:53:92:c0:b1:39:1b:39:83:
-        01:30:c4:f2:a9:fa:d0:03:bd:72:37:60:56:1f:36:7c:bd:39:
-        91:f5:6d:0d:bf:7b:d7:92
-SHA1 Fingerprint=D0:67:C1:13:51:01:0C:AA:D0:C7:6A:65:37:31:16:26:4F:53:71:A2
------BEGIN CERTIFICATE-----
-MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkG
-A1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkw
-FwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYx
-MDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAhBgNVBAoTGmUtY29tbWVyY2UgbW9u
-aXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAyMDIwMIICIjANBgkq
-hkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWiD59b
-RatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9Z
-YybNpyrOVPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3
-QWPKzv9pj2gOlTblzLmMCcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPw
-yJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCmfecqQjuCgGOlYx8ZzHyyZqjC0203b+J+
-BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKAA1GqtH6qRNdDYfOiaxaJ
-SaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9ORJitHHmkH
-r96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj0
-4KlGDfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9Me
-dKZssCz3AwyIDMvUclOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIw
-q7ejMZdnrY8XD2zHc+0klGvIg5rQmjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2
-nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
-AQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1UdIwQYMBaAFNwu
-H9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
-VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJC
-XtzoRlgHNQIw4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd
-6IwPS3BD0IL/qMy/pJTAvoe9iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf
-+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS8cE54+X1+NZK3TTN+2/BT+MAi1bi
-kvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2HcqtbepBEX4tdJP7
-wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxSvTOB
-TI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6C
-MUO+1918oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn
-4rnvyOL2NSl6dPrFf4IFYqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+I
-aFvowdlxfv1k7/9nR4hYJS8+hge9+6jlgqispdNpQ80xiEmEU5LAsTkbOYMBMMTy
-qfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/OISTE_Server_Root_ECC_G1.pem b/secure/caroot/trusted/OISTE_Server_Root_ECC_G1.pem
new file mode 100644
index 000000000000..77f156dd675a
--- /dev/null
+++ b/secure/caroot/trusted/OISTE_Server_Root_ECC_G1.pem
@@ -0,0 +1,66 @@
+##
+##  OISTE Server Root ECC G1
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            23:f9:c3:d6:35:af:8f:28:4b:1f:f0:54:ea:7e:97:9d
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=CH, O=OISTE Foundation, CN=OISTE Server Root ECC G1
+        Validity
+            Not Before: May 31 14:42:28 2023 GMT
+            Not After : May 24 14:42:27 2048 GMT
+        Subject: C=CH, O=OISTE Foundation, CN=OISTE Server Root ECC G1
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:17:2f:fa:12:bc:ac:18:f3:0a:f4:44:d6:76:42:
+                    9e:b3:e8:1f:b7:79:a9:58:b6:f8:65:d1:3a:21:4f:
+                    a8:eb:a3:be:a4:32:72:f3:b6:01:c9:2b:fd:77:85:
+                    6e:53:dd:ad:ea:aa:2e:25:92:b6:e9:21:11:a8:af:
+                    b5:4c:0b:f3:96:60:9a:3b:e7:ea:1a:78:2e:b4:3d:
+                    e5:28:de:1c:80:ba:5c:6e:0d:db:19:a5:e3:3f:9c:
+                    2a:b8:40:4b:dd:e6:4f
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                37:4D:88:65:CF:FC:3D:8A:D5:A3:F1:49:C0:4E:0C:10:6F:42:B4:9C
+            X509v3 Subject Key Identifier: 
+                37:4D:88:65:CF:FC:3D:8A:D5:A3:F1:49:C0:4E:0C:10:6F:42:B4:9C
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:66:02:31:00:a9:2a:30:1d:d0:c2:9f:90:51:51:40:3e:95:
+        54:21:cd:16:66:f7:53:6c:08:16:39:d0:12:7c:7f:63:1b:df:
+        e3:38:00:39:d9:2d:53:20:45:0b:1c:60:67:31:43:25:ed:02:
+        31:00:92:89:ae:e9:5c:62:83:62:61:f9:2d:57:ab:56:b9:11:
+        dd:25:be:6a:4e:4a:1a:82:6b:dc:cf:d3:bc:4a:b3:3c:d7:2e:
+        9b:db:f8:28:69:bc:6b:2d:ec:31:a1:3a:e3:57
+SHA1 Fingerprint=3B:F6:8B:09:AE:2A:92:7B:BA:E3:8D:3F:11:95:D9:E6:44:0C:45:E2
+-----BEGIN CERTIFICATE-----
+MIICNTCCAbqgAwIBAgIQI/nD1jWvjyhLH/BU6n6XnTAKBggqhkjOPQQDAzBLMQsw
+CQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwY
+T0lTVEUgU2VydmVyIFJvb3QgRUNDIEcxMB4XDTIzMDUzMTE0NDIyOFoXDTQ4MDUy
+NDE0NDIyN1owSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5kYXRp
+b24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IEVDQyBHMTB2MBAGByqGSM49
+AgEGBSuBBAAiA2IABBcv+hK8rBjzCvRE1nZCnrPoH7d5qVi2+GXROiFPqOujvqQy
+cvO2Ackr/XeFblPdreqqLiWStukhEaivtUwL85Zgmjvn6hp4LrQ95SjeHIC6XG4N
+2xml4z+cKrhAS93mT6NjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBQ3
+TYhlz/w9itWj8UnATgwQb0K0nDAdBgNVHQ4EFgQUN02IZc/8PYrVo/FJwE4MEG9C
+tJwwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2kAMGYCMQCpKjAd0MKfkFFR
+QD6VVCHNFmb3U2wIFjnQEnx/Yxvf4zgAOdktUyBFCxxgZzFDJe0CMQCSia7pXGKD
+YmH5LVerVrkR3SW+ak5KGoJr3M/TvEqzPNcum9v4KGm8ay3sMaE641c=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/OISTE_Server_Root_RSA_G1.pem b/secure/caroot/trusted/OISTE_Server_Root_RSA_G1.pem
new file mode 100644
index 000000000000..934a6fce33ae
--- /dev/null
+++ b/secure/caroot/trusted/OISTE_Server_Root_RSA_G1.pem
@@ -0,0 +1,134 @@
+##
+##  OISTE Server Root RSA G1
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            55:a5:d9:67:94:28:c6:ed:0c:fa:27:dd:5b:01:4d:18
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=CH, O=OISTE Foundation, CN=OISTE Server Root RSA G1
+        Validity
+            Not Before: May 31 14:37:16 2023 GMT
+            Not After : May 24 14:37:15 2048 GMT
+        Subject: C=CH, O=OISTE Foundation, CN=OISTE Server Root RSA G1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:aa:ae:f4:ab:82:cf:fb:e5:37:0b:e7:d5:96:ad:
+                    90:e8:4b:29:dc:55:60:e3:cc:bc:b3:bc:2d:92:b9:
+                    e4:a3:7a:f1:81:b4:9e:72:72:43:df:3f:ab:0b:26:
+                    b4:ee:7b:1a:69:fb:28:d0:72:5c:4a:6d:69:99:f0:
+                    63:1e:0c:d2:b1:ff:d6:8c:34:d0:ee:db:ac:48:b9:
+                    ea:b0:14:8e:d8:07:a9:24:98:dd:e9:09:be:a8:22:
+                    1b:59:39:d1:27:87:dc:1c:cd:f8:fb:b3:eb:e9:93:
+                    78:ed:0f:ce:37:7c:26:77:6e:a1:d8:2c:21:4c:e4:
+                    8a:4f:c7:13:3c:6e:c7:d5:13:97:b2:a8:db:24:69:
+                    83:56:d3:69:cb:82:12:bb:9d:1b:f2:f8:34:f2:98:
+                    2b:2a:8e:04:67:f6:e3:87:a1:1d:ad:6e:ce:36:74:
+                    0e:5e:33:3b:cb:db:51:97:94:6a:95:3c:ce:18:5a:
+                    6e:4b:c6:fc:07:8f:2e:1a:b9:4a:f7:64:34:29:dc:
+                    a6:8d:50:e1:8d:8b:4b:e5:48:1b:6e:2e:80:10:3f:
+                    e4:9f:1b:65:3f:11:b4:ea:57:69:9f:b4:00:eb:85:
+                    24:99:24:f5:21:9d:97:aa:fb:34:7f:02:6b:15:90:
+                    ad:bb:9e:5a:19:7f:a4:8c:d8:fa:6d:28:fc:38:c7:
+                    e3:4c:ad:6a:ce:d9:4e:93:92:8e:cc:0c:67:bf:0b:
+                    4b:96:ce:66:67:53:68:cb:17:11:8e:59:f7:ac:9c:
+                    1b:b9:8e:68:44:b7:18:af:e6:e5:0f:65:dc:95:09:
+                    b0:93:12:b5:1f:3e:94:a5:c7:88:75:21:b1:de:09:
+                    24:2a:4c:e2:bc:ec:4c:67:47:c2:29:88:b9:0a:ba:
+                    f9:c1:74:ce:8c:18:26:65:da:f7:6f:c6:8c:7b:68:
+                    5c:0b:ee:63:c0:5e:4b:f1:4e:cc:9f:2f:0f:e1:e8:
+                    9a:7a:93:f1:e0:c8:db:bf:27:e6:65:29:7b:36:e0:
+                    33:15:73:f2:9d:6b:84:08:68:2b:36:07:2b:27:cc:
+                    78:d8:6a:87:0e:47:74:f4:aa:a0:13:5d:64:7e:f4:
+                    db:14:ae:fb:3a:e4:2f:c1:65:e3:b9:7a:40:6c:f0:
+                    06:b7:7b:28:9b:d7:e1:5f:38:73:94:ac:d9:70:93:
+                    2d:dc:84:af:46:1c:a2:7a:2c:3f:81:26:42:e7:d4:
+                    d8:c5:6c:84:66:11:8b:77:6b:54:1c:a3:b5:d8:10:
+                    f0:ae:29:f7:67:08:88:17:5c:b8:97:79:cf:ea:2b:
+                    2a:ee:58:33:e5:6d:e9:29:aa:65:01:0d:82:13:ec:
+                    25:0b:5d:2c:40:72:15:29:d3:90:2c:f7:1a:43:d5:
+                    6a:f0:69
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                F2:C9:C1:0F:0D:63:00:BB:EC:45:0E:4A:1F:B5:B1:B3:36:CD:0E:8D
+            X509v3 Subject Key Identifier: 
+                F2:C9:C1:0F:0D:63:00:BB:EC:45:0E:4A:1F:B5:B1:B3:36:CD:0E:8D
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        34:67:79:b2:3a:c6:e5:3d:f7:23:72:b9:09:ef:92:ad:27:1f:
+        a0:4e:0a:b2:f5:da:17:0c:a2:85:d2:7e:92:51:fd:15:65:d7:
+        5c:6b:64:16:ee:8a:45:ca:0c:43:36:44:35:d9:7f:fe:79:3a:
+        1c:e8:c6:e4:3d:6b:77:d4:21:10:e3:f6:f3:20:4e:a9:be:89:
+        f3:1c:9c:a9:df:bc:30:3a:17:d1:32:43:d0:aa:8a:72:1c:51:
+        28:4c:dd:36:c8:e4:2d:67:7d:91:87:1c:9d:bc:fc:ab:28:96:
+        5e:61:5c:b8:22:33:18:48:16:50:ea:ca:2f:e9:a5:49:dc:7f:
+        3c:a4:19:bc:36:ad:92:e2:b9:f4:4b:d5:eb:08:ad:e7:78:fe:
+        17:c0:5d:87:77:e8:67:77:4f:00:66:af:f4:b1:03:3a:be:12:
+        7c:41:35:e5:f4:a6:1b:47:8b:cb:79:f7:d6:bf:17:6e:4e:65:
+        f0:f8:da:57:c1:94:81:e5:7a:56:0d:bb:46:7f:6f:91:fd:7d:
+        e6:17:e4:81:27:bb:05:88:56:dd:20:a5:f7:98:2d:91:19:69:
+        31:5f:9b:30:f2:99:ad:72:40:96:cc:d8:77:66:9b:b4:d5:0e:
+        b2:10:fe:14:aa:c3:80:71:9d:3d:8d:e8:7d:14:6c:61:64:86:
+        46:a6:d7:54:c5:b6:d7:90:16:46:a5:85:ca:9e:3a:e3:e6:13:
+        16:b6:15:23:cc:a9:29:52:fd:00:c6:f6:90:8e:56:8f:89:08:
+        dd:96:aa:e6:d3:6a:a9:86:35:f6:d5:45:78:42:4a:46:fc:03:
+        c8:5e:d8:66:f6:45:65:24:b4:be:87:7b:55:20:9d:f7:9d:b5:
+        2a:fc:b9:62:19:cb:6c:3b:af:d3:6d:38:6c:ab:7b:a6:1e:8d:
+        fc:e9:9e:fe:6b:15:b9:db:82:9a:cb:98:df:73:a1:90:a0:a0:
+        c5:e0:e8:01:a8:a3:14:9c:c8:c1:9a:ac:15:50:33:8d:ed:7c:
+        2a:8b:73:95:40:43:26:fc:81:a4:2a:5f:39:90:b7:27:cb:51:
+        77:f8:96:93:1e:cf:f2:77:7d:1f:46:93:a2:59:1e:95:44:c5:
+        2d:75:64:b0:d6:f9:e0:3c:69:ea:04:b5:1c:0b:e2:46:44:4d:
+        43:3b:97:49:71:11:bd:24:b6:c2:ad:72:54:06:fe:6b:18:f9:
+        77:db:29:2c:52:9e:6d:77:7b:62:fd:0f:4d:8e:98:32:30:30:
+        71:12:d6:25:35:e3:9f:f8:6f:9c:b5:eb:6a:1b:ad:ea:10:d3:
+        96:16:72:06:21:25:c6:4c:bc:8f:70:bb:0c:e4:5e:22:83:2d:
+        d2:be:fe:85:5b:b4:e4:bd
+SHA1 Fingerprint=F7:00:34:25:94:88:68:31:E4:34:87:3F:70:FE:86:B3:86:9F:F0:6E
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIQVaXZZ5Qoxu0M+ifdWwFNGDANBgkqhkiG9w0BAQwFADBL
+MQswCQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UE
+AwwYT0lTVEUgU2VydmVyIFJvb3QgUlNBIEcxMB4XDTIzMDUzMTE0MzcxNloXDTQ4
+MDUyNDE0MzcxNVowSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5k
+YXRpb24xITAfBgNVBAMMGE9JU1RFIFNlcnZlciBSb290IFJTQSBHMTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAKqu9KuCz/vlNwvn1ZatkOhLKdxVYOPM
+vLO8LZK55KN68YG0nnJyQ98/qwsmtO57Gmn7KNByXEptaZnwYx4M0rH/1ow00O7b
+rEi56rAUjtgHqSSY3ekJvqgiG1k50SeH3BzN+Puz6+mTeO0Pzjd8JnduodgsIUzk
+ik/HEzxux9UTl7Ko2yRpg1bTacuCErudG/L4NPKYKyqOBGf244ehHa1uzjZ0Dl4z
+O8vbUZeUapU8zhhabkvG/AePLhq5SvdkNCncpo1Q4Y2LS+VIG24ugBA/5J8bZT8R
+tOpXaZ+0AOuFJJkk9SGdl6r7NH8CaxWQrbueWhl/pIzY+m0o/DjH40ytas7ZTpOS
+jswMZ78LS5bOZmdTaMsXEY5Z96ycG7mOaES3GK/m5Q9l3JUJsJMStR8+lKXHiHUh
+sd4JJCpM4rzsTGdHwimIuQq6+cF0zowYJmXa92/GjHtoXAvuY8BeS/FOzJ8vD+Ho
+mnqT8eDI278n5mUpezbgMxVz8p1rhAhoKzYHKyfMeNhqhw5HdPSqoBNdZH702xSu
++zrkL8Fl47l6QGzwBrd7KJvX4V84c5Ss2XCTLdyEr0YconosP4EmQufU2MVshGYR
+i3drVByjtdgQ8K4p92cIiBdcuJd5z+orKu5YM+Vt6SmqZQENghPsJQtdLEByFSnT
+kCz3GkPVavBpAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU
+8snBDw1jALvsRQ5KH7WxszbNDo0wHQYDVR0OBBYEFPLJwQ8NYwC77EUOSh+1sbM2
+zQ6NMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEANGd5sjrG5T33
+I3K5Ce+SrScfoE4KsvXaFwyihdJ+klH9FWXXXGtkFu6KRcoMQzZENdl//nk6HOjG
+5D1rd9QhEOP28yBOqb6J8xycqd+8MDoX0TJD0KqKchxRKEzdNsjkLWd9kYccnbz8
+qyiWXmFcuCIzGEgWUOrKL+mlSdx/PKQZvDatkuK59EvV6wit53j+F8Bdh3foZ3dP
+AGav9LEDOr4SfEE15fSmG0eLy3n31r8Xbk5l8PjaV8GUgeV6Vg27Rn9vkf195hfk
+gSe7BYhW3SCl95gtkRlpMV+bMPKZrXJAlszYd2abtNUOshD+FKrDgHGdPY3ofRRs
+YWSGRqbXVMW215AWRqWFyp464+YTFrYVI8ypKVL9AMb2kI5Wj4kI3Zaq5tNqqYY1
+9tVFeEJKRvwDyF7YZvZFZSS0vod7VSCd9521Kvy5YhnLbDuv0204bKt7ph6N/Ome
+/msVuduCmsuY33OhkKCgxeDoAaijFJzIwZqsFVAzje18KotzlUBDJvyBpCpfOZC3
+J8tRd/iWkx7P8nd9H0aTolkelUTFLXVksNb54Dxp6gS1HAviRkRNQzuXSXERvSS2
+wq1yVAb+axj5d9spLFKebXd7Yv0PTY6YMjAwcRLWJTXjn/hvnLXrahut6hDTlhZy
+BiElxky8j3C7DOReIoMt0r7+hVu05L0=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/SecureTrust_CA.pem b/secure/caroot/trusted/SecureTrust_CA.pem
deleted file mode 100644
index 018c6b03b3b4..000000000000
--- a/secure/caroot/trusted/SecureTrust_CA.pem
+++ /dev/null
@@ -1,99 +0,0 @@
-##
-##  SecureTrust CA
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=SecureTrust Corporation, CN=SecureTrust CA
-        Validity
-            Not Before: Nov  7 19:31:18 2006 GMT
-            Not After : Dec 31 19:40:55 2029 GMT
-        Subject: C=US, O=SecureTrust Corporation, CN=SecureTrust CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:ab:a4:81:e5:95:cd:f5:f6:14:8e:c2:4f:ca:d4:
-                    e2:78:95:58:9c:41:e1:0d:99:40:24:17:39:91:33:
-                    66:e9:be:e1:83:af:62:5c:89:d1:fc:24:5b:61:b3:
-                    e0:11:11:41:1c:1d:6e:f0:b8:bb:f8:de:a7:81:ba:
-                    a6:48:c6:9f:1d:bd:be:8e:a9:41:3e:b8:94:ed:29:
-                    1a:d4:8e:d2:03:1d:03:ef:6d:0d:67:1c:57:d7:06:
-                    ad:ca:c8:f5:fe:0e:af:66:25:48:04:96:0b:5d:a3:
-                    ba:16:c3:08:4f:d1:46:f8:14:5c:f2:c8:5e:01:99:
-                    6d:fd:88:cc:86:a8:c1:6f:31:42:6c:52:3e:68:cb:
-                    f3:19:34:df:bb:87:18:56:80:26:c4:d0:dc:c0:6f:
-                    df:de:a0:c2:91:16:a0:64:11:4b:44:bc:1e:f6:e7:
-                    fa:63:de:66:ac:76:a4:71:a3:ec:36:94:68:7a:77:
-                    a4:b1:e7:0e:2f:81:7a:e2:b5:72:86:ef:a2:6b:8b:
-                    f0:0f:db:d3:59:3f:ba:72:bc:44:24:9c:e3:73:b3:
-                    f7:af:57:2f:42:26:9d:a9:74:ba:00:52:f2:4b:cd:
-                    53:7c:47:0b:36:85:0e:66:a9:08:97:16:34:57:c1:
-                    66:f7:80:e3:ed:70:54:c7:93:e0:2e:28:15:59:87:
-                    ba:bb
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            1.3.6.1.4.1.311.20.2: 
-                ...C.A
-            X509v3 Key Usage: 
-                Digital Signature, Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                42:32:B6:16:FA:04:FD:FE:5D:4B:7A:C3:FD:F7:4C:40:1D:5A:43:AF
-            X509v3 CRL Distribution Points: 
-                Full Name:
-                  URI:http://crl.securetrust.com/STCA.crl
-
-            1.3.6.1.4.1.311.21.1: 
-                ...
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        30:ed:4f:4a:e1:58:3a:52:72:5b:b5:a6:a3:65:18:a6:bb:51:
-        3b:77:e9:9d:ea:d3:9f:5c:e0:45:65:7b:0d:ca:5b:e2:70:50:
-        b2:94:05:14:ae:49:c7:8d:41:07:12:73:94:7e:0c:23:21:fd:
-        bc:10:7f:60:10:5a:72:f5:98:0e:ac:ec:b9:7f:dd:7a:6f:5d:
-        d3:1c:f4:ff:88:05:69:42:a9:05:71:c8:b7:ac:26:e8:2e:b4:
-        8c:6a:ff:71:dc:b8:b1:df:99:bc:7c:21:54:2b:e4:58:a2:bb:
-        57:29:ae:9e:a9:a3:19:26:0f:99:2e:08:b0:ef:fd:69:cf:99:
-        1a:09:8d:e3:a7:9f:2b:c9:36:34:7b:24:b3:78:4c:95:17:a4:
-        06:26:1e:b6:64:52:36:5f:60:67:d9:9c:c5:05:74:0b:e7:67:
-        23:d2:08:fc:88:e9:ae:8b:7f:e1:30:f4:37:7e:fd:c6:32:da:
-        2d:9e:44:30:30:6c:ee:07:de:d2:34:fc:d2:ff:40:f6:4b:f4:
-        66:46:06:54:a6:f2:32:0a:63:26:30:6b:9b:d1:dc:8b:47:ba:
-        e1:b9:d5:62:d0:a2:a0:f4:67:05:78:29:63:1a:6f:04:d6:f8:
-        c6:4c:a3:9a:b1:37:b4:8d:e5:28:4b:1d:9e:2c:c2:b8:68:bc:
-        ed:02:ee:31
-SHA1 Fingerprint=87:82:C6:C3:04:35:3B:CF:D2:96:92:D2:59:3E:7D:44:D9:34:FF:11
------BEGIN CERTIFICATE-----
-MIIDuDCCAqCgAwIBAgIQDPCOXAgWpa1Cf/DrJxhZ0DANBgkqhkiG9w0BAQUFADBI
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-FzAVBgNVBAMTDlNlY3VyZVRydXN0IENBMB4XDTA2MTEwNzE5MzExOFoXDTI5MTIz
-MTE5NDA1NVowSDELMAkGA1UEBhMCVVMxIDAeBgNVBAoTF1NlY3VyZVRydXN0IENv
-cnBvcmF0aW9uMRcwFQYDVQQDEw5TZWN1cmVUcnVzdCBDQTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAKukgeWVzfX2FI7CT8rU4niVWJxB4Q2ZQCQXOZEz
-Zum+4YOvYlyJ0fwkW2Gz4BERQRwdbvC4u/jep4G6pkjGnx29vo6pQT64lO0pGtSO
-0gMdA+9tDWccV9cGrcrI9f4Or2YlSASWC12juhbDCE/RRvgUXPLIXgGZbf2IzIao
-wW8xQmxSPmjL8xk037uHGFaAJsTQ3MBv396gwpEWoGQRS0S8Hvbn+mPeZqx2pHGj
-7DaUaHp3pLHnDi+BeuK1cobvomuL8A/b01k/unK8RCSc43Oz969XL0Imnal0ugBS
-8kvNU3xHCzaFDmapCJcWNFfBZveA4+1wVMeT4C4oFVmHursCAwEAAaOBnTCBmjAT
-BgkrBgEEAYI3FAIEBh4EAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB
-/zAdBgNVHQ4EFgQUQjK2FvoE/f5dS3rD/fdMQB1aQ68wNAYDVR0fBC0wKzApoCeg
-JYYjaHR0cDovL2NybC5zZWN1cmV0cnVzdC5jb20vU1RDQS5jcmwwEAYJKwYBBAGC
-NxUBBAMCAQAwDQYJKoZIhvcNAQEFBQADggEBADDtT0rhWDpSclu1pqNlGKa7UTt3
-6Z3q059c4EVlew3KW+JwULKUBRSuSceNQQcSc5R+DCMh/bwQf2AQWnL1mA6s7Ll/
-3XpvXdMc9P+IBWlCqQVxyLesJugutIxq/3HcuLHfmbx8IVQr5Fiiu1cprp6poxkm
-D5kuCLDv/WnPmRoJjeOnnyvJNjR7JLN4TJUXpAYmHrZkUjZfYGfZnMUFdAvnZyPS
-CPyI6a6Lf+Ew9Dd+/cYy2i2eRDAwbO4H3tI0/NL/QPZL9GZGBlSm8jIKYyYwa5vR
-3ItHuuG51WLQoqD0ZwV4KWMabwTW+MZMo5qxN7SN5ShLHZ4swrhovO0C7jE=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Secure_Global_CA.pem b/secure/caroot/trusted/Secure_Global_CA.pem
deleted file mode 100644
index f55a2bc02a4b..000000000000
--- a/secure/caroot/trusted/Secure_Global_CA.pem
+++ /dev/null
@@ -1,99 +0,0 @@
-##
-##  Secure Global CA
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=SecureTrust Corporation, CN=Secure Global CA
-        Validity
-            Not Before: Nov  7 19:42:28 2006 GMT
-            Not After : Dec 31 19:52:06 2029 GMT
-        Subject: C=US, O=SecureTrust Corporation, CN=Secure Global CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:af:35:2e:d8:ac:6c:55:69:06:71:e5:13:68:24:
-                    b3:4f:d8:cc:21:47:f8:f1:60:38:89:89:03:e9:bd:
-                    ea:5e:46:53:09:dc:5c:f5:5a:e8:f7:45:2a:02:eb:
-                    31:61:d7:29:33:4c:ce:c7:7c:0a:37:7e:0f:ba:32:
-                    98:e1:1d:97:af:8f:c7:dc:c9:38:96:f3:db:1a:fc:
-                    51:ed:68:c6:d0:6e:a4:7c:24:d1:ae:42:c8:96:50:
-                    63:2e:e0:fe:75:fe:98:a7:5f:49:2e:95:e3:39:33:
-                    64:8e:1e:a4:5f:90:d2:67:3c:b2:d9:fe:41:b9:55:
-                    a7:09:8e:72:05:1e:8b:dd:44:85:82:42:d0:49:c0:
-                    1d:60:f0:d1:17:2c:95:eb:f6:a5:c1:92:a3:c5:c2:
-                    a7:08:60:0d:60:04:10:96:79:9e:16:34:e6:a9:b6:
-                    fa:25:45:39:c8:1e:65:f9:93:f5:aa:f1:52:dc:99:
-                    98:3d:a5:86:1a:0c:35:33:fa:4b:a5:04:06:15:1c:
-                    31:80:ef:aa:18:6b:c2:7b:d7:da:ce:f9:33:20:d5:
-                    f5:bd:6a:33:2d:81:04:fb:b0:5c:d4:9c:a3:e2:5c:
-                    1d:e3:a9:42:75:5e:7b:d4:77:ef:39:54:ba:c9:0a:
-                    18:1b:12:99:49:2f:88:4b:fd:50:62:d1:73:e7:8f:
-                    7a:43
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            1.3.6.1.4.1.311.20.2: 
-                ...C.A
-            X509v3 Key Usage: 
-                Digital Signature, Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                AF:44:04:C2:41:7E:48:83:DB:4E:39:02:EC:EC:84:7A:E6:CE:C9:A4
-            X509v3 CRL Distribution Points: 
-                Full Name:
-                  URI:http://crl.securetrust.com/SGCA.crl
-
-            1.3.6.1.4.1.311.21.1: 
-                ...
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        63:1a:08:40:7d:a4:5e:53:0d:77:d8:7a:ae:1f:0d:0b:51:16:
-        03:ef:18:7c:c8:e3:af:6a:58:93:14:60:91:b2:84:dc:88:4e:
-        be:39:8a:3a:f3:e6:82:89:5d:01:37:b3:ab:24:a4:15:0e:92:
-        35:5a:4a:44:5e:4e:57:fa:75:ce:1f:48:ce:66:f4:3c:40:26:
-        92:98:6c:1b:ee:24:46:0c:17:b3:52:a5:db:a5:91:91:cf:37:
-        d3:6f:e7:27:08:3a:4e:19:1f:3a:a7:58:5c:17:cf:79:3f:8b:
-        e4:a7:d3:26:23:9d:26:0f:58:69:fc:47:7e:b2:d0:8d:8b:93:
-        bf:29:4f:43:69:74:76:67:4b:cf:07:8c:e6:02:f7:b5:e1:b4:
-        43:b5:4b:2d:14:9f:f9:dc:26:0d:bf:a6:47:74:06:d8:88:d1:
-        3a:29:30:84:ce:d2:39:80:62:1b:a8:c7:57:49:bc:6a:55:51:
-        67:15:4a:be:35:07:e4:d5:75:98:37:79:30:14:db:29:9d:6c:
-        c5:69:cc:47:55:a2:30:f7:cc:5c:7f:c2:c3:98:1c:6b:4e:16:
-        80:eb:7a:78:65:45:a2:00:1a:af:0c:0d:55:64:34:48:b8:92:
-        b9:f1:b4:50:29:f2:4f:23:1f:da:6c:ac:1f:44:e1:dd:23:78:
-        51:5b:c7:16
-SHA1 Fingerprint=3A:44:73:5A:E5:81:90:1F:24:86:61:46:1E:3B:9C:C4:5F:F5:3A:1B
------BEGIN CERTIFICATE-----
-MIIDvDCCAqSgAwIBAgIQB1YipOjUiolN9BPI8PjqpTANBgkqhkiG9w0BAQUFADBK
-MQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3QgQ29ycG9yYXRpb24x
-GTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwHhcNMDYxMTA3MTk0MjI4WhcNMjkx
-MjMxMTk1MjA2WjBKMQswCQYDVQQGEwJVUzEgMB4GA1UEChMXU2VjdXJlVHJ1c3Qg
-Q29ycG9yYXRpb24xGTAXBgNVBAMTEFNlY3VyZSBHbG9iYWwgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvNS7YrGxVaQZx5RNoJLNP2MwhR/jxYDiJ
-iQPpvepeRlMJ3Fz1Wuj3RSoC6zFh1ykzTM7HfAo3fg+6MpjhHZevj8fcyTiW89sa
-/FHtaMbQbqR8JNGuQsiWUGMu4P51/pinX0kuleM5M2SOHqRfkNJnPLLZ/kG5VacJ
-jnIFHovdRIWCQtBJwB1g8NEXLJXr9qXBkqPFwqcIYA1gBBCWeZ4WNOaptvolRTnI
-HmX5k/Wq8VLcmZg9pYYaDDUz+kulBAYVHDGA76oYa8J719rO+TMg1fW9ajMtgQT7
-sFzUnKPiXB3jqUJ1XnvUd+85VLrJChgbEplJL4hL/VBi0XPnj3pDAgMBAAGjgZ0w
-gZowEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0PBAQDAgGGMA8GA1UdEwEB/wQF
-MAMBAf8wHQYDVR0OBBYEFK9EBMJBfkiD2045AuzshHrmzsmkMDQGA1UdHwQtMCsw
-KaAnoCWGI2h0dHA6Ly9jcmwuc2VjdXJldHJ1c3QuY29tL1NHQ0EuY3JsMBAGCSsG
-AQQBgjcVAQQDAgEAMA0GCSqGSIb3DQEBBQUAA4IBAQBjGghAfaReUw132HquHw0L
-URYD7xh8yOOvaliTFGCRsoTciE6+OYo68+aCiV0BN7OrJKQVDpI1WkpEXk5X+nXO
-H0jOZvQ8QCaSmGwb7iRGDBezUqXbpZGRzzfTb+cnCDpOGR86p1hcF895P4vkp9Mm
-I50mD1hp/Ed+stCNi5O/KU9DaXR2Z0vPB4zmAve14bRDtUstFJ/53CYNv6ZHdAbY
-iNE6KTCEztI5gGIbqMdXSbxqVVFnFUq+NQfk1XWYN3kwFNspnWzFacxHVaIw98xc
-f8LDmBxrThaA63p4ZUWiABqvDA1VZDRIuJK58bRQKfJPIx/abKwfROHdI3hRW8cW
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/SwissSign_RSA_TLS_Root_CA_2022_-_1.pem b/secure/caroot/trusted/SwissSign_RSA_TLS_Root_CA_2022_-_1.pem
new file mode 100644
index 000000000000..2c21dec185f6
--- /dev/null
+++ b/secure/caroot/trusted/SwissSign_RSA_TLS_Root_CA_2022_-_1.pem
@@ -0,0 +1,134 @@
+##
+##  SwissSign RSA TLS Root CA 2022 - 1
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            43:fa:0c:5f:4e:1b:80:18:44:ef:d1:b4:4f:35:1f:44:f4:80:ed:cb
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=CH, O=SwissSign AG, CN=SwissSign RSA TLS Root CA 2022 - 1
+        Validity
+            Not Before: Jun  8 11:08:22 2022 GMT
+            Not After : Jun  8 11:08:22 2047 GMT
+        Subject: C=CH, O=SwissSign AG, CN=SwissSign RSA TLS Root CA 2022 - 1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:cb:2a:68:e2:0b:c3:57:bc:35:63:bc:70:a5:3b:
+                    f3:8c:3c:4e:57:96:6e:c3:4e:36:a4:f6:02:ca:1e:
+                    aa:ae:b8:de:a8:af:1d:76:da:ba:35:d0:91:70:07:
+                    df:b3:06:f2:8a:f2:2e:55:51:7b:bb:2c:24:cb:7f:
+                    92:26:80:a3:b4:94:f6:82:a1:a4:e8:fa:75:1d:59:
+                    f3:07:6a:61:64:e2:c6:8c:95:af:a3:bb:8e:6f:56:
+                    cf:71:cc:5e:81:61:0d:6d:f2:ab:02:2e:a4:97:e5:
+                    71:fc:8a:b0:91:20:5b:9c:74:52:6d:ae:15:27:59:
+                    78:f2:09:ca:65:0e:7f:cb:f4:eb:e7:dc:a9:4c:77:
+                    f6:2b:16:04:95:ae:9c:71:a5:3f:2a:da:41:42:e7:
+                    3c:84:10:f4:e1:3d:8c:6b:e2:2b:91:47:55:4f:b8:
+                    56:be:45:de:22:51:4d:4e:28:d9:5f:19:41:06:8f:
+                    0e:4d:06:e0:70:40:23:01:6a:e4:cb:13:9b:73:ac:
+                    4d:14:48:92:2d:fe:6d:a7:f8:87:6b:79:75:e1:be:
+                    10:b1:aa:88:40:59:54:d7:cf:c4:d0:9b:44:b3:38:
+                    69:64:8c:81:d1:23:7e:aa:39:3c:3b:0f:9f:4a:7b:
+                    82:ca:6b:6f:ca:22:3e:31:d0:b0:d0:2a:1c:92:8a:
+                    8f:d8:19:9c:47:e4:3e:0c:b9:c2:cd:be:41:0c:f8:
+                    a4:47:05:db:c1:17:30:38:3a:69:dc:cd:c3:69:23:
+                    fd:9a:0f:02:ce:10:6a:ce:ca:f8:b9:29:a3:36:89:
+                    86:ae:0b:c0:4f:63:b9:06:59:49:5e:0e:c1:69:b3:
+                    0a:f3:77:7e:2e:9d:8c:b3:27:98:d2:99:8d:25:a7:
+                    1f:86:b3:a6:54:70:38:fc:7d:5d:e8:4f:83:0c:d1:
+                    93:e5:12:e4:54:da:3e:f2:ad:3a:de:3e:3c:45:f0:
+                    28:0f:06:b9:e1:db:97:7b:99:45:9e:dd:fe:95:59:
+                    04:2f:75:3f:d3:ae:89:99:86:ac:14:b4:a8:84:fa:
+                    c8:5d:3b:1b:58:93:c1:17:94:55:c8:0b:e3:82:79:
+                    84:9f:f3:00:84:34:ee:dc:31:d5:8f:f2:fa:4f:96:
+                    4c:06:aa:78:fb:de:64:a2:23:cd:1f:3e:c5:8c:bc:
+                    37:54:0e:bb:5a:72:55:ef:c8:5b:b5:72:f8:78:df:
+                    37:20:4c:57:91:73:92:73:ac:18:77:43:82:20:69:
+                    ec:e9:ac:29:46:e5:0b:4e:f8:37:73:89:96:8a:1c:
+                    6d:bd:ef:be:d8:b6:f4:ca:c0:fd:47:f0:ae:0b:58:
+                    20:c5:c8:1d:36:ae:97:8d:50:83:26:24:29:f7:9d:
+                    3b:0f:05
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                6F:8E:62:8B:93:43:B0:E1:40:F6:A7:C3:FD:F1:0F:B8:0F:15:38:A5
+            X509v3 Subject Key Identifier: 
+                6F:8E:62:8B:93:43:B0:E1:40:F6:A7:C3:FD:F1:0F:B8:0F:15:38:A5
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        ac:2c:29:41:7d:fa:5c:f5:1a:95:18:bf:2c:a9:8a:a9:24:54:
+        75:f5:b8:40:ab:cb:a8:24:51:2b:18:3f:63:a9:ae:98:56:2b:
+        05:43:22:a3:b7:d7:46:9e:c0:2a:12:3d:8e:96:96:40:df:0c:
+        33:8b:6b:37:91:3a:95:bb:39:29:6d:c0:02:6c:8a:94:0b:07:
+        02:4d:18:3e:fb:fb:7b:f5:76:3d:9b:f6:5e:30:06:58:33:1e:
+        aa:78:d5:e6:54:04:3a:b2:82:09:8d:ce:16:33:59:45:28:f1:
+        a5:a3:97:0e:43:23:fd:0b:20:80:90:ff:e3:26:cf:b8:64:91:
+        e5:05:8f:13:a0:76:0d:d7:37:0c:10:88:96:f4:3e:be:95:bd:
+        f1:c3:7d:f0:a3:c3:79:47:0b:5c:92:15:63:ed:52:75:8a:e7:
+        46:69:cb:51:55:0b:2a:4c:f5:f2:64:4f:a9:5c:ff:67:32:8e:
+        55:2d:32:82:1c:80:2f:6a:91:f8:cb:bc:7e:18:a2:26:a8:2e:
+        a3:53:28:87:ed:57:e5:65:7a:4e:00:4a:5b:4e:53:c9:62:36:
+        bd:c2:8e:5b:eb:cc:6e:27:81:18:59:8b:44:63:9f:d5:0c:65:
+        f4:29:65:7f:91:2c:e5:7f:7e:e8:89:cf:8f:20:cb:6d:07:42:
+        11:51:26:32:8a:2e:3a:47:13:b8:8d:bd:47:0d:09:f0:16:a4:
+        ed:96:86:2e:19:d8:be:8c:3a:e8:45:2e:11:ba:ae:5a:e7:b9:
+        bf:b1:cc:8f:e0:a0:ff:b8:b3:d1:85:7b:79:66:a3:39:b5:3b:
+        66:d8:40:be:cf:b7:67:8b:48:c9:19:25:55:fc:bd:8d:cf:5e:
+        da:4e:a6:f2:69:ce:fd:7f:4c:77:d0:c1:46:35:98:5c:23:9b:
+        02:45:43:94:5a:dd:bc:47:ad:22:fe:ba:5e:2f:91:29:29:86:
+        7b:21:de:6e:64:b7:cb:0d:8f:37:5b:a3:08:6a:eb:f4:dd:02:
+        8f:50:03:02:b1:b8:37:68:96:50:eb:b8:5f:d4:28:8a:a5:22:
+        0c:8a:84:f0:59:2e:d5:37:d1:61:e5:42:73:58:2a:81:f7:76:
+        db:e2:e2:4d:0d:5f:f6:b7:be:05:b4:ae:4e:0d:de:16:3d:03:
+        81:b3:26:5e:4b:b8:4b:00:cf:ff:8c:17:ba:6c:60:2d:27:87:
+        37:24:e6:7a:60:2f:b5:d3:83:04:aa:4f:43:75:a2:c1:83:b2:
+        27:98:2b:b1:0e:80:ba:c0:85:5e:42:b9:df:b1:60:91:d3:eb:
+        18:7e:70:78:ae:76:83:be:71:5a:d0:90:e3:ca:c1:16:25:67:
+        4a:f0:b6:7b:ba:e1:9c:d9
+SHA1 Fingerprint=81:34:0A:BE:4C:CD:CE:CC:E7:7D:CC:8A:D4:57:E2:45:A0:77:5D:CE
+-----BEGIN CERTIFICATE-----
+MIIFkzCCA3ugAwIBAgIUQ/oMX04bgBhE79G0TzUfRPSA7cswDQYJKoZIhvcNAQEL
+BQAwUTELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzErMCkGA1UE
+AxMiU3dpc3NTaWduIFJTQSBUTFMgUm9vdCBDQSAyMDIyIC0gMTAeFw0yMjA2MDgx
+MTA4MjJaFw00NzA2MDgxMTA4MjJaMFExCzAJBgNVBAYTAkNIMRUwEwYDVQQKEwxT
+d2lzc1NpZ24gQUcxKzApBgNVBAMTIlN3aXNzU2lnbiBSU0EgVExTIFJvb3QgQ0Eg
+MjAyMiAtIDEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDLKmjiC8NX
+vDVjvHClO/OMPE5Xlm7DTjak9gLKHqquuN6orx122ro10JFwB9+zBvKK8i5VUXu7
+LCTLf5ImgKO0lPaCoaTo+nUdWfMHamFk4saMla+ju45vVs9xzF6BYQ1t8qsCLqSX
+5XH8irCRIFucdFJtrhUnWXjyCcplDn/L9Ovn3KlMd/YrFgSVrpxxpT8q2kFC5zyE
+EPThPYxr4iuRR1VPuFa+Rd4iUU1OKNlfGUEGjw5NBuBwQCMBauTLE5tzrE0USJIt
+/m2n+IdreXXhvhCxqohAWVTXz8TQm0SzOGlkjIHRI36qOTw7D59Ke4LKa2/KIj4x
+0LDQKhySio/YGZxH5D4MucLNvkEM+KRHBdvBFzA4OmnczcNpI/2aDwLOEGrOyvi5
+KaM2iYauC8BPY7kGWUleDsFpswrzd34unYyzJ5jSmY0lpx+Gs6ZUcDj8fV3oT4MM
+0ZPlEuRU2j7yrTrePjxF8CgPBrnh25d7mUWe3f6VWQQvdT/TromZhqwUtKiE+shd
+OxtYk8EXlFXIC+OCeYSf8wCENO7cMdWP8vpPlkwGqnj73mSiI80fPsWMvDdUDrta
+clXvyFu1cvh43zcgTFeRc5JzrBh3Q4IgaezprClG5QtO+DdziZaKHG29777YtvTK
+wP1H8K4LWCDFyB02rpeNUIMmJCn3nTsPBQIDAQABo2MwYTAPBgNVHRMBAf8EBTAD
+AQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBRvjmKLk0Ow4UD2p8P98Q+4
+DxU4pTAdBgNVHQ4EFgQUb45ii5NDsOFA9qfD/fEPuA8VOKUwDQYJKoZIhvcNAQEL
+BQADggIBAKwsKUF9+lz1GpUYvyypiqkkVHX1uECry6gkUSsYP2OprphWKwVDIqO3
+10aewCoSPY6WlkDfDDOLazeROpW7OSltwAJsipQLBwJNGD77+3v1dj2b9l4wBlgz
+Hqp41eZUBDqyggmNzhYzWUUo8aWjlw5DI/0LIICQ/+Mmz7hkkeUFjxOgdg3XNwwQ
+iJb0Pr6VvfHDffCjw3lHC1ySFWPtUnWK50Zpy1FVCypM9fJkT6lc/2cyjlUtMoIc
+gC9qkfjLvH4YoiaoLqNTKIftV+Vlek4ASltOU8liNr3CjlvrzG4ngRhZi0Rjn9UM
+ZfQpZX+RLOV/fuiJz48gy20HQhFRJjKKLjpHE7iNvUcNCfAWpO2Whi4Z2L6MOuhF
+LhG6rlrnub+xzI/goP+4s9GFe3lmozm1O2bYQL7Pt2eLSMkZJVX8vY3PXtpOpvJp
+zv1/THfQwUY1mFwjmwJFQ5Ra3bxHrSL+ul4vkSkphnsh3m5kt8sNjzdbowhq6/Td
+Ao9QAwKxuDdollDruF/UKIqlIgyKhPBZLtU30WHlQnNYKoH3dtvi4k0NX/a3vgW0
+rk4N3hY9A4GzJl5LuEsAz/+MF7psYC0nhzck5npgL7XTgwSqT0N1osGDsieYK7EO
+gLrAhV5Cud+xYJHT6xh+cHiudoO+cVrQkOPKwRYlZ0rwtnu64ZzZ
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem b/secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem
deleted file mode 100644
index 589d6048791f..000000000000
--- a/secure/caroot/trusted/TeliaSonera_Root_CA_v1.pem
+++ /dev/null
@@ -1,130 +0,0 @@
-##
-##  TeliaSonera Root CA v1
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            95:be:16:a0:f7:2e:46:f1:7b:39:82:72:fa:8b:cd:96
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: O=TeliaSonera, CN=TeliaSonera Root CA v1
-        Validity
-            Not Before: Oct 18 12:00:50 2007 GMT
-            Not After : Oct 18 12:00:50 2032 GMT
-        Subject: O=TeliaSonera, CN=TeliaSonera Root CA v1
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:c2:be:eb:27:f0:21:a3:f3:69:26:55:7e:9d:c5:
-                    55:16:91:5c:fd:ef:21:bf:53:80:7a:2d:d2:91:8c:
-                    63:31:f0:ec:24:f0:c3:a5:d2:72:7c:10:6d:f4:37:
-                    b7:e5:e6:7c:79:ea:8c:b5:82:8b:ae:48:b6:ac:00:
-                    dc:65:75:ec:2a:4d:5f:c1:87:f5:20:65:2b:81:a8:
-                    47:3e:89:23:95:30:16:90:7f:e8:57:07:48:e7:19:
-                    ae:bf:45:67:b1:37:1b:06:2a:fe:de:f9:ac:7d:83:
-                    fb:5e:ba:e4:8f:97:67:be:4b:8e:8d:64:07:57:38:
-                    55:69:34:36:3d:13:48:ef:4f:e2:d3:66:1e:a4:cf:
-                    1a:b7:5e:36:33:d4:b4:06:bd:18:01:fd:77:84:50:
-                    00:45:f5:8c:5d:e8:23:bc:7e:fe:35:e1:ed:50:7b:
-                    a9:30:8d:19:d3:09:8e:68:67:5d:bf:3c:97:18:53:
-                    bb:29:62:c5:ca:5e:72:c1:c7:96:d4:db:2d:a0:b4:
-                    1f:69:03:ec:ea:e2:50:f1:0c:3c:f0:ac:f3:53:2d:
-                    f0:1c:f5:ed:6c:39:39:73:80:16:c8:52:b0:23:cd:
-                    e0:3e:dc:dd:3c:47:a0:bb:35:8a:e2:98:68:8b:be:
-                    e5:bf:72:ee:d2:fa:a5:ed:12:ed:fc:98:18:a9:26:
-                    76:dc:28:4b:10:20:1c:d3:7f:16:77:2d:ed:6f:80:
-                    f7:49:bb:53:05:bb:5d:68:c7:d4:c8:75:16:3f:89:
-                    5a:8b:f7:17:47:d4:4c:f1:d2:89:79:3e:4d:3d:98:
-                    a8:61:de:3a:1e:d2:f8:5e:03:e0:c1:c9:1c:8c:d3:
-                    8d:4d:d3:95:36:b3:37:5f:63:63:9b:33:14:f0:2d:
-                    26:6b:53:7c:89:8c:32:c2:6e:ec:3d:21:00:39:c9:
-                    a1:68:e2:50:83:2e:b0:3a:2b:f3:36:a0:ac:2f:e4:
-                    6f:61:c2:51:09:39:3e:8b:53:b9:bb:67:da:dc:53:
-                    b9:76:59:36:9d:43:e5:20:e0:3d:32:60:85:22:51:
-                    b7:c7:33:bb:dd:15:2f:a4:78:a6:07:7b:81:46:36:
-                    04:86:dd:79:35:c7:95:2c:3b:b0:a3:17:35:e5:73:
-                    1f:b4:5c:59:ef:da:ea:10:65:7b:7a:d0:7f:9f:b3:
-                    b4:2a:37:3b:70:8b:9b:5b:b9:2b:b7:ec:b2:51:12:
-                    97:53:29:5a:d4:f0:12:10:dc:4f:02:bb:12:92:2f:
-                    62:d4:3f:69:43:7c:0d:d6:fc:58:75:01:88:9d:58:
-                    16:4b:de:ba:90:ff:47:01:89:06:6a:f6:5f:b2:90:
-                    6a:b3:02:a6:02:88:bf:b3:47:7e:2a:d9:d5:fa:68:
-                    78:35:4d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: 
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                F0:8F:59:38:00:B3:F5:8F:9A:96:0C:D5:EB:FA:7B:AA:17:E8:13:12
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        be:e4:5c:62:4e:24:f4:0c:08:ff:f0:d3:0c:68:e4:93:49:22:
-        3f:44:27:6f:bb:6d:de:83:66:ce:a8:cc:0d:fc:f5:9a:06:e5:
-        77:14:91:eb:9d:41:7b:99:2a:84:e5:ff:fc:21:c1:5d:f0:e4:
-        1f:57:b7:75:a9:a1:5f:02:26:ff:d7:c7:f7:4e:de:4f:f8:f7:
-        1c:46:c0:7a:4f:40:2c:22:35:f0:19:b1:d0:6b:67:2c:b0:a8:
-        e0:c0:40:37:35:f6:84:5c:5c:e3:af:42:78:fe:a7:c9:0d:50:
-        ea:0d:84:76:f6:51:ef:83:53:c6:7a:ff:0e:56:49:2e:8f:7a:
-        d6:0c:e6:27:54:e3:4d:0a:60:72:62:cd:91:07:d6:a5:bf:c8:
-        99:6b:ed:c4:19:e6:ab:4c:11:38:c5:6f:31:e2:6e:49:c8:3f:
-        76:80:26:03:26:29:e0:36:f6:f6:20:53:e3:17:70:34:17:9d:
-        63:68:1e:6b:ec:c3:4d:86:b8:13:30:2f:5d:46:0d:47:43:d5:
-        1b:aa:59:0e:b9:5c:8d:06:48:ad:74:87:5f:c7:fc:31:54:41:
-        13:e2:c7:21:0e:9e:e0:1e:0d:e1:c0:7b:43:85:90:c5:8a:58:
-        c6:65:0a:78:57:f2:c6:23:0f:01:d9:20:4b:de:0f:fb:92:85:
-        75:2a:5c:73:8d:6d:7b:25:91:ca:ee:45:ae:06:4b:00:cc:d3:
-        b1:59:50:da:3a:88:3b:29:43:46:5e:97:2b:54:ce:53:6f:8d:
-        4a:e7:96:fa:bf:71:0e:42:8b:7c:fd:28:a0:d0:48:ca:da:c4:
-        81:4c:bb:a2:73:93:26:c8:eb:0c:d6:26:88:b6:c0:24:cf:bb:
-        bd:5b:eb:75:7d:e9:08:8e:86:33:2c:79:77:09:69:a5:89:fc:
-        b3:70:90:87:76:8f:d3:22:bb:42:ce:bd:73:0b:20:26:2a:d0:
-        9b:3d:70:1e:24:6c:cd:87:76:a9:17:96:b7:cf:0d:92:fb:8e:
-        18:a9:98:49:d1:9e:fe:60:44:72:21:b9:19:ed:c2:f5:31:f1:
-        39:48:88:90:24:75:54:16:ad:ce:f4:f8:69:14:64:39:fb:a3:
-        b8:ba:70:40:c7:27:1c:bf:c4:56:53:fa:63:65:d0:f3:1c:0e:
-        16:f5:6b:86:58:4d:18:d4:e4:0d:8e:a5:9d:5b:91:dc:76:24:
-        50:3f:c6:2a:fb:d9:b7:9c:b5:d6:e6:d0:d9:e8:19:8b:15:71:
-        48:ad:b7:ea:d8:59:88:d4:90:bf:16:b3:d9:e9:ac:59:61:54:
-        c8:1c:ba:ca:c1:ca:e1:b9:20:4c:8f:3a:93:89:a5:a0:cc:bf:
-        d3:f6:75:a4:75:96:6d:56
-SHA1 Fingerprint=43:13:BB:96:F1:D5:86:9B:C1:4E:6A:92:F6:CF:F6:34:69:87:82:37
------BEGIN CERTIFICATE-----
-MIIFODCCAyCgAwIBAgIRAJW+FqD3LkbxezmCcvqLzZYwDQYJKoZIhvcNAQEFBQAw
-NzEUMBIGA1UECgwLVGVsaWFTb25lcmExHzAdBgNVBAMMFlRlbGlhU29uZXJhIFJv
-b3QgQ0EgdjEwHhcNMDcxMDE4MTIwMDUwWhcNMzIxMDE4MTIwMDUwWjA3MRQwEgYD
-VQQKDAtUZWxpYVNvbmVyYTEfMB0GA1UEAwwWVGVsaWFTb25lcmEgUm9vdCBDQSB2
-MTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMK+6yfwIaPzaSZVfp3F
-VRaRXP3vIb9TgHot0pGMYzHw7CTww6XScnwQbfQ3t+XmfHnqjLWCi65ItqwA3GV1
-7CpNX8GH9SBlK4GoRz6JI5UwFpB/6FcHSOcZrr9FZ7E3GwYq/t75rH2D+1665I+X
-Z75Ljo1kB1c4VWk0Nj0TSO9P4tNmHqTPGrdeNjPUtAa9GAH9d4RQAEX1jF3oI7x+
-/jXh7VB7qTCNGdMJjmhnXb88lxhTuylixcpecsHHltTbLaC0H2kD7OriUPEMPPCs
-81Mt8Bz17Ww5OXOAFshSsCPN4D7c3TxHoLs1iuKYaIu+5b9y7tL6pe0S7fyYGKkm
-dtwoSxAgHNN/Fnct7W+A90m7UwW7XWjH1Mh1Fj+JWov3F0fUTPHSiXk+TT2YqGHe
-Oh7S+F4D4MHJHIzTjU3TlTazN19jY5szFPAtJmtTfImMMsJu7D0hADnJoWjiUIMu
-sDor8zagrC/kb2HCUQk5PotTubtn2txTuXZZNp1D5SDgPTJghSJRt8czu90VL6R4
-pgd7gUY2BIbdeTXHlSw7sKMXNeVzH7RcWe/a6hBle3rQf5+ztCo3O3CLm1u5K7fs
-slESl1MpWtTwEhDcTwK7EpIvYtQ/aUN8Ddb8WHUBiJ1YFkveupD/RwGJBmr2X7KQ
-arMCpgKIv7NHfirZ1fpoeDVNAgMBAAGjPzA9MA8GA1UdEwEB/wQFMAMBAf8wCwYD
-VR0PBAQDAgEGMB0GA1UdDgQWBBTwj1k4ALP1j5qWDNXr+nuqF+gTEjANBgkqhkiG
-9w0BAQUFAAOCAgEAvuRcYk4k9AwI//DTDGjkk0kiP0Qnb7tt3oNmzqjMDfz1mgbl
-dxSR651Be5kqhOX//CHBXfDkH1e3damhXwIm/9fH907eT/j3HEbAek9ALCI18Bmx
-0GtnLLCo4MBANzX2hFxc469CeP6nyQ1Q6g2EdvZR74NTxnr/DlZJLo961gzmJ1Tj
-TQpgcmLNkQfWpb/ImWvtxBnmq0wROMVvMeJuScg/doAmAyYp4Db29iBT4xdwNBed
-Y2gea+zDTYa4EzAvXUYNR0PVG6pZDrlcjQZIrXSHX8f8MVRBE+LHIQ6e4B4N4cB7
-Q4WQxYpYxmUKeFfyxiMPAdkgS94P+5KFdSpcc41teyWRyu5FrgZLAMzTsVlQ2jqI
-OylDRl6XK1TOU2+NSueW+r9xDkKLfP0ooNBIytrEgUy7onOTJsjrDNYmiLbAJM+7
-vVvrdX3pCI6GMyx5dwlppYn8s3CQh3aP0yK7Qs69cwsgJirQmz1wHiRszYd2qReW
-t88NkvuOGKmYSdGe/mBEciG5Ge3C9THxOUiIkCR1VBatzvT4aRRkOfujuLpwQMcn
-HL/EVlP6Y2XQ8xwOFvVrhlhNGNTkDY6lnVuR3HYkUD/GKvvZt5y11ubQ2egZixVx
-SK236thZiNSQvxaz2emsWWFUyBy6ysHK4bkgTI86k4mloMy/0/Z1pHWWbVY=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/TrustAsia_TLS_ECC_Root_CA.pem b/secure/caroot/trusted/TrustAsia_TLS_ECC_Root_CA.pem
new file mode 100644
index 000000000000..c6b46dbb496f
--- /dev/null
+++ b/secure/caroot/trusted/TrustAsia_TLS_ECC_Root_CA.pem
@@ -0,0 +1,64 @@
+##
+##  TrustAsia TLS ECC Root CA
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            36:74:e1:4d:7c:65:13:c9:ac:83:55:25:a0:3e:52:7e:2f:50:68:c7
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia TLS ECC Root CA
+        Validity
+            Not Before: May 15 05:41:56 2024 GMT
+            Not After : May 15 05:41:55 2044 GMT
+        Subject: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia TLS ECC Root CA
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:b8:7f:a5:5b:3f:01:3e:7d:f0:88:6d:ae:29:98:
+                    e1:9b:5c:53:99:db:f7:08:ff:d5:6a:e0:8e:cb:44:
+                    a6:f0:c1:8c:bd:4f:d4:ce:d4:88:53:e8:5e:57:d7:
+                    4e:be:2c:3f:f3:12:a7:00:e9:82:e3:2a:5b:32:7c:
+                    4b:9b:14:29:9e:f8:2d:83:b5:eb:8e:31:49:3d:26:
+                    61:e9:1d:72:8b:89:b6:0a:bb:9c:33:35:0f:da:ec:
+                    de:a9:4a:1f:c9:33:b1
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                2C:85:53:BB:B1:43:CD:32:EA:9E:A3:87:FE:A2:98:A8:A6:93:E9:10
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:30:54:47:d7:c3:2d:61:86:48:f4:79:5a:55:0d:35:
+        2f:5f:0d:f6:67:6c:77:40:1a:46:e7:f8:68:5b:4e:27:1d:b8:
+        98:7d:7f:93:bf:08:4d:c4:da:45:30:a1:0f:5e:4a:78:02:31:
+        00:a3:91:87:f2:11:33:83:c3:c1:8a:91:3a:4c:2b:50:b1:bd:
+        22:94:5d:35:89:73:83:c5:9b:19:fe:b4:a1:e9:d4:a1:66:b6:
+        01:a5:36:f9:d8:68:61:28:b7:74:e1:a2:31
+SHA1 Fingerprint=B5:EC:39:F3:A1:66:37:AE:C3:05:94:57:E2:BE:11:BE:B7:A1:7F:36
+-----BEGIN CERTIFICATE-----
+MIICMTCCAbegAwIBAgIUNnThTXxlE8msg1UloD5Sfi9QaMcwCgYIKoZIzj0EAwMw
+WDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMs
+IEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgRUNDIFJvb3QgQ0EwHhcNMjQw
+NTE1MDU0MTU2WhcNNDQwNTE1MDU0MTU1WjBYMQswCQYDVQQGEwJDTjElMCMGA1UE
+ChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEiMCAGA1UEAxMZVHJ1c3RB
+c2lhIFRMUyBFQ0MgUm9vdCBDQTB2MBAGByqGSM49AgEGBSuBBAAiA2IABLh/pVs/
+AT598IhtrimY4ZtcU5nb9wj/1WrgjstEpvDBjL1P1M7UiFPoXlfXTr4sP/MSpwDp
+guMqWzJ8S5sUKZ74LYO1644xST0mYekdcouJtgq7nDM1D9rs3qlKH8kzsaNCMEAw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQULIVTu7FDzTLqnqOH/qKYqKaT6RAw
+DgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMFRH18MtYYZI9HlaVQ01
+L18N9mdsd0AaRuf4aFtOJx24mH1/k78ITcTaRTChD15KeAIxAKORh/IRM4PDwYqR
+OkwrULG9IpRdNYlzg8WbGf60oenUoWa2AaU2+dhoYSi3dOGiMQ==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/TrustAsia_TLS_RSA_Root_CA.pem b/secure/caroot/trusted/TrustAsia_TLS_RSA_Root_CA.pem
new file mode 100644
index 000000000000..347a68a6e3f5
--- /dev/null
+++ b/secure/caroot/trusted/TrustAsia_TLS_RSA_Root_CA.pem
@@ -0,0 +1,132 @@
+##
+##  TrustAsia TLS RSA Root CA
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            1c:18:d8:cf:e5:53:3f:22:35:46:53:54:24:3c:6c:47:d1:5c:4a:9c
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia TLS RSA Root CA
+        Validity
+            Not Before: May 15 05:41:57 2024 GMT
+            Not After : May 15 05:41:56 2044 GMT
+        Subject: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia TLS RSA Root CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:c3:16:b8:1b:6a:a4:44:73:e5:d6:4e:f4:b9:cf:
+                    5b:0b:c1:d1:9a:81:f5:63:b0:8f:43:c1:bb:08:5a:
+                    1a:7a:e1:07:76:26:1f:8f:69:56:be:fe:36:60:d0:
+                    0c:83:cd:94:ea:e7:c5:2d:5c:2f:05:16:02:9e:0a:
+                    a8:2f:e5:60:26:54:96:f8:98:40:1d:ac:ae:9d:74:
+                    67:2f:54:fb:94:63:98:e3:26:4a:83:c6:95:b6:09:
+                    43:50:cd:0d:7d:de:44:0e:60:12:4f:5b:35:bd:bf:
+                    99:38:6d:7d:6c:da:e2:68:73:1f:f9:31:a5:19:10:
+                    73:05:2a:c3:32:19:85:ea:34:aa:dd:42:1e:30:8d:
+                    3f:9e:b5:1e:61:d5:6f:bd:00:72:72:ad:12:3f:aa:
+                    a6:49:73:f2:86:15:95:0c:10:5f:51:64:ce:ff:77:
+                    b8:c9:6d:ac:e5:d5:98:f1:99:2e:6c:e3:c9:44:f9:
+                    b5:43:27:08:4d:f6:7e:de:44:79:bb:b2:8c:1c:da:
+                    d3:4b:6c:2e:d6:c3:78:b7:4c:d5:a4:e4:da:dc:8a:
+                    8e:0e:ff:0f:c3:a6:60:26:28:cf:36:bf:fa:57:0a:
+                    ec:5b:3f:e9:30:16:7b:c4:db:c4:d4:64:a0:30:fb:
+                    e5:fd:1d:71:92:dd:29:8f:41:58:de:00:ad:3a:fd:
+                    3d:7c:1a:a8:b1:17:f0:4e:34:78:58:25:d6:85:21:
+                    eb:79:1d:d0:dc:ab:cf:62:3c:b0:c7:97:8b:d6:d0:
+                    9f:d3:fe:3c:de:c5:e3:fc:3a:83:70:84:21:1d:09:
+                    c2:a1:fc:bb:28:21:65:53:60:7a:90:6d:96:38:5b:
+                    ff:f1:d7:7a:5b:6d:d3:c9:70:49:4a:ba:1d:3a:d0:
+                    50:da:32:20:19:e4:8b:3f:eb:d5:16:26:37:3c:fb:
+                    75:9e:b0:07:70:b8:14:60:77:dc:f6:0f:5c:52:0a:
+                    bc:5d:6d:8d:51:0a:da:c5:18:c8:9b:6d:dc:b0:83:
+                    b3:7f:a3:4e:78:4c:98:25:ab:f2:7e:2e:20:5e:82:
+                    15:a6:d6:d8:8f:ac:e5:cd:32:86:c8:f9:e4:da:89:
+                    e2:3b:3e:93:c5:13:6a:ff:c7:f7:18:fc:67:b5:ef:
+                    18:2c:54:ab:40:d3:6c:4d:ed:c5:c8:b7:38:4f:64:
+                    c4:94:4c:4f:a0:cd:ae:a5:c6:27:25:75:27:6d:c6:
+                    da:9c:8e:b0:05:99:d5:28:11:c5:21:d4:b8:fc:c7:
+                    96:ab:4a:64:59:61:6b:13:fc:4b:cc:92:a6:0f:a4:
+                    51:bf:0e:58:90:d9:82:83:39:a6:5f:b3:fa:6e:92:
+                    b3:cd:33:0e:85:a8:f1:29:d3:ab:59:ad:d6:db:de:
+                    d4:2b:81
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                B8:07:91:79:5C:06:F4:46:FD:7B:59:CA:5A:26:91:A7:45:2B:F8:53
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        21:9b:6a:05:20:5d:18:16:a7:12:a4:f7:47:3f:cd:ca:3b:ae:
+        8e:c0:82:ce:dc:48:25:78:17:6c:e0:e0:70:c4:d6:96:d9:d9:
+        f6:bf:7a:9c:13:bb:53:95:92:ff:cf:92:e0:f3:c5:27:35:57:
+        a8:3b:a2:19:eb:f8:8a:a3:04:de:69:8b:e4:3c:3c:bd:e5:af:
+        d0:12:1b:e5:89:6b:73:9b:6f:25:02:4b:90:82:af:40:c2:ad:
+        ba:9a:60:24:5a:81:4d:05:18:a3:e2:33:79:7a:0b:1f:93:ed:
+        ec:39:4a:f5:13:04:ec:8d:74:9d:81:0a:a8:6f:e8:76:fe:8b:
+        4f:2b:69:12:86:0a:34:36:dd:82:9b:6f:4f:e0:73:dd:49:7f:
+        28:3e:c9:3b:a3:57:04:d8:93:d9:3c:29:db:12:10:68:e1:c4:
+        89:b8:06:20:e7:1b:7a:bc:b1:93:61:9a:19:40:11:b5:6a:85:
+        57:01:f1:b6:5a:2d:26:73:27:96:f9:b9:3f:5b:d0:88:9d:e4:
+        a0:fd:ba:4e:95:09:83:7f:77:dc:51:05:94:9d:20:71:76:b1:
+        ec:fa:89:b5:9c:2e:85:f1:b9:5b:24:5a:b1:09:ab:da:ca:1a:
+        07:cd:86:df:db:69:db:b4:48:18:00:2d:bc:a2:c4:89:45:23:
+        a5:0e:e1:44:65:3e:8a:c1:6a:30:1d:e2:60:f8:3a:aa:87:09:
+        42:b9:81:92:dc:25:88:98:89:f1:7c:35:f1:62:ca:ee:79:f8:
+        19:2f:fe:5f:f8:db:87:ce:ea:a8:0f:0c:a6:e8:0b:a0:3c:e0:
+        6b:94:98:9c:7f:ad:06:e6:1c:ea:42:10:5f:e2:26:15:3c:37:
+        39:f7:d7:bc:ee:b8:e5:ef:03:ee:bd:22:fb:28:86:34:58:c4:
+        5a:7f:61:a2:78:0f:5e:f3:ca:9d:bc:1b:3c:a7:c8:2d:f6:a7:
+        22:11:ca:03:d8:e7:67:0a:8a:0e:cb:35:8e:34:39:d8:c8:ea:
+        8d:9f:64:e0:37:b0:6c:d7:c5:8f:c1:90:61:26:db:24:8c:1e:
+        4a:c0:88:df:35:90:ce:3f:02:f4:64:61:de:c7:c8:07:95:de:
+        32:18:3a:8f:a2:42:40:24:e5:d6:33:5d:7c:ae:ef:b1:4d:4f:
+        d4:57:90:35:6a:dc:ae:04:97:49:89:34:97:2e:30:04:e7:98:
+        f7:db:0b:01:90:c1:1f:0a:3f:f8:c2:fe:4e:fa:db:9a:73:73:
+        16:bc:05:b8:79:d8:59:af:06:e7:3f:67:38:39:b1:7c:ab:94:
+        e0:29:14:a6:28:f2:df:6d:e2:9a:db:54:43:f8:47:58:a3:5d:
+        74:15:9c:c1:ab:b0:c7:34
+SHA1 Fingerprint=A5:46:50:C5:62:EA:95:9A:1A:A7:04:6F:17:58:C7:29:53:3D:03:FA
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIUHBjYz+VTPyI1RlNUJDxsR9FcSpwwDQYJKoZIhvcNAQEM
+BQAwWDELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xIjAgBgNVBAMTGVRydXN0QXNpYSBUTFMgUlNBIFJvb3QgQ0EwHhcN
+MjQwNTE1MDU0MTU3WhcNNDQwNTE1MDU0MTU2WjBYMQswCQYDVQQGEwJDTjElMCMG
+A1UEChMcVHJ1c3RBc2lhIFRlY2hub2xvZ2llcywgSW5jLjEiMCAGA1UEAxMZVHJ1
+c3RBc2lhIFRMUyBSU0EgUm9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAMMWuBtqpERz5dZO9LnPWwvB0ZqB9WOwj0PBuwhaGnrhB3YmH49pVr7+
+NmDQDIPNlOrnxS1cLwUWAp4KqC/lYCZUlviYQB2srp10Zy9U+5RjmOMmSoPGlbYJ
+Q1DNDX3eRA5gEk9bNb2/mThtfWza4mhzH/kxpRkQcwUqwzIZheo0qt1CHjCNP561
+HmHVb70AcnKtEj+qpklz8oYVlQwQX1Fkzv93uMltrOXVmPGZLmzjyUT5tUMnCE32
+ft5EebuyjBza00tsLtbDeLdM1aTk2tyKjg7/D8OmYCYozza/+lcK7Fs/6TAWe8Tb
+xNRkoDD75f0dcZLdKY9BWN4ArTr9PXwaqLEX8E40eFgl1oUh63kd0Nyrz2I8sMeX
+i9bQn9P+PN7F4/w6g3CEIR0JwqH8uyghZVNgepBtljhb//HXeltt08lwSUq6HTrQ
+UNoyIBnkiz/r1RYmNzz7dZ6wB3C4FGB33PYPXFIKvF1tjVEK2sUYyJtt3LCDs3+j
+TnhMmCWr8n4uIF6CFabW2I+s5c0yhsj55NqJ4js+k8UTav/H9xj8Z7XvGCxUq0DT
+bE3txci3OE9kxJRMT6DNrqXGJyV1J23G2pyOsAWZ1SgRxSHUuPzHlqtKZFlhaxP8
+S8ySpg+kUb8OWJDZgoM5pl+z+m6Ss80zDoWo8SnTq1mt1tve1CuBAgMBAAGjQjBA
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFLgHkXlcBvRG/XtZylomkadFK/hT
+MA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQwFAAOCAgEAIZtqBSBdGBanEqT3
+Rz/NyjuujsCCztxIJXgXbODgcMTWltnZ9r96nBO7U5WS/8+S4PPFJzVXqDuiGev4
+iqME3mmL5Dw8veWv0BIb5Ylrc5tvJQJLkIKvQMKtuppgJFqBTQUYo+IzeXoLH5Pt
+7DlK9RME7I10nYEKqG/odv6LTytpEoYKNDbdgptvT+Bz3Ul/KD7JO6NXBNiT2Twp
+2xIQaOHEibgGIOcberyxk2GaGUARtWqFVwHxtlotJnMnlvm5P1vQiJ3koP26TpUJ
+g3933FEFlJ0gcXax7PqJtZwuhfG5WyRasQmr2soaB82G39tp27RIGAAtvKLEiUUj
+pQ7hRGU+isFqMB3iYPg6qocJQrmBktwliJiJ8Xw18WLK7nn4GS/+X/jbh87qqA8M
+pugLoDzga5SYnH+tBuYc6kIQX+ImFTw3OffXvO645e8D7r0i+yiGNFjEWn9hongP
+XvPKnbwbPKfILfanIhHKA9jnZwqKDss1jjQ52MjqjZ9k4DewbNfFj8GQYSbbJIwe
+SsCI3zWQzj8C9GRh3sfIB5XeMhg6j6JCQCTl1jNdfK7vsU1P1FeQNWrcrgSXSYk0
+ly4wBOeY99sLAZDBHwo/+ML+TvrbmnNzFrwFuHnYWa8G5z9nODmxfKuU4CkUpijy
+323imttUQ/hHWKNddBWcwauwxzQ=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem b/secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem
deleted file mode 100644
index 343e8bc6d2c0..000000000000
--- a/secure/caroot/trusted/Trustwave_Global_Certification_Authority.pem
+++ /dev/null
@@ -1,134 +0,0 @@
-##
-##  Trustwave Global Certification Authority
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            05:f7:0e:86:da:49:f3:46:35:2e:ba:b2
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, ST=Illinois, L=Chicago, O=Trustwave Holdings, Inc., CN=Trustwave Global Certification Authority
-        Validity
-            Not Before: Aug 23 19:34:12 2017 GMT
-            Not After : Aug 23 19:34:12 2042 GMT
-        Subject: C=US, ST=Illinois, L=Chicago, O=Trustwave Holdings, Inc., CN=Trustwave Global Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:b9:5d:51:28:4b:3c:37:92:d1:82:ce:bd:1d:bd:
-                    cd:dd:b8:ab:cf:0a:3e:e1:5d:e5:dc:aa:09:b9:57:
-                    02:3e:e6:63:61:df:f2:0f:82:63:ae:a3:f7:ac:73:
-                    d1:7c:e7:b3:0b:af:08:00:09:59:7f:cd:29:2a:88:
-                    93:87:17:18:80:ed:88:b2:b4:b6:10:1f:2d:d6:5f:
-                    55:a2:13:5d:d1:c6:eb:06:56:89:88:fe:ac:32:9d:
-                    fd:5c:c3:05:c7:6e:ee:86:89:ba:88:03:9d:72:21:
-                    86:90:ae:8f:03:a5:dc:9f:88:28:cb:a3:92:49:0f:
-                    ec:d0:0f:e2:6d:44:4f:80:6a:b2:d4:e7:a0:0a:53:
-                    01:ba:8e:97:91:76:6e:bc:fc:d5:6b:36:e6:40:88:
-                    d6:7b:2f:5f:05:e8:2c:6d:11:f3:e7:b2:be:92:44:
-                    4c:d2:97:a4:fe:d2:72:81:43:07:9c:e9:11:3e:f5:
-                    8b:1a:59:7d:1f:68:58:dd:04:00:2c:96:f3:43:b3:
-                    7e:98:19:74:d9:9c:73:d9:18:be:41:c7:34:79:d9:
-                    f4:62:c2:43:b9:b3:27:b0:22:cb:f9:3d:52:c7:30:
-                    47:b3:c9:3e:b8:6a:e2:e7:e8:81:70:5e:42:8b:4f:
-                    26:a5:fe:3a:c2:20:6e:bb:f8:16:8e:cd:0c:a9:b4:
-                    1b:6c:76:10:e1:58:79:46:3e:54:ce:80:a8:57:09:
-                    37:29:1b:99:13:8f:0c:c8:d6:2c:1c:fb:05:e8:08:
-                    95:3d:65:46:dc:ee:cd:69:e2:4d:8f:87:28:4e:34:
-                    0b:3e:cf:14:d9:bb:dd:b6:50:9a:ad:77:d4:19:d6:
-                    da:1a:88:c8:4e:1b:27:75:d8:b2:08:f1:ae:83:30:
-                    b9:11:0e:cd:87:f0:84:8d:15:72:7c:a1:ef:cc:f2:
-                    88:61:ba:f4:69:bb:0c:8c:0b:75:57:04:b8:4e:2a:
-                    14:2e:3d:0f:1c:1e:32:a6:62:36:ee:66:e2:22:b8:
-                    05:40:63:10:22:f3:33:1d:74:72:8a:2c:f5:39:29:
-                    a0:d3:e7:1b:80:84:2d:c5:3d:e3:4d:b1:fd:1a:6f:
-                    ba:65:07:3b:58:ec:42:45:26:fb:d8:da:25:72:c4:
-                    f6:00:b1:22:79:bd:e3:7c:59:62:4a:9c:05:6f:3d:
-                    ce:e6:d6:47:63:99:c6:24:6f:72:12:c8:ac:7f:90:
-                    b4:0b:91:70:e8:b7:e6:16:10:71:17:ce:de:06:4f:
-                    48:41:7d:35:4a:a3:89:f2:c9:4b:7b:41:11:6d:67:
-                    b7:08:98:4c:e5:11:19:ae:42:80:dc:fb:90:05:d4:
-                    f8:50:ca:be:e4:ad:c7:c2:94:d7:16:9d:e6:17:8f:
-                    af:36:fb
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                99:E0:19:67:0D:62:DB:76:B3:DA:3D:B8:5B:E8:FD:42:D2:31:0E:87
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        98:73:70:e2:b0:d3:ed:39:ec:4c:60:d9:a9:12:86:17:1e:96:
-        d0:e8:54:28:3b:64:2d:21:a6:f8:9d:56:13:6a:48:3d:4f:c7:
-        3e:29:db:6d:58:83:54:3d:87:7d:23:05:d4:e4:1c:dc:e8:38:
-        65:86:c5:75:a7:5a:db:35:05:bd:77:de:bb:29:37:40:05:07:
-        c3:94:52:9f:ca:64:dd:f1:1b:2b:dc:46:0a:10:02:31:fd:4a:
-        68:0d:07:64:90:e6:1e:f5:2a:a1:a8:bb:3c:5d:f9:a3:08:0b:
-        11:0c:f1:3f:2d:10:94:6f:fe:e2:34:87:83:d6:cf:e5:1b:35:
-        6d:d2:03:e1:b0:0d:a8:a0:aa:46:27:82:36:a7:15:b6:08:a6:
-        42:54:57:b6:99:5a:e2:0b:79:90:d7:57:12:51:35:19:88:41:
-        68:25:d4:37:17:84:15:fb:01:72:dc:95:de:52:26:20:98:26:
-        e2:76:f5:27:6f:fa:00:3b:4a:61:d9:0d:cb:51:93:2a:fd:16:
-        06:96:a7:23:9a:23:48:fe:51:bd:b6:c4:b0:b1:54:ce:de:6c:
-        41:ad:16:67:7e:db:fd:38:cd:b9:38:4e:b2:c1:60:cb:9d:17:
-        df:58:9e:7a:62:b2:26:8f:74:95:9b:e4:5b:1d:d2:0f:dd:98:
-        1c:9b:59:b9:23:d3:31:a0:a6:ff:38:dd:cf:20:4f:e9:58:56:
-        3a:67:c3:d1:f6:99:99:9d:ba:36:b6:80:2f:88:47:4f:86:bf:
-        44:3a:80:e4:37:1c:a6:ba:ea:97:98:11:d0:84:62:47:64:1e:
-        aa:ee:40:bf:34:b1:9c:8f:4e:e1:f2:92:4f:1f:8e:f3:9e:97:
-        de:f3:a6:79:6a:89:71:4f:4b:27:17:48:fe:ec:f4:50:0f:4f:
-        49:7d:cc:45:e3:bd:7a:40:c5:41:dc:61:56:27:06:69:e5:72:
-        41:81:d3:b6:01:89:a0:2f:3a:72:79:fe:3a:30:bf:41:ec:c7:
-        62:3e:91:4b:c7:d9:31:76:42:f9:f7:3c:63:ec:26:8c:73:0c:
-        7d:1a:1d:ea:a8:7c:87:a8:c2:27:7c:e1:33:41:0f:cf:cf:fc:
-        00:a0:22:80:9e:4a:a7:6f:00:b0:41:45:b7:22:ca:68:48:c5:
-        42:a2:ae:dd:1d:f2:e0:6e:4e:05:58:b1:c0:90:16:2a:a4:3d:
-        10:40:be:8f:62:63:83:a9:9c:82:7d:2d:02:e9:83:30:7c:cb:
-        27:c9:fd:1e:66:00:b0:2e:d3:21:2f:8e:33:16:6c:98:ed:10:
-        a8:07:d6:cc:93:cf:db:d1:69:1c:e4:ca:c9:e0:b6:9c:e9:ce:
-        71:71:de:6c:3f:16:a4:79
-SHA1 Fingerprint=2F:8F:36:4F:E1:58:97:44:21:59:87:A5:2A:9A:D0:69:95:26:7F:B5
------BEGIN CERTIFICATE-----
-MIIF2jCCA8KgAwIBAgIMBfcOhtpJ80Y1LrqyMA0GCSqGSIb3DQEBCwUAMIGIMQsw
-CQYDVQQGEwJVUzERMA8GA1UECAwISWxsaW5vaXMxEDAOBgNVBAcMB0NoaWNhZ28x
-ITAfBgNVBAoMGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjExMC8GA1UEAwwoVHJ1
-c3R3YXZlIEdsb2JhbCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0xNzA4MjMx
-OTM0MTJaFw00MjA4MjMxOTM0MTJaMIGIMQswCQYDVQQGEwJVUzERMA8GA1UECAwI
-SWxsaW5vaXMxEDAOBgNVBAcMB0NoaWNhZ28xITAfBgNVBAoMGFRydXN0d2F2ZSBI
-b2xkaW5ncywgSW5jLjExMC8GA1UEAwwoVHJ1c3R3YXZlIEdsb2JhbCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-ALldUShLPDeS0YLOvR29zd24q88KPuFd5dyqCblXAj7mY2Hf8g+CY66j96xz0Xzn
-swuvCAAJWX/NKSqIk4cXGIDtiLK0thAfLdZfVaITXdHG6wZWiYj+rDKd/VzDBcdu
-7oaJuogDnXIhhpCujwOl3J+IKMujkkkP7NAP4m1ET4BqstTnoApTAbqOl5F2brz8
-1Ws25kCI1nsvXwXoLG0R8+eyvpJETNKXpP7ScoFDB5zpET71ixpZfR9oWN0EACyW
-80OzfpgZdNmcc9kYvkHHNHnZ9GLCQ7mzJ7Aiy/k9UscwR7PJPrhq4ufogXBeQotP
-JqX+OsIgbrv4Fo7NDKm0G2x2EOFYeUY+VM6AqFcJNykbmROPDMjWLBz7BegIlT1l
-RtzuzWniTY+HKE40Cz7PFNm73bZQmq131BnW2hqIyE4bJ3XYsgjxroMwuREOzYfw
-hI0Vcnyh78zyiGG69Gm7DIwLdVcEuE4qFC49DxweMqZiNu5m4iK4BUBjECLzMx10
-coos9TkpoNPnG4CELcU9402x/RpvumUHO1jsQkUm+9jaJXLE9gCxInm943xZYkqc
-BW89zubWR2OZxiRvchLIrH+QtAuRcOi35hYQcRfO3gZPSEF9NUqjifLJS3tBEW1n
-twiYTOURGa5CgNz7kAXU+FDKvuStx8KU1xad5hePrzb7AgMBAAGjQjBAMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFJngGWcNYtt2s9o9uFvo/ULSMQ6HMA4GA1Ud
-DwEB/wQEAwIBBjANBgkqhkiG9w0BAQsFAAOCAgEAmHNw4rDT7TnsTGDZqRKGFx6W
-0OhUKDtkLSGm+J1WE2pIPU/HPinbbViDVD2HfSMF1OQc3Og4ZYbFdada2zUFvXfe
-uyk3QAUHw5RSn8pk3fEbK9xGChACMf1KaA0HZJDmHvUqoai7PF35owgLEQzxPy0Q
-lG/+4jSHg9bP5Rs1bdID4bANqKCqRieCNqcVtgimQlRXtpla4gt5kNdXElE1GYhB
-aCXUNxeEFfsBctyV3lImIJgm4nb1J2/6ADtKYdkNy1GTKv0WBpanI5ojSP5RvbbE
-sLFUzt5sQa0WZ37b/TjNuThOssFgy50X31ieemKyJo90lZvkWx3SD92YHJtZuSPT
-MaCm/zjdzyBP6VhWOmfD0faZmZ26NraAL4hHT4a/RDqA5Dccprrql5gR0IRiR2Qe
-qu5AvzSxnI9O4fKSTx+O856X3vOmeWqJcU9LJxdI/uz0UA9PSX3MReO9ekDFQdxh
-VicGaeVyQYHTtgGJoC86cnn+OjC/QezHYj6RS8fZMXZC+fc8Y+wmjHMMfRod6qh8
-h6jCJ3zhM0EPz8/8AKAigJ5Kp28AsEFFtyLKaEjFQqKu3R3y4G5OBVixwJAWKqQ9
-EEC+j2Jjg6mcgn0tAumDMHzLJ8n9HmYAsC7TIS+OMxZsmO0QqAfWzJPP29FpHOTK
-yeC2nOnOcXHebD8WpHk=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem b/secure/caroot/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem
deleted file mode 100644
index 89103d2eb407..000000000000
--- a/secure/caroot/trusted/Trustwave_Global_ECC_P256_Certification_Authority.pem
+++ /dev/null
@@ -1,61 +0,0 @@
-##
-##  Trustwave Global ECC P256 Certification Authority
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            0d:6a:5f:08:3f:28:5c:3e:51:95:df:5d
-        Signature Algorithm: ecdsa-with-SHA256
-        Issuer: C=US, ST=Illinois, L=Chicago, O=Trustwave Holdings, Inc., CN=Trustwave Global ECC P256 Certification Authority
-        Validity
-            Not Before: Aug 23 19:35:10 2017 GMT
-            Not After : Aug 23 19:35:10 2042 GMT
-        Subject: C=US, ST=Illinois, L=Chicago, O=Trustwave Holdings, Inc., CN=Trustwave Global ECC P256 Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (256 bit)
-                pub:
-                    04:7e:fb:6c:e6:23:e3:73:32:08:ca:60:e6:53:9c:
-                    ba:74:8d:18:b0:78:90:52:80:dd:38:c0:4a:1d:d1:
-                    a8:cc:93:a4:97:06:38:ca:0d:15:62:c6:8e:01:2a:
-                    65:9d:aa:df:34:91:2e:81:c1:e4:33:92:31:c4:fd:
-                    09:3a:a6:3f:ad
-                ASN1 OID: prime256v1
-                NIST CURVE: P-256
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                A3:41:06:AC:90:6D:D1:4A:EB:75:A5:4A:10:99:B3:B1:A1:8B:4A:F7
-    Signature Algorithm: ecdsa-with-SHA256
-    Signature Value:
-        30:44:02:20:07:e6:54:da:0e:a0:5a:b2:ae:11:9f:87:c5:b6:
-        ff:69:de:25:be:f8:a0:b7:08:f3:44:ce:2a:df:08:21:0c:37:
-        02:20:2d:26:03:a0:05:bd:6b:d1:f6:5c:f8:65:cc:86:6d:b3:
-        9c:34:48:63:84:09:c5:8d:77:1a:e2:cc:9c:e1:74:7b
-SHA1 Fingerprint=B4:90:82:DD:45:0C:BE:8B:5B:B1:66:D3:E2:A4:08:26:CD:ED:42:CF
------BEGIN CERTIFICATE-----
-MIICYDCCAgegAwIBAgIMDWpfCD8oXD5Rld9dMAoGCCqGSM49BAMCMIGRMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAf
-BgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3
-YXZlIEdsb2JhbCBFQ0MgUDI1NiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0x
-NzA4MjMxOTM1MTBaFw00MjA4MjMxOTM1MTBaMIGRMQswCQYDVQQGEwJVUzERMA8G
-A1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0
-d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBF
-Q0MgUDI1NiBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTBZMBMGByqGSM49AgEGCCqG
-SM49AwEHA0IABH77bOYj43MyCMpg5lOcunSNGLB4kFKA3TjASh3RqMyTpJcGOMoN
-FWLGjgEqZZ2q3zSRLoHB5DOSMcT9CTqmP62jQzBBMA8GA1UdEwEB/wQFMAMBAf8w
-DwYDVR0PAQH/BAUDAwcGADAdBgNVHQ4EFgQUo0EGrJBt0UrrdaVKEJmzsaGLSvcw
-CgYIKoZIzj0EAwIDRwAwRAIgB+ZU2g6gWrKuEZ+Hxbb/ad4lvvigtwjzRM4q3wgh
-DDcCIC0mA6AFvWvR9lz4ZcyGbbOcNEhjhAnFjXca4syc4XR7
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem b/secure/caroot/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem
deleted file mode 100644
index ef04699d3e57..000000000000
--- a/secure/caroot/trusted/Trustwave_Global_ECC_P384_Certification_Authority.pem
+++ /dev/null
@@ -1,67 +0,0 @@
-##
-##  Trustwave Global ECC P384 Certification Authority
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            08:bd:85:97:6c:99:27:a4:80:68:47:3b
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, ST=Illinois, L=Chicago, O=Trustwave Holdings, Inc., CN=Trustwave Global ECC P384 Certification Authority
-        Validity
-            Not Before: Aug 23 19:36:43 2017 GMT
-            Not After : Aug 23 19:36:43 2042 GMT
-        Subject: C=US, ST=Illinois, L=Chicago, O=Trustwave Holdings, Inc., CN=Trustwave Global ECC P384 Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:6b:da:0d:75:35:08:31:47:05:ae:45:99:55:f1:
-                    11:13:2e:4a:f8:10:31:23:a3:7e:83:d3:7f:28:08:
-                    3a:26:1a:3a:cf:97:82:1f:80:b7:27:09:8f:d1:8e:
-                    30:c4:0a:9b:0e:ac:58:04:ab:f7:36:7d:94:23:a4:
-                    9b:0a:8a:8b:ab:eb:fd:39:25:66:f1:5e:fe:8c:ae:
-                    8d:41:79:9d:09:60:ce:28:a9:d3:8a:6d:f3:d6:45:
-                    d4:f2:98:84:38:65:a0
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                55:A9:84:89:D2:C1:32:BD:18:CB:6C:A6:07:4E:C8:E7:9D:BE:82:90
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:64:02:30:37:01:92:97:45:12:7e:a0:f3:3e:ad:19:3a:72:
-        dd:f4:50:93:03:12:be:44:d2:4f:41:a4:8c:9c:9d:1f:a3:f6:
-        c2:92:e7:48:14:fe:4e:9b:a5:91:57:ae:c6:37:72:bb:02:30:
-        67:25:0a:b1:0c:5e:ee:a9:63:92:6f:e5:90:0b:fe:66:22:ca:
-        47:fd:8a:31:f7:83:fe:7a:bf:10:be:18:2b:1e:8f:f6:29:1e:
-        94:59:ef:8e:21:37:cb:51:98:a5:6e:4b
-SHA1 Fingerprint=E7:F3:A3:C8:CF:6F:C3:04:2E:6D:0E:67:32:C5:9E:68:95:0D:5E:D2
------BEGIN CERTIFICATE-----
-MIICnTCCAiSgAwIBAgIMCL2Fl2yZJ6SAaEc7MAoGCCqGSM49BAMDMIGRMQswCQYD
-VQQGEwJVUzERMA8GA1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAf
-BgNVBAoTGFRydXN0d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3
-YXZlIEdsb2JhbCBFQ0MgUDM4NCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0x
-NzA4MjMxOTM2NDNaFw00MjA4MjMxOTM2NDNaMIGRMQswCQYDVQQGEwJVUzERMA8G
-A1UECBMISWxsaW5vaXMxEDAOBgNVBAcTB0NoaWNhZ28xITAfBgNVBAoTGFRydXN0
-d2F2ZSBIb2xkaW5ncywgSW5jLjE6MDgGA1UEAxMxVHJ1c3R3YXZlIEdsb2JhbCBF
-Q0MgUDM4NCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTB2MBAGByqGSM49AgEGBSuB
-BAAiA2IABGvaDXU1CDFHBa5FmVXxERMuSvgQMSOjfoPTfygIOiYaOs+Xgh+AtycJ
-j9GOMMQKmw6sWASr9zZ9lCOkmwqKi6vr/TklZvFe/oyujUF5nQlgziip04pt89ZF
-1PKYhDhloKNDMEEwDwYDVR0TAQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwYAMB0G
-A1UdDgQWBBRVqYSJ0sEyvRjLbKYHTsjnnb6CkDAKBggqhkjOPQQDAwNnADBkAjA3
-AZKXRRJ+oPM+rRk6ct30UJMDEr5E0k9BpIycnR+j9sKS50gU/k6bpZFXrsY3crsC
-MGclCrEMXu6pY5Jv5ZAL/mYiykf9ijH3g/56vxC+GCsej/YpHpRZ744hN8tRmKVu
-Sw==
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/XRamp_Global_CA_Root.pem b/secure/caroot/trusted/XRamp_Global_CA_Root.pem
deleted file mode 100644
index dd38e2859c60..000000000000
--- a/secure/caroot/trusted/XRamp_Global_CA_Root.pem
+++ /dev/null
@@ -1,102 +0,0 @@
-##
-##  XRamp Global CA Root
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            50:94:6c:ec:18:ea:d5:9c:4d:d5:97:ef:75:8f:a0:ad
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, OU=www.xrampsecurity.com, O=XRamp Security Services Inc, CN=XRamp Global Certification Authority
-        Validity
-            Not Before: Nov  1 17:14:04 2004 GMT
-            Not After : Jan  1 05:37:19 2035 GMT
-        Subject: C=US, OU=www.xrampsecurity.com, O=XRamp Security Services Inc, CN=XRamp Global Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:98:24:1e:bd:15:b4:ba:df:c7:8c:a5:27:b6:38:
-                    0b:69:f3:b6:4e:a8:2c:2e:21:1d:5c:44:df:21:5d:
-                    7e:23:74:fe:5e:7e:b4:4a:b7:a6:ad:1f:ae:e0:06:
-                    16:e2:9b:5b:d9:67:74:6b:5d:80:8f:29:9d:86:1b:
-                    d9:9c:0d:98:6d:76:10:28:58:e4:65:b0:7f:4a:98:
-                    79:9f:e0:c3:31:7e:80:2b:b5:8c:c0:40:3b:11:86:
-                    d0:cb:a2:86:36:60:a4:d5:30:82:6d:d9:6e:d0:0f:
-                    12:04:33:97:5f:4f:61:5a:f0:e4:f9:91:ab:e7:1d:
-                    3b:bc:e8:cf:f4:6b:2d:34:7c:e2:48:61:1c:8e:f3:
-                    61:44:cc:6f:a0:4a:a9:94:b0:4d:da:e7:a9:34:7a:
-                    72:38:a8:41:cc:3c:94:11:7d:eb:c8:a6:8c:b7:86:
-                    cb:ca:33:3b:d9:3d:37:8b:fb:7a:3e:86:2c:e7:73:
-                    d7:0a:57:ac:64:9b:19:eb:f4:0f:04:08:8a:ac:03:
-                    17:19:64:f4:5a:25:22:8d:34:2c:b2:f6:68:1d:12:
-                    6d:d3:8a:1e:14:da:c4:8f:a6:e2:23:85:d5:7a:0d:
-                    bd:6a:e0:e9:ec:ec:17:bb:42:1b:67:aa:25:ed:45:
-                    83:21:fc:c1:c9:7c:d5:62:3e:fa:f2:c5:2d:d3:fd:
-                    d4:65
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            1.3.6.1.4.1.311.20.2: 
-                ...C.A
-            X509v3 Key Usage: 
-                Digital Signature, Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                C6:4F:A2:3D:06:63:84:09:9C:CE:62:E4:04:AC:8D:5C:B5:E9:B6:1B
-            X509v3 CRL Distribution Points: 
-                Full Name:
-                  URI:http://crl.xrampsecurity.com/XGCA.crl
-
-            1.3.6.1.4.1.311.21.1: 
-                ...
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        91:15:39:03:01:1b:67:fb:4a:1c:f9:0a:60:5b:a1:da:4d:97:
-        62:f9:24:53:27:d7:82:64:4e:90:2e:c3:49:1b:2b:9a:dc:fc:
-        a8:78:67:35:f1:1d:f0:11:bd:b7:48:e3:10:f6:0d:df:3f:d2:
-        c9:b6:aa:55:a4:48:ba:02:db:de:59:2e:15:5b:3b:9d:16:7d:
-        47:d7:37:ea:5f:4d:76:12:36:bb:1f:d7:a1:81:04:46:20:a3:
-        2c:6d:a9:9e:01:7e:3f:29:ce:00:93:df:fd:c9:92:73:89:89:
-        64:9e:e7:2b:e4:1c:91:2c:d2:b9:ce:7d:ce:6f:31:99:d3:e6:
-        be:d2:1e:90:f0:09:14:79:5c:23:ab:4d:d2:da:21:1f:4d:99:
-        79:9d:e1:cf:27:9f:10:9b:1c:88:0d:b0:8a:64:41:31:b8:0e:
-        6c:90:24:a4:9b:5c:71:8f:ba:bb:7e:1c:1b:db:6a:80:0f:21:
-        bc:e9:db:a6:b7:40:f4:b2:8b:a9:b1:e4:ef:9a:1a:d0:3d:69:
-        99:ee:a8:28:a3:e1:3c:b3:f0:b2:11:9c:cf:7c:40:e6:dd:e7:
-        43:7d:a2:d8:3a:b5:a9:8d:f2:34:99:c4:d4:10:e1:06:fd:09:
-        84:10:3b:ee:c4:4c:f4:ec:27:7c:42:c2:74:7c:82:8a:09:c9:
-        b4:03:25:bc
-SHA1 Fingerprint=B8:01:86:D1:EB:9C:86:A5:41:04:CF:30:54:F3:4C:52:B7:E5:58:C6
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIQUJRs7Bjq1ZxN1ZfvdY+grTANBgkqhkiG9w0BAQUFADCB
-gjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3dy54cmFtcHNlY3VyaXR5LmNvbTEk
-MCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2VydmljZXMgSW5jMS0wKwYDVQQDEyRY
-UmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDQxMTAxMTcx
-NDA0WhcNMzUwMTAxMDUzNzE5WjCBgjELMAkGA1UEBhMCVVMxHjAcBgNVBAsTFXd3
-dy54cmFtcHNlY3VyaXR5LmNvbTEkMCIGA1UEChMbWFJhbXAgU2VjdXJpdHkgU2Vy
-dmljZXMgSW5jMS0wKwYDVQQDEyRYUmFtcCBHbG9iYWwgQ2VydGlmaWNhdGlvbiBB
-dXRob3JpdHkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCYJB69FbS6
-38eMpSe2OAtp87ZOqCwuIR1cRN8hXX4jdP5efrRKt6atH67gBhbim1vZZ3RrXYCP
-KZ2GG9mcDZhtdhAoWORlsH9KmHmf4MMxfoArtYzAQDsRhtDLooY2YKTVMIJt2W7Q
-DxIEM5dfT2Fa8OT5kavnHTu86M/0ay00fOJIYRyO82FEzG+gSqmUsE3a56k0enI4
-qEHMPJQRfevIpoy3hsvKMzvZPTeL+3o+hiznc9cKV6xkmxnr9A8ECIqsAxcZZPRa
-JSKNNCyy9mgdEm3Tih4U2sSPpuIjhdV6Db1q4Ons7Be7QhtnqiXtRYMh/MHJfNVi
-PvryxS3T/dRlAgMBAAGjgZ8wgZwwEwYJKwYBBAGCNxQCBAYeBABDAEEwCwYDVR0P
-BAQDAgGGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFMZPoj0GY4QJnM5i5ASs
-jVy16bYbMDYGA1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jcmwueHJhbXBzZWN1cml0
-eS5jb20vWEdDQS5jcmwwEAYJKwYBBAGCNxUBBAMCAQEwDQYJKoZIhvcNAQEFBQAD
-ggEBAJEVOQMBG2f7Shz5CmBbodpNl2L5JFMn14JkTpAuw0kbK5rc/Kh4ZzXxHfAR
-vbdI4xD2Dd8/0sm2qlWkSLoC295ZLhVbO50WfUfXN+pfTXYSNrsf16GBBEYgoyxt
-qZ4Bfj8pzgCT3/3JknOJiWSe5yvkHJEs0rnOfc5vMZnT5r7SHpDwCRR5XCOrTdLa
-IR9NmXmd4c8nnxCbHIgNsIpkQTG4DmyQJKSbXHGPurt+HBvbaoAPIbzp26a3QPSy
-i6mx5O+aGtA9aZnuqCij4Tyz8LIRnM98QObd50N9otg6tamN8jSZxNQQ4Qb9CYQQ
-O+7ETPTsJ3xCwnR8gooJybQDJbw=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/certSIGN_ROOT_CA.pem b/secure/caroot/trusted/certSIGN_ROOT_CA.pem
deleted file mode 100644
index e71995aae279..000000000000
--- a/secure/caroot/trusted/certSIGN_ROOT_CA.pem
+++ /dev/null
@@ -1,88 +0,0 @@
-##
-##  certSIGN ROOT CA
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 35210227249154 (0x200605167002)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=RO, O=certSIGN, OU=certSIGN ROOT CA
-        Validity
-            Not Before: Jul  4 17:20:04 2006 GMT
-            Not After : Jul  4 17:20:04 2031 GMT
-        Subject: C=RO, O=certSIGN, OU=certSIGN ROOT CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b7:33:b9:7e:c8:25:4a:8e:b5:db:b4:28:1b:aa:
-                    57:90:e8:d1:22:d3:64:ba:d3:93:e8:d4:ac:86:61:
-                    40:6a:60:57:68:54:84:4d:bc:6a:54:02:05:ff:df:
-                    9b:9a:2a:ae:5d:07:8f:4a:c3:28:7f:ef:fb:2b:fa:
-                    79:f1:c7:ad:f0:10:53:24:90:8b:66:c9:a8:88:ab:
-                    af:5a:a3:00:e9:be:ba:46:ee:5b:73:7b:2c:17:82:
-                    81:5e:62:2c:a1:02:65:b3:bd:c5:2b:00:7e:c4:fc:
-                    03:33:57:0d:ed:e2:fa:ce:5d:45:d6:38:cd:35:b6:
-                    b2:c1:d0:9c:81:4a:aa:e4:b2:01:5c:1d:8f:5f:99:
-                    c4:b1:ad:db:88:21:eb:90:08:82:80:f3:30:a3:43:
-                    e6:90:82:ae:55:28:49:ed:5b:d7:a9:10:38:0e:fe:
-                    8f:4c:5b:9b:46:ea:41:f5:b0:08:74:c3:d0:88:33:
-                    b6:7c:d7:74:df:dc:84:d1:43:0e:75:39:a1:25:40:
-                    28:ea:78:cb:0e:2c:2e:39:9d:8c:8b:6e:16:1c:2f:
-                    26:82:10:e2:e3:65:94:0a:04:c0:5e:f7:5d:5b:f8:
-                    10:e2:d0:ba:7a:4b:fb:de:37:00:00:1a:5b:28:e3:
-                    d2:9c:73:3e:32:87:98:a1:c9:51:2f:d7:de:ac:33:
-                    b3:4f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Digital Signature, Non Repudiation, Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                E0:8C:9B:DB:25:49:B3:F1:7C:86:D6:B2:42:87:0B:D0:6B:A0:D9:E4
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        3e:d2:1c:89:2e:35:fc:f8:75:dd:e6:7f:65:88:f4:72:4c:c9:
-        2c:d7:32:4e:f3:dd:19:79:47:bd:8e:3b:5b:93:0f:50:49:24:
-        13:6b:14:06:72:ef:09:d3:a1:a1:e3:40:84:c9:e7:18:32:74:
-        3c:48:6e:0f:9f:4b:d4:f7:1e:d3:93:86:64:54:97:63:72:50:
-        d5:55:cf:fa:20:93:02:a2:9b:c3:23:93:4e:16:55:76:a0:70:
-        79:6d:cd:21:1f:cf:2f:2d:bc:19:e3:88:31:f8:59:1a:81:09:
-        c8:97:a6:74:c7:60:c4:5b:cc:57:8e:b2:75:fd:1b:02:09:db:
-        59:6f:72:93:69:f7:31:41:d6:88:38:bf:87:b2:bd:16:79:f9:
-        aa:e4:be:88:25:dd:61:27:23:1c:b5:31:07:04:36:b4:1a:90:
-        bd:a0:74:71:50:89:6d:bc:14:e3:0f:86:ae:f1:ab:3e:c7:a0:
-        09:cc:a3:48:d1:e0:db:64:e7:92:b5:cf:af:72:43:70:8b:f9:
-        c3:84:3c:13:aa:7e:92:9b:57:53:93:fa:70:c2:91:0e:31:f9:
-        9b:67:5d:e9:96:38:5e:5f:b3:73:4e:88:15:67:de:9e:76:10:
-        62:20:be:55:69:95:43:00:39:4d:f6:ee:b0:5a:4e:49:44:54:
-        58:5f:42:83
-SHA1 Fingerprint=FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B
------BEGIN CERTIFICATE-----
-MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
-AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
-QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
-MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
-0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
-UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
-RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
-OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
-JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
-AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
-BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
-LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
-MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
-44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
-Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
-i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
-9u6wWk5JRFRYX0KD
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/e-Szigno_TLS_Root_CA_2023.pem b/secure/caroot/trusted/e-Szigno_TLS_Root_CA_2023.pem
new file mode 100644
index 000000000000..047be5ae8f90
--- /dev/null
+++ b/secure/caroot/trusted/e-Szigno_TLS_Root_CA_2023.pem
@@ -0,0 +1,74 @@
+##
+##  e-Szigno TLS Root CA 2023
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            e8:6f:18:7b:d6:39:6b:98:4a:49:98:0a
+        Signature Algorithm: ecdsa-with-SHA512
+        Issuer: C=HU, L=Budapest, O=Microsec Ltd., organizationIdentifier=VATHU-23584497, CN=e-Szigno TLS Root CA 2023
+        Validity
+            Not Before: Jul 17 14:00:00 2023 GMT
+            Not After : Jul 17 14:00:00 2038 GMT
+        Subject: C=HU, L=Budapest, O=Microsec Ltd., organizationIdentifier=VATHU-23584497, CN=e-Szigno TLS Root CA 2023
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (521 bit)
+                pub:
+                    04:00:68:0f:df:a2:7c:3c:aa:74:88:61:0a:8d:c2:
+                    4c:a5:01:22:14:d4:f7:60:77:42:9c:0a:38:60:a1:
+                    8c:67:3e:b3:63:e9:fa:91:b0:8b:4b:e6:39:df:02:
+                    c2:30:01:52:00:bf:df:8c:ed:59:ad:32:65:ab:09:
+                    59:50:b5:19:c2:68:1c:00:e0:05:5f:da:50:26:1c:
+                    c3:ac:04:22:c5:3a:4d:ef:e9:57:58:36:a3:c1:19:
+                    53:10:0a:d1:cd:3f:ef:4b:35:1a:43:8f:42:13:4c:
+                    b9:2c:1a:9c:be:30:b6:c4:de:dc:4b:9d:e4:a4:3c:
+                    cb:2e:d9:ad:df:df:7d:09:df:2e:92:ff:a1
+                ASN1 OID: secp521r1
+                NIST CURVE: P-521
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                59:84:02:62:5A:46:78:F5:5D:DC:8F:0A:10:28:23:DC:D5:D6:FB:45
+            X509v3 Authority Key Identifier: 
+                59:84:02:62:5A:46:78:F5:5D:DC:8F:0A:10:28:23:DC:D5:D6:FB:45
+    Signature Algorithm: ecdsa-with-SHA512
+    Signature Value:
+        30:81:87:02:42:01:2d:da:ae:f5:2e:78:b6:66:b8:9f:b6:70:
+        7f:66:74:cf:ec:8e:7c:fe:c0:01:79:9a:ce:52:02:e7:c3:d1:
+        0c:7a:6d:cb:b5:5e:ee:17:a4:9b:db:04:76:ee:29:29:e8:af:
+        fb:ad:ac:52:f4:d7:2b:d6:77:84:10:bd:c5:d2:28:68:34:02:
+        41:35:76:5a:75:f3:92:86:08:f5:b2:1e:0a:f6:65:0b:da:76:
+        c7:52:ff:0b:1e:80:70:22:30:c3:33:db:18:ed:84:d7:8b:ec:
+        ed:d3:a8:63:81:b5:56:7c:47:c7:56:30:94:68:73:6b:d2:2e:
+        a9:b9:d9:2c:1c:29:bd:0c:ba:b9:65:8b
+SHA1 Fingerprint=6F:9A:D5:D5:DF:E8:2C:EB:BE:37:07:EE:4F:4F:52:58:29:41:D1:FE
+-----BEGIN CERTIFICATE-----
+MIICzzCCAjGgAwIBAgINAOhvGHvWOWuYSkmYCjAKBggqhkjOPQQDBDB1MQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xFzAVBgNVBGEMDlZBVEhVLTIzNTg0NDk3MSIwIAYDVQQDDBllLVN6aWdubyBU
+TFMgUm9vdCBDQSAyMDIzMB4XDTIzMDcxNzE0MDAwMFoXDTM4MDcxNzE0MDAwMFow
+dTELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRYwFAYDVQQKDA1NaWNy
+b3NlYyBMdGQuMRcwFQYDVQRhDA5WQVRIVS0yMzU4NDQ5NzEiMCAGA1UEAwwZZS1T
+emlnbm8gVExTIFJvb3QgQ0EgMjAyMzCBmzAQBgcqhkjOPQIBBgUrgQQAIwOBhgAE
+AGgP36J8PKp0iGEKjcJMpQEiFNT3YHdCnAo4YKGMZz6zY+n6kbCLS+Y53wLCMAFS
+AL/fjO1ZrTJlqwlZULUZwmgcAOAFX9pQJhzDrAQixTpN7+lXWDajwRlTEArRzT/v
+SzUaQ49CE0y5LBqcvjC2xN7cS53kpDzLLtmt3999Cd8ukv+ho2MwYTAPBgNVHRMB
+Af8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUWYQCYlpGePVd3I8K
+ECgj3NXW+0UwHwYDVR0jBBgwFoAUWYQCYlpGePVd3I8KECgj3NXW+0UwCgYIKoZI
+zj0EAwQDgYsAMIGHAkIBLdqu9S54tma4n7Zwf2Z0z+yOfP7AAXmazlIC58PRDHpt
+y7Ve7hekm9sEdu4pKeiv+62sUvTXK9Z3hBC9xdIoaDQCQTV2WnXzkoYI9bIeCvZl
+C9p2x1L/Cx6AcCIwwzPbGO2E14vs7dOoY4G1VnxHx1YwlGhza9IuqbnZLBwpvQy6
+uWWL
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Atos_TrustedRoot_Root_CA_ECC_G2_2020.pem b/secure/caroot/untrusted/Atos_TrustedRoot_Root_CA_ECC_G2_2020.pem
new file mode 100644
index 000000000000..7afdd926fb82
--- /dev/null
+++ b/secure/caroot/untrusted/Atos_TrustedRoot_Root_CA_ECC_G2_2020.pem
@@ -0,0 +1,66 @@
+##
+##  Atos TrustedRoot Root CA ECC G2 2020
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            0b:73:28:11:18:74:30:1c:ef:6f:08:84
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=DE, O=Atos, CN=Atos TrustedRoot Root CA ECC G2 2020
+        Validity
+            Not Before: Dec 15 08:39:10 2020 GMT
+            Not After : Dec 10 08:39:09 2040 GMT
+        Subject: C=DE, O=Atos, CN=Atos TrustedRoot Root CA ECC G2 2020
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:c8:5c:80:ca:4e:c2:28:1f:57:bf:38:e6:61:23:
+                    fc:d0:a9:5b:96:16:16:c3:0c:5e:15:a5:90:09:ff:
+                    38:28:b4:7a:1e:0a:d6:53:2a:c1:bb:90:40:74:37:
+                    e9:81:e8:8d:2f:68:01:35:7c:52:2e:d8:f4:58:b3:
+                    11:1c:5b:d9:87:18:93:91:2d:ec:9d:da:6c:9e:6d:
+                    84:48:fc:c2:89:05:eb:98:13:02:01:6c:53:1e:0e:
+                    49:63:58:47:b1:af:c2
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                5B:1F:C4:71:6C:B2:1B:9F:BE:5C:1F:8C:FD:B3:B6:FB:B3:0E:09:87
+            X509v3 Subject Key Identifier: 
+                5B:1F:C4:71:6C:B2:1B:9F:BE:5C:1F:8C:FD:B3:B6:FB:B3:0E:09:87
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:66:02:31:00:ec:e0:99:fd:dd:e4:54:c1:cb:1f:e8:3e:28:
+        d7:15:59:4a:82:ca:53:30:ec:eb:36:a5:b9:c8:ce:93:47:56:
+        c8:61:a6:e1:6d:92:53:95:8f:f6:e3:55:53:f0:dd:7a:e7:02:
+        31:00:b0:87:d5:1b:b3:60:fc:91:8d:80:ca:a2:1b:51:4b:38:
+        54:cb:aa:1e:7b:d7:e5:44:95:16:2f:3c:44:78:2e:25:ba:ea:
+        90:e4:ec:52:ee:57:ec:03:84:f3:5e:db:16:0d
+SHA1 Fingerprint=61:25:56:DA:62:94:E5:AE:B3:3C:F8:11:BD:B1:DC:F8:A5:D8:B3:E4
+-----BEGIN CERTIFICATE-----
+MIICMTCCAbagAwIBAgIMC3MoERh0MBzvbwiEMAoGCCqGSM49BAMDMEsxCzAJBgNV
+BAYTAkRFMQ0wCwYDVQQKDARBdG9zMS0wKwYDVQQDDCRBdG9zIFRydXN0ZWRSb290
+IFJvb3QgQ0EgRUNDIEcyIDIwMjAwHhcNMjAxMjE1MDgzOTEwWhcNNDAxMjEwMDgz
+OTA5WjBLMQswCQYDVQQGEwJERTENMAsGA1UECgwEQXRvczEtMCsGA1UEAwwkQXRv
+cyBUcnVzdGVkUm9vdCBSb290IENBIEVDQyBHMiAyMDIwMHYwEAYHKoZIzj0CAQYF
+K4EEACIDYgAEyFyAyk7CKB9XvzjmYSP80KlblhYWwwxeFaWQCf84KLR6HgrWUyrB
+u5BAdDfpgeiNL2gBNXxSLtj0WLMRHFvZhxiTkS3sndpsnm2ESPzCiQXrmBMCAWxT
+Hg5JY1hHsa/Co2MwYTAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFFsfxHFs
+shufvlwfjP2ztvuzDgmHMB0GA1UdDgQWBBRbH8RxbLIbn75cH4z9s7b7sw4JhzAO
+BgNVHQ8BAf8EBAMCAYYwCgYIKoZIzj0EAwMDaQAwZgIxAOzgmf3d5FTByx/oPijX
+FVlKgspTMOzrNqW5yM6TR1bIYabhbZJTlY/241VT8N165wIxALCH1RuzYPyRjYDK
+ohtRSzhUy6oee9flRJUWLzxEeC4luuqQ5OxS7lfsA4TzXtsWDQ==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Atos_TrustedRoot_Root_CA_RSA_G2_2020.pem b/secure/caroot/untrusted/Atos_TrustedRoot_Root_CA_RSA_G2_2020.pem
new file mode 100644
index 000000000000..b7651aa21077
--- /dev/null
+++ b/secure/caroot/untrusted/Atos_TrustedRoot_Root_CA_RSA_G2_2020.pem
@@ -0,0 +1,134 @@
+##
+##  Atos TrustedRoot Root CA RSA G2 2020
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            47:ba:29:46:55:3e:16:92:97:b0:ab:40
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=DE, O=Atos, CN=Atos TrustedRoot Root CA RSA G2 2020
+        Validity
+            Not Before: Dec 15 08:41:23 2020 GMT
+            Not After : Dec 10 08:41:22 2040 GMT
+        Subject: C=DE, O=Atos, CN=Atos TrustedRoot Root CA RSA G2 2020
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:96:31:85:4a:aa:0f:32:fe:79:e1:43:87:9c:fb:
+                    23:b7:8e:7f:0d:54:bd:c7:62:93:77:e4:1c:35:04:
+                    76:a3:03:8b:22:ee:c4:84:dd:a5:93:6e:6e:b2:8e:
+                    09:03:eb:51:16:31:17:aa:69:15:18:0e:67:74:23:
+                    5e:ea:9a:7d:b5:39:3e:3d:82:a9:6b:e1:fe:a9:1c:
+                    b0:ad:5a:4d:4c:78:83:41:8b:cf:f2:1d:62:9a:98:
+                    04:9c:63:e9:ab:65:fe:48:1d:24:65:07:47:3e:b9:
+                    91:2e:e9:9d:9b:7f:1a:35:a9:34:b0:b7:e5:70:33:
+                    ef:4a:72:51:b6:07:bf:60:3f:2a:9f:9d:54:df:f3:
+                    d7:94:49:51:03:5a:40:a9:68:dd:11:59:5c:f8:76:
+                    a6:bc:50:52:10:ed:ac:ec:95:e0:d4:83:6b:49:da:
+                    0a:4f:99:83:de:32:83:48:83:67:95:b2:7e:e7:81:
+                    85:3d:cd:82:f7:ca:02:ed:6d:88:5d:08:8d:b8:35:
+                    bf:2a:69:30:99:bb:4b:d1:41:db:45:a0:93:99:51:
+                    81:90:36:08:aa:8a:b6:e8:8f:b3:cb:ee:e5:46:0d:
+                    72:75:f5:49:6c:e1:a2:7f:2f:bc:ed:84:a6:37:ee:
+                    de:c2:4f:39:4e:f6:9e:f0:c9:d1:9b:30:9d:49:6d:
+                    e1:da:ff:12:10:8c:d6:e5:99:7b:05:b6:7d:b0:09:
+                    c7:a4:f8:b2:1c:39:95:39:33:f4:35:ce:25:62:7b:
+                    b0:5f:20:f3:cb:6d:f8:6c:52:14:64:44:8f:d3:c8:
+                    a9:76:07:e5:af:71:99:2d:2d:04:25:48:76:af:c3:
+                    e7:cc:43:f2:07:bc:4a:24:24:37:dd:fa:6e:94:09:
+                    6f:4c:5e:01:b4:fe:54:ec:23:96:a5:5e:dd:86:ff:
+                    e9:46:2a:f1:e8:dc:ec:a5:3d:af:6f:aa:0e:0f:b4:
+                    75:fa:3e:08:b9:26:45:4f:66:86:4c:bc:19:b8:e1:
+                    d5:35:ee:82:84:c8:d3:ab:12:e7:cd:73:33:62:77:
+                    f4:17:cb:bd:34:76:2a:05:ce:95:e5:78:79:4b:9e:
+                    b0:8d:f9:3c:58:38:91:ea:5e:87:38:c0:b7:42:fd:
+                    aa:4c:87:23:ad:04:20:b1:7e:76:42:da:bb:b6:16:
+                    ba:57:c8:8e:13:fa:75:d5:08:4c:af:38:91:aa:ef:
+                    8f:fa:9f:49:2e:54:7c:0a:56:b1:7a:fa:c4:4e:2f:
+                    d4:a3:fa:16:8a:d0:95:e5:97:a6:ff:c3:fc:7c:0e:
+                    47:58:f3:7f:07:7b:12:dc:57:3f:2d:e3:a1:4d:5b:
+                    52:4c:33:87:99:a8:09:7b:6c:7e:0e:f2:cf:56:42:
+                    9e:eb:05
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                20:25:F3:07:FD:A7:6F:F1:96:EE:91:10:69:CC:9A:EF:7D:C8:68:78
+            X509v3 Subject Key Identifier: 
+                20:25:F3:07:FD:A7:6F:F1:96:EE:91:10:69:CC:9A:EF:7D:C8:68:78
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        24:2b:4e:98:f2:1d:17:ed:d9:76:26:b6:30:33:e8:69:45:a1:
+        51:4b:52:d8:7a:3a:30:b6:e4:12:ea:bf:9f:4c:e0:04:a4:f6:
+        35:c6:fe:a1:30:f7:53:85:92:ad:54:05:57:5f:92:e5:2a:de:
+        36:27:9e:7b:13:47:c9:6a:75:af:fc:f3:37:e7:0c:f5:3d:01:
+        73:b5:69:51:f8:bd:59:d1:ba:0b:f8:ba:ba:64:27:43:b3:7c:
+        83:95:8a:e7:9e:13:96:d7:6f:4a:96:41:49:8b:0e:20:ad:16:
+        c6:f7:a6:87:5b:88:12:89:8b:89:ca:12:d2:56:af:22:01:21:
+        46:e9:ab:98:3f:a7:88:de:e4:cb:2a:9a:75:19:fa:39:5e:09:
+        05:d7:03:32:1a:b8:17:51:08:c7:00:40:7d:f4:be:f8:0c:59:
+        f4:69:76:6e:d3:a4:58:5b:5e:26:73:e4:42:55:06:5e:78:40:
+        0f:d3:38:9f:ef:26:51:70:74:91:f1:77:62:01:e8:d9:cb:eb:
+        a1:df:39:32:1d:bb:6b:fd:71:fe:eb:cf:a5:e6:14:fd:00:80:
+        13:c6:9a:00:48:b0:99:05:e9:ae:80:48:fb:09:3f:51:14:b5:
+        b9:e7:60:4d:4d:ca:2f:81:21:ee:52:0c:65:7a:dc:f5:89:49:
+        4c:30:92:34:58:80:32:59:b1:0d:ff:24:61:0f:e7:0a:42:d0:
+        7b:bc:f8:8e:27:47:3f:70:9d:27:d9:b6:06:3d:a5:bb:cb:5e:
+        8f:ae:0e:53:c7:9c:6a:6f:3b:4c:0f:a3:40:70:a8:9a:07:ce:
+        d4:6e:5b:07:a2:d2:e2:54:b6:bd:6f:33:72:63:ad:51:98:e1:
+        8f:76:f1:6a:07:38:25:fe:f6:62:ce:5f:db:63:c2:6e:99:ef:
+        06:dc:b9:de:19:1a:e8:54:3d:7d:d2:76:75:d9:5e:3e:32:48:
+        a7:8c:f2:9e:72:0c:f8:b8:58:b8:17:23:a5:14:87:75:58:7a:
+        00:81:07:22:39:6a:4c:94:a0:b5:a2:db:a7:2c:c1:b0:f1:a3:
+        9b:c0:4c:f7:6d:70:ea:31:9f:f1:ae:7d:3e:73:28:d9:a1:df:
+        fa:93:f0:9b:b0:f0:e2:cd:25:20:75:ef:e2:7d:32:05:c9:9b:
+        76:ee:cb:bd:31:1e:f9:94:98:4b:24:58:56:48:c0:de:06:4c:
+        bd:a6:34:5d:ed:16:61:63:73:fb:19:e2:fa:5b:d8:97:75:d4:
+        6d:9e:60:39:5e:94:8b:02:2c:eb:99:ce:60:2a:6e:1b:8c:a7:
+        4b:bc:fd:36:e6:98:1f:65:f2:7f:f1:e3:8f:4c:80:46:36:58:
+        b6:a1:65:cb:ce:1c:44:75
+SHA1 Fingerprint=32:D1:27:FA:93:B1:C1:4C:99:E2:4A:40:BC:7F:94:41:1B:5A:AC:A4
+-----BEGIN CERTIFICATE-----
+MIIFfzCCA2egAwIBAgIMR7opRlU+FpKXsKtAMA0GCSqGSIb3DQEBDAUAMEsxCzAJ
+BgNVBAYTAkRFMQ0wCwYDVQQKDARBdG9zMS0wKwYDVQQDDCRBdG9zIFRydXN0ZWRS
+b290IFJvb3QgQ0EgUlNBIEcyIDIwMjAwHhcNMjAxMjE1MDg0MTIzWhcNNDAxMjEw
+MDg0MTIyWjBLMQswCQYDVQQGEwJERTENMAsGA1UECgwEQXRvczEtMCsGA1UEAwwk
+QXRvcyBUcnVzdGVkUm9vdCBSb290IENBIFJTQSBHMiAyMDIwMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAljGFSqoPMv554UOHnPsjt45/DVS9x2KTd+Qc
+NQR2owOLIu7EhN2lk25uso4JA+tRFjEXqmkVGA5ndCNe6pp9tTk+PYKpa+H+qRyw
+rVpNTHiDQYvP8h1impgEnGPpq2X+SB0kZQdHPrmRLumdm38aNak0sLflcDPvSnJR
+tge/YD8qn51U3/PXlElRA1pAqWjdEVlc+HamvFBSEO2s7JXg1INrSdoKT5mD3jKD
+SINnlbJ+54GFPc2C98oC7W2IXQiNuDW/KmkwmbtL0UHbRaCTmVGBkDYIqoq26I+z
+y+7lRg1ydfVJbOGify+87YSmN+7ewk85Tvae8MnRmzCdSW3h2v8SEIzW5Zl7BbZ9
+sAnHpPiyHDmVOTP0Nc4lYnuwXyDzy234bFIUZESP08ipdgflr3GZLS0EJUh2r8Pn
+zEPyB7xKJCQ33fpulAlvTF4BtP5U7COWpV7dhv/pRirx6NzspT2vb6oOD7R1+j4I
+uSZFT2aGTLwZuOHVNe6ChMjTqxLnzXMzYnf0F8u9NHYqBc6V5Xh5S56wjfk8WDiR
+6l6HOMC3Qv2qTIcjrQQgsX52Qtq7tha6V8iOE/p11QhMrziRqu+P+p9JLlR8Clax
+evrETi/Uo/oWitCV5Zem/8P8fA5HWPN/B3sS3Fc/LeOhTVtSTDOHmagJe2x+DvLP
+VkKe6wUCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBQgJfMH
+/adv8ZbukRBpzJrvfchoeDAdBgNVHQ4EFgQUICXzB/2nb/GW7pEQacya733IaHgw
+DgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBDAUAA4ICAQAkK06Y8h0X7dl2JrYw
+M+hpRaFRS1LYejowtuQS6r+fTOAEpPY1xv6hMPdThZKtVAVXX5LlKt42J557E0fJ
+anWv/PM35wz1PQFztWlR+L1Z0boL+Lq6ZCdDs3yDlYrnnhOW129KlkFJiw4grRbG
+96aHW4gSiYuJyhLSVq8iASFG6auYP6eI3uTLKpp1Gfo5XgkF1wMyGrgXUQjHAEB9
+9L74DFn0aXZu06RYW14mc+RCVQZeeEAP0zif7yZRcHSR8XdiAejZy+uh3zkyHbtr
+/XH+68+l5hT9AIATxpoASLCZBemugEj7CT9RFLW552BNTcovgSHuUgxletz1iUlM
+MJI0WIAyWbEN/yRhD+cKQtB7vPiOJ0c/cJ0n2bYGPaW7y16Prg5Tx5xqbztMD6NA
+cKiaB87UblsHotLiVLa9bzNyY61RmOGPdvFqBzgl/vZizl/bY8Jume8G3LneGRro
+VD190nZ12V4+MkinjPKecgz4uFi4FyOlFId1WHoAgQciOWpMlKC1otunLMGw8aOb
+wEz3bXDqMZ/xrn0+cyjZod/6k/CbsPDizSUgde/ifTIFyZt27su9MR75lJhLJFhW
+SMDeBky9pjRd7RZhY3P7GeL6W9iXddRtnmA5XpSLAizrmc5gKm4bjKdLvP025pgf
+ZfJ/8eOPTIBGNli2oWXLzhxEdQ==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/COMODO_Certification_Authority.pem b/secure/caroot/untrusted/COMODO_Certification_Authority.pem
index 92455edff796..92455edff796 100644
--- a/secure/caroot/trusted/COMODO_Certification_Authority.pem
+++ b/secure/caroot/untrusted/COMODO_Certification_Authority.pem
diff --git a/secure/caroot/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem b/secure/caroot/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem
deleted file mode 100644
index 5d7577fd66de..000000000000
--- a/secure/caroot/untrusted/Camerfirma_Chambers_of_Commerce_Root.pem
+++ /dev/null
@@ -1,109 +0,0 @@
-##
-##  Camerfirma Chambers of Commerce Root
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=EU, O=AC Camerfirma SA CIF A82743287, OU=http://www.chambersign.org, CN=Chambers of Commerce Root
-        Validity
-            Not Before: Sep 30 16:13:43 2003 GMT
-            Not After : Sep 30 16:13:44 2037 GMT
-        Subject: C=EU, O=AC Camerfirma SA CIF A82743287, OU=http://www.chambersign.org, CN=Chambers of Commerce Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b7:36:55:e5:a5:5d:18:30:e0:da:89:54:91:fc:
-                    c8:c7:52:f8:2f:50:d9:ef:b1:75:73:65:47:7d:1b:
-                    5b:ba:75:c5:fc:a1:88:24:fa:2f:ed:ca:08:4a:39:
-                    54:c4:51:7a:b5:da:60:ea:38:3c:81:b2:cb:f1:bb:
-                    d9:91:23:3f:48:01:70:75:a9:05:2a:ad:1f:71:f3:
-                    c9:54:3d:1d:06:6a:40:3e:b3:0c:85:ee:5c:1b:79:
-                    c2:62:c4:b8:36:8e:35:5d:01:0c:23:04:47:35:aa:
-                    9b:60:4e:a0:66:3d:cb:26:0a:9c:40:a1:f4:5d:98:
-                    bf:71:ab:a5:00:68:2a:ed:83:7a:0f:a2:14:b5:d4:
-                    22:b3:80:b0:3c:0c:5a:51:69:2d:58:18:8f:ed:99:
-                    9e:f1:ae:e2:95:e6:f6:47:a8:d6:0c:0f:b0:58:58:
-                    db:c3:66:37:9e:9b:91:54:33:37:d2:94:1c:6a:48:
-                    c9:c9:f2:a5:da:a5:0c:23:f7:23:0e:9c:32:55:5e:
-                    71:9c:84:05:51:9a:2d:fd:e6:4e:2a:34:5a:de:ca:
-                    40:37:67:0c:54:21:55:77:da:0a:0c:cc:97:ae:80:
-                    dc:94:36:4a:f4:3e:ce:36:13:1e:53:e4:ac:4e:3a:
-                    05:ec:db:ae:72:9c:38:8b:d0:39:3b:89:0a:3e:77:
-                    fe:75
-                Exponent: 3 (0x3)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE, pathlen:12
-            X509v3 CRL Distribution Points: 
-                Full Name:
-                  URI:http://crl.chambersign.org/chambersroot.crl
-
-            X509v3 Subject Key Identifier: 
-                E3:94:F5:B1:4D:E9:DB:A1:29:5B:57:8B:4D:76:06:76:E1:D1:A2:8A
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            Netscape Cert Type: 
-                SSL CA, S/MIME CA, Object Signing CA
-            X509v3 Subject Alternative Name: 
-                email:chambersroot@chambersign.org
-            X509v3 Issuer Alternative Name: 
-                email:chambersroot@chambersign.org
-            X509v3 Certificate Policies: 
-                Policy: 1.3.6.1.4.1.17326.10.3.1
-                  CPS: http://cps.chambersign.org/cps/chambersroot.html
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        0c:41:97:c2:1a:86:c0:22:7c:9f:fb:90:f3:1a:d1:03:b1:ef:
-        13:f9:21:5f:04:9c:da:c9:a5:8d:27:6c:96:87:91:be:41:90:
-        01:72:93:e7:1e:7d:5f:f6:89:c6:5d:a7:40:09:3d:ac:49:45:
-        45:dc:2e:8d:30:68:b2:09:ba:fb:c3:2f:cc:ba:0b:df:3f:77:
-        7b:46:7d:3a:12:24:8e:96:8f:3c:05:0a:6f:d2:94:28:1d:6d:
-        0c:c0:2e:88:22:d5:d8:cf:1d:13:c7:f0:48:d7:d7:05:a7:cf:
-        c7:47:9e:3b:3c:34:c8:80:4f:d4:14:bb:fc:0d:50:f7:fa:b3:
-        ec:42:5f:a9:dd:6d:c8:f4:75:cf:7b:c1:72:26:b1:01:1c:5c:
-        2c:fd:7a:4e:b4:01:c5:05:57:b9:e7:3c:aa:05:d9:88:e9:07:
-        46:41:ce:ef:41:81:ae:58:df:83:a2:ae:ca:d7:77:1f:e7:00:
-        3c:9d:6f:8e:e4:32:09:1d:4d:78:34:78:34:3c:94:9b:26:ed:
-        4f:71:c6:19:7a:bd:20:22:48:5a:fe:4b:7d:03:b7:e7:58:be:
-        c6:32:4e:74:1e:68:dd:a8:68:5b:b3:3e:ee:62:7d:d9:80:e8:
-        0a:75:7a:b7:ee:b4:65:9a:21:90:e0:aa:d0:98:bc:38:b5:73:
-        3c:8b:f8:dc
-SHA1 Fingerprint=6E:3A:55:A4:19:0C:19:5C:93:84:3C:C0:DB:72:2E:31:30:61:F0:B1
------BEGIN CERTIFICATE-----
-MIIEvTCCA6WgAwIBAgIBADANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEiMCAGA1UEAxMZQ2hhbWJlcnMg
-b2YgQ29tbWVyY2UgUm9vdDAeFw0wMzA5MzAxNjEzNDNaFw0zNzA5MzAxNjEzNDRa
-MH8xCzAJBgNVBAYTAkVVMScwJQYDVQQKEx5BQyBDYW1lcmZpcm1hIFNBIENJRiBB
-ODI3NDMyODcxIzAhBgNVBAsTGmh0dHA6Ly93d3cuY2hhbWJlcnNpZ24ub3JnMSIw
-IAYDVQQDExlDaGFtYmVycyBvZiBDb21tZXJjZSBSb290MIIBIDANBgkqhkiG9w0B
-AQEFAAOCAQ0AMIIBCAKCAQEAtzZV5aVdGDDg2olUkfzIx1L4L1DZ77F1c2VHfRtb
-unXF/KGIJPov7coISjlUxFF6tdpg6jg8gbLL8bvZkSM/SAFwdakFKq0fcfPJVD0d
-BmpAPrMMhe5cG3nCYsS4No41XQEMIwRHNaqbYE6gZj3LJgqcQKH0XZi/caulAGgq
-7YN6D6IUtdQis4CwPAxaUWktWBiP7Zme8a7ileb2R6jWDA+wWFjbw2Y3npuRVDM3
-0pQcakjJyfKl2qUMI/cjDpwyVV5xnIQFUZot/eZOKjRa3spAN2cMVCFVd9oKDMyX
-roDclDZK9D7ONhMeU+SsTjoF7Nuucpw4i9A5O4kKPnf+dQIBA6OCAUQwggFAMBIG
-A1UdEwEB/wQIMAYBAf8CAQwwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL2NybC5j
-aGFtYmVyc2lnbi5vcmcvY2hhbWJlcnNyb290LmNybDAdBgNVHQ4EFgQU45T1sU3p
-26EpW1eLTXYGduHRooowDgYDVR0PAQH/BAQDAgEGMBEGCWCGSAGG+EIBAQQEAwIA
-BzAnBgNVHREEIDAegRxjaGFtYmVyc3Jvb3RAY2hhbWJlcnNpZ24ub3JnMCcGA1Ud
-EgQgMB6BHGNoYW1iZXJzcm9vdEBjaGFtYmVyc2lnbi5vcmcwWAYDVR0gBFEwTzBN
-BgsrBgEEAYGHLgoDATA+MDwGCCsGAQUFBwIBFjBodHRwOi8vY3BzLmNoYW1iZXJz
-aWduLm9yZy9jcHMvY2hhbWJlcnNyb290Lmh0bWwwDQYJKoZIhvcNAQEFBQADggEB
-AAxBl8IahsAifJ/7kPMa0QOx7xP5IV8EnNrJpY0nbJaHkb5BkAFyk+cefV/2icZd
-p0AJPaxJRUXcLo0waLIJuvvDL8y6C98/d3tGfToSJI6WjzwFCm/SlCgdbQzALogi
-1djPHRPH8EjX1wWnz8dHnjs8NMiAT9QUu/wNUPf6s+xCX6ndbcj0dc97wXImsQEc
-XCz9ek60AcUFV7nnPKoF2YjpB0ZBzu9Bga5Y34OirsrXdx/nADydb47kMgkdTXg0
-eDQ8lJsm7U9xxhl6vSAiSFr+S30Dt+dYvsYyTnQeaN2oaFuzPu5ifdmA6Ap1erfu
-tGWaIZDgqtCYvDi1czyL+Nw=
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Camerfirma_Global_Chambersign_Root.pem b/secure/caroot/untrusted/Camerfirma_Global_Chambersign_Root.pem
deleted file mode 100644
index 43fd743fd716..000000000000
--- a/secure/caroot/untrusted/Camerfirma_Global_Chambersign_Root.pem
+++ /dev/null
@@ -1,109 +0,0 @@
-##
-##  Camerfirma Global Chambersign Root
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=EU, O=AC Camerfirma SA CIF A82743287, OU=http://www.chambersign.org, CN=Global Chambersign Root
-        Validity
-            Not Before: Sep 30 16:14:18 2003 GMT
-            Not After : Sep 30 16:14:18 2037 GMT
-        Subject: C=EU, O=AC Camerfirma SA CIF A82743287, OU=http://www.chambersign.org, CN=Global Chambersign Root
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:a2:70:a2:d0:9f:42:ae:5b:17:c7:d8:7d:cf:14:
-                    83:fc:4f:c9:a1:b7:13:af:8a:d7:9e:3e:04:0a:92:
-                    8b:60:56:fa:b4:32:2f:88:4d:a1:60:08:f4:b7:09:
-                    4e:a0:49:2f:49:d6:d3:df:9d:97:5a:9f:94:04:70:
-                    ec:3f:59:d9:b7:cc:66:8b:98:52:28:09:02:df:c5:
-                    2f:84:8d:7a:97:77:bf:ec:40:9d:25:72:ab:b5:3f:
-                    32:98:fb:b7:b7:fc:72:84:e5:35:87:f9:55:fa:a3:
-                    1f:0e:6f:2e:28:dd:69:a0:d9:42:10:c6:f8:b5:44:
-                    c2:d0:43:7f:db:bc:e4:a2:3c:6a:55:78:0a:77:a9:
-                    d8:ea:19:32:b7:2f:fe:5c:3f:1b:ee:b1:98:ec:ca:
-                    ad:7a:69:45:e3:96:0f:55:f6:e6:ed:75:ea:65:e8:
-                    32:56:93:46:89:a8:25:8a:65:06:ee:6b:bf:79:07:
-                    d0:f1:b7:af:ed:2c:4d:92:bb:c0:a8:5f:a7:67:7d:
-                    04:f2:15:08:70:ac:92:d6:7d:04:d2:33:fb:4c:b6:
-                    0b:0b:fb:1a:c9:c4:8d:03:a9:7e:5c:f2:50:ab:12:
-                    a5:a1:cf:48:50:a5:ef:d2:c8:1a:13:fa:b0:7f:b1:
-                    82:1c:77:6a:0f:5f:dc:0b:95:8f:ef:43:7e:e6:45:
-                    09:25
-                Exponent: 3 (0x3)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE, pathlen:12
-            X509v3 CRL Distribution Points: 
-                Full Name:
-                  URI:http://crl.chambersign.org/chambersignroot.crl
-
-            X509v3 Subject Key Identifier: 
-                43:9C:36:9F:B0:9E:30:4D:C6:CE:5F:AD:10:AB:E5:03:A5:FA:A9:14
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            Netscape Cert Type: 
-                SSL CA, S/MIME CA, Object Signing CA
-            X509v3 Subject Alternative Name: 
-                email:chambersignroot@chambersign.org
-            X509v3 Issuer Alternative Name: 
-                email:chambersignroot@chambersign.org
-            X509v3 Certificate Policies: 
-                Policy: 1.3.6.1.4.1.17326.10.1.1
-                  CPS: http://cps.chambersign.org/cps/chambersignroot.html
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        3c:3b:70:91:f9:04:54:27:91:e1:ed:ed:fe:68:7f:61:5d:e5:
-        41:65:4f:32:f1:18:05:94:6a:1c:de:1f:70:db:3e:7b:32:02:
-        34:b5:0c:6c:a1:8a:7c:a5:f4:8f:ff:d4:d8:ad:17:d5:2d:04:
-        d1:3f:58:80:e2:81:59:88:be:c0:e3:46:93:24:fe:90:bd:26:
-        a2:30:2d:e8:97:26:57:35:89:74:96:18:f6:15:e2:af:24:19:
-        56:02:02:b2:ba:0f:14:ea:c6:8a:66:c1:86:45:55:8b:be:92:
-        be:9c:a4:04:c7:49:3c:9e:e8:29:7a:89:d7:fe:af:ff:68:f5:
-        a5:17:90:bd:ac:99:cc:a5:86:57:09:67:46:db:d6:16:c2:46:
-        f1:e4:a9:50:f5:8f:d1:92:15:d3:5f:3e:c6:00:49:3a:6e:58:
-        b2:d1:d1:27:0d:25:c8:32:f8:20:11:cd:7d:32:33:48:94:54:
-        4c:dd:dc:79:c4:30:9f:eb:8e:b8:55:b5:d7:88:5c:c5:6a:24:
-        3d:b2:d3:05:03:51:c6:07:ef:cc:14:72:74:3d:6e:72:ce:18:
-        28:8c:4a:a0:77:e5:09:2b:45:44:47:ac:b7:67:7f:01:8a:05:
-        5a:93:be:a1:c1:ff:f8:e7:0e:67:a4:47:49:76:5d:75:90:1a:
-        f5:26:8f:f0
-SHA1 Fingerprint=33:9B:6B:14:50:24:9B:55:7A:01:87:72:84:D9:E0:2F:C3:D2:D8:E9
------BEGIN CERTIFICATE-----
-MIIExTCCA62gAwIBAgIBADANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJFVTEn
-MCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgyNzQzMjg3MSMwIQYDVQQL
-ExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4GA1UEAxMXR2xvYmFsIENo
-YW1iZXJzaWduIFJvb3QwHhcNMDMwOTMwMTYxNDE4WhcNMzcwOTMwMTYxNDE4WjB9
-MQswCQYDVQQGEwJFVTEnMCUGA1UEChMeQUMgQ2FtZXJmaXJtYSBTQSBDSUYgQTgy
-NzQzMjg3MSMwIQYDVQQLExpodHRwOi8vd3d3LmNoYW1iZXJzaWduLm9yZzEgMB4G
-A1UEAxMXR2xvYmFsIENoYW1iZXJzaWduIFJvb3QwggEgMA0GCSqGSIb3DQEBAQUA
-A4IBDQAwggEIAoIBAQCicKLQn0KuWxfH2H3PFIP8T8mhtxOviteePgQKkotgVvq0
-Mi+ITaFgCPS3CU6gSS9J1tPfnZdan5QEcOw/Wdm3zGaLmFIoCQLfxS+EjXqXd7/s
-QJ0lcqu1PzKY+7e3/HKE5TWH+VX6ox8Oby4o3Wmg2UIQxvi1RMLQQ3/bvOSiPGpV
-eAp3qdjqGTK3L/5cPxvusZjsyq16aUXjlg9V9ubtdepl6DJWk0aJqCWKZQbua795
-B9Dxt6/tLE2Su8CoX6dnfQTyFQhwrJLWfQTSM/tMtgsL+xrJxI0DqX5c8lCrEqWh
-z0hQpe/SyBoT+rB/sYIcd2oPX9wLlY/vQ37mRQklAgEDo4IBUDCCAUwwEgYDVR0T
-AQH/BAgwBgEB/wIBDDA/BgNVHR8EODA2MDSgMqAwhi5odHRwOi8vY3JsLmNoYW1i
-ZXJzaWduLm9yZy9jaGFtYmVyc2lnbnJvb3QuY3JsMB0GA1UdDgQWBBRDnDafsJ4w
-TcbOX60Qq+UDpfqpFDAOBgNVHQ8BAf8EBAMCAQYwEQYJYIZIAYb4QgEBBAQDAgAH
-MCoGA1UdEQQjMCGBH2NoYW1iZXJzaWducm9vdEBjaGFtYmVyc2lnbi5vcmcwKgYD
-VR0SBCMwIYEfY2hhbWJlcnNpZ25yb290QGNoYW1iZXJzaWduLm9yZzBbBgNVHSAE
-VDBSMFAGCysGAQQBgYcuCgEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly9jcHMuY2hh
-bWJlcnNpZ24ub3JnL2Nwcy9jaGFtYmVyc2lnbnJvb3QuaHRtbDANBgkqhkiG9w0B
-AQUFAAOCAQEAPDtwkfkEVCeR4e3t/mh/YV3lQWVPMvEYBZRqHN4fcNs+ezICNLUM
-bKGKfKX0j//U2K0X1S0E0T9YgOKBWYi+wONGkyT+kL0mojAt6JcmVzWJdJYY9hXi
-ryQZVgICsroPFOrGimbBhkVVi76SvpykBMdJPJ7oKXqJ1/6v/2j1pReQvayZzKWG
-VwlnRtvWFsJG8eSpUPWP0ZIV018+xgBJOm5YstHRJw0lyDL4IBHNfTIzSJRUTN3c
-ecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREest2d/
-AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A==
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Certigna.pem b/secure/caroot/untrusted/Certigna.pem
index 0751abfc8649..0751abfc8649 100644
--- a/secure/caroot/trusted/Certigna.pem
+++ b/secure/caroot/untrusted/Certigna.pem
diff --git a/secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem b/secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem
deleted file mode 100644
index 0318e4ee3f43..000000000000
--- a/secure/caroot/untrusted/Chambers_of_Commerce_Root_-_2008.pem
+++ /dev/null
@@ -1,149 +0,0 @@
-##
-##  Chambers of Commerce Root - 2008
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            a3:da:42:7e:a4:b1:ae:da
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: 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
-        Validity
-            Not Before: Aug  1 12:29:50 2008 GMT
-            Not After : Jul 31 12:29:50 2038 GMT
-        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
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:af:00:cb:70:37:2b:80:5a:4a:3a:6c:78:94:7d:
-                    a3:7f:1a:1f:f6:35:d5:bd:db:cb:0d:44:72:3e:26:
-                    b2:90:52:ba:63:3b:28:58:6f:a5:b3:6d:94:a6:f3:
-                    dd:64:0c:55:f6:f6:e7:f2:22:22:80:5e:e1:62:c6:
-                    b6:29:e1:81:6c:f2:bf:e5:7d:32:6a:54:a0:32:19:
-                    59:fe:1f:8b:d7:3d:60:86:85:24:6f:e3:11:b3:77:
-                    3e:20:96:35:21:6b:b3:08:d9:70:2e:64:f7:84:92:
-                    53:d6:0e:b0:90:8a:8a:e3:87:8d:06:d3:bd:90:0e:
-                    e2:99:a1:1b:86:0e:da:9a:0a:bb:0b:61:50:06:52:
-                    f1:9e:7f:76:ec:cb:0f:d0:1e:0d:cf:99:30:3d:1c:
-                    c4:45:10:58:ac:d6:d3:e8:d7:e5:ea:c5:01:07:77:
-                    d6:51:e6:03:7f:8a:48:a5:4d:68:75:b9:e9:bc:9e:
-                    4e:19:71:f5:32:4b:9c:6d:60:19:0b:fb:cc:9d:75:
-                    dc:bf:26:cd:8f:93:78:39:79:73:5e:25:0e:ca:5c:
-                    eb:77:12:07:cb:64:41:47:72:93:ab:50:c3:eb:09:
-                    76:64:34:d2:39:b7:76:11:09:0d:76:45:c4:a9:ae:
-                    3d:6a:af:b5:7d:65:2f:94:58:10:ec:5c:7c:af:7e:
-                    e2:b6:18:d9:d0:9b:4e:5a:49:df:a9:66:0b:cc:3c:
-                    c6:78:7c:a7:9c:1d:e3:ce:8e:53:be:05:de:60:0f:
-                    6b:e5:1a:db:3f:e3:e1:21:c9:29:c1:f1:eb:07:9c:
-                    52:1b:01:44:51:3c:7b:25:d7:c4:e5:52:54:5d:25:
-                    07:ca:16:20:b8:ad:e4:41:ee:7a:08:fe:99:6f:83:
-                    a6:91:02:b0:6c:36:55:6a:e7:7d:f5:96:e6:ca:81:
-                    d6:97:f1:94:83:e9:ed:b0:b1:6b:12:69:1e:ac:fb:
-                    5d:a9:c5:98:e9:b4:5b:58:7a:be:3d:a2:44:3a:63:
-                    59:d4:0b:25:de:1b:4f:bd:e5:01:9e:cd:d2:29:d5:
-                    9f:17:19:0a:6f:bf:0c:90:d3:09:5f:d9:e3:8a:35:
-                    cc:79:5a:4d:19:37:92:b7:c4:c1:ad:af:f4:79:24:
-                    9a:b2:01:0b:b1:af:5c:96:f3:80:32:fb:5c:3d:98:
-                    f1:a0:3f:4a:de:be:af:94:2e:d9:55:9a:17:6e:60:
-                    9d:63:6c:b8:63:c9:ae:81:5c:18:35:e0:90:bb:be:
-                    3c:4f:37:22:b9:7e:eb:cf:9e:77:21:a6:3d:38:81:
-                    fb:48:da:31:3d:2b:e3:89:f5:d0:b5:bd:7e:e0:50:
-                    c4:12:89:b3:23:9a:10:31:85:db:ae:6f:ef:38:33:
-                    18:76:11
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE, pathlen:12
-            X509v3 Subject Key Identifier: 
-                F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19
-            X509v3 Authority Key Identifier: 
-                keyid:F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19
-                DirName:/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
-                serial:A3:DA:42:7E:A4:B1:AE:DA
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Certificate Policies: 
-                Policy: X509v3 Any Policy
-                  CPS: http://policy.camerfirma.com
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be:
-        3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a:
-        e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5:
-        c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d:
-        13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d:
-        c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d:
-        92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82:
-        56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a:
-        90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a:
-        7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22:
-        08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e:
-        45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a:
-        ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60:
-        97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0:
-        29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6:
-        f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c:
-        b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29:
-        a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22:
-        d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba:
-        cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34:
-        20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8:
-        f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e:
-        c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e:
-        18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da:
-        bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6:
-        be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3:
-        82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a:
-        0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c:
-        7c:80:c5:f0:d9:77:48:d0
-SHA1 Fingerprint=78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C
------BEGIN CERTIFICATE-----
-MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
-IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
-MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
-dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
-EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
-MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
-CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
-28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
-VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
-DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
-5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
-ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
-Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
-UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
-+12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
-Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
-ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
-hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
-HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
-+HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
-YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
-L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
-ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
-IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
-HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
-DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
-PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
-5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
-glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
-FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
-pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
-xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
-tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
-jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
-fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
-OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
-d0jQ
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Comodo_AAA_Services_root.pem b/secure/caroot/untrusted/Comodo_AAA_Services_root.pem
index e5ae7b3f51a8..e5ae7b3f51a8 100644
--- a/secure/caroot/trusted/Comodo_AAA_Services_root.pem
+++ b/secure/caroot/untrusted/Comodo_AAA_Services_root.pem
diff --git a/secure/caroot/untrusted/D-Trust_SBR_Root_CA_1_2022.pem b/secure/caroot/untrusted/D-Trust_SBR_Root_CA_1_2022.pem
new file mode 100644
index 000000000000..3a2ccd41a7aa
--- /dev/null
+++ b/secure/caroot/untrusted/D-Trust_SBR_Root_CA_1_2022.pem
@@ -0,0 +1,69 @@
+##
+##  D-Trust SBR Root CA 1 2022
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            52:cf:e4:8c:6d:a0:4a:f7:3f:82:97:0c:80:09:8c:95
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=DE, O=D-Trust GmbH, CN=D-Trust SBR Root CA 1 2022
+        Validity
+            Not Before: Jul  6 11:30:00 2022 GMT
+            Not After : Jul  6 11:29:59 2037 GMT
+        Subject: C=DE, O=D-Trust GmbH, CN=D-Trust SBR Root CA 1 2022
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:59:93:39:f6:8c:49:66:28:d7:61:0c:c8:ab:7f:
+                    0c:a3:2d:df:a2:a4:7c:92:2b:68:d5:2e:7e:1e:40:
+                    cb:b4:68:49:7f:12:a1:ab:7f:57:9f:19:2e:63:2e:
+                    5b:fe:66:71:0c:33:0f:b9:de:6b:c4:88:c3:b1:ef:
+                    ec:39:40:e3:96:ab:db:e5:7b:ae:1f:dc:f9:af:46:
+                    9a:6a:46:06:2f:c7:37:64:8b:17:62:fe:96:c3:a2:
+                    ee:84:e0:b0:97:39:bc
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                F1:29:A3:1E:01:12:1D:3D:75:56:4D:C7:50:7C:C5:19:AA:0F:18:B7
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 CRL Distribution Points: 
+                Full Name:
+                  URI:http://crl.d-trust.net/crl/d-trust_sbr_root_ca_1_2022.crl
+
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:66:02:31:00:97:f9:de:ae:4b:8f:98:b5:1e:40:7f:32:7d:
+        4d:54:43:da:89:cd:c2:aa:92:3c:d1:82:1e:73:cf:fa:4c:92:
+        20:fb:63:27:c5:f5:73:3d:09:3d:f7:a7:61:86:8c:f3:6a:02:
+        31:00:e7:2f:7c:b8:f5:25:8c:3b:39:1f:36:ab:8d:f5:86:a2:
+        2e:e1:7a:64:da:67:39:02:fe:fe:33:3f:d9:73:b6:58:5b:3a:
+        fc:b2:a4:d9:60:78:77:cc:79:a7:a6:ae:55:bd
+SHA1 Fingerprint=0F:52:3A:6B:4E:7D:1D:18:05:A5:48:F9:4D:CD:E4:C3:1E:1B:E9:E6
+-----BEGIN CERTIFICATE-----
+MIICXjCCAeOgAwIBAgIQUs/kjG2gSvc/gpcMgAmMlTAKBggqhkjOPQQDAzBJMQsw
+CQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSMwIQYDVQQDExpELVRy
+dXN0IFNCUiBSb290IENBIDEgMjAyMjAeFw0yMjA3MDYxMTMwMDBaFw0zNzA3MDYx
+MTI5NTlaMEkxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgxIzAh
+BgNVBAMTGkQtVHJ1c3QgU0JSIFJvb3QgQ0EgMSAyMDIyMHYwEAYHKoZIzj0CAQYF
+K4EEACIDYgAEWZM59oxJZijXYQzIq38Moy3foqR8kito1S5+HkDLtGhJfxKhq39X
+nxkuYy5b/mZxDDMPud5rxIjDse/sOUDjlqvb5XuuH9z5r0aaakYGL8c3ZIsXYv6W
+w6LuhOCwlzm8o4GPMIGMMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPEpox4B
+Eh09dVZNx1B8xRmqDxi3MA4GA1UdDwEB/wQEAwIBBjBKBgNVHR8EQzBBMD+gPaA7
+hjlodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9kLXRydXN0X3Nicl9yb290X2Nh
+XzFfMjAyMi5jcmwwCgYIKoZIzj0EAwMDaQAwZgIxAJf53q5Lj5i1HkB/Mn1NVEPa
+ic3CqpI80YIec8/6TJIg+2MnxfVzPQk996dhhozzagIxAOcvfLj1JYw7OR82q431
+hqIu4Xpk2mc5Av7+Mz/Zc7ZYWzr8sqTZYHh3zHmnpq5VvQ==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/D-Trust_SBR_Root_CA_2_2022.pem b/secure/caroot/untrusted/D-Trust_SBR_Root_CA_2_2022.pem
new file mode 100644
index 000000000000..4441fd5e4afb
--- /dev/null
+++ b/secure/caroot/untrusted/D-Trust_SBR_Root_CA_2_2022.pem
@@ -0,0 +1,137 @@
+##
+##  D-Trust SBR Root CA 2 2022
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            54:d5:a3:95:1e:3d:95:ba:72:1b:9a:d0:31:21:4a:ba
+        Signature Algorithm: sha512WithRSAEncryption
+        Issuer: C=DE, O=D-Trust GmbH, CN=D-Trust SBR Root CA 2 2022
+        Validity
+            Not Before: Jul  7 07:30:00 2022 GMT
+            Not After : Jul  7 07:29:59 2037 GMT
+        Subject: C=DE, O=D-Trust GmbH, CN=D-Trust SBR Root CA 2 2022
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:af:2c:bc:8e:36:8c:eb:64:af:51:6a:d6:6e:3c:
+                    5e:91:3a:ea:9a:c3:ca:6c:fb:aa:27:9e:64:22:a9:
+                    40:df:b9:28:45:5a:ec:53:61:16:28:98:c2:8a:a4:
+                    75:78:50:84:dd:fa:20:48:92:07:65:41:35:66:51:
+                    12:74:61:9d:07:06:85:39:31:57:7b:28:3f:d5:9c:
+                    a5:ec:5a:e9:1c:4b:27:9f:ce:27:06:f3:37:f5:52:
+                    d8:11:33:16:41:3a:1f:f5:63:78:65:63:86:c9:bf:
+                    c8:01:04:1f:6e:ee:e2:ec:ac:0c:ee:82:92:e2:f6:
+                    1a:0d:3f:39:f9:9d:65:93:ad:f8:b9:05:c1:3d:f8:
+                    37:81:56:c3:a0:fe:05:ec:e0:94:16:3a:23:16:04:
+                    da:a6:0a:93:85:72:6d:61:3b:a1:8d:45:d6:e3:7f:
+                    be:15:bd:36:84:08:f6:0b:83:6b:26:aa:a2:bd:e0:
+                    b0:e7:aa:e0:ae:67:c4:d3:82:a5:0c:a9:a4:f0:33:
+                    79:0d:50:3f:f0:ef:90:3d:24:b9:7f:d2:20:6c:ea:
+                    97:f3:bf:9c:dc:47:de:09:61:bd:94:79:95:5a:02:
+                    76:35:60:c4:47:22:0d:f7:76:63:03:d3:c6:fb:83:
+                    c6:5d:ab:ad:ed:69:25:2b:03:5b:4d:25:00:41:e3:
+                    8c:87:17:52:a8:e0:05:2b:43:4d:14:13:ca:e7:3f:
+                    43:22:bc:37:a4:75:f1:f6:bf:3a:ef:32:1e:ae:ee:
+                    58:86:90:72:ba:04:ac:40:48:ef:5c:c4:78:a7:a9:
+                    8f:27:5a:cb:7a:ec:58:f2:c2:08:58:90:6d:4d:03:
+                    85:79:71:15:05:0e:4e:3e:f9:df:0f:05:f7:5f:14:
+                    48:56:21:0d:33:92:b1:ac:8c:e5:18:fe:bf:0f:ee:
+                    e0:04:aa:bd:21:f2:58:b6:5c:89:0a:8b:18:09:22:
+                    1a:b3:35:c6:66:c2:f5:33:15:99:80:e0:08:f9:96:
+                    2f:13:8c:ee:da:b7:88:c4:e9:37:b5:d7:6a:d7:3a:
+                    84:4d:ab:70:8c:d3:4e:14:55:a0:a2:10:fc:64:da:
+                    67:e8:f1:cb:33:dd:c9:9a:8a:8f:96:2f:58:81:d9:
+                    f8:9a:00:43:cc:90:fb:55:76:fb:86:e3:37:01:28:
+                    0c:6f:f4:e9:59:4d:15:77:51:42:4a:cc:34:b8:80:
+                    43:50:81:ef:57:a5:13:db:a7:94:79:0f:4b:ca:7e:
+                    17:7d:af:a3:21:64:e8:71:55:56:8f:06:b0:47:ec:
+                    59:0f:5d:70:5b:2c:16:42:f0:86:9e:75:de:6b:4d:
+                    48:98:84:e2:57:18:b6:9c:82:99:65:3a:8b:80:78:
+                    57:0c:49
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                5D:B3:80:94:1B:E5:86:BF:68:BA:14:34:A4:F6:EE:6D:F2:DD:DF:E7
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 CRL Distribution Points: 
+                Full Name:
+                  URI:http://crl.d-trust.net/crl/d-trust_sbr_root_ca_2_2022.crl
+
+    Signature Algorithm: sha512WithRSAEncryption
+    Signature Value:
+        34:54:2e:58:18:56:cd:4a:bd:97:d3:f5:7d:2b:dc:af:0f:51:
+        e1:4d:bc:21:4b:93:f4:00:44:13:07:10:0b:25:18:3e:48:59:
+        96:f7:a1:e1:93:90:78:66:1a:3d:23:eb:22:ab:01:a6:8e:0c:
+        51:33:e6:6d:8c:31:ee:ac:a4:01:70:39:48:de:c7:66:2c:6b:
+        0d:cb:73:9f:87:92:e9:3e:47:1f:b8:ef:2f:ee:b7:56:8c:48:
+        89:f0:38:a7:15:39:b2:ee:c0:3f:17:a4:73:02:08:9c:bc:06:
+        8a:a4:c2:b7:61:61:f9:c3:db:c4:d0:7a:7c:61:de:b1:58:91:
+        f5:dd:65:4c:2f:0b:f8:eb:3d:b5:ed:8a:be:77:1c:ba:59:02:
+        12:66:71:e5:98:27:ce:0e:3d:af:51:a2:45:f9:82:fb:5a:a5:
+        94:70:f7:8b:84:c3:4c:65:25:9b:7b:e2:1f:30:70:b3:40:8e:
+        3a:ee:bd:f4:e7:68:c5:9d:c9:29:47:71:0e:93:c8:b5:48:4e:
+        f5:66:bb:07:88:71:69:6b:7b:48:8e:6f:f0:11:c4:b4:c9:70:
+        14:98:20:bd:ed:a7:ea:01:da:6e:a5:9b:12:fe:3e:44:30:b3:
+        f0:eb:75:52:c0:f4:c3:fa:77:26:a4:77:82:2d:6f:f3:28:1e:
+        4e:95:f0:30:f7:89:f8:2c:a2:50:5b:f2:be:32:7e:6c:54:db:
+        72:c9:2a:5a:e0:1c:b6:0b:d8:52:9a:59:a1:e3:b0:01:27:c5:
+        a0:16:50:66:dc:eb:ae:6d:f4:9b:5b:3d:84:6d:5b:87:e7:a9:
+        89:bb:6e:b8:e0:9b:53:89:c0:ff:2e:40:1a:89:44:2e:18:43:
+        67:38:e4:7c:72:5f:d9:a3:29:25:41:41:3d:1c:77:1b:64:a8:
+        c3:55:ee:63:71:66:62:83:f4:7f:26:99:a0:54:3b:a1:12:6d:
+        70:62:ce:d3:f9:b8:bd:22:fc:d4:9a:d4:bb:e2:38:16:2f:b7:
+        7d:39:c2:b0:a9:03:e9:9c:cf:7e:18:8d:76:dc:5f:11:bb:eb:
+        42:ec:50:09:3e:5c:ec:90:31:d8:1a:72:ba:3f:69:07:ee:98:
+        34:c2:34:a4:d6:da:13:d6:a9:84:f2:00:86:c0:54:ba:1e:11:
+        b0:e2:b9:c4:07:b4:91:e7:aa:e6:31:56:6f:b1:44:c4:2a:62:
+        bc:c9:b0:65:9c:34:fc:0c:1a:53:df:21:17:bb:c2:6d:a1:0a:
+        e6:f1:b0:aa:44:09:50:49:38:7a:5d:71:e2:31:2e:19:b0:df:
+        95:42:04:7d:84:88:ce:0a:23:67:6b:38:9d:16:de:06:fe:28:
+        70:38:a5:5a:ae:fc:83:ed
+SHA1 Fingerprint=27:FF:63:B9:EF:34:29:31:03:38:1A:D8:60:60:DA:CC:60:28:35:E1
+-----BEGIN CERTIFICATE-----
+MIIFrDCCA5SgAwIBAgIQVNWjlR49lbpyG5rQMSFKujANBgkqhkiG9w0BAQ0FADBJ
+MQswCQYDVQQGEwJERTEVMBMGA1UEChMMRC1UcnVzdCBHbWJIMSMwIQYDVQQDExpE
+LVRydXN0IFNCUiBSb290IENBIDIgMjAyMjAeFw0yMjA3MDcwNzMwMDBaFw0zNzA3
+MDcwNzI5NTlaMEkxCzAJBgNVBAYTAkRFMRUwEwYDVQQKEwxELVRydXN0IEdtYkgx
+IzAhBgNVBAMTGkQtVHJ1c3QgU0JSIFJvb3QgQ0EgMiAyMDIyMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEAryy8jjaM62SvUWrWbjxekTrqmsPKbPuqJ55k
+IqlA37koRVrsU2EWKJjCiqR1eFCE3fogSJIHZUE1ZlESdGGdBwaFOTFXeyg/1Zyl
+7FrpHEsnn84nBvM39VLYETMWQTof9WN4ZWOGyb/IAQQfbu7i7KwM7oKS4vYaDT85
++Z1lk634uQXBPfg3gVbDoP4F7OCUFjojFgTapgqThXJtYTuhjUXW43++Fb02hAj2
+C4NrJqqiveCw56rgrmfE04KlDKmk8DN5DVA/8O+QPSS5f9IgbOqX87+c3EfeCWG9
+lHmVWgJ2NWDERyIN93ZjA9PG+4PGXaut7WklKwNbTSUAQeOMhxdSqOAFK0NNFBPK
+5z9DIrw3pHXx9r867zIeru5YhpByugSsQEjvXMR4p6mPJ1rLeuxY8sIIWJBtTQOF
+eXEVBQ5OPvnfDwX3XxRIViENM5KxrIzlGP6/D+7gBKq9IfJYtlyJCosYCSIaszXG
+ZsL1MxWZgOAI+ZYvE4zu2reIxOk3tddq1zqETatwjNNOFFWgohD8ZNpn6PHLM93J
+moqPli9Ygdn4mgBDzJD7VXb7huM3ASgMb/TpWU0Vd1FCSsw0uIBDUIHvV6UT26eU
+eQ9Lyn4Xfa+jIWTocVVWjwawR+xZD11wWywWQvCGnnXea01ImITiVxi2nIKZZTqL
+gHhXDEkCAwEAAaOBjzCBjDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRds4CU
+G+WGv2i6FDSk9u5t8t3f5zAOBgNVHQ8BAf8EBAMCAQYwSgYDVR0fBEMwQTA/oD2g
+O4Y5aHR0cDovL2NybC5kLXRydXN0Lm5ldC9jcmwvZC10cnVzdF9zYnJfcm9vdF9j
+YV8yXzIwMjIuY3JsMA0GCSqGSIb3DQEBDQUAA4ICAQA0VC5YGFbNSr2X0/V9K9yv
+D1HhTbwhS5P0AEQTBxALJRg+SFmW96Hhk5B4Zho9I+siqwGmjgxRM+ZtjDHurKQB
+cDlI3sdmLGsNy3Ofh5LpPkcfuO8v7rdWjEiJ8DinFTmy7sA/F6RzAgicvAaKpMK3
+YWH5w9vE0Hp8Yd6xWJH13WVMLwv46z217Yq+dxy6WQISZnHlmCfODj2vUaJF+YL7
+WqWUcPeLhMNMZSWbe+IfMHCzQI467r3052jFnckpR3EOk8i1SE71ZrsHiHFpa3tI
+jm/wEcS0yXAUmCC97afqAdpupZsS/j5EMLPw63VSwPTD+ncmpHeCLW/zKB5OlfAw
+94n4LKJQW/K+Mn5sVNtyySpa4By2C9hSmlmh47ABJ8WgFlBm3OuubfSbWz2EbVuH
+56mJu2644JtTicD/LkAaiUQuGENnOOR8cl/ZoyklQUE9HHcbZKjDVe5jcWZig/R/
+JpmgVDuhEm1wYs7T+bi9IvzUmtS74jgWL7d9OcKwqQPpnM9+GI123F8Ru+tC7FAJ
+PlzskDHYGnK6P2kH7pg0wjSk1toT1qmE8gCGwFS6HhGw4rnEB7SR56rmMVZvsUTE
+KmK8ybBlnDT8DBpT3yEXu8JtoQrm8bCqRAlQSTh6XXHiMS4ZsN+VQgR9hIjOCiNn
+azidFt4G/ihwOKVarvyD7Q==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/DIGITALSIGN_GLOBAL_ROOT_ECDSA_CA.pem b/secure/caroot/untrusted/DIGITALSIGN_GLOBAL_ROOT_ECDSA_CA.pem
new file mode 100644
index 000000000000..726a920eb93b
--- /dev/null
+++ b/secure/caroot/untrusted/DIGITALSIGN_GLOBAL_ROOT_ECDSA_CA.pem
@@ -0,0 +1,67 @@
+##
+##  DIGITALSIGN GLOBAL ROOT ECDSA CA
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            36:2d:8f:72:88:a2:28:27:e4:00:ff:24:c6:2d:e4:eb:fa:9d:b6:e1
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=PT, O=DigitalSign Certificadora Digital, CN=DIGITALSIGN GLOBAL ROOT ECDSA CA
+        Validity
+            Not Before: Jan 21 11:07:50 2021 GMT
+            Not After : Jan 15 11:07:50 2046 GMT
+        Subject: C=PT, O=DigitalSign Certificadora Digital, CN=DIGITALSIGN GLOBAL ROOT ECDSA CA
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:6e:0b:a3:ab:33:4d:1c:ea:4a:e8:fc:04:8d:14:
+                    a0:7d:f0:08:2c:5f:83:ab:93:d1:d2:7b:ba:d7:49:
+                    7d:8f:ec:12:50:5f:d4:b9:cb:e5:f0:f9:33:63:1f:
+                    c9:57:ec:40:d8:11:0b:97:e8:52:16:cc:29:8e:f4:
+                    06:86:1e:38:dc:3d:57:c4:ee:aa:bd:c8:54:04:26:
+                    5a:27:13:51:47:3d:1f:1f:1a:8e:a8:95:a4:33:d0:
+                    cc:47:cc:6d:b8:fc:48
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                CE:AF:4A:8B:1A:75:E2:F1:38:E7:02:F0:16:AD:5E:EA:64:D5:7B:B4
+            X509v3 Subject Key Identifier: 
+                CE:AF:4A:8B:1A:75:E2:F1:38:E7:02:F0:16:AD:5E:EA:64:D5:7B:B4
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:30:0a:88:c4:71:9c:44:03:4d:8d:b4:c7:bc:a8:ae:
+        d9:30:27:35:6a:6b:16:63:d7:fc:e7:59:e1:a7:89:1b:4c:31:
+        9a:23:55:44:e6:f3:43:21:d5:47:27:6f:6d:57:01:aa:02:31:
+        00:fb:b2:ea:e2:97:7f:51:b5:9f:48:eb:bc:6f:35:89:a8:64:
+        70:ab:57:76:cd:c0:c6:14:60:ca:7f:e2:82:00:73:f7:cc:35:
+        ea:8e:24:9b:e5:08:59:c7:04:8c:73:78:fe
+SHA1 Fingerprint=67:A8:08:EB:8F:88:F5:80:6C:05:45:1B:17:F3:D7:00:2F:D2:4A:8A
+-----BEGIN CERTIFICATE-----
+MIICajCCAfCgAwIBAgIUNi2PcoiiKCfkAP8kxi3k6/qdtuEwCgYIKoZIzj0EAwMw
+ZDELMAkGA1UEBhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmljYWRv
+cmEgRGlnaXRhbDEpMCcGA1UEAwwgRElHSVRBTFNJR04gR0xPQkFMIFJPT1QgRUNE
+U0EgQ0EwHhcNMjEwMTIxMTEwNzUwWhcNNDYwMTE1MTEwNzUwWjBkMQswCQYDVQQG
+EwJQVDEqMCgGA1UECgwhRGlnaXRhbFNpZ24gQ2VydGlmaWNhZG9yYSBEaWdpdGFs
+MSkwJwYDVQQDDCBESUdJVEFMU0lHTiBHTE9CQUwgUk9PVCBFQ0RTQSBDQTB2MBAG
+ByqGSM49AgEGBSuBBAAiA2IABG4Lo6szTRzqSuj8BI0UoH3wCCxfg6uT0dJ7utdJ
+fY/sElBf1LnL5fD5M2MfyVfsQNgRC5foUhbMKY70BoYeONw9V8Tuqr3IVAQmWicT
+UUc9Hx8ajqiVpDPQzEfMbbj8SKNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSME
+GDAWgBTOr0qLGnXi8TjnAvAWrV7qZNV7tDAdBgNVHQ4EFgQUzq9Kixp14vE45wLw
+Fq1e6mTVe7QwDgYDVR0PAQH/BAQDAgEGMAoGCCqGSM49BAMDA2gAMGUCMAqIxHGc
+RANNjbTHvKiu2TAnNWprFmPX/OdZ4aeJG0wxmiNVRObzQyHVRydvbVcBqgIxAPuy
+6uKXf1G1n0jrvG81iahkcKtXds3AxhRgyn/iggBz98w16o4km+UIWccEjHN4/g==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/DIGITALSIGN_GLOBAL_ROOT_RSA_CA.pem b/secure/caroot/untrusted/DIGITALSIGN_GLOBAL_ROOT_RSA_CA.pem
new file mode 100644
index 000000000000..12e8caf749d1
--- /dev/null
+++ b/secure/caroot/untrusted/DIGITALSIGN_GLOBAL_ROOT_RSA_CA.pem
@@ -0,0 +1,135 @@
+##
+##  DIGITALSIGN GLOBAL ROOT RSA CA
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            5d:59:c8:ca:ab:09:57:f5:e6:b5:da:29:94:04:6a:ff:c5:d4:95:87
+        Signature Algorithm: sha512WithRSAEncryption
+        Issuer: C=PT, O=DigitalSign Certificadora Digital, CN=DIGITALSIGN GLOBAL ROOT RSA CA
+        Validity
+            Not Before: Jan 21 10:50:34 2021 GMT
+            Not After : Jan 15 10:50:34 2046 GMT
+        Subject: C=PT, O=DigitalSign Certificadora Digital, CN=DIGITALSIGN GLOBAL ROOT RSA CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:c8:87:b6:38:d3:1c:f0:de:12:f8:83:c7:c4:8a:
+                    e2:89:b8:b4:22:7a:78:f8:0c:66:51:68:76:37:0a:
+                    d5:4f:c2:5a:08:b8:16:5c:f7:72:01:09:37:84:81:
+                    2a:54:6b:d7:92:d0:6c:fa:a8:a7:43:12:34:eb:0e:
+                    db:37:0f:29:fe:8a:31:51:42:e8:4b:9c:90:a8:c8:
+                    2c:11:d3:fd:a0:29:7e:ce:de:94:f6:82:e0:58:b4:
+                    4e:45:25:f1:22:f2:3d:d3:0f:7b:54:1a:dc:32:b6:
+                    d6:51:4e:7e:41:b4:57:b8:2c:c6:b9:0e:2e:ca:57:
+                    f1:d5:c8:d3:58:e7:a5:e9:42:11:ae:d3:20:25:94:
+                    69:d7:8f:ca:a2:0d:c3:d3:9f:07:68:3f:15:d2:67:
+                    2e:53:fd:76:82:9b:0b:73:a9:29:0d:9e:11:93:14:
+                    08:98:ec:9e:54:12:4a:56:a2:06:15:ec:6b:6c:2e:
+                    92:60:2e:86:0d:ae:82:1f:51:4d:e3:b2:07:d7:10:
+                    19:57:22:f6:a9:69:44:84:f3:d9:3d:a0:06:bf:cc:
+                    88:7e:7f:f5:ce:5b:a5:c2:2a:6a:74:42:ea:6f:a6:
+                    ff:f9:68:b1:d0:5f:bd:91:d2:55:6f:33:57:4c:1e:
+                    9d:e4:e2:8b:c1:85:65:a0:e0:6a:9c:00:00:88:92:
+                    dd:58:08:16:f2:70:31:a8:1c:e1:de:bd:4e:71:e9:
+                    d6:be:7e:b5:a1:5a:c3:4d:f7:bf:9b:bd:94:a4:fd:
+                    f5:aa:53:93:46:c9:26:01:04:70:c4:a0:71:ba:ce:
+                    25:66:fb:91:7e:55:70:ee:49:0a:4d:62:7f:c2:50:
+                    9a:72:f2:18:67:9d:e9:45:a8:34:84:e8:f8:81:f6:
+                    d1:5a:22:1e:07:4f:3b:b3:7f:dd:11:a5:73:dc:be:
+                    a9:19:3a:69:a9:6d:1b:32:e2:89:aa:a5:27:0b:5a:
+                    7e:74:e2:0f:64:39:5d:7e:5c:b9:c1:17:fc:c7:8d:
+                    5e:c9:ec:24:ed:d2:f2:3f:7a:84:45:37:02:be:3e:
+                    6b:59:c4:e6:5b:16:6d:c0:aa:9e:aa:b5:59:2e:2c:
+                    70:55:9c:cc:99:96:98:24:54:d1:8e:da:ca:b4:11:
+                    b4:b7:70:43:1f:6f:90:0b:20:a0:a8:76:13:65:db:
+                    db:23:5a:75:4b:a1:0b:31:77:0a:ee:7d:68:61:1a:
+                    13:8c:ea:51:7e:5c:56:a3:57:4c:5d:a1:eb:13:65:
+                    bf:54:14:cc:f3:ee:dc:d7:ec:3c:97:f2:78:56:b8:
+                    df:72:5c:70:fc:ce:06:dd:9f:d2:07:31:ef:e7:52:
+                    91:9e:cd:ba:d7:c0:18:44:07:31:65:49:32:69:13:
+                    4a:eb:8f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                B5:36:BC:3C:8C:1A:AB:2C:F6:59:19:2D:83:14:DA:93:25:15:D6:86
+            X509v3 Subject Key Identifier: 
+                B5:36:BC:3C:8C:1A:AB:2C:F6:59:19:2D:83:14:DA:93:25:15:D6:86
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha512WithRSAEncryption
+    Signature Value:
+        14:fb:31:25:38:31:f8:ca:08:b2:23:76:38:ad:f8:d3:59:f5:
+        cc:b4:57:25:e1:44:be:7e:fc:16:ec:ae:fa:26:9f:4f:67:16:
+        4a:56:f0:fd:ed:c7:19:01:34:8e:90:5a:2d:d6:80:5c:ec:71:
+        d2:81:25:82:1e:00:71:df:9a:d1:d5:1d:22:bb:d1:a5:f3:62:
+        0f:b4:eb:dc:24:73:fe:a6:56:cd:9a:14:c5:04:35:16:31:a2:
+        07:eb:a5:00:e2:b6:f8:5f:72:fd:3f:61:49:8e:de:7e:4d:38:
+        d7:7a:1e:74:37:6c:51:dc:be:00:04:b8:38:14:f3:20:c1:ed:
+        9b:a7:23:fd:0d:42:84:1d:7f:f2:73:c3:d0:78:63:f1:9f:ec:
+        d7:5b:e9:f1:be:6c:a0:4b:03:9e:8d:69:e1:14:da:88:10:81:
+        23:53:ff:da:54:2b:0b:c6:b9:96:95:04:18:46:f3:7b:a8:97:
+        d8:5b:68:a4:e4:38:1c:0e:45:e5:98:d3:09:ae:9a:5e:ec:b3:
+        79:0d:39:72:f2:f4:94:9d:0e:9e:60:22:e6:a8:f6:4c:85:cd:
+        07:82:3a:68:39:cd:3d:5f:e3:38:f4:b6:af:3b:6b:4a:9f:60:
+        51:45:a2:40:02:e5:aa:0c:e3:3e:d1:78:d4:a2:74:9c:26:ba:
+        05:9a:28:70:4a:3e:a6:0b:d0:1d:49:f0:ba:f8:ae:41:10:7e:
+        a4:07:12:bd:a8:cf:29:3d:57:bb:c7:f1:43:47:00:3e:ae:70:
+        18:5a:20:7b:09:cb:3a:3a:70:80:e5:4c:60:98:c1:15:c1:1d:
+        4a:f7:c8:f0:9b:e1:72:ad:e7:5d:68:58:0b:04:b1:8c:bc:9f:
+        b7:fb:6e:8b:5b:04:55:fb:eb:23:55:d7:78:50:da:25:cb:be:
+        27:36:bb:24:1a:79:1c:51:d1:fe:13:bb:ff:78:2c:dc:a4:be:
+        2f:f6:c5:4b:53:cf:a7:4c:99:5e:70:ac:59:88:04:ae:64:04:
+        bf:7b:a6:7a:4d:d3:e8:77:bd:a1:7e:50:15:f3:ef:49:30:85:
+        4d:21:57:aa:db:2c:75:97:ad:81:01:87:a2:b1:70:9d:1e:06:
+        5a:03:60:b1:3f:a6:6d:82:2c:d4:14:b1:81:a5:e8:3d:88:1d:
+        b4:72:2c:58:37:8a:8e:38:94:b8:73:dd:a9:e0:b8:f6:77:a2:
+        b3:7c:58:de:ae:69:3a:b5:8b:a5:1a:bb:f2:d8:74:06:9c:fd:
+        62:73:20:21:76:b1:7e:70:9e:19:d4:eb:17:62:19:38:99:cd:
+        36:2b:47:fe:31:cb:df:b9:e4:ac:08:d3:d8:a6:eb:d4:9e:7e:
+        4b:64:a4:55:5d:2b:17:c9
+SHA1 Fingerprint=B9:82:07:97:AE:52:A5:68:6F:46:07:DF:FD:03:72:3D:92:86:88:2D
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIUXVnIyqsJV/XmtdoplARq/8XUlYcwDQYJKoZIhvcNAQEN
+BQAwYjELMAkGA1UEBhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmlj
+YWRvcmEgRGlnaXRhbDEnMCUGA1UEAwweRElHSVRBTFNJR04gR0xPQkFMIFJPT1Qg
+UlNBIENBMB4XDTIxMDEyMTEwNTAzNFoXDTQ2MDExNTEwNTAzNFowYjELMAkGA1UE
+BhMCUFQxKjAoBgNVBAoMIURpZ2l0YWxTaWduIENlcnRpZmljYWRvcmEgRGlnaXRh
+bDEnMCUGA1UEAwweRElHSVRBTFNJR04gR0xPQkFMIFJPT1QgUlNBIENBMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAyIe2ONMc8N4S+IPHxIriibi0Inp4
++AxmUWh2NwrVT8JaCLgWXPdyAQk3hIEqVGvXktBs+qinQxI06w7bNw8p/ooxUULo
+S5yQqMgsEdP9oCl+zt6U9oLgWLRORSXxIvI90w97VBrcMrbWUU5+QbRXuCzGuQ4u
+ylfx1cjTWOel6UIRrtMgJZRp14/Kog3D058HaD8V0mcuU/12gpsLc6kpDZ4RkxQI
+mOyeVBJKVqIGFexrbC6SYC6GDa6CH1FN47IH1xAZVyL2qWlEhPPZPaAGv8yIfn/1
+zlulwipqdELqb6b/+Wix0F+9kdJVbzNXTB6d5OKLwYVloOBqnAAAiJLdWAgW8nAx
+qBzh3r1OcenWvn61oVrDTfe/m72UpP31qlOTRskmAQRwxKBxus4lZvuRflVw7kkK
+TWJ/wlCacvIYZ53pRag0hOj4gfbRWiIeB087s3/dEaVz3L6pGTppqW0bMuKJqqUn
+C1p+dOIPZDldfly5wRf8x41eyewk7dLyP3qERTcCvj5rWcTmWxZtwKqeqrVZLixw
+VZzMmZaYJFTRjtrKtBG0t3BDH2+QCyCgqHYTZdvbI1p1S6ELMXcK7n1oYRoTjOpR
+flxWo1dMXaHrE2W/VBTM8+7c1+w8l/J4Vrjfclxw/M4G3Z/SBzHv51KRns2618AY
+RAcxZUkyaRNK648CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAW
+gBS1Nrw8jBqrLPZZGS2DFNqTJRXWhjAdBgNVHQ4EFgQUtTa8PIwaqyz2WRktgxTa
+kyUV1oYwDgYDVR0PAQH/BAQDAgEGMA0GCSqGSIb3DQEBDQUAA4ICAQAU+zElODH4
+ygiyI3Y4rfjTWfXMtFcl4US+fvwW7K76Jp9PZxZKVvD97ccZATSOkFot1oBc7HHS
+gSWCHgBx35rR1R0iu9Gl82IPtOvcJHP+plbNmhTFBDUWMaIH66UA4rb4X3L9P2FJ
+jt5+TTjXeh50N2xR3L4ABLg4FPMgwe2bpyP9DUKEHX/yc8PQeGPxn+zXW+nxvmyg
+SwOejWnhFNqIEIEjU//aVCsLxrmWlQQYRvN7qJfYW2ik5DgcDkXlmNMJrppe7LN5
+DTly8vSUnQ6eYCLmqPZMhc0HgjpoOc09X+M49LavO2tKn2BRRaJAAuWqDOM+0XjU
+onScJroFmihwSj6mC9AdSfC6+K5BEH6kBxK9qM8pPVe7x/FDRwA+rnAYWiB7Ccs6
+OnCA5UxgmMEVwR1K98jwm+FyreddaFgLBLGMvJ+3+26LWwRV++sjVdd4UNoly74n
+NrskGnkcUdH+E7v/eCzcpL4v9sVLU8+nTJlecKxZiASuZAS/e6Z6TdPod72hflAV
+8+9JMIVNIVeq2yx1l62BAYeisXCdHgZaA2CxP6ZtgizUFLGBpeg9iB20cixYN4qO
+OJS4c92p4Lj2d6KzfFjermk6tYulGrvy2HQGnP1icyAhdrF+cJ4Z1OsXYhk4mc02
+K0f+McvfueSsCNPYpuvUnn5LZKRVXSsXyQ==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem b/secure/caroot/untrusted/DigiCert_Assured_ID_Root_CA.pem
index 0246f54016ff..0246f54016ff 100644
--- a/secure/caroot/trusted/DigiCert_Assured_ID_Root_CA.pem
+++ b/secure/caroot/untrusted/DigiCert_Assured_ID_Root_CA.pem
diff --git a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem b/secure/caroot/untrusted/DigiCert_Global_Root_CA.pem
index 6270979a1341..6270979a1341 100644
--- a/secure/caroot/trusted/DigiCert_Global_Root_CA.pem
+++ b/secure/caroot/untrusted/DigiCert_Global_Root_CA.pem
diff --git a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem b/secure/caroot/untrusted/DigiCert_High_Assurance_EV_Root_CA.pem
index a96602fd6e5d..a96602fd6e5d 100644
--- a/secure/caroot/trusted/DigiCert_High_Assurance_EV_Root_CA.pem
+++ b/secure/caroot/untrusted/DigiCert_High_Assurance_EV_Root_CA.pem
diff --git a/secure/caroot/untrusted/DigiCert_SMIME_ECC_P384_Root_G5.pem b/secure/caroot/untrusted/DigiCert_SMIME_ECC_P384_Root_G5.pem
new file mode 100644
index 000000000000..f15257041bb1
--- /dev/null
+++ b/secure/caroot/untrusted/DigiCert_SMIME_ECC_P384_Root_G5.pem
@@ -0,0 +1,64 @@
+##
+##  DigiCert SMIME ECC P384 Root G5
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            05:3f:6e:a0:06:01:72:7d:ed:3f:c3:a3:b6:a3:d6:ef
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=US, O=DigiCert, Inc., CN=DigiCert SMIME ECC P384 Root G5
+        Validity
+            Not Before: Jan 15 00:00:00 2021 GMT
+            Not After : Jan 14 23:59:59 2046 GMT
+        Subject: C=US, O=DigiCert, Inc., CN=DigiCert SMIME ECC P384 Root G5
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:16:9d:55:e5:b6:d4:fb:fb:67:6b:1a:d4:a1:aa:
+                    d2:77:95:3e:88:e5:07:9f:b6:70:66:20:28:a4:88:
+                    ec:70:35:af:b3:32:ff:37:13:4a:9e:bc:01:03:de:
+                    84:c1:b8:c6:e6:65:47:89:f2:13:55:bf:cd:a5:1e:
+                    08:60:7f:ad:7f:e8:61:92:29:cf:09:47:5e:0b:1c:
+                    c0:1f:a4:bf:f2:5b:bc:98:ef:99:4c:cc:70:6b:b6:
+                    ba:d0:28:1d:bf:be:04
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                73:7A:6B:96:DB:42:07:8B:52:66:C2:64:32:17:FE:E0:67:90:2E:AD
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:64:02:30:37:44:f5:32:80:e3:71:eb:f4:6d:cf:7c:cc:91:
+        9a:c3:6e:71:d8:d2:23:5d:92:4d:82:42:6d:5c:61:95:f6:91:
+        f5:a7:08:f6:6a:97:e9:9c:94:2d:98:70:fd:33:b6:09:02:30:
+        07:3c:2f:b9:58:82:5e:0f:a3:62:a8:93:67:f0:20:c3:69:bf:
+        03:2c:3b:50:a7:3b:af:41:38:c9:52:48:91:d6:0e:fb:bc:60:
+        30:7c:64:3f:12:1e:45:7f:51:3e:f4:a6
+SHA1 Fingerprint=1C:B8:A7:08:C9:0D:20:79:01:A0:B2:36:7F:F0:95:65:E4:53:24:FE
+-----BEGIN CERTIFICATE-----
+MIICHDCCAaOgAwIBAgIQBT9uoAYBcn3tP8OjtqPW7zAKBggqhkjOPQQDAzBQMQsw
+CQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xKDAmBgNVBAMTH0Rp
+Z2lDZXJ0IFNNSU1FIEVDQyBQMzg0IFJvb3QgRzUwHhcNMjEwMTE1MDAwMDAwWhcN
+NDYwMTE0MjM1OTU5WjBQMQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQs
+IEluYy4xKDAmBgNVBAMTH0RpZ2lDZXJ0IFNNSU1FIEVDQyBQMzg0IFJvb3QgRzUw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAAQWnVXlttT7+2drGtShqtJ3lT6I5QeftnBm
+ICikiOxwNa+zMv83E0qevAED3oTBuMbmZUeJ8hNVv82lHghgf61/6GGSKc8JR14L
+HMAfpL/yW7yY75lMzHBrtrrQKB2/vgSjQjBAMB0GA1UdDgQWBBRzemuW20IHi1Jm
+wmQyF/7gZ5AurTAOBgNVHQ8BAf8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAKBggq
+hkjOPQQDAwNnADBkAjA3RPUygONx6/Rtz3zMkZrDbnHY0iNdkk2CQm1cYZX2kfWn
+CPZql+mclC2YcP0ztgkCMAc8L7lYgl4Po2Kok2fwIMNpvwMsO1CnO69BOMlSSJHW
+Dvu8YDB8ZD8SHkV/UT70pg==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/DigiCert_SMIME_RSA4096_Root_G5.pem b/secure/caroot/untrusted/DigiCert_SMIME_RSA4096_Root_G5.pem
new file mode 100644
index 000000000000..78d0bcd5dca5
--- /dev/null
+++ b/secure/caroot/untrusted/DigiCert_SMIME_RSA4096_Root_G5.pem
@@ -0,0 +1,131 @@
+##
+##  DigiCert SMIME RSA4096 Root G5
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            05:f6:ba:04:23:83:46:cb:7d:5c:e6:b9:5b:ba:1c:55
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=US, O=DigiCert, Inc., CN=DigiCert SMIME RSA4096 Root G5
+        Validity
+            Not Before: Jan 15 00:00:00 2021 GMT
+            Not After : Jan 14 23:59:59 2046 GMT
+        Subject: C=US, O=DigiCert, Inc., CN=DigiCert SMIME RSA4096 Root G5
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:e0:6a:5b:d9:f8:f9:7d:ec:b5:7b:ef:5f:dd:5c:
+                    34:d8:da:5d:d1:cb:65:75:ab:21:7c:5b:00:d4:82:
+                    6f:45:85:41:8a:a9:12:02:72:32:f0:14:f5:03:75:
+                    bb:63:97:49:0f:40:99:0b:1a:1e:56:a7:d2:d0:e1:
+                    ab:dd:e5:04:1b:e3:1f:14:12:02:88:f5:a0:80:09:
+                    f6:27:9a:50:f0:ba:e3:a2:e0:ac:6a:14:91:b5:6b:
+                    38:10:7a:a2:31:e1:91:1b:b7:b9:f0:2b:5b:c8:77:
+                    09:76:b7:51:c4:36:0a:99:53:54:44:25:b7:09:35:
+                    86:17:05:56:93:3d:41:b7:02:d7:62:1f:8a:92:11:
+                    87:ea:11:6d:ea:08:11:dc:b1:78:48:49:92:f6:b4:
+                    51:80:78:23:d8:fe:e1:56:1a:3a:90:13:56:34:89:
+                    d5:e2:95:8b:5f:de:b2:cc:fb:3f:38:b7:85:f7:ea:
+                    9e:bf:2e:a1:2e:2f:4d:7d:6a:11:2e:36:a0:ff:11:
+                    08:04:95:55:e0:1b:3b:67:93:a9:94:55:ea:32:ed:
+                    06:3a:7f:c2:7f:e3:ad:13:27:d1:34:41:b3:30:c3:
+                    bf:b4:88:f8:03:82:a4:df:3e:ab:78:77:a0:59:93:
+                    71:e7:dd:eb:00:04:7b:cc:48:39:28:e0:1e:a3:15:
+                    69:c8:36:b2:a1:0b:97:df:55:d6:ef:91:9c:a4:f6:
+                    16:f7:51:0a:ee:03:23:91:dc:04:ff:e0:dd:38:f6:
+                    22:03:00:c2:07:71:1a:12:c9:d7:46:2a:94:1b:cd:
+                    d6:bb:1b:ee:bf:be:4d:50:58:b0:0b:cd:30:76:29:
+                    f5:cf:e5:b6:6a:2f:76:b0:b0:69:6a:d0:6d:65:18:
+                    35:7e:93:bc:72:17:c1:55:42:cd:2f:c2:25:bb:f4:
+                    fd:1d:a1:64:22:54:5d:e2:9e:72:41:84:6e:71:96:
+                    ea:45:07:b6:5e:7a:4a:86:9d:73:64:77:38:03:d2:
+                    0f:53:a5:55:20:c4:4d:ff:68:6f:55:a9:ea:dd:71:
+                    e4:4f:d9:85:a3:7c:4e:29:02:9e:0b:09:f2:1a:53:
+                    cc:00:a6:dd:d1:34:f6:0d:c1:30:b1:9c:02:64:ac:
+                    35:ed:a5:b0:29:b1:d2:95:33:0f:d2:20:33:bd:ec:
+                    23:4b:f2:19:f9:da:98:64:e4:2c:31:1f:2e:e1:8d:
+                    1c:04:95:28:4d:8c:58:cd:4b:e5:73:82:86:8c:ec:
+                    a8:d6:79:5c:fb:64:bb:dc:0c:4c:28:f6:17:af:e2:
+                    68:d6:16:86:98:db:fc:01:dc:31:ba:f8:9c:0e:f9:
+                    28:46:4a:e1:fd:96:06:45:79:11:68:17:65:5c:8b:
+                    26:87:5b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                D1:A3:D4:57:1D:4F:55:DB:75:4C:5C:42:9E:63:16:CE:B4:C6:3B:1F
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        07:a7:0a:de:53:bb:9a:eb:70:bf:b2:36:90:cd:e4:a7:b8:f1:
+        0c:e4:5d:5a:1d:78:65:fc:c9:b8:1e:23:11:57:7c:69:35:6d:
+        01:ff:53:50:bf:07:0e:ba:c7:01:3f:58:2a:94:75:03:ab:1c:
+        0b:23:dc:1b:8a:1e:37:3d:1d:58:8f:73:d9:b3:2a:6f:df:10:
+        a0:5b:0c:a7:ca:b0:7f:b9:24:a2:01:35:32:e5:5e:46:41:eb:
+        d8:7f:73:e7:42:e9:a4:51:26:77:81:0a:a8:eb:0f:0a:50:9d:
+        7e:8a:20:67:fc:0b:8e:3a:11:d3:c5:8c:60:18:d9:4b:b1:fc:
+        d4:f1:b4:49:4e:ae:87:e1:d1:fb:76:a1:5f:f3:06:cf:97:96:
+        0c:e9:9e:75:81:5c:53:0d:22:fc:36:e6:49:6e:74:db:00:85:
+        8d:7c:22:a0:8e:fb:10:4c:d4:62:13:5b:ef:4b:72:26:8b:fc:
+        4e:8a:8f:fe:97:10:53:c5:78:8b:42:64:1b:5f:e0:89:fd:bb:
+        09:7f:50:e0:54:85:26:11:6a:1d:65:f9:49:29:dc:7c:36:df:
+        fb:3d:f7:d2:ac:ee:32:8d:6e:a6:7d:39:9c:45:c4:ca:0d:f5:
+        3b:b4:79:53:a5:2f:56:c7:51:c5:8a:4c:64:5d:90:43:23:8e:
+        6b:4c:17:78:cc:e8:bf:f5:3b:e4:a8:48:cf:ad:9b:0c:df:32:
+        4a:d3:d9:12:8e:23:78:0d:2d:af:9f:af:9e:3c:09:c2:97:00:
+        ed:3a:69:1c:71:3f:39:df:d3:8f:c4:66:f5:ef:36:94:0f:f3:
+        dd:92:b6:96:5f:90:a6:dd:73:aa:a6:20:94:94:25:6a:09:0c:
+        72:e4:13:23:60:4c:a3:ca:17:2e:7b:67:00:db:d0:cd:ea:7a:
+        1f:39:26:57:89:30:77:cb:4e:e5:95:45:4f:5f:fb:36:5c:3d:
+        f9:20:b5:3a:10:25:4f:93:32:5a:ee:c1:96:e8:e9:56:04:b0:
+        49:61:4d:ec:78:a8:9d:18:c1:ff:d8:ea:2f:56:ef:95:2b:7b:
+        04:5e:67:e3:55:40:ed:39:04:f9:0b:79:f5:6a:8c:5c:0f:89:
+        9a:90:c7:cd:8b:de:db:26:35:a1:6e:cd:b3:42:f2:a2:0f:3b:
+        0c:8e:93:ff:14:cf:fc:f7:93:f7:e4:41:08:6e:19:52:11:0f:
+        53:19:73:78:0c:cf:d8:85:81:f8:ad:55:c8:b0:9e:46:63:af:
+        9c:52:ee:5c:bf:f0:c0:5b:37:1e:09:20:d2:3e:23:c6:a1:15:
+        4a:0e:36:7e:30:c5:79:6a:bc:22:88:d9:0c:52:40:1f:dd:4e:
+        0f:67:26:16:d2:ad:17:1c
+SHA1 Fingerprint=5B:C5:AD:E2:9A:A7:54:DA:84:89:53:A5:FE:D7:5B:46:86:D0:57:08
+-----BEGIN CERTIFICATE-----
+MIIFajCCA1KgAwIBAgIQBfa6BCODRst9XOa5W7ocVTANBgkqhkiG9w0BAQwFADBP
+MQswCQYDVQQGEwJVUzEXMBUGA1UEChMORGlnaUNlcnQsIEluYy4xJzAlBgNVBAMT
+HkRpZ2lDZXJ0IFNNSU1FIFJTQTQwOTYgUm9vdCBHNTAeFw0yMTAxMTUwMDAwMDBa
+Fw00NjAxMTQyMzU5NTlaME8xCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5EaWdpQ2Vy
+dCwgSW5jLjEnMCUGA1UEAxMeRGlnaUNlcnQgU01JTUUgUlNBNDA5NiBSb290IEc1
+MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA4Gpb2fj5fey1e+9f3Vw0
+2Npd0ctldashfFsA1IJvRYVBiqkSAnIy8BT1A3W7Y5dJD0CZCxoeVqfS0OGr3eUE
+G+MfFBICiPWggAn2J5pQ8LrjouCsahSRtWs4EHqiMeGRG7e58CtbyHcJdrdRxDYK
+mVNURCW3CTWGFwVWkz1BtwLXYh+KkhGH6hFt6ggR3LF4SEmS9rRRgHgj2P7hVho6
+kBNWNInV4pWLX96yzPs/OLeF9+qevy6hLi9NfWoRLjag/xEIBJVV4Bs7Z5OplFXq
+Mu0GOn/Cf+OtEyfRNEGzMMO/tIj4A4Kk3z6reHegWZNx593rAAR7zEg5KOAeoxVp
+yDayoQuX31XW75GcpPYW91EK7gMjkdwE/+DdOPYiAwDCB3EaEsnXRiqUG83Wuxvu
+v75NUFiwC80wdin1z+W2ai92sLBpatBtZRg1fpO8chfBVULNL8Ilu/T9HaFkIlRd
+4p5yQYRucZbqRQe2XnpKhp1zZHc4A9IPU6VVIMRN/2hvVanq3XHkT9mFo3xOKQKe
+CwnyGlPMAKbd0TT2DcEwsZwCZKw17aWwKbHSlTMP0iAzvewjS/IZ+dqYZOQsMR8u
+4Y0cBJUoTYxYzUvlc4KGjOyo1nlc+2S73AxMKPYXr+Jo1haGmNv8AdwxuvicDvko
+Rkrh/ZYGRXkRaBdlXIsmh1sCAwEAAaNCMEAwHQYDVR0OBBYEFNGj1FcdT1XbdUxc
+Qp5jFs60xjsfMA4GA1UdDwEB/wQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MA0GCSqG
+SIb3DQEBDAUAA4ICAQAHpwreU7ua63C/sjaQzeSnuPEM5F1aHXhl/Mm4HiMRV3xp
+NW0B/1NQvwcOuscBP1gqlHUDqxwLI9wbih43PR1Yj3PZsypv3xCgWwynyrB/uSSi
+ATUy5V5GQevYf3PnQumkUSZ3gQqo6w8KUJ1+iiBn/AuOOhHTxYxgGNlLsfzU8bRJ
+Tq6H4dH7dqFf8wbPl5YM6Z51gVxTDSL8NuZJbnTbAIWNfCKgjvsQTNRiE1vvS3Im
+i/xOio/+lxBTxXiLQmQbX+CJ/bsJf1DgVIUmEWodZflJKdx8Nt/7PffSrO4yjW6m
+fTmcRcTKDfU7tHlTpS9Wx1HFikxkXZBDI45rTBd4zOi/9TvkqEjPrZsM3zJK09kS
+jiN4DS2vn6+ePAnClwDtOmkccT8539OPxGb17zaUD/PdkraWX5Cm3XOqpiCUlCVq
+CQxy5BMjYEyjyhcue2cA29DN6nofOSZXiTB3y07llUVPX/s2XD35ILU6ECVPkzJa
+7sGW6OlWBLBJYU3seKidGMH/2OovVu+VK3sEXmfjVUDtOQT5C3n1aoxcD4makMfN
+i97bJjWhbs2zQvKiDzsMjpP/FM/895P35EEIbhlSEQ9TGXN4DM/YhYH4rVXIsJ5G
+Y6+cUu5cv/DAWzceCSDSPiPGoRVKDjZ+MMV5arwiiNkMUkAf3U4PZyYW0q0XHA==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem b/secure/caroot/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem
deleted file mode 100644
index 5c8e87176c7e..000000000000
--- a/secure/caroot/untrusted/E-Tugra_Global_Root_CA_ECC_v3.pem
+++ /dev/null
@@ -1,69 +0,0 @@
-##
-##  E-Tugra Global Root CA ECC v3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            26:46:19:77:31:e1:4f:6f:28:36:de:39:51:86:e6:d4:97:88:22:c1
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=TR, L=Ankara, O=E-Tugra EBG A.S., OU=E-Tugra Trust Center, CN=E-Tugra Global Root CA ECC v3
-        Validity
-            Not Before: Mar 18 09:46:58 2020 GMT
-            Not After : Mar 12 09:46:58 2045 GMT
-        Subject: C=TR, L=Ankara, O=E-Tugra EBG A.S., OU=E-Tugra Trust Center, CN=E-Tugra Global Root CA ECC v3
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:8e:98:29:bf:c7:10:1e:27:db:ab:03:cc:28:2c:
-                    d8:5e:48:19:10:29:cc:cb:59:81:cc:8c:b8:92:17:
-                    89:83:2a:92:f6:c3:a4:1d:4c:62:d5:9f:d6:a0:46:
-                    dc:1c:bc:76:c1:e3:47:d0:5b:13:da:e7:a5:b3:66:
-                    48:e7:21:9a:4a:4f:86:0a:7d:6c:ea:4d:32:80:0a:
-                    b2:7a:09:9b:69:4b:98:81:e2:2e:ec:02:70:96:1f:
-                    fd:f5:46:ce:ca:dc:82
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Authority Key Identifier: 
-                FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5
-            X509v3 Subject Key Identifier: 
-                FF:82:31:72:3E:F9:C4:66:6C:AD:38:9E:D1:B0:51:88:A5:90:CC:F5
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:66:02:31:00:e6:05:58:69:61:e5:2d:ca:0d:cb:f1:19:08:
-        bd:d6:fd:51:92:1a:7e:63:54:04:90:91:9a:35:91:39:99:fa:
-        07:a9:66:93:ba:c8:68:d4:8a:3f:fa:ed:6e:16:02:27:b7:02:
-        31:00:dd:5a:17:2b:76:1d:65:42:96:a6:ac:5d:8a:79:56:d8:
-        8a:1b:df:9a:de:5f:c7:50:8f:b1:5b:71:0c:26:df:6a:40:00:
-        ec:33:91:21:71:be:68:e4:23:a4:d9:ad:a1:37
-SHA1 Fingerprint=8A:2F:AF:57:53:B1:B0:E6:A1:04:EC:5B:6A:69:71:6D:F6:1C:E2:84
------BEGIN CERTIFICATE-----
-MIICpTCCAiqgAwIBAgIUJkYZdzHhT28oNt45UYbm1JeIIsEwCgYIKoZIzj0EAwMw
-gYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUtVHVn
-cmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYwJAYD
-VQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIEVDQyB2MzAeFw0yMDAzMTgwOTQ2
-NThaFw00NTAzMTIwOTQ2NThaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMGQW5r
-YXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1Z3Jh
-IFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBDQSBF
-Q0MgdjMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASOmCm/xxAeJ9urA8woLNheSBkQ
-KczLWYHMjLiSF4mDKpL2w6QdTGLVn9agRtwcvHbB40fQWxPa56WzZkjnIZpKT4YK
-fWzqTTKACrJ6CZtpS5iB4i7sAnCWH/31Rs7K3IKjYzBhMA8GA1UdEwEB/wQFMAMB
-Af8wHwYDVR0jBBgwFoAU/4Ixcj75xGZsrTie0bBRiKWQzPUwHQYDVR0OBBYEFP+C
-MXI++cRmbK04ntGwUYilkMz1MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNp
-ADBmAjEA5gVYaWHlLcoNy/EZCL3W/VGSGn5jVASQkZo1kTmZ+gepZpO6yGjUij/6
-7W4WAie3AjEA3VoXK3YdZUKWpqxdinlW2Iob35reX8dQj7FbcQwm32pAAOwzkSFx
-vmjkI6TZraE3
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem b/secure/caroot/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem
deleted file mode 100644
index ce226f323f43..000000000000
--- a/secure/caroot/untrusted/E-Tugra_Global_Root_CA_RSA_v3.pem
+++ /dev/null
@@ -1,136 +0,0 @@
-##
-##  E-Tugra Global Root CA RSA v3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            0d:4d:c5:cd:16:22:95:96:08:7e:b8:0b:7f:15:06:34:fb:79:10:34
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=TR, L=Ankara, O=E-Tugra EBG A.S., OU=E-Tugra Trust Center, CN=E-Tugra Global Root CA RSA v3
-        Validity
-            Not Before: Mar 18 09:07:17 2020 GMT
-            Not After : Mar 12 09:07:17 2045 GMT
-        Subject: C=TR, L=Ankara, O=E-Tugra EBG A.S., OU=E-Tugra Trust Center, CN=E-Tugra Global Root CA RSA v3
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:a2:66:f0:89:b7:72:7b:ee:09:c9:63:d2:d3:43:
-                    dd:5e:c3:a6:84:38:4a:f1:8d:81:bb:14:bd:47:e8:
-                    40:17:f3:3d:c3:78:45:72:a6:2e:90:de:9a:3a:d4:
-                    20:71:ca:bc:9f:1d:4b:97:0a:c7:31:ba:3e:d7:fe:
-                    25:a9:2a:8e:36:f4:d1:2f:c7:b7:a9:5d:33:dc:30:
-                    70:f8:40:6c:4b:b2:a6:31:61:d1:34:3c:3d:31:7a:
-                    c7:af:c4:a7:a7:84:e1:97:a4:e8:4b:f6:17:7c:ee:
-                    3c:07:ed:e2:8a:57:dc:b6:fb:f8:43:25:50:ea:27:
-                    81:a8:86:bc:8f:52:4a:96:3a:60:1a:96:bb:fd:73:
-                    f4:85:fd:83:fd:7f:84:6d:34:6c:7f:6a:b7:4b:01:
-                    03:bf:ad:69:b7:d7:32:d9:f5:57:6a:e9:86:82:3e:
-                    a5:66:31:b3:16:3d:c2:f3:26:60:32:d3:52:1e:b0:
-                    6c:a4:37:3e:f4:f5:af:eb:e1:df:80:06:cf:2a:41:
-                    e7:66:09:e1:4b:97:e7:77:bd:21:6d:29:b6:67:c3:
-                    2d:7e:ed:d6:79:65:d1:cf:3a:b6:d1:b1:5e:56:61:
-                    50:7a:5a:ce:4e:50:31:80:03:98:47:e7:e4:18:7c:
-                    44:5a:c6:a4:b3:3b:c6:c6:c3:3a:f0:6c:c3:8b:c8:
-                    a4:91:05:f3:f5:d9:b6:aa:06:a1:b7:ab:e4:b1:ea:
-                    21:14:5c:83:a4:fc:ff:b6:50:d3:8c:12:26:99:76:
-                    70:e9:c0:0f:a6:74:fc:bb:d0:1b:78:ce:72:92:e2:
-                    28:9c:bc:e6:e9:09:d8:3a:d3:89:e6:be:2e:77:df:
-                    01:0a:6f:96:f6:e5:8d:3c:4d:52:76:1a:56:e1:73:
-                    7e:17:ac:3d:ad:6c:a3:52:12:18:70:e6:80:4e:33:
-                    f2:7e:26:32:ac:05:8d:38:a4:e6:76:3c:9f:10:69:
-                    0e:6d:9d:d2:c1:79:20:6b:5b:cf:33:8d:d1:94:76:
-                    35:e7:5d:55:c7:b7:ac:28:ab:46:cc:e7:3b:21:b5:
-                    0a:0a:e4:4a:59:dc:81:35:4b:44:95:12:0a:67:a5:
-                    a1:ff:5b:00:07:d2:c0:cc:f9:3f:fc:9f:33:f2:00:
-                    f8:8c:6c:87:9d:06:2d:f1:ef:e3:e6:06:fa:c5:66:
-                    13:5b:fc:50:07:9e:71:86:b2:da:6f:74:30:cf:93:
-                    53:e8:dc:22:d6:de:20:1f:61:8d:a3:2e:a3:78:32:
-                    90:6c:dc:ac:32:b5:05:e4:f5:3c:33:0d:d6:e0:87:
-                    77:17:4c:9d:b0:d8:09:a8:0d:57:f7:44:85:f0:c8:
-                    04:be:5c:5d:5a:e3:17:8e:54:63:69:7f:49:74:64:
-                    05:8c:a3
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Authority Key Identifier: 
-                B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF
-            X509v3 Subject Key Identifier: 
-                B2:B4:AE:E6:2D:F7:26:D5:AA:75:2D:76:4B:C0:1B:53:21:D0:48:EF
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        89:a8:72:7f:8c:eb:ce:2e:18:c4:10:80:2d:10:0c:ff:fb:14:
-        cd:04:e0:14:3c:4e:9a:fb:9f:29:bf:22:9e:57:b9:82:73:12:
-        63:26:b5:cc:90:e9:d2:2a:29:ee:9c:2d:cc:2c:99:be:45:27:
-        e4:b1:71:ed:e4:38:95:31:41:f2:7d:7a:63:78:df:ca:36:16:
-        2f:82:88:9f:bc:11:47:4f:76:4d:c8:2d:8e:eb:df:2d:7c:4e:
-        3b:da:ae:f6:e3:da:5d:14:a6:ae:e8:85:44:9d:06:6e:8e:fb:
-        ef:7a:4a:6a:2d:2b:28:18:fe:bf:90:2c:75:16:9f:0f:ea:96:
-        7d:05:ee:9b:13:a5:44:6c:f8:03:d0:dd:23:e1:fd:03:12:12:
-        08:f4:18:34:b3:e0:37:0b:77:11:01:48:bf:61:b4:b5:f8:19:
-        d9:cb:4d:ea:a3:8c:ef:fd:f0:06:b5:6d:92:f4:4a:61:50:84:
-        ed:ec:49:d3:e4:be:68:e6:2e:e3:31:0b:54:0b:1a:92:d6:82:
-        d8:b6:a2:65:3c:66:04:f9:55:da:6c:fb:db:b5:14:66:4d:94:
-        83:3b:cd:1e:a6:2b:b2:fe:77:40:86:ab:e7:df:0a:c9:fd:f6:
-        dd:87:56:18:d8:b0:2c:55:60:96:fa:08:7e:52:90:f5:4b:a6:
-        2e:87:7c:cb:20:db:06:3e:a0:5d:03:77:7d:a2:3c:13:1b:29:
-        a2:13:55:a0:3d:14:22:af:6f:b8:d0:9a:1b:72:dd:05:01:8d:
-        86:60:bf:a4:67:ee:b5:a5:0d:d1:7f:e6:1a:2b:62:66:c3:07:
-        ba:e7:a0:48:1c:38:c3:e9:45:fb:a7:7f:fc:ed:02:68:1a:ca:
-        77:12:77:a6:00:55:28:14:ec:d6:c7:12:a2:1b:65:42:e9:91:
-        e8:cb:3e:87:89:54:5d:d9:af:9d:97:9c:69:e7:0a:ff:0f:5a:
-        78:8b:63:2a:4c:7d:47:94:3f:de:4b:e9:53:d0:30:f1:c5:f6:
-        9e:49:df:3b:a0:91:a3:a3:fe:cd:58:cc:ea:df:af:6f:28:3b:
-        a0:69:9b:8f:ec:ac:ae:2b:54:9d:9b:04:b1:47:20:af:96:12:
-        3e:63:94:1d:04:e7:2e:bb:86:c7:0c:9a:88:bf:76:47:ef:f7:
-        b0:0b:97:66:d2:44:cf:60:52:07:e1:d5:2c:4a:3a:27:61:77:
-        ca:d7:8f:e7:87:0e:30:ff:0c:bb:04:e2:61:c3:a2:c8:97:61:
-        8e:b4:30:6a:3c:6d:c2:07:5f:4a:73:2f:3f:f9:16:8a:01:66:
-        ef:ba:91:ca:52:57:7b:ae:d4:e6:0f:dd:0b:7a:7f:8b:9e:26:
-        20:cf:3b:ef:81:71:83:59
-SHA1 Fingerprint=E9:A8:5D:22:14:52:1C:5B:AA:0A:B4:BE:24:6A:23:8A:C9:BA:E2:A9
------BEGIN CERTIFICATE-----
-MIIF8zCCA9ugAwIBAgIUDU3FzRYilZYIfrgLfxUGNPt5EDQwDQYJKoZIhvcNAQEL
-BQAwgYAxCzAJBgNVBAYTAlRSMQ8wDQYDVQQHEwZBbmthcmExGTAXBgNVBAoTEEUt
-VHVncmEgRUJHIEEuUy4xHTAbBgNVBAsTFEUtVHVncmEgVHJ1c3QgQ2VudGVyMSYw
-JAYDVQQDEx1FLVR1Z3JhIEdsb2JhbCBSb290IENBIFJTQSB2MzAeFw0yMDAzMTgw
-OTA3MTdaFw00NTAzMTIwOTA3MTdaMIGAMQswCQYDVQQGEwJUUjEPMA0GA1UEBxMG
-QW5rYXJhMRkwFwYDVQQKExBFLVR1Z3JhIEVCRyBBLlMuMR0wGwYDVQQLExRFLVR1
-Z3JhIFRydXN0IENlbnRlcjEmMCQGA1UEAxMdRS1UdWdyYSBHbG9iYWwgUm9vdCBD
-QSBSU0EgdjMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCiZvCJt3J7
-7gnJY9LTQ91ew6aEOErxjYG7FL1H6EAX8z3DeEVypi6Q3po61CBxyryfHUuXCscx
-uj7X/iWpKo429NEvx7epXTPcMHD4QGxLsqYxYdE0PD0xesevxKenhOGXpOhL9hd8
-7jwH7eKKV9y2+/hDJVDqJ4GohryPUkqWOmAalrv9c/SF/YP9f4RtNGx/ardLAQO/
-rWm31zLZ9Vdq6YaCPqVmMbMWPcLzJmAy01IesGykNz709a/r4d+ABs8qQedmCeFL
-l+d3vSFtKbZnwy1+7dZ5ZdHPOrbRsV5WYVB6Ws5OUDGAA5hH5+QYfERaxqSzO8bG
-wzrwbMOLyKSRBfP12baqBqG3q+Sx6iEUXIOk/P+2UNOMEiaZdnDpwA+mdPy70Bt4
-znKS4iicvObpCdg604nmvi533wEKb5b25Y08TVJ2Glbhc34XrD2tbKNSEhhw5oBO
-M/J+JjKsBY04pOZ2PJ8QaQ5tndLBeSBrW88zjdGUdjXnXVXHt6woq0bM5zshtQoK
-5EpZ3IE1S0SVEgpnpaH/WwAH0sDM+T/8nzPyAPiMbIedBi3x7+PmBvrFZhNb/FAH
-nnGGstpvdDDPk1Po3CLW3iAfYY2jLqN4MpBs3KwytQXk9TwzDdbgh3cXTJ2w2Amo
-DVf3RIXwyAS+XF1a4xeOVGNpf0l0ZAWMowIDAQABo2MwYTAPBgNVHRMBAf8EBTAD
-AQH/MB8GA1UdIwQYMBaAFLK0ruYt9ybVqnUtdkvAG1Mh0EjvMB0GA1UdDgQWBBSy
-tK7mLfcm1ap1LXZLwBtTIdBI7zAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEL
-BQADggIBAImocn+M684uGMQQgC0QDP/7FM0E4BQ8Tpr7nym/Ip5XuYJzEmMmtcyQ
-6dIqKe6cLcwsmb5FJ+Sxce3kOJUxQfJ9emN438o2Fi+CiJ+8EUdPdk3ILY7r3y18
-Tjvarvbj2l0Upq7ohUSdBm6O++96SmotKygY/r+QLHUWnw/qln0F7psTpURs+APQ
-3SPh/QMSEgj0GDSz4DcLdxEBSL9htLX4GdnLTeqjjO/98Aa1bZL0SmFQhO3sSdPk
-vmjmLuMxC1QLGpLWgti2omU8ZgT5Vdps+9u1FGZNlIM7zR6mK7L+d0CGq+ffCsn9
-9t2HVhjYsCxVYJb6CH5SkPVLpi6HfMsg2wY+oF0Dd32iPBMbKaITVaA9FCKvb7jQ
-mhty3QUBjYZgv6Rn7rWlDdF/5horYmbDB7rnoEgcOMPpRfunf/ztAmgayncSd6YA
-VSgU7NbHEqIbZULpkejLPoeJVF3Zr52XnGnnCv8PWniLYypMfUeUP95L6VPQMPHF
-9p5J3zugkaOj/s1YzOrfr28oO6Bpm4/srK4rVJ2bBLFHIK+WEj5jlB0E5y67hscM
-moi/dkfv97ALl2bSRM9gUgfh1SxKOidhd8rXj+eHDjD/DLsE4mHDosiXYY60MGo8
-bcIHX0pzLz/5FooBZu+6kcpSV3uu1OYP3Qt6f4ueJiDPO++BcYNZ
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/EC-ACC.pem b/secure/caroot/untrusted/EC-ACC.pem
deleted file mode 100644
index 0605493d156e..000000000000
--- a/secure/caroot/untrusted/EC-ACC.pem
+++ /dev/null
@@ -1,107 +0,0 @@
-##
-##  EC-ACC
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-             (Negative)11:d4:c2:14:2b:de:21:eb:57:9d:53:fb:0c:22:3b:ff
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=ES, O=Agencia Catalana de Certificacio (NIF Q-0801176-I), OU=Serveis Publics de Certificacio, OU=Vegeu https://www.catcert.net/verarrel (c)03, OU=Jerarquia Entitats de Certificacio Catalanes, CN=EC-ACC
-        Validity
-            Not Before: Jan  7 23:00:00 2003 GMT
-            Not After : Jan  7 22:59:59 2031 GMT
-        Subject: C=ES, O=Agencia Catalana de Certificacio (NIF Q-0801176-I), OU=Serveis Publics de Certificacio, OU=Vegeu https://www.catcert.net/verarrel (c)03, OU=Jerarquia Entitats de Certificacio Catalanes, CN=EC-ACC
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b3:22:c7:4f:e2:97:42:95:88:47:83:40:f6:1d:
-                    17:f3:83:73:24:1e:51:f3:98:8a:c3:92:b8:ff:40:
-                    90:05:70:87:60:c9:00:a9:b5:94:65:19:22:15:17:
-                    c2:43:6c:66:44:9a:0d:04:3e:39:6f:a5:4b:7a:aa:
-                    63:b7:8a:44:9d:d9:63:91:84:66:e0:28:0f:ba:42:
-                    e3:6e:8e:f7:14:27:93:69:ee:91:0e:a3:5f:0e:b1:
-                    eb:66:a2:72:4f:12:13:86:65:7a:3e:db:4f:07:f4:
-                    a7:09:60:da:3a:42:99:c7:b2:7f:b3:16:95:1c:c7:
-                    f9:34:b5:94:85:d5:99:5e:a0:48:a0:7e:e7:17:65:
-                    b8:a2:75:b8:1e:f3:e5:42:7d:af:ed:f3:8a:48:64:
-                    5d:82:14:93:d8:c0:e4:ff:b3:50:72:f2:76:f6:b3:
-                    5d:42:50:79:d0:94:3e:6b:0c:00:be:d8:6b:0e:4e:
-                    2a:ec:3e:d2:cc:82:a2:18:65:33:13:77:9e:9a:5d:
-                    1a:13:d8:c3:db:3d:c8:97:7a:ee:70:ed:a7:e6:7c:
-                    db:71:cf:2d:94:62:df:6d:d6:f5:38:be:3f:a5:85:
-                    0a:19:b8:a8:d8:09:75:42:70:c4:ea:ef:cb:0e:c8:
-                    34:a8:12:22:98:0c:b8:13:94:b6:4b:ec:f0:d0:90:
-                    e7:27
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Alternative Name: 
-                email:ec_acc@catcert.net
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                A0:C3:8B:44:AA:37:A5:45:BF:97:80:5A:D1:F1:78:A2:9B:E9:5D:8D
-            X509v3 Certificate Policies: 
-                Policy: 1.3.6.1.4.1.15096.1.3.1.10
-                  CPS: https://www.catcert.net/verarrel
-                  User Notice:
-                    Explicit Text: Vegeu https://www.catcert.net/verarrel 
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        a0:48:5b:82:01:f6:4d:48:b8:39:55:35:9c:80:7a:53:99:d5:
-        5a:ff:b1:71:3b:cc:39:09:94:5e:d6:da:ef:be:01:5b:5d:d3:
-        1e:d8:fd:7d:4f:cd:a0:41:e0:34:93:bf:cb:e2:86:9c:37:92:
-        90:56:1c:dc:eb:29:05:e5:c4:9e:c7:35:df:8a:0c:cd:c5:21:
-        43:e9:aa:88:e5:35:c0:19:42:63:5a:02:5e:a4:48:18:3a:85:
-        6f:dc:9d:bc:3f:9d:9c:c1:87:b8:7a:61:08:e9:77:0b:7f:70:
-        ab:7a:dd:d9:97:2c:64:1e:85:bf:bc:74:96:a1:c3:7a:12:ec:
-        0c:1a:6e:83:0c:3c:e8:72:46:9f:fb:48:d5:5e:97:e6:b1:a1:
-        f8:e4:ef:46:25:94:9c:89:db:69:38:be:ec:5c:0e:56:c7:65:
-        51:e5:50:88:88:bf:42:d5:2b:3d:e5:f9:ba:9e:2e:b3:ca:f4:
-        73:92:02:0b:be:4c:66:eb:20:fe:b9:cb:b5:99:7f:e6:b6:13:
-        fa:ca:4b:4d:d9:ee:53:46:06:3b:c6:4e:ad:93:5a:81:7e:6c:
-        2a:4b:6a:05:45:8c:f2:21:a4:31:90:87:6c:65:9c:9d:a5:60:
-        95:3a:52:7f:f5:d1:ab:08:6e:f3:ee:5b:f9:88:3d:7e:b8:6f:
-        6e:03:e4:42
-SHA1 Fingerprint=28:90:3A:63:5B:52:80:FA:E6:77:4C:0B:6D:A7:D6:BA:A6:4A:F2:E8
------BEGIN CERTIFICATE-----
-MIIFVjCCBD6gAwIBAgIQ7is969Qh3hSoYqwE893EATANBgkqhkiG9w0BAQUFADCB
-8zELMAkGA1UEBhMCRVMxOzA5BgNVBAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2Vy
-dGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMSgwJgYDVQQLEx9TZXJ2ZWlzIFB1
-YmxpY3MgZGUgQ2VydGlmaWNhY2lvMTUwMwYDVQQLEyxWZWdldSBodHRwczovL3d3
-dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAoYykwMzE1MDMGA1UECxMsSmVyYXJxdWlh
-IEVudGl0YXRzIGRlIENlcnRpZmljYWNpbyBDYXRhbGFuZXMxDzANBgNVBAMTBkVD
-LUFDQzAeFw0wMzAxMDcyMzAwMDBaFw0zMTAxMDcyMjU5NTlaMIHzMQswCQYDVQQG
-EwJFUzE7MDkGA1UEChMyQWdlbmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2FjaW8g
-KE5JRiBRLTA4MDExNzYtSSkxKDAmBgNVBAsTH1NlcnZlaXMgUHVibGljcyBkZSBD
-ZXJ0aWZpY2FjaW8xNTAzBgNVBAsTLFZlZ2V1IGh0dHBzOi8vd3d3LmNhdGNlcnQu
-bmV0L3ZlcmFycmVsIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMg
-ZGUgQ2VydGlmaWNhY2lvIENhdGFsYW5lczEPMA0GA1UEAxMGRUMtQUNDMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsyLHT+KXQpWIR4NA9h0X84NzJB5R
-85iKw5K4/0CQBXCHYMkAqbWUZRkiFRfCQ2xmRJoNBD45b6VLeqpjt4pEndljkYRm
-4CgPukLjbo73FCeTae6RDqNfDrHrZqJyTxIThmV6PttPB/SnCWDaOkKZx7J/sxaV
-HMf5NLWUhdWZXqBIoH7nF2W4onW4HvPlQn2v7fOKSGRdghST2MDk/7NQcvJ29rNd
-QlB50JQ+awwAvthrDk4q7D7SzIKiGGUzE3eeml0aE9jD2z3Il3rucO2n5nzbcc8t
-lGLfbdb1OL4/pYUKGbio2Al1QnDE6u/LDsg0qBIimAy4E5S2S+zw0JDnJwIDAQAB
-o4HjMIHgMB0GA1UdEQQWMBSBEmVjX2FjY0BjYXRjZXJ0Lm5ldDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUoMOLRKo3pUW/l4Ba0fF4
-opvpXY0wfwYDVR0gBHgwdjB0BgsrBgEEAfV4AQMBCjBlMCwGCCsGAQUFBwIBFiBo
-dHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbDA1BggrBgEFBQcCAjApGidW
-ZWdldSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJhcnJlbCAwDQYJKoZIhvcN
-AQEFBQADggEBAKBIW4IB9k1IuDlVNZyAelOZ1Vr/sXE7zDkJlF7W2u++AVtd0x7Y
-/X1PzaBB4DSTv8vihpw3kpBWHNzrKQXlxJ7HNd+KDM3FIUPpqojlNcAZQmNaAl6k
-SBg6hW/cnbw/nZzBh7h6YQjpdwt/cKt63dmXLGQehb+8dJahw3oS7AwaboMMPOhy
-Rp/7SNVel+axofjk70YllJyJ22k4vuxcDlbHZVHlUIiIv0LVKz3l+bqeLrPK9HOS
-Agu+TGbrIP65y7WZf+a2E/rKS03Z7lNGBjvGTq2TWoF+bCpLagVFjPIhpDGQh2xl
-nJ2lYJU6Un/10asIbvPuW/mIPX64b24D5EI=
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/EE_Certification_Centre_Root_CA.pem b/secure/caroot/untrusted/EE_Certification_Centre_Root_CA.pem
deleted file mode 100644
index 9f6856fbd0f5..000000000000
--- a/secure/caroot/untrusted/EE_Certification_Centre_Root_CA.pem
+++ /dev/null
@@ -1,95 +0,0 @@
-##
-##  EE Certification Centre Root CA
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            54:80:f9:a0:73:ed:3f:00:4c:ca:89:d8:e3:71:e6:4a
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=EE, O=AS Sertifitseerimiskeskus, CN=EE Certification Centre Root CA, emailAddress=pki@sk.ee
-        Validity
-            Not Before: Oct 30 10:10:30 2010 GMT
-            Not After : Dec 17 23:59:59 2030 GMT
-        Subject: C=EE, O=AS Sertifitseerimiskeskus, CN=EE Certification Centre Root CA, emailAddress=pki@sk.ee
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c8:20:c0:ec:e0:c5:4b:ab:07:78:95:f3:44:ee:
-                    fb:0b:0c:ff:74:8e:61:bb:b1:62:ea:23:d8:ab:a1:
-                    65:32:7a:eb:8e:17:4f:96:d8:0a:7b:91:a2:63:6c:
-                    c7:8c:4c:2e:79:bf:a9:05:fc:69:5c:95:8d:62:f9:
-                    b9:70:ed:c3:51:7d:d0:93:e6:6c:eb:30:4b:e1:bc:
-                    7d:bf:52:9b:ce:6e:7b:65:f2:38:b1:c0:a2:32:ef:
-                    62:b2:68:e0:61:53:c1:36:95:ff:ec:94:ba:36:ae:
-                    9c:1c:a7:32:0f:e5:7c:b4:c6:6f:74:fd:7b:18:e8:
-                    ac:57:ed:06:20:4b:32:30:58:5b:fd:cd:a8:e6:a1:
-                    fc:70:bc:8e:92:73:db:97:a7:7c:21:ae:3d:c1:f5:
-                    48:87:6c:27:bd:9f:25:74:81:55:b0:f7:75:f6:3d:
-                    a4:64:6b:d6:4f:e7:ce:40:ad:0f:dd:32:d3:bc:8a:
-                    12:53:98:c9:89:fb:10:1d:4d:7e:cd:7e:1f:56:0d:
-                    21:70:85:f6:20:83:1f:f6:ba:1f:04:8f:ea:77:88:
-                    35:c4:ff:ea:4e:a1:8b:4d:3f:63:1b:44:c3:44:d4:
-                    25:76:ca:b7:8d:d7:1e:4a:66:64:cd:5c:c5:9c:83:
-                    e1:c2:08:88:9a:ec:4e:a3:f1:3e:1c:2c:d9:6c:1d:
-                    a1:4b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                12:F2:5A:3E:EA:56:1C:BF:CD:06:AC:F1:F1:25:C9:A9:4B:D4:14:99
-            X509v3 Extended Key Usage: 
-                TLS Web Client Authentication, TLS Web Server Authentication, Code Signing, E-mail Protection, Time Stamping, OCSP Signing
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        7b:f6:e4:c0:0d:aa:19:47:b7:4d:57:a3:fe:ad:bb:b1:6a:d5:
-        0f:9e:db:e4:63:c5:8e:a1:50:56:93:96:b8:38:c0:24:22:66:
-        bc:53:14:61:95:bf:d0:c7:2a:96:39:3f:7d:28:b3:10:40:21:
-        6a:c4:af:b0:52:77:18:e1:96:d8:56:5d:e3:dd:36:5e:1d:a7:
-        50:54:a0:c5:2a:e4:aa:8c:94:8a:4f:9d:35:ff:76:a4:06:13:
-        91:a2:a2:7d:00:44:3f:55:d3:82:3c:1a:d5:5b:bc:56:4c:22:
-        2e:46:43:8a:24:40:2d:f3:12:b8:3b:70:1a:a4:96:b9:1a:af:
-        87:41:1a:6a:18:0d:06:4f:c7:3e:6e:b9:29:4d:0d:49:89:11:
-        87:32:5b:e6:4b:04:c8:e4:5c:e6:74:73:94:5d:16:98:13:95:
-        fe:fb:db:b1:44:e5:3a:70:ac:37:6b:e6:b3:33:72:28:c9:b3:
-        57:a0:f6:02:16:88:06:0b:b6:a6:4b:20:28:d4:de:3d:8b:ad:
-        37:05:53:74:fe:6e:cc:bc:43:17:71:5e:f9:c5:cc:1a:a9:61:
-        ee:f7:76:0c:f3:72:f4:72:ad:cf:72:02:36:07:47:cf:ef:19:
-        50:89:60:cc:e9:24:95:0f:c2:cb:1d:f2:6f:76:90:c7:cc:75:
-        c1:96:c5:9d
-SHA1 Fingerprint=C9:A8:B9:E7:55:80:5E:58:E3:53:77:A7:25:EB:AF:C3:7B:27:CC:D7
------BEGIN CERTIFICATE-----
-MIIEAzCCAuugAwIBAgIQVID5oHPtPwBMyonY43HmSjANBgkqhkiG9w0BAQUFADB1
-MQswCQYDVQQGEwJFRTEiMCAGA1UECgwZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1
-czEoMCYGA1UEAwwfRUUgQ2VydGlmaWNhdGlvbiBDZW50cmUgUm9vdCBDQTEYMBYG
-CSqGSIb3DQEJARYJcGtpQHNrLmVlMCIYDzIwMTAxMDMwMTAxMDMwWhgPMjAzMDEy
-MTcyMzU5NTlaMHUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKDBlBUyBTZXJ0aWZpdHNl
-ZXJpbWlza2Vza3VzMSgwJgYDVQQDDB9FRSBDZXJ0aWZpY2F0aW9uIENlbnRyZSBS
-b290IENBMRgwFgYJKoZIhvcNAQkBFglwa2lAc2suZWUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDIIMDs4MVLqwd4lfNE7vsLDP90jmG7sWLqI9iroWUy
-euuOF0+W2Ap7kaJjbMeMTC55v6kF/GlclY1i+blw7cNRfdCT5mzrMEvhvH2/UpvO
-bntl8jixwKIy72KyaOBhU8E2lf/slLo2rpwcpzIP5Xy0xm90/XsY6KxX7QYgSzIw
-WFv9zajmofxwvI6Sc9uXp3whrj3B9UiHbCe9nyV0gVWw93X2PaRka9ZP585ArQ/d
-MtO8ihJTmMmJ+xAdTX7Nfh9WDSFwhfYggx/2uh8Ej+p3iDXE/+pOoYtNP2MbRMNE
-1CV2yreN1x5KZmTNXMWcg+HCCIia7E6j8T4cLNlsHaFLAgMBAAGjgYowgYcwDwYD
-VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBLyWj7qVhy/
-zQas8fElyalL1BSZMEUGA1UdJQQ+MDwGCCsGAQUFBwMCBggrBgEFBQcDAQYIKwYB
-BQUHAwMGCCsGAQUFBwMEBggrBgEFBQcDCAYIKwYBBQUHAwkwDQYJKoZIhvcNAQEF
-BQADggEBAHv25MANqhlHt01Xo/6tu7Fq1Q+e2+RjxY6hUFaTlrg4wCQiZrxTFGGV
-v9DHKpY5P30osxBAIWrEr7BSdxjhlthWXePdNl4dp1BUoMUq5KqMlIpPnTX/dqQG
-E5Gion0ARD9V04I8GtVbvFZMIi5GQ4okQC3zErg7cBqklrkar4dBGmoYDQZPxz5u
-uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIW
-iAYLtqZLICjU3j2LrTcFU3T+bsy8QxdxXvnFzBqpYe73dgzzcvRyrc9yAjYHR8/v
-GVCJYMzpJJUPwssd8m92kMfMdcGWxZ0=
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem b/secure/caroot/untrusted/Entrust_Root_Certification_Authority.pem
index 1a605e5a1208..1a605e5a1208 100644
--- a/secure/caroot/trusted/Entrust_Root_Certification_Authority.pem
+++ b/secure/caroot/untrusted/Entrust_Root_Certification_Authority.pem
diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem b/secure/caroot/untrusted/Entrust_Root_Certification_Authority_-_EC1.pem
index 69791bfd89b3..69791bfd89b3 100644
--- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_EC1.pem
+++ b/secure/caroot/untrusted/Entrust_Root_Certification_Authority_-_EC1.pem
diff --git a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem b/secure/caroot/untrusted/Entrust_Root_Certification_Authority_-_G2.pem
index 170c09d7d873..170c09d7d873 100644
--- a/secure/caroot/trusted/Entrust_Root_Certification_Authority_-_G2.pem
+++ b/secure/caroot/untrusted/Entrust_Root_Certification_Authority_-_G2.pem
diff --git a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem b/secure/caroot/untrusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
index e2fe9972f805..e2fe9972f805 100644
--- a/secure/caroot/trusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
+++ b/secure/caroot/untrusted/Entrust_net_Premium_2048_Secure_Server_CA.pem
diff --git a/secure/caroot/trusted/GTS_Root_R2.pem b/secure/caroot/untrusted/GTS_Root_R2.pem
index 277c9d6482f4..277c9d6482f4 100644
--- a/secure/caroot/trusted/GTS_Root_R2.pem
+++ b/secure/caroot/untrusted/GTS_Root_R2.pem
diff --git a/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority.pem b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority.pem
deleted file mode 100644
index 4556c986d502..000000000000
--- a/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority.pem
+++ /dev/null
@@ -1,90 +0,0 @@
-##
-##  GeoTrust Primary Certification Authority
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=GeoTrust Inc., CN=GeoTrust Primary Certification Authority
-        Validity
-            Not Before: Nov 27 00:00:00 2006 GMT
-            Not After : Jul 16 23:59:59 2036 GMT
-        Subject: C=US, O=GeoTrust Inc., CN=GeoTrust Primary Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:be:b8:15:7b:ff:d4:7c:7d:67:ad:83:64:7b:c8:
-                    42:53:2d:df:f6:84:08:20:61:d6:01:59:6a:9c:44:
-                    11:af:ef:76:fd:95:7e:ce:61:30:bb:7a:83:5f:02:
-                    bd:01:66:ca:ee:15:8d:6f:a1:30:9c:bd:a1:85:9e:
-                    94:3a:f3:56:88:00:31:cf:d8:ee:6a:96:02:d9:ed:
-                    03:8c:fb:75:6d:e7:ea:b8:55:16:05:16:9a:f4:e0:
-                    5e:b1:88:c0:64:85:5c:15:4d:88:c7:b7:ba:e0:75:
-                    e9:ad:05:3d:9d:c7:89:48:e0:bb:28:c8:03:e1:30:
-                    93:64:5e:52:c0:59:70:22:35:57:88:8a:f1:95:0a:
-                    83:d7:bc:31:73:01:34:ed:ef:46:71:e0:6b:02:a8:
-                    35:72:6b:97:9b:66:e0:cb:1c:79:5f:d8:1a:04:68:
-                    1e:47:02:e6:9d:60:e2:36:97:01:df:ce:35:92:df:
-                    be:67:c7:6d:77:59:3b:8f:9d:d6:90:15:94:bc:42:
-                    34:10:c1:39:f9:b1:27:3e:7e:d6:8a:75:c5:b2:af:
-                    96:d3:a2:de:9b:e4:98:be:7d:e1:e9:81:ad:b6:6f:
-                    fc:d7:0e:da:e0:34:b0:0d:1a:77:e7:e3:08:98:ef:
-                    58:fa:9c:84:b7:36:af:c2:df:ac:d2:f4:10:06:70:
-                    71:35
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                2C:D5:50:41:97:15:8B:F0:8F:36:61:5B:4A:FB:6B:D9:99:C9:33:92
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        5a:70:7f:2c:dd:b7:34:4f:f5:86:51:a9:26:be:4b:b8:aa:f1:
-        71:0d:dc:61:c7:a0:ea:34:1e:7a:77:0f:04:35:e8:27:8f:6c:
-        90:bf:91:16:24:46:3e:4a:4e:ce:2b:16:d5:0b:52:1d:fc:1f:
-        67:a2:02:45:31:4f:ce:f3:fa:03:a7:79:9d:53:6a:d9:da:63:
-        3a:f8:80:d7:d3:99:e1:a5:e1:be:d4:55:71:98:35:3a:be:93:
-        ea:ae:ad:42:b2:90:6f:e0:fc:21:4d:35:63:33:89:49:d6:9b:
-        4e:ca:c7:e7:4e:09:00:f7:da:c7:ef:99:62:99:77:b6:95:22:
-        5e:8a:a0:ab:f4:b8:78:98:ca:38:19:99:c9:72:9e:78:cd:4b:
-        ac:af:19:a0:73:12:2d:fc:c2:41:ba:81:91:da:16:5a:31:b7:
-        f9:b4:71:80:12:48:99:72:73:5a:59:53:c1:63:52:33:ed:a7:
-        c9:d2:39:02:70:fa:e0:b1:42:66:29:aa:9b:51:ed:30:54:22:
-        14:5f:d9:ab:1d:c1:e4:94:f0:f8:f5:2b:f7:ea:ca:78:46:d6:
-        b8:91:fd:a6:0d:2b:1a:14:01:3e:80:f0:42:a0:95:07:5e:6d:
-        cd:cc:4b:a4:45:8d:ab:12:e8:b3:de:5a:e5:a0:7c:e8:0f:22:
-        1d:5a:e9:59
-SHA1 Fingerprint=32:3C:11:8E:1B:F7:B8:B6:52:54:E2:E2:10:0D:D6:02:90:37:F0:96
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQGKy1av1pthU6Y2yv2vrEoTANBgkqhkiG9w0BAQUFADBY
-MQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjExMC8GA1UEAxMo
-R2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wNjEx
-MjcwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMFgxCzAJBgNVBAYTAlVTMRYwFAYDVQQK
-Ew1HZW9UcnVzdCBJbmMuMTEwLwYDVQQDEyhHZW9UcnVzdCBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEAvrgVe//UfH1nrYNke8hCUy3f9oQIIGHWAVlqnEQRr+92/ZV+zmEwu3qDXwK9
-AWbK7hWNb6EwnL2hhZ6UOvNWiAAxz9juapYC2e0DjPt1befquFUWBRaa9OBesYjA
-ZIVcFU2Ix7e64HXprQU9nceJSOC7KMgD4TCTZF5SwFlwIjVXiIrxlQqD17wxcwE0
-7e9GceBrAqg1cmuXm2bgyxx5X9gaBGgeRwLmnWDiNpcB3841kt++Z8dtd1k7j53W
-kBWUvEI0EME5+bEnPn7WinXFsq+W06Lem+SYvn3h6YGttm/81w7a4DSwDRp35+MI
-mO9Y+pyEtzavwt+s0vQQBnBxNQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4G
-A1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQULNVQQZcVi/CPNmFbSvtr2ZnJM5IwDQYJ
-KoZIhvcNAQEFBQADggEBAFpwfyzdtzRP9YZRqSa+S7iq8XEN3GHHoOo0Hnp3DwQ1
-6CePbJC/kRYkRj5KTs4rFtULUh38H2eiAkUxT87z+gOneZ1TatnaYzr4gNfTmeGl
-4b7UVXGYNTq+k+qurUKykG/g/CFNNWMziUnWm07Kx+dOCQD32sfvmWKZd7aVIl6K
-oKv0uHiYyjgZmclynnjNS6yvGaBzEi38wkG6gZHaFloxt/m0cYASSJlyc1pZU8Fj
-UjPtp8nSOQJw+uCxQmYpqptR7TBUIhRf2asdweSU8Pj1K/fqynhG1riR/aYNKxoU
-AT6A8EKglQdebc3MS6RFjasS6LPeWuWgfOgPIh1a6Vk=
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
deleted file mode 100644
index a99362a2c2e0..000000000000
--- a/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G2.pem
+++ /dev/null
@@ -1,67 +0,0 @@
-##
-##  GeoTrust Primary Certification Authority - G2
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            3c:b2:f4:48:0a:00:e2:fe:eb:24:3b:5e:60:3e:c3:6b
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=GeoTrust Inc., OU=(c) 2007 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G2
-        Validity
-            Not Before: Nov  5 00:00:00 2007 GMT
-            Not After : Jan 18 23:59:59 2038 GMT
-        Subject: C=US, O=GeoTrust Inc., OU=(c) 2007 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G2
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:15:b1:e8:fd:03:15:43:e5:ac:eb:87:37:11:62:
-                    ef:d2:83:36:52:7d:45:57:0b:4a:8d:7b:54:3b:3a:
-                    6e:5f:15:02:c0:50:a6:cf:25:2f:7d:ca:48:b8:c7:
-                    50:63:1c:2a:21:08:7c:9a:36:d8:0b:fe:d1:26:c5:
-                    58:31:30:28:25:f3:5d:5d:a3:b8:b6:a5:b4:92:ed:
-                    6c:2c:9f:eb:dd:43:89:a2:3c:4b:48:91:1d:50:ec:
-                    26:df:d6:60:2e:bd:21
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                15:5F:35:57:51:55:FB:25:B2:AD:03:69:FC:01:A3:FA:BE:11:55:D5
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:64:02:30:64:96:59:a6:e8:09:de:8b:ba:fa:5a:88:88:f0:
-        1f:91:d3:46:a8:f2:4a:4c:02:63:fb:6c:5f:38:db:2e:41:93:
-        a9:0e:e6:9d:dc:31:1c:b2:a0:a7:18:1c:79:e1:c7:36:02:30:
-        3a:56:af:9a:74:6c:f6:fb:83:e0:33:d3:08:5f:a1:9c:c2:5b:
-        9f:46:d6:b6:cb:91:06:63:a2:06:e7:33:ac:3e:a8:81:12:d0:
-        cb:ba:d0:92:0b:b6:9e:96:aa:04:0f:8a
-SHA1 Fingerprint=8D:17:84:D5:37:F3:03:7D:EC:70:FE:57:8B:51:9A:99:E6:10:D7:B0
------BEGIN CERTIFICATE-----
-MIICrjCCAjWgAwIBAgIQPLL0SAoA4v7rJDteYD7DazAKBggqhkjOPQQDAzCBmDEL
-MAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsTMChj
-KSAyMDA3IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTE2
-MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEcyMB4XDTA3MTEwNTAwMDAwMFoXDTM4MDExODIzNTk1OVowgZgxCzAJBgNV
-BAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykgMjAw
-NyBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0BgNV
-BAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBH
-MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABBWx6P0DFUPlrOuHNxFi79KDNlJ9RVcL
-So17VDs6bl8VAsBQps8lL33KSLjHUGMcKiEIfJo22Av+0SbFWDEwKCXzXV2juLal
-tJLtbCyf691DiaI8S0iRHVDsJt/WYC69IaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAO
-BgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFBVfNVdRVfslsq0DafwBo/q+EVXVMAoG
-CCqGSM49BAMDA2cAMGQCMGSWWaboCd6LuvpaiIjwH5HTRqjySkwCY/tsXzjbLkGT
-qQ7mndwxHLKgpxgceeHHNgIwOlavmnRs9vuD4DPTCF+hnMJbn0bWtsuRBmOiBucz
-rD6ogRLQy7rQkgu2npaqBA+K
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G3.pem
deleted file mode 100644
index 86b2dba7f212..000000000000
--- a/secure/caroot/untrusted/GeoTrust_Primary_Certification_Authority_-_G3.pem
+++ /dev/null
@@ -1,93 +0,0 @@
-##
-##  GeoTrust Primary Certification Authority - G3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=GeoTrust Inc., OU=(c) 2008 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G3
-        Validity
-            Not Before: Apr  2 00:00:00 2008 GMT
-            Not After : Dec  1 23:59:59 2037 GMT
-        Subject: C=US, O=GeoTrust Inc., OU=(c) 2008 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G3
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:dc:e2:5e:62:58:1d:33:57:39:32:33:fa:eb:cb:
-                    87:8c:a7:d4:4a:dd:06:88:ea:64:8e:31:98:a5:38:
-                    90:1e:98:cf:2e:63:2b:f0:46:bc:44:b2:89:a1:c0:
-                    28:0c:49:70:21:95:9f:64:c0:a6:93:12:02:65:26:
-                    86:c6:a5:89:f0:fa:d7:84:a0:70:af:4f:1a:97:3f:
-                    06:44:d5:c9:eb:72:10:7d:e4:31:28:fb:1c:61:e6:
-                    28:07:44:73:92:22:69:a7:03:88:6c:9d:63:c8:52:
-                    da:98:27:e7:08:4c:70:3e:b4:c9:12:c1:c5:67:83:
-                    5d:33:f3:03:11:ec:6a:d0:53:e2:d1:ba:36:60:94:
-                    80:bb:61:63:6c:5b:17:7e:df:40:94:1e:ab:0d:c2:
-                    21:28:70:88:ff:d6:26:6c:6c:60:04:25:4e:55:7e:
-                    7d:ef:bf:94:48:de:b7:1d:dd:70:8d:05:5f:88:a5:
-                    9b:f2:c2:ee:ea:d1:40:41:6d:62:38:1d:56:06:c5:
-                    03:47:51:20:19:fc:7b:10:0b:0e:62:ae:76:55:bf:
-                    5f:77:be:3e:49:01:53:3d:98:25:03:76:24:5a:1d:
-                    b4:db:89:ea:79:e5:b6:b3:3b:3f:ba:4c:28:41:7f:
-                    06:ac:6a:8e:c1:d0:f6:05:1d:7d:e6:42:86:e3:a5:
-                    d5:47
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                C4:79:CA:8E:A1:4E:03:1D:1C:DC:6B:DB:31:5B:94:3E:3F:30:7F:2D
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        2d:c5:13:cf:56:80:7b:7a:78:bd:9f:ae:2c:99:e7:ef:da:df:
-        94:5e:09:69:a7:e7:6e:68:8c:bd:72:be:47:a9:0e:97:12:b8:
-        4a:f1:64:d3:39:df:25:34:d4:c1:cd:4e:81:f0:0f:04:c4:24:
-        b3:34:96:c6:a6:aa:30:df:68:61:73:d7:f9:8e:85:89:ef:0e:
-        5e:95:28:4a:2a:27:8f:10:8e:2e:7c:86:c4:02:9e:da:0c:77:
-        65:0e:44:0d:92:fd:fd:b3:16:36:fa:11:0d:1d:8c:0e:07:89:
-        6a:29:56:f7:72:f4:dd:15:9c:77:35:66:57:ab:13:53:d8:8e:
-        c1:40:c5:d7:13:16:5a:72:c7:b7:69:01:c4:7a:b1:83:01:68:
-        7d:8d:41:a1:94:18:c1:25:5c:fc:f0:fe:83:02:87:7c:0d:0d:
-        cf:2e:08:5c:4a:40:0d:3e:ec:81:61:e6:24:db:ca:e0:0e:2d:
-        07:b2:3e:56:dc:8d:f5:41:85:07:48:9b:0c:0b:cb:49:3f:7d:
-        ec:b7:fd:cb:8d:67:89:1a:ab:ed:bb:1e:a3:00:08:08:17:2a:
-        82:5c:31:5d:46:8a:2d:0f:86:9b:74:d9:45:fb:d4:40:b1:7a:
-        aa:68:2d:86:b2:99:22:e1:c1:2b:c7:9c:f8:f3:5f:a8:82:12:
-        eb:19:11:2d
-SHA1 Fingerprint=03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD
------BEGIN CERTIFICATE-----
-MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
-mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
-MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
-eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
-cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
-BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
-MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
-BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
-+uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
-hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
-5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
-JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
-DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
-huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
-HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
-AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
-zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
-kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
-AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
-SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
-spki4cErx5z481+oghLrGREt
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/GeoTrust_Universal_CA.pem b/secure/caroot/untrusted/GeoTrust_Universal_CA.pem
deleted file mode 100644
index 26b4f726c4bc..000000000000
--- a/secure/caroot/untrusted/GeoTrust_Universal_CA.pem
+++ /dev/null
@@ -1,132 +0,0 @@
-##
-##  GeoTrust Universal CA
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA
-        Validity
-            Not Before: Mar  4 05:00:00 2004 GMT
-            Not After : Mar  4 05:00:00 2029 GMT
-        Subject: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:a6:15:55:a0:a3:c6:e0:1f:8c:9d:21:50:d7:c1:
-                    be:2b:5b:b5:a4:9e:a1:d9:72:58:bd:00:1b:4c:bf:
-                    61:c9:14:1d:45:82:ab:c6:1d:80:d6:3d:eb:10:9c:
-                    3a:af:6d:24:f8:bc:71:01:9e:06:f5:7c:5f:1e:c1:
-                    0e:55:ca:83:9a:59:30:ae:19:cb:30:48:95:ed:22:
-                    37:8d:f4:4a:9a:72:66:3e:ad:95:c0:e0:16:00:e0:
-                    10:1f:2b:31:0e:d7:94:54:d3:42:33:a0:34:1d:1e:
-                    45:76:dd:4f:ca:18:37:ec:85:15:7a:19:08:fc:d5:
-                    c7:9c:f0:f2:a9:2e:10:a9:92:e6:3d:58:3d:a9:16:
-                    68:3c:2f:75:21:18:7f:28:77:a5:e1:61:17:b7:a6:
-                    e9:f8:1e:99:db:73:6e:f4:0a:a2:21:6c:ee:da:aa:
-                    85:92:66:af:f6:7a:6b:82:da:ba:22:08:35:0f:cf:
-                    42:f1:35:fa:6a:ee:7e:2b:25:cc:3a:11:e4:6d:af:
-                    73:b2:76:1d:ad:d0:b2:78:67:1a:a4:39:1c:51:0b:
-                    67:56:83:fd:38:5d:0d:ce:dd:f0:bb:2b:96:1f:de:
-                    7b:32:52:fd:1d:bb:b5:06:a1:b2:21:5e:a5:d6:95:
-                    68:7f:f0:99:9e:dc:45:08:3e:e7:d2:09:0d:35:94:
-                    dd:80:4e:53:97:d7:b5:09:44:20:64:16:17:03:02:
-                    4c:53:0d:68:de:d5:aa:72:4d:93:6d:82:0e:db:9c:
-                    bd:cf:b4:f3:5c:5d:54:7a:69:09:96:d6:db:11:c1:
-                    8d:75:a8:b4:cf:39:c8:ce:3c:bc:24:7c:e6:62:ca:
-                    e1:bd:7d:a7:bd:57:65:0b:e4:fe:25:ed:b6:69:10:
-                    dc:28:1a:46:bd:01:1d:d0:97:b5:e1:98:3b:c0:37:
-                    64:d6:3d:94:ee:0b:e1:f5:28:ae:0b:56:bf:71:8b:
-                    23:29:41:8e:86:c5:4b:52:7b:d8:71:ab:1f:8a:15:
-                    a6:3b:83:5a:d7:58:01:51:c6:4c:41:d9:7f:d8:41:
-                    67:72:a2:28:df:60:83:a9:9e:c8:7b:fc:53:73:72:
-                    59:f5:93:7a:17:76:0e:ce:f7:e5:5c:d9:0b:55:34:
-                    a2:aa:5b:b5:6a:54:e7:13:ca:57:ec:97:6d:f4:5e:
-                    06:2f:45:8b:58:d4:23:16:92:e4:16:6e:28:63:59:
-                    30:df:50:01:9c:63:89:1a:9f:db:17:94:82:70:37:
-                    c3:24:9e:9a:47:d6:5a:ca:4e:a8:69:89:72:1f:91:
-                    6c:db:7e:9e:1b:ad:c7:1f:73:dd:2c:4f:19:65:fd:
-                    7f:93:40:10:2e:d2:f0:ed:3c:9e:2e:28:3e:69:26:
-                    33:c5:7b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                DA:BB:2E:AA:B0:0C:B8:88:26:51:74:5C:6D:03:D3:C0:D8:8F:7A:D6
-            X509v3 Authority Key Identifier: 
-                DA:BB:2E:AA:B0:0C:B8:88:26:51:74:5C:6D:03:D3:C0:D8:8F:7A:D6
-            X509v3 Key Usage: critical
-                Digital Signature, Certificate Sign, CRL Sign
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        31:78:e6:c7:b5:df:b8:94:40:c9:71:c4:a8:35:ec:46:1d:c2:
-        85:f3:28:58:86:b0:0b:fc:8e:b2:39:8f:44:55:ab:64:84:5c:
-        69:a9:d0:9a:38:3c:fa:e5:1f:35:e5:44:e3:80:79:94:68:a4:
-        bb:c4:9f:3d:e1:34:cd:30:46:8b:54:2b:95:a5:ef:f7:3f:99:
-        84:fd:35:e6:cf:31:c6:dc:6a:bf:a7:d7:23:08:e1:98:5e:c3:
-        5a:08:76:a9:a6:af:77:2f:b7:60:bd:44:46:6a:ef:97:ff:73:
-        95:c1:8e:e8:93:fb:fd:31:b7:ec:57:11:11:45:9b:30:f1:1a:
-        88:39:c1:4f:3c:a7:00:d5:c7:fc:ab:6d:80:22:70:a5:0c:e0:
-        5d:04:29:02:fb:cb:a0:91:d1:7c:d6:c3:7e:50:d5:9d:58:be:
-        41:38:eb:b9:75:3c:15:d9:9b:c9:4a:83:59:c0:da:53:fd:33:
-        bb:36:18:9b:85:0f:15:dd:ee:2d:ac:76:93:b9:d9:01:8d:48:
-        10:a8:fb:f5:38:86:f1:db:0a:c6:bd:84:a3:23:41:de:d6:77:
-        6f:85:d4:85:1c:50:e0:ae:51:8a:ba:8d:3e:76:e2:b9:ca:27:
-        f2:5f:9f:ef:6e:59:0d:06:d8:2b:17:a4:d2:7c:6b:bb:5f:14:
-        1a:48:8f:1a:4c:e7:b3:47:1c:8e:4c:45:2b:20:ee:48:df:e7:
-        dd:09:8e:18:a8:da:40:8d:92:26:11:53:61:73:5d:eb:bd:e7:
-        c4:4d:29:37:61:eb:ac:39:2d:67:2e:16:d6:f5:00:83:85:a1:
-        cc:7f:76:c4:7d:e4:b7:4b:66:ef:03:45:60:69:b6:0c:52:96:
-        92:84:5e:a6:a3:b5:a4:3e:2b:d9:cc:d8:1b:47:aa:f2:44:da:
-        4f:f9:03:e8:f0:14:cb:3f:f3:83:de:d0:c1:54:e3:b7:e8:0a:
-        37:4d:8b:20:59:03:30:19:a1:2c:c8:bd:11:1f:df:ae:c9:4a:
-        c5:f3:27:66:66:86:ac:68:91:ff:d9:e6:53:1c:0f:8b:5c:69:
-        65:0a:26:c8:1e:34:c3:5d:51:7b:d7:a9:9c:06:a1:36:dd:d5:
-        89:94:bc:d9:e4:2d:0c:5e:09:6c:08:97:7c:a3:3d:7c:93:ff:
-        3f:a1:14:a7:cf:b5:5d:eb:db:db:1c:c4:76:df:88:b9:bd:45:
-        05:95:1b:ae:fc:46:6a:4c:af:48:e3:ce:ae:0f:d2:7e:eb:e6:
-        6c:9c:4f:81:6a:7a:64:ac:bb:3e:d5:e7:cb:76:2e:c5:a7:48:
-        c1:5c:90:0f:cb:c8:3f:fa:e6:32:e1:8d:1b:6f:a4:e6:8e:d8:
-        f9:29:48:8a:ce:73:fe:2c
-SHA1 Fingerprint=E6:21:F3:35:43:79:05:9A:4B:68:30:9D:8A:2F:74:22:15:87:EC:79
------BEGIN CERTIFICATE-----
-MIIFaDCCA1CgAwIBAgIBATANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEeMBwGA1UEAxMVR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBMB4XDTA0MDMwNDA1MDAwMFoXDTI5MDMwNDA1MDAwMFowRTELMAkGA1UE
-BhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xHjAcBgNVBAMTFUdlb1RydXN0
-IFVuaXZlcnNhbCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKYV
-VaCjxuAfjJ0hUNfBvitbtaSeodlyWL0AG0y/YckUHUWCq8YdgNY96xCcOq9tJPi8
-cQGeBvV8Xx7BDlXKg5pZMK4ZyzBIle0iN430SppyZj6tlcDgFgDgEB8rMQ7XlFTT
-QjOgNB0eRXbdT8oYN+yFFXoZCPzVx5zw8qkuEKmS5j1YPakWaDwvdSEYfyh3peFh
-F7em6fgemdtzbvQKoiFs7tqqhZJmr/Z6a4LauiIINQ/PQvE1+mrufislzDoR5G2v
-c7J2Ha3QsnhnGqQ5HFELZ1aD/ThdDc7d8Lsrlh/eezJS/R27tQahsiFepdaVaH/w
-mZ7cRQg+59IJDTWU3YBOU5fXtQlEIGQWFwMCTFMNaN7VqnJNk22CDtucvc+081xd
-VHppCZbW2xHBjXWotM85yM48vCR85mLK4b19p71XZQvk/iXttmkQ3CgaRr0BHdCX
-teGYO8A3ZNY9lO4L4fUorgtWv3GLIylBjobFS1J72HGrH4oVpjuDWtdYAVHGTEHZ
-f9hBZ3KiKN9gg6meyHv8U3NyWfWTehd2Ds735VzZC1U0oqpbtWpU5xPKV+yXbfRe
-Bi9Fi1jUIxaS5BZuKGNZMN9QAZxjiRqf2xeUgnA3wySemkfWWspOqGmJch+RbNt+
-nhutxx9z3SxPGWX9f5NAEC7S8O08ni4oPmkmM8V7AgMBAAGjYzBhMA8GA1UdEwEB
-/wQFMAMBAf8wHQYDVR0OBBYEFNq7LqqwDLiIJlF0XG0D08DYj3rWMB8GA1UdIwQY
-MBaAFNq7LqqwDLiIJlF0XG0D08DYj3rWMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG
-9w0BAQUFAAOCAgEAMXjmx7XfuJRAyXHEqDXsRh3ChfMoWIawC/yOsjmPRFWrZIRc
-aanQmjg8+uUfNeVE44B5lGiku8SfPeE0zTBGi1QrlaXv9z+ZhP015s8xxtxqv6fX
-IwjhmF7DWgh2qaavdy+3YL1ERmrvl/9zlcGO6JP7/TG37FcREUWbMPEaiDnBTzyn
-ANXH/KttgCJwpQzgXQQpAvvLoJHRfNbDflDVnVi+QTjruXU8FdmbyUqDWcDaU/0z
-uzYYm4UPFd3uLax2k7nZAY1IEKj79TiG8dsKxr2EoyNB3tZ3b4XUhRxQ4K5RirqN
-Pnbiucon8l+f725ZDQbYKxek0nxru18UGkiPGkzns0ccjkxFKyDuSN/n3QmOGKja
-QI2SJhFTYXNd673nxE0pN2HrrDktZy4W1vUAg4WhzH92xH3kt0tm7wNFYGm2DFKW
-koRepqO1pD4r2czYG0eq8kTaT/kD6PAUyz/zg97QwVTjt+gKN02LIFkDMBmhLMi9
-ER/frslKxfMnZmaGrGiR/9nmUxwPi1xpZQomyB40w11Re9epnAahNt3ViZS82eQt
-DF4JbAiXfKM9fJP/P6EUp8+1Xevb2xzEdt+Iub1FBZUbrvxGakyvSOPOrg/Sfuvm
-bJxPgWp6ZKy7PtXny3YuxadIwVyQD8vIP/rmMuGNG2+k5o7Y+SlIis5z/iw=
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/GeoTrust_Universal_CA_2.pem b/secure/caroot/untrusted/GeoTrust_Universal_CA_2.pem
deleted file mode 100644
index 8294fc4871fd..000000000000
--- a/secure/caroot/untrusted/GeoTrust_Universal_CA_2.pem
+++ /dev/null
@@ -1,132 +0,0 @@
-##
-##  GeoTrust Universal CA 2
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA 2
-        Validity
-            Not Before: Mar  4 05:00:00 2004 GMT
-            Not After : Mar  4 05:00:00 2029 GMT
-        Subject: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA 2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:b3:54:52:c1:c9:3e:f2:d9:dc:b1:53:1a:59:29:
-                    e7:b1:c3:45:28:e5:d7:d1:ed:c5:c5:4b:a1:aa:74:
-                    7b:57:af:4a:26:fc:d8:f5:5e:a7:6e:19:db:74:0c:
-                    4f:35:5b:32:0b:01:e3:db:eb:7a:77:35:ea:aa:5a:
-                    e0:d6:e8:a1:57:94:f0:90:a3:74:56:94:44:30:03:
-                    1e:5c:4e:2b:85:26:74:82:7a:0c:76:a0:6f:4d:ce:
-                    41:2d:a0:15:06:14:5f:b7:42:cd:7b:8f:58:61:34:
-                    dc:2a:08:f9:2e:c3:01:a6:22:44:1c:4c:07:82:e6:
-                    5b:ce:d0:4a:7c:04:d3:19:73:27:f0:aa:98:7f:2e:
-                    af:4e:eb:87:1e:24:77:6a:5d:b6:e8:5b:45:ba:dc:
-                    c3:a1:05:6f:56:8e:8f:10:26:a5:49:c3:2e:d7:41:
-                    87:22:e0:4f:86:ca:60:b5:ea:a1:63:c0:01:97:10:
-                    79:bd:00:3c:12:6d:2b:15:b1:ac:4b:b1:ee:18:b9:
-                    4e:96:dc:dc:76:ff:3b:be:cf:5f:03:c0:fc:3b:e8:
-                    be:46:1b:ff:da:40:c2:52:f7:fe:e3:3a:f7:6a:77:
-                    35:d0:da:8d:eb:5e:18:6a:31:c7:1e:ba:3c:1b:28:
-                    d6:6b:54:c6:aa:5b:d7:a2:2c:1b:19:cc:a2:02:f6:
-                    9b:59:bd:37:6b:86:b5:6d:82:ba:d8:ea:c9:56:bc:
-                    a9:36:58:fd:3e:19:f3:ed:0c:26:a9:93:38:f8:4f:
-                    c1:5d:22:06:d0:97:ea:e1:ad:c6:55:e0:81:2b:28:
-                    83:3a:fa:f4:7b:21:51:00:be:52:38:ce:cd:66:79:
-                    a8:f4:81:56:e2:d0:83:09:47:51:5b:50:6a:cf:db:
-                    48:1a:5d:3e:f7:cb:f6:65:f7:6c:f1:95:f8:02:3b:
-                    32:56:82:39:7a:5b:bd:2f:89:1b:bf:a1:b4:e8:ff:
-                    7f:8d:8c:df:03:f1:60:4e:58:11:4c:eb:a3:3f:10:
-                    2b:83:9a:01:73:d9:94:6d:84:00:27:66:ac:f0:70:
-                    40:09:42:92:ad:4f:93:0d:61:09:51:24:d8:92:d5:
-                    0b:94:61:b2:87:b2:ed:ff:9a:35:ff:85:54:ca:ed:
-                    44:43:ac:1b:3c:16:6b:48:4a:0a:1c:40:88:1f:92:
-                    c2:0b:00:05:ff:f2:c8:02:4a:a4:aa:a9:cc:99:96:
-                    9c:2f:58:e0:7d:e1:be:bb:07:dc:5f:04:72:5c:31:
-                    34:c3:ec:5f:2d:e0:3d:64:90:22:e6:d1:ec:b8:2e:
-                    dd:59:ae:d9:a1:37:bf:54:35:dc:73:32:4f:8c:04:
-                    1e:33:b2:c9:46:f1:d8:5c:c8:55:50:c9:68:bd:a8:
-                    ba:36:09
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                76:F3:55:E1:FA:A4:36:FB:F0:9F:5C:62:71:ED:3C:F4:47:38:10:2B
-            X509v3 Authority Key Identifier: 
-                76:F3:55:E1:FA:A4:36:FB:F0:9F:5C:62:71:ED:3C:F4:47:38:10:2B
-            X509v3 Key Usage: critical
-                Digital Signature, Certificate Sign, CRL Sign
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        66:c1:c6:23:f3:d9:e0:2e:6e:5f:e8:cf:ae:b0:b0:25:4d:2b:
-        f8:3b:58:9b:40:24:37:5a:cb:ab:16:49:ff:b3:75:79:33:a1:
-        2f:6d:70:17:34:91:fe:67:7e:8f:ec:9b:e5:5e:82:a9:55:1f:
-        2f:dc:d4:51:07:12:fe:ac:16:3e:2c:35:c6:63:fc:dc:10:eb:
-        0d:a3:aa:d0:7c:cc:d1:d0:2f:51:2e:c4:14:5a:de:e8:19:e1:
-        3e:c6:cc:a4:29:e7:2e:84:aa:06:30:78:76:54:73:28:98:59:
-        38:e0:00:0d:62:d3:42:7d:21:9f:ae:3d:3a:8c:d5:fa:77:0d:
-        18:2b:16:0e:5f:36:e1:fc:2a:b5:30:24:cf:e0:63:0c:7b:58:
-        1a:fe:99:ba:42:12:b1:91:f4:7c:68:e2:c8:e8:af:2c:ea:c9:
-        7e:ae:bb:2a:3d:0d:15:dc:34:95:b6:18:74:a8:6a:0f:c7:b4:
-        f4:13:c4:e4:5b:ed:0a:d2:a4:97:4c:2a:ed:2f:6c:12:89:3d:
-        f1:27:70:aa:6a:03:52:21:9f:40:a8:67:50:f2:f3:5a:1f:df:
-        df:23:f6:dc:78:4e:e6:98:4f:55:3a:53:e3:ef:f2:f4:9f:c7:
-        7c:d8:58:af:29:22:97:b8:e0:bd:91:2e:b0:76:ec:57:11:cf:
-        ef:29:44:f3:e9:85:7a:60:63:e4:5d:33:89:17:d9:31:aa:da:
-        d6:f3:18:35:72:cf:87:2b:2f:63:23:84:5d:84:8c:3f:57:a0:
-        88:fc:99:91:28:26:69:99:d4:8f:97:44:be:8e:d5:48:b1:a4:
-        28:29:f1:15:b4:e1:e5:9e:dd:f8:8f:a6:6f:26:d7:09:3c:3a:
-        1c:11:0e:a6:6c:37:f7:ad:44:87:2c:28:c7:d8:74:82:b3:d0:
-        6f:4a:57:bb:35:29:27:a0:8b:e8:21:a7:87:64:36:5d:cc:d8:
-        16:ac:c7:b2:27:40:92:55:38:28:8d:51:6e:dd:14:67:53:6c:
-        71:5c:26:84:4d:75:5a:b6:7e:60:56:a9:4d:ad:fb:9b:1e:97:
-        f3:0d:d9:d2:97:54:77:da:3d:12:b7:e0:1e:ef:08:06:ac:f9:
-        85:87:e9:a2:dc:af:7e:18:12:83:fd:56:17:41:2e:d5:29:82:
-        7d:99:f4:31:f6:71:a9:cf:2c:01:27:a5:05:b9:aa:b2:48:4e:
-        2a:ef:9f:93:52:51:95:3c:52:73:8e:56:4c:17:40:c0:09:28:
-        e4:8b:6a:48:53:db:ec:cd:55:55:f1:c6:f8:e9:a2:2c:4c:a6:
-        d1:26:5f:7e:af:5a:4c:da:1f:a6:f2:1c:2c:7e:ae:02:16:d2:
-        56:d0:2f:57:53:47:e8:92
-SHA1 Fingerprint=37:9A:19:7B:41:85:45:35:0C:A6:03:69:F3:3C:2E:AF:47:4F:20:79
------BEGIN CERTIFICATE-----
-MIIFbDCCA1SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMQswCQYDVQQGEwJVUzEW
-MBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1c3QgVW5pdmVy
-c2FsIENBIDIwHhcNMDQwMzA0MDUwMDAwWhcNMjkwMzA0MDUwMDAwWjBHMQswCQYD
-VQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5jLjEgMB4GA1UEAxMXR2VvVHJ1
-c3QgVW5pdmVyc2FsIENBIDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoIC
-AQCzVFLByT7y2dyxUxpZKeexw0Uo5dfR7cXFS6GqdHtXr0om/Nj1XqduGdt0DE81
-WzILAePb63p3NeqqWuDW6KFXlPCQo3RWlEQwAx5cTiuFJnSCegx2oG9NzkEtoBUG
-FF+3Qs17j1hhNNwqCPkuwwGmIkQcTAeC5lvO0Ep8BNMZcyfwqph/Lq9O64ceJHdq
-XbboW0W63MOhBW9Wjo8QJqVJwy7XQYci4E+GymC16qFjwAGXEHm9ADwSbSsVsaxL
-se4YuU6W3Nx2/zu+z18DwPw76L5GG//aQMJS9/7jOvdqdzXQ2o3rXhhqMcceujwb
-KNZrVMaqW9eiLBsZzKIC9ptZvTdrhrVtgrrY6slWvKk2WP0+GfPtDCapkzj4T8Fd
-IgbQl+rhrcZV4IErKIM6+vR7IVEAvlI4zs1meaj0gVbi0IMJR1FbUGrP20gaXT73
-y/Zl92zxlfgCOzJWgjl6W70viRu/obTo/3+NjN8D8WBOWBFM66M/ECuDmgFz2ZRt
-hAAnZqzwcEAJQpKtT5MNYQlRJNiS1QuUYbKHsu3/mjX/hVTK7URDrBs8FmtISgoc
-QIgfksILAAX/8sgCSqSqqcyZlpwvWOB94b67B9xfBHJcMTTD7F8t4D1kkCLm0ey4
-Lt1ZrtmhN79UNdxzMk+MBB4zsslG8dhcyFVQyWi9qLo2CQIDAQABo2MwYTAPBgNV
-HRMBAf8EBTADAQH/MB0GA1UdDgQWBBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAfBgNV
-HSMEGDAWgBR281Xh+qQ2+/CfXGJx7Tz0RzgQKzAOBgNVHQ8BAf8EBAMCAYYwDQYJ
-KoZIhvcNAQEFBQADggIBAGbBxiPz2eAubl/oz66wsCVNK/g7WJtAJDday6sWSf+z
-dXkzoS9tcBc0kf5nfo/sm+VegqlVHy/c1FEHEv6sFj4sNcZj/NwQ6w2jqtB8zNHQ
-L1EuxBRa3ugZ4T7GzKQp5y6EqgYweHZUcyiYWTjgAA1i00J9IZ+uPTqM1fp3DRgr
-Fg5fNuH8KrUwJM/gYwx7WBr+mbpCErGR9Hxo4sjoryzqyX6uuyo9DRXcNJW2GHSo
-ag/HtPQTxORb7QrSpJdMKu0vbBKJPfEncKpqA1Ihn0CoZ1Dy81of398j9tx4TuaY
-T1U6U+Pv8vSfx3zYWK8pIpe44L2RLrB27FcRz+8pRPPphXpgY+RdM4kX2TGq2tbz
-GDVyz4crL2MjhF2EjD9XoIj8mZEoJmmZ1I+XRL6O1UixpCgp8RW04eWe3fiPpm8m
-1wk8OhwRDqZsN/etRIcsKMfYdIKz0G9KV7s1KSegi+ghp4dkNl3M2Basx7InQJJV
-OCiNUW7dFGdTbHFcJoRNdVq2fmBWqU2t+5sel/MN2dKXVHfaPRK34B7vCAas+YWH
-6aLcr34YEoP9VhdBLtUpgn2Z9DH2canPLAEnpQW5qrJITirvn5NSUZU8UnOOVkwX
-QMAJKOSLakhT2+zNVVXxxvjpoixMptEmX36vWkzaH6byHCx+rgIW0lbQL1dTR+iS
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/GlobalSign_Root_CA.pem b/secure/caroot/untrusted/GlobalSign_Root_CA.pem
index d7484896abb1..d7484896abb1 100644
--- a/secure/caroot/trusted/GlobalSign_Root_CA.pem
+++ b/secure/caroot/untrusted/GlobalSign_Root_CA.pem
diff --git a/secure/caroot/untrusted/GlobalSign_Secure_Mail_Root_E45.pem b/secure/caroot/untrusted/GlobalSign_Secure_Mail_Root_E45.pem
new file mode 100644
index 000000000000..656f4ce1a3fb
--- /dev/null
+++ b/secure/caroot/untrusted/GlobalSign_Secure_Mail_Root_E45.pem
@@ -0,0 +1,64 @@
+##
+##  GlobalSign Secure Mail Root E45
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            76:53:fe:aa:27:1d:95:46:5d:d6:f1:9e:e5:b8:90:0a
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=BE, O=GlobalSign nv-sa, CN=GlobalSign Secure Mail Root E45
+        Validity
+            Not Before: Mar 18 00:00:00 2020 GMT
+            Not After : Mar 18 00:00:00 2045 GMT
+        Subject: C=BE, O=GlobalSign nv-sa, CN=GlobalSign Secure Mail Root E45
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:f9:79:8b:81:47:37:89:96:3f:45:49:50:7f:1a:
+                    26:0b:93:32:7e:2e:c0:c0:a7:08:9a:c3:6e:8f:9b:
+                    3e:0b:22:ec:37:53:b7:6f:8a:b0:bc:27:37:4b:6d:
+                    a9:46:3b:d9:1f:ff:a5:a1:44:bb:2d:73:bf:9e:41:
+                    07:5c:53:9b:51:08:3a:5a:bb:6f:38:c7:16:91:78:
+                    c2:4a:13:69:1d:82:df:5a:2f:00:88:96:a2:2e:1c:
+                    74:f9:9d:7e:66:37:8a
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                DF:13:5E:8B:5F:C2:40:02:FD:56:B7:94:4C:B6:1E:D5:A6:B1:14:96
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:30:13:b0:be:d7:71:20:3e:e4:ab:9c:ce:36:12:7d:
+        5f:4c:1f:2a:b5:69:45:33:5f:d3:2d:5a:b2:e4:88:c7:de:0a:
+        36:42:32:79:9d:a6:6b:ba:e1:f9:44:2a:7b:8a:c3:12:02:31:
+        00:a0:66:1c:4e:87:9d:87:c9:ed:99:4c:1b:0a:ee:2d:60:c3:
+        37:c7:1d:cd:b5:72:b0:d9:c6:ef:bc:f2:ff:3f:f0:52:dd:08:
+        e7:aa:64:79:c3:e4:69:57:91:2f:a4:cb:7c
+SHA1 Fingerprint=18:2E:1F:32:4F:89:DF:BE:FE:88:89:F0:93:C2:C4:A0:2B:67:75:21
+-----BEGIN CERTIFICATE-----
+MIICITCCAaegAwIBAgIQdlP+qicdlUZd1vGe5biQCjAKBggqhkjOPQQDAzBSMQsw
+CQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEoMCYGA1UEAxMf
+R2xvYmFsU2lnbiBTZWN1cmUgTWFpbCBSb290IEU0NTAeFw0yMDAzMTgwMDAwMDBa
+Fw00NTAzMTgwMDAwMDBaMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxT
+aWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFNlY3VyZSBNYWlsIFJvb3Qg
+RTQ1MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE+XmLgUc3iZY/RUlQfxomC5Myfi7A
+wKcImsNuj5s+CyLsN1O3b4qwvCc3S22pRjvZH/+loUS7LXO/nkEHXFObUQg6Wrtv
+OMcWkXjCShNpHYLfWi8AiJaiLhx0+Z1+ZjeKo0IwQDAOBgNVHQ8BAf8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU3xNei1/CQAL9VreUTLYe1aaxFJYw
+CgYIKoZIzj0EAwMDaAAwZQIwE7C+13EgPuSrnM42En1fTB8qtWlFM1/TLVqy5IjH
+3go2QjJ5naZruuH5RCp7isMSAjEAoGYcToedh8ntmUwbCu4tYMM3xx3NtXKw2cbv
+vPL/P/BS3QjnqmR5w+RpV5EvpMt8
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/GlobalSign_Secure_Mail_Root_R45.pem b/secure/caroot/untrusted/GlobalSign_Secure_Mail_Root_R45.pem
new file mode 100644
index 000000000000..9f9cf6047c86
--- /dev/null
+++ b/secure/caroot/untrusted/GlobalSign_Secure_Mail_Root_R45.pem
@@ -0,0 +1,132 @@
+##
+##  GlobalSign Secure Mail Root R45
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            76:53:fe:a8:4c:50:ab:9f:8d:32:b5:1d:03:8f:57:dc
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=BE, O=GlobalSign nv-sa, CN=GlobalSign Secure Mail Root R45
+        Validity
+            Not Before: Mar 18 00:00:00 2020 GMT
+            Not After : Mar 18 00:00:00 2045 GMT
+        Subject: C=BE, O=GlobalSign nv-sa, CN=GlobalSign Secure Mail Root R45
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:dc:79:cc:6d:06:f9:6d:bb:e0:56:04:6c:7f:e0:
+                    75:cc:2d:05:49:e8:4b:dc:54:ec:5b:77:95:72:bf:
+                    7f:62:9d:85:a9:8a:24:50:5f:53:e5:db:74:6f:a4:
+                    29:5b:13:2a:09:ad:9a:c5:2f:c2:f7:76:3b:a1:45:
+                    46:aa:43:e6:24:fe:2b:b0:6f:32:70:19:46:5a:79:
+                    26:2f:fc:3d:7d:5f:64:cb:57:cc:61:61:a8:d9:95:
+                    6e:e3:95:a0:6e:7f:47:12:18:d6:ef:03:c9:fb:8a:
+                    fa:9a:bd:82:15:a9:55:77:4b:11:4f:59:e0:6b:c3:
+                    71:f3:0c:d8:54:d5:81:68:3e:13:b9:15:2e:87:8a:
+                    3c:44:27:36:62:24:6e:f8:2c:05:72:30:61:bd:42:
+                    91:23:c4:9d:25:a7:d9:54:9a:14:a3:31:ad:80:79:
+                    0c:a7:63:6c:98:a3:ac:57:47:33:1f:65:96:e1:d0:
+                    d2:35:da:f9:71:f7:a1:a6:25:b5:41:5d:df:3e:60:
+                    d8:d1:f6:9f:a5:f2:b8:cc:13:aa:8f:f9:b2:6e:e1:
+                    83:2d:93:dd:3e:85:1a:dd:e8:b1:5c:26:01:cb:49:
+                    85:fc:fc:d2:d4:7f:85:62:86:74:f9:cb:ec:35:22:
+                    a2:0c:30:8f:3b:ab:79:eb:56:f2:fa:42:f3:ed:f9:
+                    1f:45:89:40:29:ad:ea:92:74:ea:52:fd:56:b4:2b:
+                    da:a2:ed:75:c2:6e:ab:ce:52:90:4b:f6:de:f0:49:
+                    8f:9a:48:d4:88:19:6d:45:e6:cc:8c:b9:dd:64:60:
+                    60:02:40:f8:b9:cf:bc:58:eb:3d:85:b9:c6:0a:d3:
+                    9c:07:66:8f:c7:18:39:23:46:e1:3c:1e:a3:2f:50:
+                    61:92:0b:3d:2b:6c:f1:a3:47:38:57:91:ab:0d:8f:
+                    c6:9d:4d:04:d2:26:52:5c:e5:a5:fd:2a:2d:16:2a:
+                    01:69:e7:a9:7d:e1:36:b7:b1:2a:c5:d9:b1:8d:bd:
+                    b9:8b:ce:cc:8b:a1:3e:0b:48:cd:50:95:34:c4:d8:
+                    08:59:d8:6b:26:f4:be:f5:d4:22:17:00:57:c9:ae:
+                    9b:04:30:33:9f:0b:fb:df:56:a2:c9:6e:54:76:da:
+                    b1:97:62:27:59:0f:11:8a:22:1b:64:96:3f:a8:f1:
+                    b7:24:4a:8d:3c:53:7c:6d:83:76:3d:b2:26:48:73:
+                    f5:44:16:01:2d:09:2a:8e:16:96:50:d0:73:06:5d:
+                    bb:22:48:82:4c:0a:46:5a:3f:80:ff:5c:f2:f2:9a:
+                    ac:2c:08:e0:d6:ea:f0:12:38:81:4f:a6:10:ed:46:
+                    ab:cc:16:9c:0b:cf:64:a6:99:02:85:44:67:46:ad:
+                    fd:4d:e7
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                A0:93:15:28:6E:EE:8F:08:B2:35:C6:9E:62:79:74:A7:B1:0E:2B:7B
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        45:0a:f8:d1:5c:ac:62:81:d0:04:d7:b6:ff:57:51:89:0b:0c:
+        cb:de:24:65:37:fb:ab:9e:ed:66:f4:ea:0c:19:69:89:b8:19:
+        b1:30:56:b4:d9:f6:f7:be:c6:ae:97:cb:45:f6:11:8c:3a:30:
+        64:4c:c1:9f:59:c0:46:42:08:06:47:64:17:78:e0:95:07:06:
+        d6:8c:a2:ac:a9:d9:3f:d3:7b:56:4f:fc:c4:87:28:df:b6:2b:
+        16:23:c0:9f:1f:5b:e3:d6:44:5e:22:4f:23:04:8c:35:16:b5:
+        79:07:86:5c:2f:97:e2:f6:08:64:a6:dc:db:a8:8a:e3:a4:7b:
+        77:0d:d1:29:93:28:20:b4:53:a3:4b:4e:5f:de:c1:f6:75:23:
+        fc:1f:3c:78:4f:70:31:78:2f:a2:35:54:71:04:ac:c8:c4:6d:
+        c3:f6:91:b1:fe:cd:ee:44:6e:81:f6:40:c5:3e:2a:01:bf:ab:
+        4c:b1:03:3f:0d:11:e4:0f:d2:24:e3:22:88:9b:9f:5f:47:3d:
+        51:49:e0:09:37:7e:17:21:31:76:b7:67:71:48:28:4b:25:d7:
+        10:e8:9f:61:59:16:c5:3e:32:4e:1f:0c:ce:a3:cc:0f:e4:c7:
+        11:07:22:2f:38:08:dd:5b:97:eb:42:6c:59:9a:9a:ee:7a:d0:
+        9d:df:c5:db:09:43:2e:0a:aa:19:3d:6b:e8:6a:30:7a:57:e6:
+        bf:b3:6a:39:a9:8f:e3:f1:4f:65:68:b6:bd:9f:28:8f:a1:16:
+        5a:09:50:3a:32:2e:1d:2f:44:11:42:a6:00:e6:31:98:ff:2d:
+        a1:0f:e6:a4:60:56:cf:79:d7:b2:4e:d7:b0:fa:6e:0c:57:23:
+        c7:ce:1f:a5:b1:4c:6d:19:49:9e:0e:7f:70:8f:71:3f:58:28:
+        9f:75:dd:61:e0:3a:b7:39:b6:ee:97:d4:35:51:fb:8b:49:60:
+        c8:3c:66:ae:97:ee:8d:26:59:57:bb:78:f0:7a:50:30:09:b0:
+        60:aa:9f:4e:dc:c9:3e:1e:3a:dc:62:93:33:b0:3a:54:74:6f:
+        2c:31:45:d1:6b:11:32:6a:68:76:f6:3d:f6:6a:13:5e:24:98:
+        e7:ea:1d:9a:cf:78:82:07:60:f7:4d:10:d3:81:9a:45:8d:9e:
+        af:9b:dc:80:c7:43:b2:95:68:a4:c3:0e:e8:0a:47:15:bf:54:
+        33:dc:01:e7:d5:a6:1e:73:d8:7a:b2:bf:2f:ad:e3:55:30:9e:
+        df:0e:41:bc:e0:11:f5:a1:0c:a8:22:e1:e3:00:a3:4e:70:7c:
+        92:e3:04:d1:7a:42:8a:75:90:59:e3:9b:d1:4c:a2:64:bd:73:
+        79:9b:6f:f2:b3:c1:f6:3c
+SHA1 Fingerprint=76:18:D1:F3:80:24:3D:52:40:C6:11:6A:AD:57:77:09:7D:81:30:A0
+-----BEGIN CERTIFICATE-----
+MIIFcDCCA1igAwIBAgIQdlP+qExQq5+NMrUdA49X3DANBgkqhkiG9w0BAQwFADBS
+MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEoMCYGA1UE
+AxMfR2xvYmFsU2lnbiBTZWN1cmUgTWFpbCBSb290IFI0NTAeFw0yMDAzMTgwMDAw
+MDBaFw00NTAzMTgwMDAwMDBaMFIxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+YWxTaWduIG52LXNhMSgwJgYDVQQDEx9HbG9iYWxTaWduIFNlY3VyZSBNYWlsIFJv
+b3QgUjQ1MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA3HnMbQb5bbvg
+VgRsf+B1zC0FSehL3FTsW3eVcr9/Yp2FqYokUF9T5dt0b6QpWxMqCa2axS/C93Y7
+oUVGqkPmJP4rsG8ycBlGWnkmL/w9fV9ky1fMYWGo2ZVu45Wgbn9HEhjW7wPJ+4r6
+mr2CFalVd0sRT1nga8Nx8wzYVNWBaD4TuRUuh4o8RCc2YiRu+CwFcjBhvUKRI8Sd
+JafZVJoUozGtgHkMp2NsmKOsV0czH2WW4dDSNdr5cfehpiW1QV3fPmDY0fafpfK4
+zBOqj/mybuGDLZPdPoUa3eixXCYBy0mF/PzS1H+FYoZ0+cvsNSKiDDCPO6t561by
++kLz7fkfRYlAKa3qknTqUv1WtCvaou11wm6rzlKQS/be8EmPmkjUiBltRebMjLnd
+ZGBgAkD4uc+8WOs9hbnGCtOcB2aPxxg5I0bhPB6jL1Bhkgs9K2zxo0c4V5GrDY/G
+nU0E0iZSXOWl/SotFioBaeepfeE2t7Eqxdmxjb25i87Mi6E+C0jNUJU0xNgIWdhr
+JvS+9dQiFwBXya6bBDAznwv731aiyW5Udtqxl2InWQ8RiiIbZJY/qPG3JEqNPFN8
+bYN2PbImSHP1RBYBLQkqjhaWUNBzBl27IkiCTApGWj+A/1zy8pqsLAjg1urwEjiB
+T6YQ7UarzBacC89kppkChURnRq39TecCAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgGG
+MA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKCTFShu7o8IsjXGnmJ5dKexDit7
+MA0GCSqGSIb3DQEBDAUAA4ICAQBFCvjRXKxigdAE17b/V1GJCwzL3iRlN/urnu1m
+9OoMGWmJuBmxMFa02fb3vsaul8tF9hGMOjBkTMGfWcBGQggGR2QXeOCVBwbWjKKs
+qdk/03tWT/zEhyjftisWI8CfH1vj1kReIk8jBIw1FrV5B4ZcL5fi9ghkptzbqIrj
+pHt3DdEpkyggtFOjS05f3sH2dSP8Hzx4T3AxeC+iNVRxBKzIxG3D9pGx/s3uRG6B
+9kDFPioBv6tMsQM/DRHkD9Ik4yKIm59fRz1RSeAJN34XITF2t2dxSChLJdcQ6J9h
+WRbFPjJOHwzOo8wP5McRByIvOAjdW5frQmxZmpruetCd38XbCUMuCqoZPWvoajB6
+V+a/s2o5qY/j8U9laLa9nyiPoRZaCVA6Mi4dL0QRQqYA5jGY/y2hD+akYFbPedey
+Ttew+m4MVyPHzh+lsUxtGUmeDn9wj3E/WCifdd1h4Dq3Obbul9Q1UfuLSWDIPGau
+l+6NJllXu3jwelAwCbBgqp9O3Mk+HjrcYpMzsDpUdG8sMUXRaxEyamh29j32ahNe
+JJjn6h2az3iCB2D3TRDTgZpFjZ6vm9yAx0OylWikww7oCkcVv1Qz3AHn1aYec9h6
+sr8vreNVMJ7fDkG84BH1oQyoIuHjAKNOcHyS4wTRekKKdZBZ45vRTKJkvXN5m2/y
+s8H2PA==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem b/secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem
deleted file mode 100644
index c0a22dbf307e..000000000000
--- a/secure/caroot/untrusted/Global_Chambersign_Root_-_2008.pem
+++ /dev/null
@@ -1,148 +0,0 @@
-##
-##  Global Chambersign Root - 2008
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            c9:cd:d3:e9:d5:7d:23:ce
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=EU, L=Madrid (see current address at www.camerfirma.com/address), serialNumber=A82743287, O=AC Camerfirma S.A., CN=Global Chambersign Root - 2008
-        Validity
-            Not Before: Aug  1 12:31:40 2008 GMT
-            Not After : Jul 31 12:31:40 2038 GMT
-        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
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:c0:df:56:d3:e4:3a:9b:76:45:b4:13:db:ff:c1:
-                    b6:19:8b:37:41:18:95:52:47:eb:17:9d:29:88:8e:
-                    35:6c:06:32:2e:47:62:f3:49:04:bf:7d:44:36:b1:
-                    71:cc:bd:5a:09:73:d5:d9:85:44:ff:91:57:25:df:
-                    5e:36:8e:70:d1:5c:71:43:1d:d9:da:ef:5c:d2:fb:
-                    1b:bd:3a:b5:cb:ad:a3:cc:44:a7:0d:ae:21:15:3f:
-                    b9:7a:5b:92:75:d8:a4:12:38:89:19:8a:b7:80:d2:
-                    e2:32:6f:56:9c:91:d6:88:10:0b:b3:74:64:92:74:
-                    60:f3:f6:cf:18:4f:60:b2:23:d0:c7:3b:ce:61:4b:
-                    99:8f:c2:0c:d0:40:b2:98:dc:0d:a8:4e:a3:b9:0a:
-                    ae:60:a0:ad:45:52:63:ba:66:bd:68:e0:f9:be:1a:
-                    a8:81:bb:1e:41:78:75:d3:c1:fe:00:55:b0:87:54:
-                    e8:27:90:35:1d:4c:33:ad:97:fc:97:2e:98:84:bf:
-                    2c:c9:a3:bf:d1:98:11:14:ed:63:f8:ca:98:88:58:
-                    17:99:ed:45:03:97:7e:3c:86:1e:88:8c:be:f2:91:
-                    84:8f:65:34:d8:00:4c:7d:b7:31:17:5a:29:7a:0a:
-                    18:24:30:a3:37:b5:7a:a9:01:7d:26:d6:f9:0e:8e:
-                    59:f1:fd:1b:33:b5:29:3b:17:3b:41:b6:21:dd:d4:
-                    c0:3d:a5:9f:9f:1f:43:50:c9:bb:bc:6c:7a:97:98:
-                    ee:cd:8c:1f:fb:9c:51:ae:8b:70:bd:27:9f:71:c0:
-                    6b:ac:7d:90:66:e8:d7:5d:3a:0d:b0:d5:c2:8d:d5:
-                    c8:9d:9d:c1:6d:d0:d0:bf:51:e4:e3:f8:c3:38:36:
-                    ae:d6:a7:75:e6:af:84:43:5d:93:92:0c:6a:07:de:
-                    3b:1d:98:22:d6:ac:c1:35:db:a3:a0:25:ff:72:b5:
-                    76:1d:de:6d:e9:2c:66:2c:52:84:d0:45:92:ce:1c:
-                    e5:e5:33:1d:dc:07:53:54:a3:aa:82:3b:9a:37:2f:
-                    dc:dd:a0:64:e9:e6:dd:bd:ae:fc:64:85:1d:3c:a7:
-                    c9:06:de:84:ff:6b:e8:6b:1a:3c:c5:a2:b3:42:fb:
-                    8b:09:3e:5f:08:52:c7:62:c4:d4:05:71:bf:c4:64:
-                    e4:f8:a1:83:e8:3e:12:9b:a8:1e:d4:36:4d:2f:71:
-                    f6:8d:28:f6:83:a9:13:d2:61:c1:91:bb:48:c0:34:
-                    8f:41:8c:4b:4c:db:69:12:ff:50:94:9c:20:83:59:
-                    73:ed:7c:a1:f2:f1:fd:dd:f7:49:d3:43:58:a0:56:
-                    63:ca:3d:3d:e5:35:56:59:e9:0e:ca:20:cc:2b:4b:
-                    93:29:0f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE, pathlen:12
-            X509v3 Subject Key Identifier: 
-                B9:09:CA:9C:1E:DB:D3:6C:3A:6B:AE:ED:54:F1:5B:93:06:35:2E:5E
-            X509v3 Authority Key Identifier: 
-                keyid:B9:09:CA:9C:1E:DB:D3:6C:3A:6B:AE:ED:54:F1:5B:93:06:35:2E:5E
-                DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com\/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Global Chambersign Root - 2008
-                serial:C9:CD:D3:E9:D5:7D:23:CE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Certificate Policies: 
-                Policy: X509v3 Any Policy
-                  CPS: http://policy.camerfirma.com
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        80:88:7f:70:de:92:28:d9:05:94:46:ff:90:57:a9:f1:2f:df:
-        1a:0d:6b:fa:7c:0e:1c:49:24:79:27:d8:46:aa:6f:29:59:52:
-        88:70:12:ea:dd:3d:f5:9b:53:54:6f:e1:60:a2:a8:09:b9:ec:
-        eb:59:7c:c6:35:f1:dc:18:e9:f1:67:e5:af:ba:45:e0:09:de:
-        ca:44:0f:c2:17:0e:77:91:45:7a:33:5f:5f:96:2c:68:8b:c1:
-        47:8f:98:9b:3d:c0:ec:cb:f5:d5:82:92:84:35:d1:be:36:38:
-        56:72:31:5b:47:2d:aa:17:a4:63:51:eb:0a:01:ad:7f:ec:75:
-        9e:cb:a1:1f:f1:7f:12:b1:b9:e4:64:7f:67:d6:23:2a:f4:b8:
-        39:5d:98:e8:21:a7:e1:bd:3d:42:1a:74:9a:70:af:68:6c:50:
-        5d:49:cf:ff:fb:0e:5d:e6:2c:47:d7:81:3a:59:00:b5:73:6b:
-        63:20:f6:31:45:08:39:0e:f4:70:7e:40:70:5a:3f:d0:6b:42:
-        a9:74:3d:28:2f:02:6d:75:72:95:09:8d:48:63:c6:c6:23:57:
-        92:93:5e:35:c1:8d:f9:0a:f7:2c:9d:62:1c:f6:ad:7c:dd:a6:
-        31:1e:b6:b1:c7:7e:85:26:fa:a4:6a:b5:da:63:30:d1:ef:93:
-        37:b2:66:2f:7d:05:f7:e7:b7:4b:98:94:35:c0:d9:3a:29:c1:
-        9d:b2:50:33:1d:4a:a9:5a:a6:c9:03:ef:ed:f4:e7:a8:6e:8a:
-        b4:57:84:eb:a4:3f:d0:ee:aa:aa:87:5b:63:e8:93:e2:6b:a8:
-        d4:b8:72:78:6b:1b:ed:39:e4:5d:cb:9b:aa:87:d5:4f:4e:00:
-        fe:d9:6a:9f:3c:31:0f:28:02:01:7d:98:e8:a7:b0:a2:64:9e:
-        79:f8:48:f2:15:a9:cc:e6:c8:44:eb:3f:78:99:f2:7b:71:3e:
-        3c:f1:98:a7:c5:18:12:3f:e6:bb:28:33:42:e9:45:0a:7c:6d:
-        f2:86:79:2f:c5:82:19:7d:09:89:7c:b2:54:76:88:ae:de:c1:
-        f3:cc:e1:6e:db:31:d6:93:ae:99:a0:ef:25:6a:73:98:89:5b:
-        3a:2e:13:88:1e:bf:c0:92:94:34:1b:e3:27:b7:8b:1e:6f:42:
-        ff:e7:e9:37:9b:50:1d:2d:a2:f9:02:ee:cb:58:58:3a:71:bc:
-        68:e3:aa:c1:af:1c:28:1f:a2:dc:23:65:3f:81:ea:ae:99:d3:
-        d8:30:cf:13:0d:4f:15:c9:84:bc:a7:48:2d:f8:30:23:77:d8:
-        46:4b:79:6d:f6:8c:ed:3a:7f:60:11:78:f4:e9:9b:ae:d5:54:
-        c0:74:80:d1:0b:42:9f:c1
-SHA1 Fingerprint=4A:BD:EE:EC:95:0D:35:9C:89:AE:C7:52:A1:2C:5B:29:F6:D6:AA:0C
------BEGIN CERTIFICATE-----
-MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
-VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
-IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
-MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
-aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
-MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
-cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
-A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
-BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
-hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
-KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
-G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
-zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
-ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
-HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
-Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
-yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
-beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
-6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
-wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
-zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
-BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
-ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
-ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
-cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
-YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
-CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
-KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
-hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
-UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
-X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
-fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
-a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
-Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
-SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
-AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
-M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
-v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
-09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Go_Daddy_Class_2_CA.pem b/secure/caroot/untrusted/Go_Daddy_Class_2_CA.pem
index 0d411301b9d1..0d411301b9d1 100644
--- a/secure/caroot/trusted/Go_Daddy_Class_2_CA.pem
+++ b/secure/caroot/untrusted/Go_Daddy_Class_2_CA.pem
diff --git a/secure/caroot/untrusted/HARICA_Client_ECC_Root_CA_2021.pem b/secure/caroot/untrusted/HARICA_Client_ECC_Root_CA_2021.pem
new file mode 100644
index 000000000000..56c31500b0d1
--- /dev/null
+++ b/secure/caroot/untrusted/HARICA_Client_ECC_Root_CA_2021.pem
@@ -0,0 +1,65 @@
+##
+##  HARICA Client ECC Root CA 2021
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            31:68:d9:d8:e1:62:57:1e:d2:19:44:88:e6:10:7d:f0
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=GR, O=Hellenic Academic and Research Institutions CA, CN=HARICA Client ECC Root CA 2021
+        Validity
+            Not Before: Feb 19 11:03:34 2021 GMT
+            Not After : Feb 13 11:03:33 2045 GMT
+        Subject: C=GR, O=Hellenic Academic and Research Institutions CA, CN=HARICA Client ECC Root CA 2021
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:07:18:ad:95:96:94:d0:5c:0f:82:f7:2a:40:fa:
+                    02:c9:c9:3d:36:a6:a3:04:6a:c1:6d:95:01:88:60:
+                    12:54:6c:5c:a2:2b:6e:13:3a:88:95:0c:1c:26:86:
+                    36:4a:89:19:b7:18:de:3b:e8:a8:50:1f:ca:df:5b:
+                    bf:49:80:15:db:e3:30:e1:1d:5a:c7:2a:8a:01:07:
+                    fe:6d:2c:34:ef:28:28:97:bc:c1:f9:57:86:95:8b:
+                    35:cf:9e:5a:d1:68:95
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                52:08:D2:BE:32:81:25:FD:F5:1A:97:EC:4E:5F:1A:BB:53:CD:90:AD
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:64:02:30:4c:31:45:46:4f:a8:e6:be:c3:77:b2:1a:18:4b:
+        2d:88:7b:58:e6:ab:94:6b:44:03:b0:17:ff:df:82:73:44:51:
+        2c:fd:93:1d:06:7b:14:d2:89:ec:40:0c:ef:21:01:2e:02:30:
+        2f:c9:2e:5a:6c:2c:1d:d9:95:e0:9e:b0:b9:5c:52:7c:f6:f8:
+        38:ca:2e:f1:d4:1d:f2:a2:49:a2:95:f8:c1:58:5e:4f:fe:73:
+        0a:ef:31:b0:ab:23:58:13:8c:8b:de:3b
+SHA1 Fingerprint=BE:64:D3:DA:14:4B:D2:6B:CD:AF:8F:DB:A6:A6:72:F8:DE:26:F9:00
+-----BEGIN CERTIFICATE-----
+MIICWjCCAeGgAwIBAgIQMWjZ2OFiVx7SGUSI5hB98DAKBggqhkjOPQQDAzBvMQsw
+CQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2Vh
+cmNoIEluc3RpdHV0aW9ucyBDQTEnMCUGA1UEAwweSEFSSUNBIENsaWVudCBFQ0Mg
+Um9vdCBDQSAyMDIxMB4XDTIxMDIxOTExMDMzNFoXDTQ1MDIxMzExMDMzM1owbzEL
+MAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl
+YXJjaCBJbnN0aXR1dGlvbnMgQ0ExJzAlBgNVBAMMHkhBUklDQSBDbGllbnQgRUND
+IFJvb3QgQ0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABAcYrZWWlNBcD4L3
+KkD6AsnJPTamowRqwW2VAYhgElRsXKIrbhM6iJUMHCaGNkqJGbcY3jvoqFAfyt9b
+v0mAFdvjMOEdWscqigEH/m0sNO8oKJe8wflXhpWLNc+eWtFolaNCMEAwDwYDVR0T
+AQH/BAUwAwEB/zAdBgNVHQ4EFgQUUgjSvjKBJf31GpfsTl8au1PNkK0wDgYDVR0P
+AQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMEwxRUZPqOa+w3eyGhhLLYh7WOar
+lGtEA7AX/9+Cc0RRLP2THQZ7FNKJ7EAM7yEBLgIwL8kuWmwsHdmV4J6wuVxSfPb4
+OMou8dQd8qJJopX4wVheT/5zCu8xsKsjWBOMi947
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/HARICA_Client_RSA_Root_CA_2021.pem b/secure/caroot/untrusted/HARICA_Client_RSA_Root_CA_2021.pem
new file mode 100644
index 000000000000..72d75615d694
--- /dev/null
+++ b/secure/caroot/untrusted/HARICA_Client_RSA_Root_CA_2021.pem
@@ -0,0 +1,133 @@
+##
+##  HARICA Client RSA Root CA 2021
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            55:52:f8:1e:db:1b:24:2c:9e:bb:96:18:cd:02:28:3e
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GR, O=Hellenic Academic and Research Institutions CA, CN=HARICA Client RSA Root CA 2021
+        Validity
+            Not Before: Feb 19 10:58:46 2021 GMT
+            Not After : Feb 13 10:58:45 2045 GMT
+        Subject: C=GR, O=Hellenic Academic and Research Institutions CA, CN=HARICA Client RSA Root CA 2021
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:81:db:57:42:90:2c:74:35:f4:f8:b8:74:19:4d:
+                    ab:09:5a:77:45:81:73:62:b0:35:9f:f8:d0:b7:33:
+                    00:87:13:b6:96:ab:0e:54:12:30:07:bc:9b:b7:48:
+                    d7:d1:19:83:ae:8e:d8:a9:f1:a9:00:84:b0:8c:5e:
+                    9e:e8:0c:8f:54:69:bf:f6:d4:08:4f:26:70:fe:18:
+                    41:63:1a:b3:32:8b:40:f8:07:ab:57:31:f0:c6:16:
+                    76:67:9a:b4:dd:2f:f2:d1:6b:c5:d0:92:84:91:71:
+                    6e:0f:2e:63:e9:1f:53:a4:dd:52:13:cc:09:83:29:
+                    81:0c:c5:53:75:44:b1:0e:67:53:18:d0:c3:1f:88:
+                    4b:9f:94:24:b4:29:bc:bb:e8:4e:fd:6f:d2:15:1d:
+                    49:dc:8d:70:f2:11:1a:20:51:55:11:ba:88:6f:c4:
+                    f7:50:79:d6:aa:31:e2:84:3d:5e:32:c8:77:2a:50:
+                    71:e5:0b:2f:e9:b6:ea:ef:ab:0a:33:39:0e:fd:8f:
+                    a5:67:43:82:8e:98:69:09:09:1b:40:cd:38:67:47:
+                    ea:c9:ec:97:71:12:de:24:f5:72:3c:d1:f7:43:4c:
+                    26:f7:90:b2:89:e9:45:4b:55:3d:31:05:7a:41:e2:
+                    95:ba:43:c0:17:c5:b6:85:3d:19:8d:64:70:f3:5b:
+                    ac:cd:9f:d3:29:75:87:4b:95:67:6a:a6:f8:d1:dd:
+                    bc:90:86:89:43:29:a9:37:5b:f5:5d:b0:26:5a:53:
+                    42:76:90:2b:cf:9e:56:6c:2b:54:cf:5c:9a:65:df:
+                    5b:8b:48:60:38:7c:fb:c5:0b:cf:76:04:63:02:33:
+                    2a:7d:f5:83:67:e7:fa:c6:43:fd:2b:0f:d4:26:2f:
+                    77:a4:32:c1:24:ea:64:9d:bf:b3:38:71:31:44:f2:
+                    47:b8:a2:66:41:a1:fb:9b:7b:bc:c7:46:6a:75:bf:
+                    5a:a2:8c:e8:6a:44:c1:b8:96:b5:c0:32:08:2d:7b:
+                    74:35:73:b2:ca:c6:fe:af:11:72:18:f6:e7:c8:c2:
+                    cf:a5:2a:ea:7b:d6:59:e8:7c:a0:b2:6a:40:09:69:
+                    0e:a5:96:db:d1:00:b9:f1:88:6e:36:f0:88:b2:9d:
+                    f1:52:f2:c3:7c:bf:30:89:3c:0a:69:f9:22:a4:65:
+                    e1:9b:e0:74:c6:b1:85:97:96:2c:ae:94:8f:50:a6:
+                    39:12:1f:be:47:f2:81:78:d3:75:36:9e:7d:5a:20:
+                    97:e2:52:ae:99:9f:c6:7c:9b:66:f3:fe:d8:cf:ee:
+                    bd:97:06:1d:2d:85:dc:3e:36:53:96:7b:20:ba:e8:
+                    c8:e1:ad:96:62:3e:11:7c:b3:00:84:9e:a7:4c:71:
+                    ab:4a:37
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                A0:D6:07:3D:5E:24:F7:7B:A0:44:2E:24:52:0D:19:AA:2B:04:91:A7
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        0d:47:f9:09:66:31:52:ec:79:ee:c2:a8:f2:68:3e:ed:96:45:
+        cb:3a:a6:98:63:3f:ea:2b:4d:4e:03:d0:1c:82:e1:cb:d3:e5:
+        d6:ab:5b:67:28:bc:9d:fe:0c:99:0a:80:55:a7:ce:1b:23:61:
+        0d:b0:57:f0:fe:e0:ca:be:e6:90:db:83:2c:be:83:8e:f4:79:
+        b6:fe:d0:0d:42:a7:58:1f:69:ea:81:f5:05:a5:fe:46:68:eb:
+        6c:78:c9:e0:ea:e7:e6:de:31:c5:d2:d5:2c:82:63:28:9d:5d:
+        a8:1a:7e:88:e6:e7:2b:f1:2c:d5:d0:05:9e:dc:2d:bd:37:66:
+        d4:04:a2:a7:ad:bf:3a:c2:a8:3b:ad:ff:8d:9d:33:e0:b9:9a:
+        84:a1:87:1f:76:f4:82:74:d7:0e:f9:30:48:3e:5b:88:3e:aa:
+        5c:6b:d6:2f:0c:e8:8e:73:c2:18:91:83:39:b6:66:5a:d0:1f:
+        60:27:5d:4d:e3:f6:3a:0d:66:50:9c:78:7b:ab:f3:13:10:ae:
+        0f:2f:ab:e8:64:b3:18:20:9d:46:35:64:25:73:ea:9b:10:5c:
+        58:35:89:b1:46:48:a7:f4:ac:d4:1d:9e:5b:cc:a9:a5:1a:13:
+        4f:24:50:aa:d9:1b:6d:b1:40:fb:9d:dd:58:74:c4:c2:6f:14:
+        72:ec:db:35:9f:b8:54:75:45:c3:a6:c8:1a:28:35:3a:ae:65:
+        f2:a9:98:ce:af:5b:c9:38:8c:31:3b:7f:cc:dc:96:fd:e2:5b:
+        d6:d0:59:f4:76:ba:0b:cb:4f:83:10:c7:40:d0:1d:60:e9:2a:
+        e5:48:58:77:0c:45:69:be:19:71:04:24:e2:e3:24:1f:4a:c8:
+        c1:3e:99:f5:96:98:38:48:25:a1:15:b0:1b:d7:e2:84:18:5b:
+        f6:71:35:9a:68:7b:40:cc:18:5c:0c:24:9d:d4:95:f5:99:aa:
+        46:ea:ae:ac:bf:f4:14:19:24:e8:8c:ec:e3:f5:bc:06:68:8a:
+        2a:0c:05:5f:0a:97:75:a7:dc:7e:c0:fd:d7:7a:18:df:30:d1:
+        38:4b:1f:b0:98:70:bf:cc:7c:73:f0:6e:c4:31:a5:a4:97:1d:
+        ac:bf:ce:6c:21:4a:be:27:23:67:f3:06:56:81:0a:91:8e:b6:
+        e1:03:05:33:2c:da:34:08:4d:4e:50:23:ad:1f:a5:c5:d4:7a:
+        fe:ea:09:ec:a7:28:60:8b:46:7c:b5:ea:9b:dd:4f:f9:e7:6b:
+        15:c6:88:cf:43:db:e5:27:dc:04:56:6e:6f:46:15:f1:56:2d:
+        e8:5c:0c:73:c3:23:81:38:20:cb:c9:0c:69:cf:2c:ab:3b:84:
+        60:33:19:52:fd:69:14:33
+SHA1 Fingerprint=46:C6:90:0A:77:3A:B6:BC:F4:65:AD:AC:FC:E3:F7:07:00:6E:DE:6E
+-----BEGIN CERTIFICATE-----
+MIIFqjCCA5KgAwIBAgIQVVL4HtsbJCyeu5YYzQIoPjANBgkqhkiG9w0BAQsFADBv
+MQswCQYDVQQGEwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
+c2VhcmNoIEluc3RpdHV0aW9ucyBDQTEnMCUGA1UEAwweSEFSSUNBIENsaWVudCBS
+U0EgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTg0NloXDTQ1MDIxMzEwNTg0NVow
+bzELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWljIGFuZCBS
+ZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJzAlBgNVBAMMHkhBUklDQSBDbGllbnQg
+UlNBIFJvb3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AIHbV0KQLHQ19Pi4dBlNqwlad0WBc2KwNZ/40LczAIcTtparDlQSMAe8m7dI19EZ
+g66O2KnxqQCEsIxenugMj1Rpv/bUCE8mcP4YQWMaszKLQPgHq1cx8MYWdmeatN0v
+8tFrxdCShJFxbg8uY+kfU6TdUhPMCYMpgQzFU3VEsQ5nUxjQwx+IS5+UJLQpvLvo
+Tv1v0hUdSdyNcPIRGiBRVRG6iG/E91B51qox4oQ9XjLIdypQceULL+m26u+rCjM5
+Dv2PpWdDgo6YaQkJG0DNOGdH6snsl3ES3iT1cjzR90NMJveQsonpRUtVPTEFekHi
+lbpDwBfFtoU9GY1kcPNbrM2f0yl1h0uVZ2qm+NHdvJCGiUMpqTdb9V2wJlpTQnaQ
+K8+eVmwrVM9cmmXfW4tIYDh8+8ULz3YEYwIzKn31g2fn+sZD/SsP1CYvd6QywSTq
+ZJ2/szhxMUTyR7iiZkGh+5t7vMdGanW/WqKM6GpEwbiWtcAyCC17dDVzssrG/q8R
+chj258jCz6Uq6nvWWeh8oLJqQAlpDqWW29EAufGIbjbwiLKd8VLyw3y/MIk8Cmn5
+IqRl4ZvgdMaxhZeWLK6Uj1CmORIfvkfygXjTdTaefVogl+JSrpmfxnybZvP+2M/u
+vZcGHS2F3D42U5Z7ILroyOGtlmI+EXyzAISep0xxq0o3AgMBAAGjQjBAMA8GA1Ud
+EwEB/wQFMAMBAf8wHQYDVR0OBBYEFKDWBz1eJPd7oEQuJFINGaorBJGnMA4GA1Ud
+DwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAgEADUf5CWYxUux57sKo8mg+7ZZF
+yzqmmGM/6itNTgPQHILhy9Pl1qtbZyi8nf4MmQqAVafOGyNhDbBX8P7gyr7mkNuD
+LL6DjvR5tv7QDUKnWB9p6oH1BaX+RmjrbHjJ4Orn5t4xxdLVLIJjKJ1dqBp+iObn
+K/Es1dAFntwtvTdm1ASip62/OsKoO63/jZ0z4LmahKGHH3b0gnTXDvkwSD5biD6q
+XGvWLwzojnPCGJGDObZmWtAfYCddTeP2Og1mUJx4e6vzExCuDy+r6GSzGCCdRjVk
+JXPqmxBcWDWJsUZIp/Ss1B2eW8yppRoTTyRQqtkbbbFA+53dWHTEwm8UcuzbNZ+4
+VHVFw6bIGig1Oq5l8qmYzq9byTiMMTt/zNyW/eJb1tBZ9Ha6C8tPgxDHQNAdYOkq
+5UhYdwxFab4ZcQQk4uMkH0rIwT6Z9ZaYOEgloRWwG9fihBhb9nE1mmh7QMwYXAwk
+ndSV9ZmqRuqurL/0FBkk6Izs4/W8BmiKKgwFXwqXdafcfsD913oY3zDROEsfsJhw
+v8x8c/BuxDGlpJcdrL/ObCFKvicjZ/MGVoEKkY624QMFMyzaNAhNTlAjrR+lxdR6
+/uoJ7KcoYItGfLXqm91P+edrFcaIz0Pb5SfcBFZub0YV8VYt6FwMc8MjgTggy8kM
+ac8sqzuEYDMZUv1pFDM=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem b/secure/caroot/untrusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem
deleted file mode 100644
index c8e73bc4d867..000000000000
--- a/secure/caroot/untrusted/Hellenic_Academic_and_Research_Institutions_RootCA_2011.pem
+++ /dev/null
@@ -1,103 +0,0 @@
-##
-##  Hellenic Academic and Research Institutions RootCA 2011
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 0 (0x0)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=GR, O=Hellenic Academic and Research Institutions Cert. Authority, CN=Hellenic Academic and Research Institutions RootCA 2011
-        Validity
-            Not Before: Dec  6 13:49:52 2011 GMT
-            Not After : Dec  1 13:49:52 2031 GMT
-        Subject: C=GR, O=Hellenic Academic and Research Institutions Cert. Authority, CN=Hellenic Academic and Research Institutions RootCA 2011
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:a9:53:00:e3:2e:a6:f6:8e:fa:60:d8:2d:95:3e:
-                    f8:2c:2a:54:4e:cd:b9:84:61:94:58:4f:8f:3d:8b:
-                    e4:43:f3:75:89:8d:51:e4:c3:37:d2:8a:88:4d:79:
-                    1e:b7:12:dd:43:78:4a:8a:92:e6:d7:48:d5:0f:a4:
-                    3a:29:44:35:b8:07:f6:68:1d:55:cd:38:51:f0:8c:
-                    24:31:85:af:83:c9:7d:e9:77:af:ed:1a:7b:9d:17:
-                    f9:b3:9d:38:50:0f:a6:5a:79:91:80:af:37:ae:a6:
-                    d3:31:fb:b5:26:09:9d:3c:5a:ef:51:c5:2b:df:96:
-                    5d:eb:32:1e:02:da:70:49:ec:6e:0c:c8:9a:37:8d:
-                    f7:f1:36:60:4b:26:2c:82:9e:d0:78:f3:0d:0f:63:
-                    a4:51:30:e1:f9:2b:27:12:07:d8:ea:bd:18:62:98:
-                    b0:59:37:7d:be:ee:f3:20:51:42:5a:83:ef:93:ba:
-                    69:15:f1:62:9d:9f:99:39:82:a1:b7:74:2e:8b:d4:
-                    c5:0b:7b:2f:f0:c8:0a:da:3d:79:0a:9a:93:1c:a5:
-                    28:72:73:91:43:9a:a7:d1:4d:85:84:b9:a9:74:8f:
-                    14:40:c7:dc:de:ac:41:64:6c:b4:19:9b:02:63:6d:
-                    24:64:8f:44:b2:25:ea:ce:5d:74:0c:63:32:5c:8d:
-                    87:e5
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: 
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                A6:91:42:FD:13:61:4A:23:9E:08:A4:29:E5:D8:13:04:23:EE:41:25
-            X509v3 Name Constraints: 
-                Permitted:
-                  DNS:.gr
-                  DNS:.eu
-                  DNS:.edu
-                  DNS:.org
-                  email:.gr
-                  email:.eu
-                  email:.edu
-                  email:.org
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        1f:ef:79:41:e1:7b:6e:3f:b2:8c:86:37:42:4a:4e:1c:37:1e:
-        8d:66:ba:24:81:c9:4f:12:0f:21:c0:03:97:86:25:6d:5d:d3:
-        22:29:a8:6c:a2:0d:a9:eb:3d:06:5b:99:3a:c7:cc:c3:9a:34:
-        7f:ab:0e:c8:4e:1c:e1:fa:e4:dc:cd:0d:be:bf:24:fe:6c:e7:
-        6b:c2:0d:c8:06:9e:4e:8d:61:28:a6:6a:fd:e5:f6:62:ea:18:
-        3c:4e:a0:53:9d:b2:3a:9c:eb:a5:9c:91:16:b6:4d:82:e0:0c:
-        05:48:a9:6c:f5:cc:f8:cb:9d:49:b4:f0:02:a5:fd:70:03:ed:
-        8a:21:a5:ae:13:86:49:c3:33:73:be:87:3b:74:8b:17:45:26:
-        4c:16:91:83:fe:67:7d:cd:4d:63:67:fa:f3:03:12:96:78:06:
-        8d:b1:67:ed:8e:3f:be:9f:4f:02:f5:b3:09:2f:f3:4c:87:df:
-        2a:cb:95:7c:01:cc:ac:36:7a:bf:a2:73:7a:f7:8f:c1:b5:9a:
-        a1:14:b2:8f:33:9f:0d:ef:22:dc:66:7b:84:bd:45:17:06:3d:
-        3c:ca:b9:77:34:8f:ca:ea:cf:3f:31:3e:e3:88:e3:80:49:25:
-        c8:97:b5:9d:9a:99:4d:b0:3c:f8:4a:00:9b:64:dd:9f:39:4b:
-        d1:27:d7:b8
-SHA1 Fingerprint=FE:45:65:9B:79:03:5B:98:A1:61:B5:51:2E:AC:DA:58:09:48:22:4D
------BEGIN CERTIFICATE-----
-MIIEMTCCAxmgAwIBAgIBADANBgkqhkiG9w0BAQUFADCBlTELMAkGA1UEBhMCR1Ix
-RDBCBgNVBAoTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1
-dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUAwPgYDVQQDEzdIZWxsZW5pYyBBY2FkZW1p
-YyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIFJvb3RDQSAyMDExMB4XDTExMTIw
-NjEzNDk1MloXDTMxMTIwMTEzNDk1MlowgZUxCzAJBgNVBAYTAkdSMUQwQgYDVQQK
-EztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIENl
-cnQuIEF1dGhvcml0eTFAMD4GA1UEAxM3SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJl
-c2VhcmNoIEluc3RpdHV0aW9ucyBSb290Q0EgMjAxMTCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKlTAOMupvaO+mDYLZU++CwqVE7NuYRhlFhPjz2L5EPz
-dYmNUeTDN9KKiE15HrcS3UN4SoqS5tdI1Q+kOilENbgH9mgdVc04UfCMJDGFr4PJ
-fel3r+0ae50X+bOdOFAPplp5kYCvN66m0zH7tSYJnTxa71HFK9+WXesyHgLacEns
-bgzImjeN9/E2YEsmLIKe0HjzDQ9jpFEw4fkrJxIH2Oq9GGKYsFk3fb7u8yBRQlqD
-75O6aRXxYp2fmTmCobd0LovUxQt7L/DICto9eQqakxylKHJzkUOap9FNhYS5qXSP
-FEDH3N6sQWRstBmbAmNtJGSPRLIl6s5ddAxjMlyNh+UCAwEAAaOBiTCBhjAPBgNV
-HRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBBjAdBgNVHQ4EFgQUppFC/RNhSiOeCKQp
-5dgTBCPuQSUwRwYDVR0eBEAwPqA8MAWCAy5ncjAFggMuZXUwBoIELmVkdTAGggQu
-b3JnMAWBAy5ncjAFgQMuZXUwBoEELmVkdTAGgQQub3JnMA0GCSqGSIb3DQEBBQUA
-A4IBAQAf73lB4XtuP7KMhjdCSk4cNx6NZrokgclPEg8hwAOXhiVtXdMiKahsog2p
-6z0GW5k6x8zDmjR/qw7IThzh+uTczQ2+vyT+bOdrwg3IBp5OjWEopmr95fZi6hg8
-TqBTnbI6nOulnJEWtk2C4AwFSKls9cz4y51JtPACpf1wA+2KIaWuE4ZJwzNzvoc7
-dIsXRSZMFpGD/md9zU1jZ/rzAxKWeAaNsWftjj++n08C9bMJL/NMh98qy5V8Acys
-Nnq/onN694/BtZqhFLKPM58N7yLcZnuEvUUXBj08yrl3NI/K6s8/MT7jiOOASSXI
-l7WdmplNsDz4SgCbZN2fOUvRJ9e4
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/LAWtrust_Root_CA2__4096_.pem b/secure/caroot/untrusted/LAWtrust_Root_CA2__4096_.pem
new file mode 100644
index 000000000000..64020f27a73b
--- /dev/null
+++ b/secure/caroot/untrusted/LAWtrust_Root_CA2__4096_.pem
@@ -0,0 +1,135 @@
+##
+##  LAWtrust Root CA2 (4096)
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1427795633 (0x551a6eb1)
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=ZA, O=LAWtrust, CN=LAWtrust Root CA2 (4096)
+        Validity
+            Not Before: Feb 14 09:19:38 2023 GMT
+            Not After : Feb 14 09:49:38 2053 GMT
+        Subject: C=ZA, O=LAWtrust, CN=LAWtrust Root CA2 (4096)
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:cc:17:cb:2b:43:ba:6c:f9:c9:93:8a:65:0d:12:
+                    4c:ec:27:14:b7:13:79:e0:d4:d5:2d:18:56:f1:f9:
+                    ea:2a:10:16:4e:6c:44:c7:6a:65:46:f3:9a:89:35:
+                    d1:87:f8:33:89:2f:88:09:1a:92:10:91:90:c1:6b:
+                    9f:0e:6e:7f:26:8a:13:5d:18:ac:68:01:0d:10:78:
+                    65:70:d8:8e:8f:84:5a:97:30:18:d0:11:0e:4a:8d:
+                    52:10:a5:81:2b:51:28:f5:63:c4:b6:ec:40:b3:01:
+                    e5:ad:77:bd:e5:38:ef:bc:8d:b3:dd:19:a0:7b:0d:
+                    8d:b4:db:6a:fb:25:33:5a:fa:91:af:c4:71:45:30:
+                    f8:88:29:7b:cb:bf:d5:ba:27:04:8e:dd:b2:00:f7:
+                    ca:5c:99:35:14:ea:fd:75:06:15:08:bb:ca:57:68:
+                    fb:3f:fb:b4:34:73:63:d1:d5:e3:c8:38:5a:69:7d:
+                    6a:7a:44:0c:0d:8a:4e:ed:92:1d:10:8f:3b:22:2c:
+                    b6:df:ed:c5:c6:f0:89:79:54:65:5e:5f:1b:bd:8f:
+                    7d:df:b9:b7:ed:eb:e4:c5:07:d1:67:3c:95:3b:91:
+                    fe:42:7a:52:40:80:04:d2:39:57:4b:f4:92:7d:ff:
+                    9b:ef:e5:9d:c9:09:b2:91:12:38:a6:29:08:3b:ae:
+                    eb:ca:cc:ed:4d:e7:4e:21:01:07:fc:6f:32:ce:69:
+                    8c:84:52:c6:77:ea:27:30:0a:de:a5:af:30:2b:68:
+                    1f:ac:d4:ec:21:ad:22:49:76:ce:0f:c2:f2:07:2a:
+                    f9:6a:12:83:9a:3b:04:ae:19:7a:fe:a1:86:24:fa:
+                    41:5e:25:7c:40:ac:27:b6:e3:29:36:6f:35:e2:57:
+                    d0:19:58:df:ff:64:f6:c3:01:49:76:db:2b:be:bc:
+                    b9:4f:14:0a:d5:1b:58:21:f6:1c:2e:00:7c:f8:94:
+                    b5:cb:37:1a:14:e4:32:b9:16:d4:60:ec:05:aa:5f:
+                    32:fa:6a:23:12:ac:d4:10:bb:d2:a2:82:b4:4b:0e:
+                    8b:70:27:aa:d6:07:c1:67:88:fa:84:c3:08:c9:8a:
+                    84:c8:d2:37:72:81:0f:8d:16:4a:e4:d7:35:51:a5:
+                    38:0f:8c:84:4b:95:36:c0:f5:d7:9d:e0:5d:8f:ab:
+                    91:ee:00:08:b9:9d:52:1f:ec:f8:99:bb:79:56:b1:
+                    49:da:d2:e5:d8:61:8b:5b:af:f0:ab:37:c5:7b:1a:
+                    8e:86:be:7e:c5:7b:15:1e:61:68:e8:0b:87:8b:73:
+                    49:a1:17:73:7e:29:78:8e:ca:e0:41:2f:75:73:74:
+                    a2:97:3a:7f:f7:2e:74:09:b8:4c:60:8b:46:36:19:
+                    10:2d:9d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Private Key Usage Period: 
+                Not Before: Feb 14 09:19:38 2023 GMT, Not After: Feb 14 09:49:38 2053 GMT
+            X509v3 Authority Key Identifier: 
+                D7:D6:56:62:5C:3F:17:81:E6:73:44:29:F5:51:05:EF:0B:60:37:AC
+            X509v3 Subject Key Identifier: 
+                D7:D6:56:62:5C:3F:17:81:E6:73:44:29:F5:51:05:EF:0B:60:37:AC
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        49:9c:29:fe:3d:ec:9e:45:7f:ab:3e:3c:fe:23:6f:37:3e:77:
+        a7:53:ff:78:9f:fc:49:44:80:57:66:9c:6e:da:79:ff:cd:45:
+        ad:4c:93:bf:b5:59:c6:e9:10:b7:e5:f8:8c:fb:87:c5:1e:8b:
+        d8:b3:3f:02:96:0a:bb:8a:8e:ef:d7:b4:c0:83:20:38:97:59:
+        45:64:fc:f6:77:13:f2:09:d7:a1:c8:38:74:08:ea:f9:48:4c:
+        fa:1f:04:9c:b4:ff:ec:6e:56:36:72:93:6c:95:3e:2c:5f:de:
+        0f:0b:ab:c9:cc:15:3e:16:8f:66:fc:b2:10:b8:a1:d1:b4:de:
+        c0:63:19:cc:ef:53:aa:75:36:22:8b:25:1f:bf:9b:c8:d7:c1:
+        5f:ec:a6:37:09:aa:7b:62:bc:f6:22:2d:f1:d6:58:dd:8c:bb:
+        52:f4:0b:a7:76:a9:7a:7b:1a:8d:dc:ad:9a:81:62:2e:86:05:
+        90:72:47:2f:a1:c9:67:84:b0:0d:6c:b0:b8:9b:16:b7:d0:99:
+        14:2f:9c:12:9b:23:a8:8d:a6:43:1e:e9:e5:2d:e5:78:a7:1f:
+        64:94:64:b6:77:b2:a8:5c:fb:09:ab:29:eb:1e:6d:75:d1:f6:
+        d0:c5:a5:c3:1d:9f:1e:f3:1a:2d:b2:c8:1f:e5:28:0a:6e:f3:
+        5f:fd:da:e6:23:a1:76:90:5c:4b:98:01:82:2c:ee:47:2d:02:
+        1a:5f:7f:34:c5:69:b5:72:ad:3e:f3:cf:9e:6d:f8:29:e8:11:
+        27:2b:e0:59:0b:1b:61:eb:4a:ca:69:a5:a4:d5:cd:51:1b:94:
+        8e:79:cd:df:f6:ae:74:5d:b1:2c:1b:86:53:fe:d1:30:06:41:
+        34:07:62:82:4c:f4:7e:c7:87:74:0e:b0:21:1e:09:20:80:c1:
+        b3:15:3d:46:6d:d3:f1:06:92:3f:ef:a0:95:8a:1c:6e:77:31:
+        b6:eb:78:29:0c:7b:ee:82:a5:4f:7e:a4:29:5e:9e:aa:2d:f8:
+        8e:c0:f3:fc:0d:06:85:9b:4e:dc:f7:e2:09:7c:d0:14:51:1e:
+        7a:b3:23:af:fa:d1:61:2a:65:b5:01:d9:b8:e3:07:ca:24:76:
+        d2:f0:4a:be:ef:86:04:80:42:15:70:11:68:7e:d7:c7:bb:fe:
+        e7:4e:9b:9c:95:a5:1c:4a:a4:c9:d0:09:8c:aa:ce:48:d2:1e:
+        92:97:d7:11:e9:ed:66:cc:37:dc:f5:d7:1b:74:9b:a6:ea:42:
+        ac:5d:32:e0:58:f4:81:47:ff:d2:12:e2:7e:1c:dc:49:76:96:
+        c3:1d:9f:4b:ca:5c:2a:37:5b:3d:8a:d1:38:9b:21:da:e3:bf:
+        45:43:d3:e0:58:77:1f:28
+SHA1 Fingerprint=EC:A2:D5:30:A9:AB:2C:7D:0E:75:61:64:4E:0A:E0:16:A1:54:38:7D
+-----BEGIN CERTIFICATE-----
+MIIFmDCCA4CgAwIBAgIEVRpusTANBgkqhkiG9w0BAQsFADBDMQswCQYDVQQGEwJa
+QTERMA8GA1UEChMITEFXdHJ1c3QxITAfBgNVBAMTGExBV3RydXN0IFJvb3QgQ0Ey
+ICg0MDk2KTAgFw0yMzAyMTQwOTE5MzhaGA8yMDUzMDIxNDA5NDkzOFowQzELMAkG
+A1UEBhMCWkExETAPBgNVBAoTCExBV3RydXN0MSEwHwYDVQQDExhMQVd0cnVzdCBS
+b290IENBMiAoNDA5NikwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM
+F8srQ7ps+cmTimUNEkzsJxS3E3ng1NUtGFbx+eoqEBZObETHamVG85qJNdGH+DOJ
+L4gJGpIQkZDBa58Obn8mihNdGKxoAQ0QeGVw2I6PhFqXMBjQEQ5KjVIQpYErUSj1
+Y8S27ECzAeWtd73lOO+8jbPdGaB7DY2022r7JTNa+pGvxHFFMPiIKXvLv9W6JwSO
+3bIA98pcmTUU6v11BhUIu8pXaPs/+7Q0c2PR1ePIOFppfWp6RAwNik7tkh0Qjzsi
+LLbf7cXG8Il5VGVeXxu9j33fubft6+TFB9FnPJU7kf5CelJAgATSOVdL9JJ9/5vv
+5Z3JCbKREjimKQg7ruvKzO1N504hAQf8bzLOaYyEUsZ36icwCt6lrzAraB+s1Owh
+rSJJds4PwvIHKvlqEoOaOwSuGXr+oYYk+kFeJXxArCe24yk2bzXiV9AZWN//ZPbD
+AUl22yu+vLlPFArVG1gh9hwuAHz4lLXLNxoU5DK5FtRg7AWqXzL6aiMSrNQQu9Ki
+grRLDotwJ6rWB8FniPqEwwjJioTI0jdygQ+NFkrk1zVRpTgPjIRLlTbA9ded4F2P
+q5HuAAi5nVIf7PiZu3lWsUna0uXYYYtbr/CrN8V7Go6Gvn7FexUeYWjoC4eLc0mh
+F3N+KXiOyuBBL3VzdKKXOn/3LnQJuExgi0Y2GRAtnQIDAQABo4GRMIGOMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMCsGA1UdEAQkMCKADzIwMjMwMjE0
+MDkxOTM4WoEPMjA1MzAyMTQwOTQ5MzhaMB8GA1UdIwQYMBaAFNfWVmJcPxeB5nNE
+KfVRBe8LYDesMB0GA1UdDgQWBBTX1lZiXD8XgeZzRCn1UQXvC2A3rDANBgkqhkiG
+9w0BAQsFAAOCAgEASZwp/j3snkV/qz48/iNvNz53p1P/eJ/8SUSAV2acbtp5/81F
+rUyTv7VZxukQt+X4jPuHxR6L2LM/ApYKu4qO79e0wIMgOJdZRWT89ncT8gnXocg4
+dAjq+UhM+h8EnLT/7G5WNnKTbJU+LF/eDwurycwVPhaPZvyyELih0bTewGMZzO9T
+qnU2IoslH7+byNfBX+ymNwmqe2K89iIt8dZY3Yy7UvQLp3apensajdytmoFiLoYF
+kHJHL6HJZ4SwDWywuJsWt9CZFC+cEpsjqI2mQx7p5S3leKcfZJRktneyqFz7Casp
+6x5tddH20MWlwx2fHvMaLbLIH+UoCm7zX/3a5iOhdpBcS5gBgizuRy0CGl9/NMVp
+tXKtPvPPnm34KegRJyvgWQsbYetKymmlpNXNURuUjnnN3/audF2xLBuGU/7RMAZB
+NAdigkz0fseHdA6wIR4JIIDBsxU9Rm3T8QaSP++glYocbncxtut4KQx77oKlT36k
+KV6eqi34jsDz/A0GhZtO3PfiCXzQFFEeerMjr/rRYSpltQHZuOMHyiR20vBKvu+G
+BIBCFXARaH7Xx7v+506bnJWlHEqkydAJjKrOSNIekpfXEentZsw33PXXG3SbpupC
+rF0y4Fj0gUf/0hLifhzcSXaWwx2fS8pcKjdbPYrROJsh2uO/RUPT4Fh3Hyg=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/LuxTrust_Global_Root_2.pem b/secure/caroot/untrusted/LuxTrust_Global_Root_2.pem
deleted file mode 100644
index fc3a0ccbd503..000000000000
--- a/secure/caroot/untrusted/LuxTrust_Global_Root_2.pem
+++ /dev/null
@@ -1,138 +0,0 @@
-##
-##  LuxTrust Global Root 2
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            0a:7e:a6:df:4b:44:9e:da:6a:24:85:9e:e6:b8:15:d3:16:7f:bb:b1
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=LU, O=LuxTrust S.A., CN=LuxTrust Global Root 2
-        Validity
-            Not Before: Mar  5 13:21:57 2015 GMT
-            Not After : Mar  5 13:21:57 2035 GMT
-        Subject: C=LU, O=LuxTrust S.A., CN=LuxTrust Global Root 2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:d7:85:97:bf:11:98:e9:f0:62:83:4c:3c:87:f9:
-                    53:6a:37:0b:f2:0f:3c:87:ce:6f:dc:26:29:bd:c5:
-                    89:ba:c9:83:3d:f7:ee:ca:5b:c6:6d:49:73:b4:c9:
-                    46:a3:1b:34:13:3f:c1:89:45:57:f4:d9:b1:fb:36:
-                    65:4b:fb:08:e2:48:71:11:c8:6e:3b:9e:9d:df:89:
-                    65:37:a6:85:f6:3b:44:18:b6:c6:37:30:62:44:92:
-                    97:69:7d:42:30:24:e4:0d:0c:89:6b:63:de:c5:e1:
-                    df:4e:a9:14:6c:53:e0:61:ce:f6:17:2f:1d:3c:bd:
-                    e6:22:4c:1d:93:f5:10:c4:a1:76:ec:6a:de:c5:6c:
-                    df:96:b4:56:40:42:c0:62:92:30:a1:2d:15:94:a0:
-                    d2:20:06:09:6e:6a:6d:e5:eb:b7:be:d4:f0:f1:15:
-                    7c:8b:e6:4e:ba:13:cc:4b:27:5e:99:3c:17:5d:8f:
-                    81:7f:33:3d:4f:d3:3f:1b:ec:5c:3f:f0:3c:4c:75:
-                    6e:f2:a6:d5:9d:da:2d:07:63:02:c6:72:e9:94:bc:
-                    4c:49:95:4f:88:52:c8:db:e8:69:82:f8:cc:34:5b:
-                    22:f0:86:a7:89:bd:48:0a:6d:66:81:6d:c8:c8:64:
-                    fb:01:e1:f4:e1:de:d9:9e:dd:db:5b:d4:2a:99:26:
-                    15:1b:1e:4c:92:29:82:9e:d5:92:81:92:41:70:19:
-                    f7:a4:e5:93:4b:bc:77:67:31:dd:1c:fd:31:70:0d:
-                    17:99:0c:f9:0c:39:19:2a:17:b5:30:71:55:d5:0f:
-                    ae:58:e1:3d:2f:34:9b:cf:9f:f6:78:85:c2:93:7a:
-                    72:3e:66:8f:9c:16:11:60:8f:9e:89:6f:67:be:e0:
-                    47:5a:3b:0c:9a:67:8b:cf:46:c6:ae:38:a3:f2:a7:
-                    bc:e6:d6:85:6b:33:24:70:22:4b:cb:08:9b:bb:c8:
-                    f8:02:29:1d:be:20:0c:46:bf:6b:87:9b:b3:2a:66:
-                    42:35:46:6c:aa:ba:ad:f9:98:7b:e9:50:55:14:31:
-                    bf:b1:da:2d:ed:80:ad:68:24:fb:69:ab:d8:71:13:
-                    30:e6:67:b3:87:40:fd:89:7e:f2:43:d1:11:df:2f:
-                    65:2f:64:ce:5f:14:b9:b1:bf:31:bd:87:78:5a:59:
-                    65:88:aa:fc:59:32:48:86:d6:4c:b9:29:4b:95:d3:
-                    76:f3:77:25:6d:42:1c:38:83:4d:fd:a3:5f:9b:7f:
-                    2d:ac:79:1b:0e:42:31:97:63:a4:fb:8a:69:d5:22:
-                    0d:34:90:30:2e:a8:b4:e0:6d:b6:94:ac:bc:8b:4e:
-                    d7:70:fc:c5:38:8e:64:25:e1:4d:39:90:ce:c9:87:
-                    84:58:71
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Certificate Policies: 
-                Policy: 1.3.171.1.1.1.10
-                  CPS: https://repository.luxtrust.lu
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Authority Key Identifier: 
-                FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3
-            X509v3 Subject Key Identifier: 
-                FF:18:28:76:F9:48:05:2C:A1:AE:F1:2B:1B:2B:B2:53:F8:4B:7C:B3
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        6a:19:14:ed:6e:79:c1:2c:87:d4:0d:70:7e:d7:f6:78:c9:0b:
-        04:4e:c4:b1:ce:93:70:fe:b0:54:c0:32:cd:99:30:64:17:bf:
-        0f:e5:e2:33:fd:07:36:40:72:0e:1a:b6:6a:59:d6:00:e5:68:
-        20:dd:2e:72:0d:1f:6a:64:31:20:84:7d:49:a6:5a:37:eb:45:
-        c9:85:f5:d4:c7:17:99:07:e6:9b:55:e4:0c:e8:a9:b4:ce:8c:
-        5b:b5:11:5c:cf:8a:0e:0d:d6:ac:77:81:fe:32:9c:24:9e:72:
-        ce:54:f3:d0:6f:a2:56:d6:ec:c3:37:2c:65:58:be:57:00:1a:
-        f2:35:fa:eb:7b:31:5d:c2:c1:12:3d:96:81:88:96:89:c1:59:
-        5c:7a:e6:7f:70:34:e7:83:e2:b1:e1:e1:b8:58:ef:d4:95:e4:
-        60:9c:f0:96:97:72:8c:eb:84:02:2e:65:8f:a4:b7:d2:7f:67:
-        dd:c8:d3:9e:5c:aa:a9:a4:a0:25:14:06:9b:ec:4f:7e:2d:0b:
-        7f:1d:75:f1:33:d8:ed:ce:b8:75:6d:3e:5b:b9:98:1d:31:0d:
-        56:d8:43:0f:30:91:b2:04:6b:dd:56:be:95:80:55:67:be:d8:
-        cd:83:d9:18:ee:2e:0f:86:2d:92:9e:70:13:ec:de:51:c9:43:
-        78:02:a5:4d:c8:f9:5f:c4:91:58:46:16:77:5a:74:aa:40:bc:
-        07:9f:30:b9:b1:f7:12:17:dd:e3:ff:24:40:1d:7a:6a:d1:4f:
-        18:0a:aa:90:1d:eb:40:1e:df:a1:1e:44:92:10:9a:f2:8d:e1:
-        d1:4b:46:9e:e8:45:42:97:ea:45:99:f3:ec:66:d5:02:fa:f2:
-        a6:4a:24:aa:de:ce:b9:ca:f9:3f:93:6f:f9:a3:ba:ea:a5:3e:
-        99:ad:fd:ff:7b:99:f5:65:ee:f0:59:28:67:d7:90:95:a4:13:
-        84:a9:84:c1:e8:ce:ce:75:93:63:1a:bc:3c:ea:d5:64:1f:2d:
-        2a:12:39:c6:c3:5a:32:ed:47:91:16:0e:bc:38:c1:50:de:8f:
-        ca:2a:90:34:1c:ee:41:94:9c:5e:19:2e:f8:45:49:99:74:91:
-        b0:04:6f:e3:04:5a:b1:ab:2a:ab:fe:c7:d0:96:b6:da:e1:4a:
-        64:06:6e:60:4d:bd:42:4e:ff:78:da:24:ca:1b:b4:d7:96:39:
-        6c:ae:f1:0e:aa:a7:7d:48:8b:20:4c:cf:64:d6:b8:97:46:b0:
-        4e:d1:2a:56:3a:a0:93:bd:af:80:24:e0:0a:7e:e7:ca:d5:ca:
-        e8:85:55:dc:36:2a:e1:94:68:93:c7:66:72:44:0f:80:21:32:
-        6c:25:c7:23:80:83:0a:eb
-SHA1 Fingerprint=1E:0E:56:19:0A:D1:8B:25:98:B2:04:44:FF:66:8A:04:17:99:5F:3F
------BEGIN CERTIFICATE-----
-MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQEL
-BQAwRjELMAkGA1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNV
-BAMMFkx1eFRydXN0IEdsb2JhbCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUw
-MzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEWMBQGA1UECgwNTHV4VHJ1c3QgUy5B
-LjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCCAiIwDQYJKoZIhvcN
-AQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wmKb3F
-ibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTem
-hfY7RBi2xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1
-EMShduxq3sVs35a0VkBCwGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsn
-Xpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4
-zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkmFRseTJIpgp7VkoGSQXAZ
-96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niFwpN6cj5m
-j5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4g
-DEa/a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+
-8kPREd8vZS9kzl8UubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2j
-X5t/Lax5Gw5CMZdjpPuKadUiDTSQMC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmH
-hFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB/zBCBgNVHSAEOzA5MDcGByuB
-KwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5Lmx1eHRydXN0
-Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT
-+Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQEL
-BQADggIBAGoZFO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9
-BzZAcg4atmpZ1gDlaCDdLnINH2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTO
-jFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW7MM3LGVYvlcAGvI1+ut7MV3CwRI9
-loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIuZY+kt9J/Z93I055c
-qqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWAVWe+
-2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/
-JEAdemrRTxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKre
-zrnK+T+Tb/mjuuqlPpmt/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQf
-LSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+
-x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31IiyBMz2TWuJdGsE7RKlY6
-oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Network_Solutions_Certificate_Authority.pem b/secure/caroot/untrusted/Network_Solutions_Certificate_Authority.pem
deleted file mode 100644
index 9e5578fd21b0..000000000000
--- a/secure/caroot/untrusted/Network_Solutions_Certificate_Authority.pem
+++ /dev/null
@@ -1,96 +0,0 @@
-##
-##  Network Solutions Certificate Authority
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=Network Solutions L.L.C., CN=Network Solutions Certificate Authority
-        Validity
-            Not Before: Dec  1 00:00:00 2006 GMT
-            Not After : Dec 31 23:59:59 2029 GMT
-        Subject: C=US, O=Network Solutions L.L.C., CN=Network Solutions Certificate Authority
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:e4:bc:7e:92:30:6d:c6:d8:8e:2b:0b:bc:46:ce:
-                    e0:27:96:de:de:f9:fa:12:d3:3c:33:73:b3:04:2f:
-                    bc:71:8c:e5:9f:b6:22:60:3e:5f:5d:ce:09:ff:82:
-                    0c:1b:9a:51:50:1a:26:89:dd:d5:61:5d:19:dc:12:
-                    0f:2d:0a:a2:43:5d:17:d0:34:92:20:ea:73:cf:38:
-                    2c:06:26:09:7a:72:f7:fa:50:32:f8:c2:93:d3:69:
-                    a2:23:ce:41:b1:cc:e4:d5:1f:36:d1:8a:3a:f8:8c:
-                    63:e2:14:59:69:ed:0d:d3:7f:6b:e8:b8:03:e5:4f:
-                    6a:e5:98:63:69:48:05:be:2e:ff:33:b6:e9:97:59:
-                    69:f8:67:19:ae:93:61:96:44:15:d3:72:b0:3f:bc:
-                    6a:7d:ec:48:7f:8d:c3:ab:aa:71:2b:53:69:41:53:
-                    34:b5:b0:b9:c5:06:0a:c4:b0:45:f5:41:5d:6e:89:
-                    45:7b:3d:3b:26:8c:74:c2:e5:d2:d1:7d:b2:11:d4:
-                    fb:58:32:22:9a:80:c9:dc:fd:0c:e9:7f:5e:03:97:
-                    ce:3b:00:14:87:27:70:38:a9:8e:6e:b3:27:76:98:
-                    51:e0:05:e3:21:ab:1a:d5:85:22:3c:29:b5:9a:16:
-                    c5:80:a8:f4:bb:6b:30:8f:2f:46:02:a2:b1:0c:22:
-                    e0:d3
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                21:30:C9:FB:00:D7:4E:98:DA:87:AA:2A:D0:A7:2E:B1:40:31:A7:4C
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 CRL Distribution Points: 
-                Full Name:
-                  URI:http://crl.netsolssl.com/NetworkSolutionsCertificateAuthority.crl
-
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        bb:ae:4b:e7:b7:57:eb:7f:aa:2d:b7:73:47:85:6a:c1:e4:a5:
-        1d:e4:e7:3c:e9:f4:59:65:77:b5:7a:5b:5a:8d:25:36:e0:7a:
-        97:2e:38:c0:57:60:83:98:06:83:9f:b9:76:7a:6e:50:e0:ba:
-        88:2c:fc:45:cc:18:b0:99:95:51:0e:ec:1d:b8:88:ff:87:50:
-        1c:82:c2:e3:e0:32:80:bf:a0:0b:47:c8:c3:31:ef:99:67:32:
-        80:4f:17:21:79:0c:69:5c:de:5e:34:ae:02:b5:26:ea:50:df:
-        7f:18:65:2c:c9:f2:63:e1:a9:07:fe:7c:71:1f:6b:33:24:6a:
-        1e:05:f7:05:68:c0:6a:12:cb:2e:5e:61:cb:ae:28:d3:7e:c2:
-        b4:66:91:26:5f:3c:2e:24:5f:cb:58:0f:eb:28:ec:af:11:96:
-        f3:dc:7b:6f:c0:a7:88:f2:53:77:b3:60:5e:ae:ae:28:da:35:
-        2c:6f:34:45:d3:26:e1:de:ec:5b:4f:27:6b:16:7c:bd:44:04:
-        18:82:b3:89:79:17:10:71:3d:7a:a2:16:4e:f5:01:cd:a4:6c:
-        65:68:a1:49:76:5c:43:c9:d8:bc:36:67:6c:a5:94:b5:d4:cc:
-        b9:bd:6a:35:56:21:de:d8:c3:eb:fb:cb:a4:60:4c:b0:55:a0:
-        a0:7b:57:b2
-SHA1 Fingerprint=74:F8:A3:C3:EF:E7:B3:90:06:4B:83:90:3C:21:64:60:20:E5:DF:CE
------BEGIN CERTIFICATE-----
-MIID5jCCAs6gAwIBAgIQV8szb8JcFuZHFhfjkDFo4DANBgkqhkiG9w0BAQUFADBi
-MQswCQYDVQQGEwJVUzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMu
-MTAwLgYDVQQDEydOZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3Jp
-dHkwHhcNMDYxMjAxMDAwMDAwWhcNMjkxMjMxMjM1OTU5WjBiMQswCQYDVQQGEwJV
-UzEhMB8GA1UEChMYTmV0d29yayBTb2x1dGlvbnMgTC5MLkMuMTAwLgYDVQQDEydO
-ZXR3b3JrIFNvbHV0aW9ucyBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDkvH6SMG3G2I4rC7xGzuAnlt7e+foS0zwz
-c7MEL7xxjOWftiJgPl9dzgn/ggwbmlFQGiaJ3dVhXRncEg8tCqJDXRfQNJIg6nPP
-OCwGJgl6cvf6UDL4wpPTaaIjzkGxzOTVHzbRijr4jGPiFFlp7Q3Tf2vouAPlT2rl
-mGNpSAW+Lv8ztumXWWn4Zxmuk2GWRBXTcrA/vGp97Eh/jcOrqnErU2lBUzS1sLnF
-BgrEsEX1QV1uiUV7PTsmjHTC5dLRfbIR1PtYMiKagMnc/Qzpf14Dl847ABSHJ3A4
-qY5usyd2mFHgBeMhqxrVhSI8KbWaFsWAqPS7azCPL0YCorEMIuDTAgMBAAGjgZcw
-gZQwHQYDVR0OBBYEFCEwyfsA106Y2oeqKtCnLrFAMadMMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MFIGA1UdHwRLMEkwR6BFoEOGQWh0dHA6Ly9jcmwu
-bmV0c29sc3NsLmNvbS9OZXR3b3JrU29sdXRpb25zQ2VydGlmaWNhdGVBdXRob3Jp
-dHkuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQC7rkvnt1frf6ott3NHhWrB5KUd5Oc8
-6fRZZXe1eltajSU24HqXLjjAV2CDmAaDn7l2em5Q4LqILPxFzBiwmZVRDuwduIj/
-h1AcgsLj4DKAv6ALR8jDMe+ZZzKATxcheQxpXN5eNK4CtSbqUN9/GGUsyfJj4akH
-/nxxH2szJGoeBfcFaMBqEssuXmHLrijTfsK0ZpEmXzwuJF/LWA/rKOyvEZbz3Htv
-wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHN
-pGxlaKFJdlxDydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/OISTE_Client_Root_ECC_G1.pem b/secure/caroot/untrusted/OISTE_Client_Root_ECC_G1.pem
new file mode 100644
index 000000000000..875f11f7d06a
--- /dev/null
+++ b/secure/caroot/untrusted/OISTE_Client_Root_ECC_G1.pem
@@ -0,0 +1,66 @@
+##
+##  OISTE Client Root ECC G1
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            54:ec:97:d6:8b:b4:c4:0b:21:6e:0e:b2:d0:53:c8:7a
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=CH, O=OISTE Foundation, CN=OISTE Client Root ECC G1
+        Validity
+            Not Before: May 31 14:31:40 2023 GMT
+            Not After : May 24 14:31:39 2048 GMT
+        Subject: C=CH, O=OISTE Foundation, CN=OISTE Client Root ECC G1
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:88:4e:68:1f:c9:9e:be:3a:04:5b:15:c3:35:f4:
+                    cc:50:c5:08:ad:38:6e:a8:3c:d2:02:ba:cc:ab:25:
+                    fd:75:40:fd:67:19:9f:1b:0a:5d:f6:cb:16:7b:f9:
+                    5c:1e:82:dc:15:44:d4:9c:3c:6d:61:93:45:f4:4f:
+                    cf:62:b9:df:3e:53:8d:9a:d4:4a:de:88:aa:0b:a6:
+                    f1:d4:61:d6:1e:74:d5:18:b2:c5:4d:4c:ef:80:7b:
+                    ec:0d:eb:83:39:54:96
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                99:57:3B:39:B1:2D:00:8C:21:66:8C:95:69:9C:6D:75:EC:8C:3F:FA
+            X509v3 Subject Key Identifier: 
+                99:57:3B:39:B1:2D:00:8C:21:66:8C:95:69:9C:6D:75:EC:8C:3F:FA
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:31:00:96:ff:e4:82:4e:16:22:5b:a0:85:18:3c:3d:
+        3a:8f:20:06:08:25:e7:f5:91:36:19:ad:7b:b4:df:5b:66:12:
+        37:73:70:ed:cd:05:28:07:5e:08:ce:0d:42:5f:19:91:02:02:
+        30:67:49:87:ae:06:41:1d:20:d3:31:a6:aa:26:37:f1:27:8a:
+        61:0d:fe:9a:06:43:a7:2e:9e:26:47:a3:32:18:8b:e8:5e:50:
+        05:f1:b0:7a:48:76:de:db:a1:62:4a:ba:77
+SHA1 Fingerprint=C0:2B:13:F9:1D:77:56:ED:6C:92:83:F1:86:DF:2A:D5:1E:6E:F2:BC
+-----BEGIN CERTIFICATE-----
+MIICNDCCAbqgAwIBAgIQVOyX1ou0xAshbg6y0FPIejAKBggqhkjOPQQDAzBLMQsw
+CQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UEAwwY
+T0lTVEUgQ2xpZW50IFJvb3QgRUNDIEcxMB4XDTIzMDUzMTE0MzE0MFoXDTQ4MDUy
+NDE0MzEzOVowSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5kYXRp
+b24xITAfBgNVBAMMGE9JU1RFIENsaWVudCBSb290IEVDQyBHMTB2MBAGByqGSM49
+AgEGBSuBBAAiA2IABIhOaB/Jnr46BFsVwzX0zFDFCK04bqg80gK6zKsl/XVA/WcZ
+nxsKXfbLFnv5XB6C3BVE1Jw8bWGTRfRPz2K53z5TjZrUSt6Iqgum8dRh1h501Riy
+xU1M74B77A3rgzlUlqNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBSZ
+Vzs5sS0AjCFmjJVpnG117Iw/+jAdBgNVHQ4EFgQUmVc7ObEtAIwhZoyVaZxtdeyM
+P/owDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2gAMGUCMQCW/+SCThYiW6CF
+GDw9Oo8gBggl5/WRNhmte7TfW2YSN3Nw7c0FKAdeCM4NQl8ZkQICMGdJh64GQR0g
+0zGmqiY38SeKYQ3+mgZDpy6eJkejMhiL6F5QBfGwekh23tuhYkq6dw==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/OISTE_Client_Root_RSA_G1.pem b/secure/caroot/untrusted/OISTE_Client_Root_RSA_G1.pem
new file mode 100644
index 000000000000..2960d74970fa
--- /dev/null
+++ b/secure/caroot/untrusted/OISTE_Client_Root_RSA_G1.pem
@@ -0,0 +1,134 @@
+##
+##  OISTE Client Root RSA G1
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            34:17:6f:59:01:88:1b:aa:a5:dd:c8:48:bb:b4:3b:73
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=CH, O=OISTE Foundation, CN=OISTE Client Root RSA G1
+        Validity
+            Not Before: May 31 14:23:29 2023 GMT
+            Not After : May 24 14:23:28 2048 GMT
+        Subject: C=CH, O=OISTE Foundation, CN=OISTE Client Root RSA G1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:ba:4f:fe:fe:54:13:b5:84:3c:bc:e0:d3:31:f1:
+                    1d:6e:dc:c4:53:71:fa:e4:39:51:43:76:7d:92:1f:
+                    81:7f:00:6b:41:c2:e6:da:dc:18:4d:6c:17:59:70:
+                    09:33:62:ec:69:88:2d:b0:dd:59:f9:61:60:60:56:
+                    f1:b6:b4:ef:eb:87:d0:13:fe:c3:cf:6f:8f:7e:39:
+                    58:51:b3:89:02:8e:54:95:1e:22:5f:ab:28:05:43:
+                    27:f8:45:f4:09:42:26:94:fe:bd:13:78:bb:91:f2:
+                    10:10:9c:0d:67:7c:da:64:20:eb:7a:30:1a:ba:48:
+                    0d:78:54:2a:99:31:34:ab:cb:a6:6a:e7:0c:67:39:
+                    66:a4:26:a8:27:28:e7:f3:e6:3c:73:e4:2b:cc:6f:
+                    31:2e:13:74:61:cb:68:e6:d2:33:ce:52:bc:7e:65:
+                    24:5a:21:81:31:43:aa:b2:9c:d1:18:e7:61:3c:52:
+                    af:80:89:e9:34:46:de:f9:4d:99:5a:6d:1d:bd:c6:
+                    25:d1:93:55:8e:f8:27:92:43:3a:8c:95:45:40:e3:
+                    89:18:a7:86:c1:59:98:ca:db:26:1c:13:c0:8c:81:
+                    b9:98:b0:ad:69:ad:6e:18:e3:7b:62:41:f5:ad:36:
+                    fe:0b:b4:7b:20:5f:9f:a9:6e:f9:99:82:12:52:d2:
+                    8a:c4:54:78:b4:7c:f7:41:9b:03:e7:07:5e:b3:c2:
+                    b9:49:64:67:92:16:c4:60:90:0e:b0:82:7d:33:ad:
+                    d0:36:ea:d1:76:6b:7c:88:47:98:ac:1b:f9:b4:50:
+                    8c:61:81:69:d8:31:f3:8d:fa:3e:f2:f5:4b:af:ce:
+                    c3:1d:ef:5f:28:1b:eb:18:d6:a0:58:52:32:be:42:
+                    6f:cd:49:97:22:c1:70:b9:d3:e3:60:4f:de:83:82:
+                    a0:4e:30:bd:73:53:c2:bd:17:fd:a0:c0:98:8f:ea:
+                    0e:17:07:e6:43:95:20:4e:db:11:a8:f9:e3:d3:b8:
+                    27:47:0c:27:db:12:eb:81:55:cc:75:db:9f:d3:17:
+                    43:c4:fb:eb:8a:28:6d:e9:af:44:50:5a:43:fb:f1:
+                    39:e2:93:50:cf:98:fc:44:96:58:38:a5:a5:ed:45:
+                    c3:52:42:05:a7:ef:e5:3c:a4:ac:3d:e7:d6:a9:56:
+                    05:aa:b0:c3:a7:19:e4:e5:3d:d7:57:44:6d:94:11:
+                    1f:ca:70:c8:fc:b9:4c:cc:41:5a:83:74:53:90:78:
+                    cf:d6:d4:2e:4f:b1:aa:4d:2e:f5:d1:08:5b:3a:64:
+                    ef:c8:a7:a8:7a:61:ec:ec:a6:d5:88:4e:b6:54:d4:
+                    58:91:c2:25:64:91:bc:0a:14:3d:92:14:9a:b5:0b:
+                    06:e9:2f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                29:82:25:35:0A:3A:BE:92:2B:E4:09:03:E4:EC:8F:8D:38:72:39:CB
+            X509v3 Subject Key Identifier: 
+                29:82:25:35:0A:3A:BE:92:2B:E4:09:03:E4:EC:8F:8D:38:72:39:CB
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        6d:23:86:c2:ff:f5:e0:c8:c0:55:8a:60:31:cc:97:43:47:70:
+        43:d3:e3:ec:52:fa:d3:c2:9e:fb:89:32:1a:ca:46:93:4f:04:
+        97:2b:db:d0:9c:84:0d:95:07:42:54:fe:ef:69:21:df:92:03:
+        2e:8f:37:21:23:77:a9:77:37:6c:a0:c4:ae:9c:a7:58:39:4a:
+        15:97:62:46:83:51:20:ed:3f:c2:a3:f1:c3:62:27:d0:ac:13:
+        1e:fe:3c:52:1d:90:d5:63:f1:a9:5e:ea:7f:e7:e7:eb:96:5a:
+        51:ec:d4:a9:1b:e3:0c:94:66:ac:cb:88:92:49:be:73:5c:8a:
+        e0:6a:bc:a6:81:cd:b3:5c:d4:23:92:c8:4d:f9:20:8c:70:94:
+        4b:68:6d:f2:8f:1e:6c:35:f7:e8:5f:d4:d7:bd:20:37:52:66:
+        ff:2b:bb:49:66:b7:71:a8:2c:5f:73:0f:07:92:e7:4e:5f:a5:
+        06:db:c9:8a:3c:97:c5:42:ea:7d:0f:81:1b:57:eb:9e:0c:0f:
+        ff:a3:27:20:49:53:a6:b3:3a:4c:cb:6d:30:35:da:f2:f0:9a:
+        fe:50:df:6d:5c:24:3d:4d:77:6a:7d:86:5f:4c:d0:e1:a6:b4:
+        ae:04:13:01:90:f1:80:68:84:07:94:82:07:83:eb:91:e5:93:
+        0e:75:91:ae:a3:23:20:49:64:d4:ba:39:96:57:70:ee:55:34:
+        28:7c:d6:af:ca:a9:9e:e6:c9:01:c9:07:c1:d0:44:b1:80:b4:
+        51:50:aa:8f:f6:9c:e5:67:73:d0:1b:ea:83:35:17:2f:50:c6:
+        de:56:c7:bb:a3:03:cb:e2:a1:18:e8:f8:ce:51:06:a3:d2:03:
+        40:61:1a:a7:67:57:83:fc:d1:12:b9:28:aa:da:4e:6b:d5:9c:
+        d8:85:37:da:bd:22:d7:34:59:9c:1a:a6:ce:78:d6:94:78:07:
+        06:0f:b1:93:21:a0:49:c7:10:9e:0a:ae:51:77:1a:f9:71:90:
+        c3:ad:98:0f:8a:29:6a:60:01:aa:4f:ad:20:03:2d:6a:8e:a3:
+        0b:6a:d6:fd:93:0c:8a:61:cb:bd:28:f1:5f:71:fd:b8:33:39:
+        d6:4a:f1:f6:b2:68:52:3e:65:8f:43:9d:81:24:24:f6:28:4c:
+        35:a7:fd:33:0a:a5:78:c1:04:1f:ec:49:6a:c4:ae:d5:44:16:
+        a6:a7:8d:7f:da:21:96:3e:a8:ba:16:67:d4:a9:a1:e7:c2:9a:
+        f8:10:d9:3b:9a:ee:68:f6:2f:00:ee:cb:bb:66:8d:22:38:86:
+        f4:bf:5f:78:a9:c8:a0:1d:5a:bb:75:50:f9:52:0b:0f:1d:02:
+        2c:14:1a:f3:87:6a:77:f3
+SHA1 Fingerprint=BD:A8:13:20:E0:BF:97:ED:A2:8E:9E:18:5F:F2:D5:FE:E5:2B:13:D5
+-----BEGIN CERTIFICATE-----
+MIIFgzCCA2ugAwIBAgIQNBdvWQGIG6ql3chIu7Q7czANBgkqhkiG9w0BAQwFADBL
+MQswCQYDVQQGEwJDSDEZMBcGA1UECgwQT0lTVEUgRm91bmRhdGlvbjEhMB8GA1UE
+AwwYT0lTVEUgQ2xpZW50IFJvb3QgUlNBIEcxMB4XDTIzMDUzMTE0MjMyOVoXDTQ4
+MDUyNDE0MjMyOFowSzELMAkGA1UEBhMCQ0gxGTAXBgNVBAoMEE9JU1RFIEZvdW5k
+YXRpb24xITAfBgNVBAMMGE9JU1RFIENsaWVudCBSb290IFJTQSBHMTCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBALpP/v5UE7WEPLzg0zHxHW7cxFNx+uQ5
+UUN2fZIfgX8Aa0HC5trcGE1sF1lwCTNi7GmILbDdWflhYGBW8ba07+uH0BP+w89v
+j345WFGziQKOVJUeIl+rKAVDJ/hF9AlCJpT+vRN4u5HyEBCcDWd82mQg63owGrpI
+DXhUKpkxNKvLpmrnDGc5ZqQmqCco5/PmPHPkK8xvMS4TdGHLaObSM85SvH5lJFoh
+gTFDqrKc0RjnYTxSr4CJ6TRG3vlNmVptHb3GJdGTVY74J5JDOoyVRUDjiRinhsFZ
+mMrbJhwTwIyBuZiwrWmtbhjje2JB9a02/gu0eyBfn6lu+ZmCElLSisRUeLR890Gb
+A+cHXrPCuUlkZ5IWxGCQDrCCfTOt0Dbq0XZrfIhHmKwb+bRQjGGBadgx8436PvL1
+S6/Owx3vXygb6xjWoFhSMr5Cb81JlyLBcLnT42BP3oOCoE4wvXNTwr0X/aDAmI/q
+DhcH5kOVIE7bEaj549O4J0cMJ9sS64FVzHXbn9MXQ8T764oobemvRFBaQ/vxOeKT
+UM+Y/ESWWDilpe1Fw1JCBafv5TykrD3n1qlWBaqww6cZ5OU911dEbZQRH8pwyPy5
+TMxBWoN0U5B4z9bULk+xqk0u9dEIWzpk78inqHph7Oym1YhOtlTUWJHCJWSRvAoU
+PZIUmrULBukvAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAU
+KYIlNQo6vpIr5AkD5OyPjThyOcswHQYDVR0OBBYEFCmCJTUKOr6SK+QJA+Tsj404
+cjnLMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQwFAAOCAgEAbSOGwv/14MjA
+VYpgMcyXQ0dwQ9Pj7FL608Ke+4kyGspGk08Elyvb0JyEDZUHQlT+72kh35IDLo83
+ISN3qXc3bKDErpynWDlKFZdiRoNRIO0/wqPxw2In0KwTHv48Uh2Q1WPxqV7qf+fn
+65ZaUezUqRvjDJRmrMuIkkm+c1yK4Gq8poHNs1zUI5LITfkgjHCUS2ht8o8ebDX3
+6F/U170gN1Jm/yu7SWa3cagsX3MPB5LnTl+lBtvJijyXxULqfQ+BG1frngwP/6Mn
+IElTprM6TMttMDXa8vCa/lDfbVwkPU13an2GX0zQ4aa0rgQTAZDxgGiEB5SCB4Pr
+keWTDnWRrqMjIElk1Lo5lldw7lU0KHzWr8qpnubJAckHwdBEsYC0UVCqj/ac5Wdz
+0BvqgzUXL1DG3lbHu6MDy+KhGOj4zlEGo9IDQGEap2dXg/zRErkoqtpOa9Wc2IU3
+2r0i1zRZnBqmznjWlHgHBg+xkyGgSccQngquUXca+XGQw62YD4opamABqk+tIAMt
+ao6jC2rW/ZMMimHLvSjxX3H9uDM51krx9rJoUj5lj0OdgSQk9ihMNaf9MwqleMEE
+H+xJasSu1UQWpqeNf9ohlj6ouhZn1Kmh58Ka+BDZO5ruaPYvAO7Lu2aNIjiG9L9f
+eKnIoB1au3VQ+VILDx0CLBQa84dqd/M=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/trusted/QuoVadis_Root_CA_2.pem b/secure/caroot/untrusted/QuoVadis_Root_CA_2.pem
index c344fb029907..c344fb029907 100644
--- a/secure/caroot/trusted/QuoVadis_Root_CA_2.pem
+++ b/secure/caroot/untrusted/QuoVadis_Root_CA_2.pem
diff --git a/secure/caroot/trusted/QuoVadis_Root_CA_3.pem b/secure/caroot/untrusted/QuoVadis_Root_CA_3.pem
index b14ef22e03cb..b14ef22e03cb 100644
--- a/secure/caroot/trusted/QuoVadis_Root_CA_3.pem
+++ b/secure/caroot/untrusted/QuoVadis_Root_CA_3.pem
diff --git a/secure/caroot/untrusted/SSL_com_Client_ECC_Root_CA_2022.pem b/secure/caroot/untrusted/SSL_com_Client_ECC_Root_CA_2022.pem
new file mode 100644
index 000000000000..48e162447ee7
--- /dev/null
+++ b/secure/caroot/untrusted/SSL_com_Client_ECC_Root_CA_2022.pem
@@ -0,0 +1,67 @@
+##
+##  SSL.com Client ECC Root CA 2022
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            76:f8:48:1e:ae:f0:3c:70:1f:e0:3f:25:54:01:83:d5
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=US, O=SSL Corporation, CN=SSL.com Client ECC Root CA 2022
+        Validity
+            Not Before: Aug 25 16:30:32 2022 GMT
+            Not After : Aug 19 16:30:31 2046 GMT
+        Subject: C=US, O=SSL Corporation, CN=SSL.com Client ECC Root CA 2022
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:2d:53:7e:9f:8b:3e:b3:36:ba:50:e2:cc:eb:dc:
+                    ba:26:8a:d3:8c:06:3f:67:0f:ef:f5:17:e5:d4:ae:
+                    9a:46:2a:41:01:07:69:e7:67:71:f1:c2:03:36:c6:
+                    f0:2b:52:8e:cf:14:92:68:a4:3e:70:51:12:69:8d:
+                    78:a2:82:ca:29:14:c0:e4:94:22:b2:44:92:60:6f:
+                    c8:04:a4:67:d5:a2:d0:f3:d0:d7:ea:8e:3c:0f:ba:
+                    d2:40:47:90:34:ee:7d
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                B7:FE:2D:62:C5:81:53:CD:52:1A:2F:5D:60:A0:C3:5D:FB:B2:1C:1C
+            X509v3 Subject Key Identifier: 
+                B7:FE:2D:62:C5:81:53:CD:52:1A:2F:5D:60:A0:C3:5D:FB:B2:1C:1C
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:30:4d:07:11:2d:11:fb:b9:26:c3:21:dd:72:e1:17:
+        fc:c1:cf:14:ea:49:ce:71:87:8e:d6:53:dc:11:cd:5d:54:8a:
+        af:d9:2d:f4:8c:51:ea:bc:66:47:e2:7f:95:83:60:65:02:31:
+        00:8c:21:4c:4f:bb:e5:b0:50:df:90:62:49:e6:cc:91:db:f8:
+        3f:5d:71:91:08:8e:4f:92:c9:7f:a6:5c:ea:13:7e:ed:6d:c4:
+        e8:c3:2a:6f:5c:11:e1:a5:f3:6a:5a:9a:4d
+SHA1 Fingerprint=80:7B:1D:9D:65:72:3D:C7:56:F9:EC:C5:00:83:49:F6:F2:AC:F4:86
+-----BEGIN CERTIFICATE-----
+MIICQDCCAcagAwIBAgIQdvhIHq7wPHAf4D8lVAGD1TAKBggqhkjOPQQDAzBRMQsw
+CQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSgwJgYDVQQDDB9T
+U0wuY29tIENsaWVudCBFQ0MgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzAzMloX
+DTQ2MDgxOTE2MzAzMVowUTELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBDb3Jw
+b3JhdGlvbjEoMCYGA1UEAwwfU1NMLmNvbSBDbGllbnQgRUNDIFJvb3QgQ0EgMjAy
+MjB2MBAGByqGSM49AgEGBSuBBAAiA2IABC1Tfp+LPrM2ulDizOvcuiaK04wGP2cP
+7/UX5dSumkYqQQEHaedncfHCAzbG8CtSjs8UkmikPnBREmmNeKKCyikUwOSUIrJE
+kmBvyASkZ9Wi0PPQ1+qOPA+60kBHkDTufaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAf
+BgNVHSMEGDAWgBS3/i1ixYFTzVIaL11goMNd+7IcHDAdBgNVHQ4EFgQUt/4tYsWB
+U81SGi9dYKDDXfuyHBwwDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2gAMGUC
+ME0HES0R+7kmwyHdcuEX/MHPFOpJznGHjtZT3BHNXVSKr9kt9IxR6rxmR+J/lYNg
+ZQIxAIwhTE+75bBQ35BiSebMkdv4P11xkQiOT5LJf6Zc6hN+7W3E6MMqb1wR4aXz
+alqaTQ==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/SSL_com_Client_RSA_Root_CA_2022.pem b/secure/caroot/untrusted/SSL_com_Client_RSA_Root_CA_2022.pem
new file mode 100644
index 000000000000..56c0dde52478
--- /dev/null
+++ b/secure/caroot/untrusted/SSL_com_Client_RSA_Root_CA_2022.pem
@@ -0,0 +1,134 @@
+##
+##  SSL.com Client RSA Root CA 2022
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            76:af:ee:88:93:15:45:b6:50:53:9b:80:9c:a4:df:9a
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=SSL Corporation, CN=SSL.com Client RSA Root CA 2022
+        Validity
+            Not Before: Aug 25 16:31:07 2022 GMT
+            Not After : Aug 19 16:31:06 2046 GMT
+        Subject: C=US, O=SSL Corporation, CN=SSL.com Client RSA Root CA 2022
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:b8:58:db:46:30:fb:c9:3f:e3:c8:f0:01:33:34:
+                    e2:da:48:a8:18:e9:20:6e:9a:d7:01:e1:d5:29:8f:
+                    30:b4:23:6a:e4:cb:62:b0:be:e2:9f:20:bd:3e:54:
+                    a0:39:68:c7:86:37:66:74:06:06:ef:74:2b:da:dc:
+                    9f:84:a9:52:2f:90:d2:ee:7e:7c:fb:a5:22:ad:6f:
+                    70:46:67:96:3d:29:d4:a3:bb:56:7b:14:04:59:c1:
+                    21:63:44:1e:b2:1f:12:5c:90:87:65:0d:88:f6:1e:
+                    88:22:e2:63:54:bb:f3:36:f8:d6:7f:dc:da:ff:29:
+                    35:a9:c6:6e:0e:69:5b:3f:d8:be:82:87:15:70:5d:
+                    b0:c7:5c:12:0f:63:a6:38:cd:cf:73:b9:c3:0e:89:
+                    26:37:1b:3f:62:1c:32:69:d1:9b:d9:ff:55:90:31:
+                    de:b1:63:dd:cf:c5:74:77:fc:ef:88:21:53:bf:00:
+                    31:1a:26:2c:00:30:a5:5f:6c:e3:e4:f6:00:8a:ca:
+                    98:87:9c:74:03:7a:8b:66:ec:7e:fd:a3:8f:35:25:
+                    5c:78:a5:b3:a4:fb:3d:6d:a9:8a:f0:6c:88:82:8b:
+                    fd:4a:d0:6f:e4:d7:a3:b4:8e:34:49:38:be:ce:45:
+                    e5:d2:1c:ca:5e:c2:37:14:8b:cd:66:56:33:37:9d:
+                    e5:6b:ec:43:92:64:a0:42:da:75:6f:c0:15:ec:f9:
+                    69:bd:34:b9:8a:7b:fa:16:fb:55:fe:52:20:e8:04:
+                    04:56:56:65:f5:37:44:98:c8:8a:46:e9:b7:ac:b8:
+                    e8:be:62:8e:54:36:5b:f7:3b:70:bf:5d:ee:2d:ba:
+                    5f:de:42:19:86:f0:7f:8b:eb:08:cb:d8:be:ea:0e:
+                    42:42:a0:36:73:57:17:ed:32:ea:d0:8d:e8:07:1b:
+                    9b:99:e8:c4:9a:62:04:0e:48:f7:3c:12:ba:f7:58:
+                    c1:9a:8c:e9:c7:b0:23:36:56:34:1d:cb:6c:da:ba:
+                    07:84:1d:fd:d1:ac:9f:e6:c2:89:ef:c3:b9:6c:18:
+                    b3:69:87:57:5f:b5:0c:38:5b:a7:21:24:2a:3b:a7:
+                    34:91:9e:b4:54:ea:28:4f:d3:c1:a3:8b:e4:e6:2b:
+                    d5:f2:9d:bf:9b:61:00:22:dd:d6:4b:44:1f:3f:5d:
+                    56:fe:de:9c:78:cc:99:5b:aa:e4:bd:ba:db:43:4b:
+                    ad:4c:26:4c:a3:4d:34:8a:6c:74:36:13:db:62:fc:
+                    9b:b2:05:81:ff:ae:3f:0c:cd:f6:1b:a2:f4:39:e7:
+                    ca:f5:4c:5c:fb:54:77:35:80:5a:c0:12:a1:13:01:
+                    33:67:3d:9d:81:a1:a9:f5:85:24:58:88:78:e7:f4:
+                    e3:68:55
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                F0:38:42:94:34:A9:3C:00:7F:52:EE:39:A5:F7:4B:0D:BC:6A:7D:23
+            X509v3 Subject Key Identifier: 
+                F0:38:42:94:34:A9:3C:00:7F:52:EE:39:A5:F7:4B:0D:BC:6A:7D:23
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        99:4f:db:f0:ea:d6:11:fa:2a:fd:c8:ab:6d:e4:0e:73:62:d2:
+        42:9f:15:fe:7c:70:52:3f:64:87:82:31:3f:45:40:2e:e1:22:
+        9f:06:66:29:fc:96:d3:2d:8d:b6:38:c7:d9:f3:27:c1:59:29:
+        a0:8c:f6:73:24:0f:28:22:d7:4e:61:dd:13:dd:db:9f:32:52:
+        93:fb:4f:cc:ea:38:3c:98:6a:03:ab:16:af:21:d1:42:ae:7d:
+        45:2b:ea:c4:cf:8a:59:9f:82:70:76:3a:f8:62:26:c9:10:97:
+        58:40:24:a4:2d:b9:2f:29:80:27:e1:89:6b:72:ca:49:08:71:
+        37:53:05:f1:80:ce:d3:42:02:d2:fc:c2:d1:94:06:ee:07:e2:
+        f6:83:e2:7f:9f:e7:bb:56:c3:5b:bf:dd:95:93:09:1e:24:c1:
+        cf:26:cd:ad:a4:ae:c2:b4:69:e7:aa:b5:ed:37:94:e9:dd:d1:
+        63:85:6b:9a:7a:4a:56:76:dc:19:85:28:d4:e4:c6:a4:d8:b8:
+        96:41:77:d0:b4:59:f1:46:05:87:87:02:1f:69:b9:82:18:d0:
+        43:d9:26:da:1a:67:a8:d6:75:76:ea:f2:6d:0e:42:ff:88:26:
+        a2:6e:84:fe:7e:62:1b:f0:c6:3d:ed:c0:1c:6a:c7:91:d6:b8:
+        00:37:49:9b:b9:84:05:a1:cd:6e:31:d6:44:ea:53:8b:ba:53:
+        98:1d:a1:90:8a:e9:85:f8:1b:f2:93:58:c3:c8:dc:9a:26:4f:
+        3e:20:cf:4f:43:f3:10:8c:7f:10:61:7a:36:ca:aa:0b:7d:cc:
+        9f:47:44:59:ae:a5:95:c6:99:53:e3:07:6b:3d:49:10:b0:18:
+        ff:5d:0e:85:43:14:4b:e7:6b:d3:4a:b5:b2:60:61:dc:69:49:
+        02:23:5d:e8:92:71:c3:9c:9f:45:67:79:1e:dc:32:86:ba:aa:
+        55:3c:64:6f:32:b5:10:40:15:de:72:40:78:e0:6e:70:bb:6e:
+        eb:09:e8:39:d9:ac:ba:92:75:dd:43:ca:ba:01:95:ad:1a:81:
+        2b:3a:f0:e3:c5:2f:0c:18:4d:10:c6:ae:c0:ed:fe:05:52:7f:
+        19:05:cb:a9:af:35:08:0c:38:22:e4:fe:56:e5:53:3e:bf:e4:
+        d6:b3:d9:08:c3:3d:d5:33:32:81:24:c5:a9:e1:65:11:b8:32:
+        33:30:71:18:49:1d:1a:45:c6:9a:14:8a:58:39:28:6e:f3:cb:
+        51:b9:49:26:64:78:03:c7:91:11:83:a9:b9:90:34:b6:6f:aa:
+        05:9e:85:28:57:99:be:7f:27:06:49:62:4d:a1:fc:09:e1:2b:
+        46:09:4c:14:9b:56:8f:45
+SHA1 Fingerprint=AA:59:70:E5:20:32:9F:CB:D0:D5:79:9F:FB:1B:82:1D:FD:1F:79:65
+-----BEGIN CERTIFICATE-----
+MIIFjzCCA3egAwIBAgIQdq/uiJMVRbZQU5uAnKTfmjANBgkqhkiG9w0BAQsFADBR
+MQswCQYDVQQGEwJVUzEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMSgwJgYDVQQD
+DB9TU0wuY29tIENsaWVudCBSU0EgUm9vdCBDQSAyMDIyMB4XDTIyMDgyNTE2MzEw
+N1oXDTQ2MDgxOTE2MzEwNlowUTELMAkGA1UEBhMCVVMxGDAWBgNVBAoMD1NTTCBD
+b3Jwb3JhdGlvbjEoMCYGA1UEAwwfU1NMLmNvbSBDbGllbnQgUlNBIFJvb3QgQ0Eg
+MjAyMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALhY20Yw+8k/48jw
+ATM04tpIqBjpIG6a1wHh1SmPMLQjauTLYrC+4p8gvT5UoDlox4Y3ZnQGBu90K9rc
+n4SpUi+Q0u5+fPulIq1vcEZnlj0p1KO7VnsUBFnBIWNEHrIfElyQh2UNiPYeiCLi
+Y1S78zb41n/c2v8pNanGbg5pWz/YvoKHFXBdsMdcEg9jpjjNz3O5ww6JJjcbP2Ic
+MmnRm9n/VZAx3rFj3c/FdHf874ghU78AMRomLAAwpV9s4+T2AIrKmIecdAN6i2bs
+fv2jjzUlXHils6T7PW2pivBsiIKL/UrQb+TXo7SONEk4vs5F5dIcyl7CNxSLzWZW
+Mzed5WvsQ5JkoELadW/AFez5ab00uYp7+hb7Vf5SIOgEBFZWZfU3RJjIikbpt6y4
+6L5ijlQ2W/c7cL9d7i26X95CGYbwf4vrCMvYvuoOQkKgNnNXF+0y6tCN6Acbm5no
+xJpiBA5I9zwSuvdYwZqM6cewIzZWNB3LbNq6B4Qd/dGsn+bCie/DuWwYs2mHV1+1
+DDhbpyEkKjunNJGetFTqKE/TwaOL5OYr1fKdv5thACLd1ktEHz9dVv7enHjMmVuq
+5L2620NLrUwmTKNNNIpsdDYT22L8m7IFgf+uPwzN9hui9DnnyvVMXPtUdzWAWsAS
+oRMBM2c9nYGhqfWFJFiIeOf042hVAgMBAAGjYzBhMA8GA1UdEwEB/wQFMAMBAf8w
+HwYDVR0jBBgwFoAU8DhClDSpPAB/Uu45pfdLDbxqfSMwHQYDVR0OBBYEFPA4QpQ0
+qTwAf1LuOaX3Sw28an0jMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOC
+AgEAmU/b8OrWEfoq/cirbeQOc2LSQp8V/nxwUj9kh4IxP0VALuEinwZmKfyW0y2N
+tjjH2fMnwVkpoIz2cyQPKCLXTmHdE93bnzJSk/tPzOo4PJhqA6sWryHRQq59RSvq
+xM+KWZ+CcHY6+GImyRCXWEAkpC25LymAJ+GJa3LKSQhxN1MF8YDO00IC0vzC0ZQG
+7gfi9oPif5/nu1bDW7/dlZMJHiTBzybNraSuwrRp56q17TeU6d3RY4VrmnpKVnbc
+GYUo1OTGpNi4lkF30LRZ8UYFh4cCH2m5ghjQQ9km2hpnqNZ1durybQ5C/4gmom6E
+/n5iG/DGPe3AHGrHkda4ADdJm7mEBaHNbjHWROpTi7pTmB2hkIrphfgb8pNYw8jc
+miZPPiDPT0PzEIx/EGF6NsqqC33Mn0dEWa6llcaZU+MHaz1JELAY/10OhUMUS+dr
+00q1smBh3GlJAiNd6JJxw5yfRWd5HtwyhrqqVTxkbzK1EEAV3nJAeOBucLtu6wno
+OdmsupJ13UPKugGVrRqBKzrw48UvDBhNEMauwO3+BVJ/GQXLqa81CAw4IuT+VuVT
+Pr/k1rPZCMM91TMygSTFqeFlEbgyMzBxGEkdGkXGmhSKWDkobvPLUblJJmR4A8eR
+EYOpuZA0tm+qBZ6FKFeZvn8nBkliTaH8CeErRglMFJtWj0U=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Sectigo_Public_Email_Protection_Root_E46.pem b/secure/caroot/untrusted/Sectigo_Public_Email_Protection_Root_E46.pem
new file mode 100644
index 000000000000..f8ad29b1e50a
--- /dev/null
+++ b/secure/caroot/untrusted/Sectigo_Public_Email_Protection_Root_E46.pem
@@ -0,0 +1,64 @@
+##
+##  Sectigo Public Email Protection Root E46
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            6e:f5:d3:a7:41:8e:a0:59:40:a7:30:6b:d2:40:65:56
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=GB, O=Sectigo Limited, CN=Sectigo Public Email Protection Root E46
+        Validity
+            Not Before: Mar 22 00:00:00 2021 GMT
+            Not After : Mar 21 23:59:59 2046 GMT
+        Subject: C=GB, O=Sectigo Limited, CN=Sectigo Public Email Protection Root E46
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:b8:a7:52:94:f5:3e:05:b0:1b:f6:1f:b1:d3:7e:
+                    b9:e4:05:66:54:80:ce:6c:a5:68:7d:e4:53:52:db:
+                    82:fa:c4:86:df:43:78:f7:c8:ad:16:bc:3f:78:32:
+                    cb:6b:d3:49:d6:44:e5:b3:7e:9f:7b:a6:c6:2c:f2:
+                    e2:b6:d3:89:b0:9a:3c:4b:ce:89:4b:c6:c6:cb:3a:
+                    49:60:0f:46:bc:6d:4e:7a:9c:c9:9b:85:7b:0a:b6:
+                    b0:47:c2:88:e3:d4:d1
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                2D:4E:8C:A7:C2:23:B2:57:A9:06:6B:3E:6B:2B:89:F3:C3:5E:47:CE
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:31:00:92:9d:1a:59:63:45:58:8e:1b:16:e4:7d:7a:
+        6c:36:48:30:1f:2b:72:e7:90:33:34:fd:24:a2:c6:06:8c:6f:
+        3b:32:57:5a:f8:fe:c6:49:12:53:9a:d9:10:b2:99:51:72:02:
+        30:05:25:2a:33:21:fc:93:e6:22:a2:cc:70:55:28:35:56:a2:
+        07:c4:21:84:23:1a:4c:4c:99:50:99:92:14:cb:4a:dc:56:fb:
+        f5:d3:8f:6a:2c:f5:71:3a:f8:8b:3b:03:9e
+SHA1 Fingerprint=3A:C5:C3:78:34:5B:E1:82:92:46:ED:17:86:B3:93:91:7B:51:F2:14
+-----BEGIN CERTIFICATE-----
+MIICMTCCAbegAwIBAgIQbvXTp0GOoFlApzBr0kBlVjAKBggqhkjOPQQDAzBaMQsw
+CQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTEwLwYDVQQDEyhT
+ZWN0aWdvIFB1YmxpYyBFbWFpbCBQcm90ZWN0aW9uIFJvb3QgRTQ2MB4XDTIxMDMy
+MjAwMDAwMFoXDTQ2MDMyMTIzNTk1OVowWjELMAkGA1UEBhMCR0IxGDAWBgNVBAoT
+D1NlY3RpZ28gTGltaXRlZDExMC8GA1UEAxMoU2VjdGlnbyBQdWJsaWMgRW1haWwg
+UHJvdGVjdGlvbiBSb290IEU0NjB2MBAGByqGSM49AgEGBSuBBAAiA2IABLinUpT1
+PgWwG/YfsdN+ueQFZlSAzmylaH3kU1LbgvrEht9DePfIrRa8P3gyy2vTSdZE5bN+
+n3umxizy4rbTibCaPEvOiUvGxss6SWAPRrxtTnqcyZuFewq2sEfCiOPU0aNCMEAw
+HQYDVR0OBBYEFC1OjKfCI7JXqQZrPmsrifPDXkfOMA4GA1UdDwEB/wQEAwIBhjAP
+BgNVHRMBAf8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQCSnRpZY0VYjhsW5H16
+bDZIMB8rcueQMzT9JKLGBoxvOzJXWvj+xkkSU5rZELKZUXICMAUlKjMh/JPmIqLM
+cFUoNVaiB8QhhCMaTEyZUJmSFMtK3Fb79dOPaiz1cTr4izsDng==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Sectigo_Public_Email_Protection_Root_R46.pem b/secure/caroot/untrusted/Sectigo_Public_Email_Protection_Root_R46.pem
new file mode 100644
index 000000000000..bcdfa6049859
--- /dev/null
+++ b/secure/caroot/untrusted/Sectigo_Public_Email_Protection_Root_R46.pem
@@ -0,0 +1,132 @@
+##
+##  Sectigo Public Email Protection Root R46
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            1d:44:9e:b9:0d:83:91:74:ae:dd:f2:eb:88:b7:a6:a3
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=GB, O=Sectigo Limited, CN=Sectigo Public Email Protection Root R46
+        Validity
+            Not Before: Mar 22 00:00:00 2021 GMT
+            Not After : Mar 21 23:59:59 2046 GMT
+        Subject: C=GB, O=Sectigo Limited, CN=Sectigo Public Email Protection Root R46
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:91:e5:1b:fa:aa:6d:37:2b:75:c7:2e:5f:14:a5:
+                    db:2c:97:b6:2c:46:8f:69:d9:ec:96:2d:f3:1d:5a:
+                    be:d3:1d:23:e6:68:09:ff:4a:11:73:1a:ae:67:9f:
+                    76:9a:d2:e7:ec:b8:d9:5f:2b:f9:26:56:51:af:76:
+                    9d:a9:fc:17:ef:32:0a:d0:23:3c:ba:2c:4f:47:83:
+                    ec:9d:05:68:42:5e:06:e0:d5:e8:2b:68:48:97:b2:
+                    fa:f3:a4:71:35:7d:34:9b:17:8b:7f:4d:0d:db:dc:
+                    4f:05:4c:94:62:bf:35:fa:2f:c8:a7:1c:66:d9:71:
+                    5f:e5:e6:5a:55:ca:ab:f4:b8:77:19:45:50:45:4e:
+                    4a:ab:db:9e:66:c1:19:b7:37:42:c8:56:a5:40:12:
+                    f9:33:e8:38:45:3a:c6:84:a3:02:8e:2f:24:b0:c3:
+                    41:85:07:49:9c:cf:dc:d1:f2:26:6f:ed:33:1c:33:
+                    67:2a:45:37:d9:85:65:22:1a:b1:b5:10:52:09:6b:
+                    03:c6:1f:70:3d:91:c4:7d:90:3d:ed:66:f8:90:ff:
+                    25:e0:ed:92:a2:8b:31:29:ad:9c:12:66:78:63:9d:
+                    57:ec:fb:0b:de:8e:dc:8b:cb:3a:a9:77:f4:ba:e5:
+                    ec:38:8c:8b:e6:13:66:a7:69:58:c3:82:1a:1a:cd:
+                    f1:9f:d8:53:92:4e:49:7d:a9:45:e7:f1:43:21:5a:
+                    b7:3e:40:cd:63:89:cf:d9:bf:c7:50:0b:e1:bc:e7:
+                    88:96:ad:9e:d4:17:da:5d:cf:e0:91:fd:a6:10:d4:
+                    b9:03:81:9b:69:ac:fb:84:a8:81:35:eb:1b:eb:68:
+                    6c:7c:60:3e:c3:df:c9:b4:ae:74:1d:48:ad:dd:6e:
+                    11:86:e1:2a:6a:36:16:ae:c8:ce:bc:db:58:fc:40:
+                    93:40:d8:8e:53:97:c2:ac:22:38:e5:88:31:b3:2e:
+                    a1:ef:ec:e0:42:0d:ea:ff:93:56:4a:06:a4:9b:4c:
+                    02:68:64:8f:56:50:c1:81:05:fd:cb:db:c5:d7:15:
+                    f2:6b:b5:76:c3:a3:f9:32:ce:ca:b5:4a:a9:1b:7d:
+                    19:dc:7f:c7:6a:7e:95:ec:b6:b8:8d:fd:95:4a:9c:
+                    a3:2b:6d:8b:f1:70:e5:47:2b:00:5c:e4:b9:9e:d4:
+                    f8:d9:58:29:d0:cb:e0:28:62:6c:ae:9c:62:e2:cc:
+                    bc:36:93:41:f5:ef:fe:46:62:95:b0:57:4a:74:2c:
+                    47:52:29:9d:dd:a2:a1:4f:42:c2:92:ce:2d:50:52:
+                    5e:8c:0a:a1:f7:d8:9d:c5:f8:fd:36:87:4e:57:fd:
+                    68:a1:5f:99:83:1c:f0:b5:dd:e8:92:d3:65:40:55:
+                    ca:96:85
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                A7:D7:95:77:EB:4A:C3:27:CD:93:BE:37:4C:26:84:21:14:7D:5D:98
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        34:d2:f1:15:f3:93:01:d4:72:8b:f0:ab:08:1f:13:3c:73:b4:
+        b0:ab:e8:78:d9:6c:ba:9a:af:26:ec:10:80:e5:0d:53:31:dd:
+        e3:fa:8c:51:22:24:33:37:b8:18:7e:3a:fa:58:e8:34:e5:8c:
+        e0:a1:1f:09:41:d2:37:3f:cc:cb:09:35:42:88:e9:fc:11:d7:
+        cf:42:aa:a4:70:b6:71:c1:53:bd:c5:74:af:c4:22:24:63:cf:
+        62:82:7d:c9:cb:51:c1:88:90:6d:5b:5c:be:fb:99:a8:ba:b6:
+        86:b0:e9:66:0b:e5:1b:6b:af:ea:2b:86:a7:df:a8:23:4c:96:
+        3f:4f:57:42:18:15:83:43:f1:86:26:b7:2a:03:ce:0b:9d:e8:
+        a5:68:1e:8c:6f:bd:85:e3:1b:51:8f:e7:17:2f:2b:d0:d6:78:
+        c2:2d:dd:72:88:d4:65:9e:fa:99:d4:7e:e7:97:0a:92:01:9a:
+        a5:a9:84:3a:0c:2a:74:3d:33:18:c8:87:f7:e8:a4:f5:86:42:
+        39:fd:6b:75:29:fc:00:06:ac:a2:a5:1a:54:8e:e9:50:49:17:
+        66:af:4b:04:2d:9b:94:80:a5:54:ab:8c:57:17:44:9f:0f:d6:
+        68:64:72:b4:4b:1e:01:c7:d9:9b:94:d9:83:99:af:12:05:11:
+        a3:98:22:d2:f2:57:ca:24:f9:ba:38:15:12:48:ba:63:3b:fc:
+        8b:95:78:d6:72:07:56:cc:cd:fc:9d:1c:d0:c5:64:3b:63:34:
+        cf:04:99:8a:b7:30:79:7a:b6:f2:c6:d5:d9:54:7a:87:0b:7e:
+        4e:f7:84:ec:14:f3:88:16:12:f1:d5:ae:0a:1a:09:ee:86:ad:
+        e5:ab:fd:ae:c3:29:79:74:c3:01:5f:11:9b:df:75:99:c6:4a:
+        f7:9b:8f:6c:49:ec:21:2f:b4:02:59:b3:2d:d0:72:90:ba:0b:
+        14:74:78:4b:cf:c1:5f:55:72:8e:54:2b:13:ce:fa:58:0c:d3:
+        bb:2c:d9:a9:91:61:f8:f8:f1:b6:7b:de:bc:a9:cc:92:04:cc:
+        4b:6b:5f:73:80:b6:21:ed:50:4f:d7:76:87:6e:ce:df:d2:b7:
+        bd:62:a1:7d:58:62:68:45:52:b6:3f:de:12:db:ed:04:69:9e:
+        76:88:aa:01:6d:da:86:c7:60:1b:c3:52:ac:37:ec:50:71:80:
+        72:2a:21:45:0a:53:47:3c:19:eb:8d:d2:59:04:de:25:b0:eb:
+        1f:35:6f:60:7d:d7:b5:c6:bb:0b:27:8d:e0:4d:54:e5:cf:1d:
+        26:01:6e:3b:35:c8:20:12:89:83:f0:d2:ed:58:3b:34:9d:bb:
+        31:f5:32:fd:31:f3:56:1a
+SHA1 Fingerprint=D3:7B:8B:0A:E8:42:44:FB:6B:80:38:EE:AE:91:80:26:1A:48:70:66
+-----BEGIN CERTIFICATE-----
+MIIFgDCCA2igAwIBAgIQHUSeuQ2DkXSu3fLriLemozANBgkqhkiG9w0BAQwFADBa
+MQswCQYDVQQGEwJHQjEYMBYGA1UEChMPU2VjdGlnbyBMaW1pdGVkMTEwLwYDVQQD
+EyhTZWN0aWdvIFB1YmxpYyBFbWFpbCBQcm90ZWN0aW9uIFJvb3QgUjQ2MB4XDTIx
+MDMyMjAwMDAwMFoXDTQ2MDMyMTIzNTk1OVowWjELMAkGA1UEBhMCR0IxGDAWBgNV
+BAoTD1NlY3RpZ28gTGltaXRlZDExMC8GA1UEAxMoU2VjdGlnbyBQdWJsaWMgRW1h
+aWwgUHJvdGVjdGlvbiBSb290IFI0NjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAJHlG/qqbTcrdccuXxSl2yyXtixGj2nZ7JYt8x1avtMdI+ZoCf9KEXMa
+rmefdprS5+y42V8r+SZWUa92nan8F+8yCtAjPLosT0eD7J0FaEJeBuDV6CtoSJey
++vOkcTV9NJsXi39NDdvcTwVMlGK/NfovyKccZtlxX+XmWlXKq/S4dxlFUEVOSqvb
+nmbBGbc3QshWpUAS+TPoOEU6xoSjAo4vJLDDQYUHSZzP3NHyJm/tMxwzZypFN9mF
+ZSIasbUQUglrA8YfcD2RxH2QPe1m+JD/JeDtkqKLMSmtnBJmeGOdV+z7C96O3IvL
+Oql39Lrl7DiMi+YTZqdpWMOCGhrN8Z/YU5JOSX2pRefxQyFatz5AzWOJz9m/x1AL
+4bzniJatntQX2l3P4JH9phDUuQOBm2ms+4SogTXrG+tobHxgPsPfybSudB1Ird1u
+EYbhKmo2Fq7IzrzbWPxAk0DYjlOXwqwiOOWIMbMuoe/s4EIN6v+TVkoGpJtMAmhk
+j1ZQwYEF/cvbxdcV8mu1dsOj+TLOyrVKqRt9Gdx/x2p+ley2uI39lUqcoytti/Fw
+5UcrAFzkuZ7U+NlYKdDL4ChibK6cYuLMvDaTQfXv/kZilbBXSnQsR1Ipnd2ioU9C
+wpLOLVBSXowKoffYncX4/TaHTlf9aKFfmYMc8LXd6JLTZUBVypaFAgMBAAGjQjBA
+MB0GA1UdDgQWBBSn15V360rDJ82TvjdMJoQhFH1dmDAOBgNVHQ8BAf8EBAMCAYYw
+DwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQwFAAOCAgEANNLxFfOTAdRyi/Cr
+CB8TPHO0sKvoeNlsupqvJuwQgOUNUzHd4/qMUSIkMze4GH46+ljoNOWM4KEfCUHS
+Nz/Mywk1Qojp/BHXz0KqpHC2ccFTvcV0r8QiJGPPYoJ9yctRwYiQbVtcvvuZqLq2
+hrDpZgvlG2uv6iuGp9+oI0yWP09XQhgVg0Pxhia3KgPOC53opWgejG+9heMbUY/n
+Fy8r0NZ4wi3dcojUZZ76mdR+55cKkgGapamEOgwqdD0zGMiH9+ik9YZCOf1rdSn8
+AAasoqUaVI7pUEkXZq9LBC2blIClVKuMVxdEnw/WaGRytEseAcfZm5TZg5mvEgUR
+o5gi0vJXyiT5ujgVEki6Yzv8i5V41nIHVszN/J0c0MVkO2M0zwSZircweXq28sbV
+2VR6hwt+TveE7BTziBYS8dWuChoJ7oat5av9rsMpeXTDAV8Rm991mcZK95uPbEns
+IS+0AlmzLdBykLoLFHR4S8/BX1VyjlQrE876WAzTuyzZqZFh+PjxtnvevKnMkgTM
+S2tfc4C2Ie1QT9d2h27O39K3vWKhfVhiaEVStj/eEtvtBGmedoiqAW3ahsdgG8NS
+rDfsUHGAciohRQpTRzwZ643SWQTeJbDrHzVvYH3Xtca7CyeN4E1U5c8dJgFuOzXI
+IBKJg/DS7Vg7NJ27MfUy/THzVho=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/SecureSign_RootCA11.pem b/secure/caroot/untrusted/SecureSign_RootCA11.pem
deleted file mode 100644
index 7cbbc1b2ccc0..000000000000
--- a/secure/caroot/untrusted/SecureSign_RootCA11.pem
+++ /dev/null
@@ -1,89 +0,0 @@
-##
-##  SecureSign RootCA11
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=JP, O=Japan Certification Services, Inc., CN=SecureSign RootCA11
-        Validity
-            Not Before: Apr  8 04:56:47 2009 GMT
-            Not After : Apr  8 04:56:47 2029 GMT
-        Subject: C=JP, O=Japan Certification Services, Inc., CN=SecureSign RootCA11
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:fd:77:aa:a5:1c:90:05:3b:cb:4c:9b:33:8b:5a:
-                    14:45:a4:e7:90:16:d1:df:57:d2:21:10:a4:17:fd:
-                    df:ac:d6:1f:a7:e4:db:7c:f7:ec:df:b8:03:da:94:
-                    58:fd:5d:72:7c:8c:3f:5f:01:67:74:15:96:e3:02:
-                    3c:87:db:ae:cb:01:8e:c2:f3:66:c6:85:45:f4:02:
-                    c6:3a:b5:62:b2:af:fa:9c:bf:a4:e6:d4:80:30:98:
-                    f3:0d:b6:93:8f:a9:d4:d8:36:f2:b0:fc:8a:ca:2c:
-                    a1:15:33:95:31:da:c0:1b:f2:ee:62:99:86:63:3f:
-                    bf:dd:93:2a:83:a8:76:b9:13:1f:b7:ce:4e:42:85:
-                    8f:22:e7:2e:1a:f2:95:09:b2:05:b5:44:4e:77:a1:
-                    20:bd:a9:f2:4e:0a:7d:50:ad:f5:05:0d:45:4f:46:
-                    71:fd:28:3e:53:fb:04:d8:2d:d7:65:1d:4a:1b:fa:
-                    cf:3b:b0:31:9a:35:6e:c8:8b:06:d3:00:91:f2:94:
-                    08:65:4c:b1:34:06:00:7a:89:e2:f0:c7:03:59:cf:
-                    d5:d6:e8:a7:32:b3:e6:98:40:86:c5:cd:27:12:8b:
-                    cc:7b:ce:b7:11:3c:62:60:07:23:3e:2b:40:6e:94:
-                    80:09:6d:b6:b3:6f:77:6f:35:08:50:fb:02:87:c5:
-                    3e:89
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                5B:F8:4D:4F:B2:A5:86:D4:3A:D2:F1:63:9A:A0:BE:09:F6:57:B7:DE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        a0:a1:38:16:66:2e:a7:56:1f:21:9c:06:fa:1d:ed:b9:22:c5:
-        38:26:d8:4e:4f:ec:a3:7f:79:de:46:21:a1:87:77:8f:07:08:
-        9a:b2:a4:c5:af:0f:32:98:0b:7c:66:29:b6:9b:7d:25:52:49:
-        43:ab:4c:2e:2b:6e:7a:70:af:16:0e:e3:02:6c:fb:42:e6:18:
-        9d:45:d8:55:c8:e8:3b:dd:e7:e1:f4:2e:0b:1c:34:5c:6c:58:
-        4a:fb:8c:88:50:5f:95:1c:bf:ed:ab:22:b5:65:b3:85:ba:9e:
-        0f:b8:ad:e5:7a:1b:8a:50:3a:1d:bd:0d:bc:7b:54:50:0b:b9:
-        42:af:55:a0:18:81:ad:65:99:ef:be:e4:9c:bf:c4:85:ab:41:
-        b2:54:6f:dc:25:cd:ed:78:e2:8e:0c:8d:09:49:dd:63:7b:5a:
-        69:96:02:21:a8:bd:52:59:e9:7d:35:cb:c8:52:ca:7f:81:fe:
-        d9:6b:d3:f7:11:ed:25:df:f8:e7:f9:a4:fa:72:97:84:53:0d:
-        a5:d0:32:18:51:76:59:14:6c:0f:eb:ec:5f:80:8c:75:43:83:
-        c3:85:98:ff:4c:9e:2d:0d:e4:77:83:93:4e:b5:96:07:8b:28:
-        13:9b:8c:19:8d:41:27:49:40:ee:de:e6:23:44:39:dc:a1:22:
-        d6:ba:03:f2
-SHA1 Fingerprint=3B:C4:9F:48:F8:F3:73:A0:9C:1E:BD:F8:5B:B1:C3:65:C7:D8:11:B3
------BEGIN CERTIFICATE-----
-MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
-MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
-A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
-MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
-Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
-QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
-i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
-h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
-MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
-UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
-8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
-h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
-VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
-AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
-KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
-X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
-QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
-pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
-QSdJQO7e5iNEOdyhIta6A/I=
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Security_Communication_RootCA3.pem b/secure/caroot/untrusted/Security_Communication_RootCA3.pem
deleted file mode 100644
index 2f31e16660ab..000000000000
--- a/secure/caroot/untrusted/Security_Communication_RootCA3.pem
+++ /dev/null
@@ -1,132 +0,0 @@
-##
-##  Security Communication RootCA3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            e1:7c:37:40:fd:1b:fe:67
-        Signature Algorithm: sha384WithRSAEncryption
-        Issuer: C=JP, O=SECOM Trust Systems CO.,LTD., CN=Security Communication RootCA3
-        Validity
-            Not Before: Jun 16 06:17:16 2016 GMT
-            Not After : Jan 18 06:17:16 2038 GMT
-        Subject: C=JP, O=SECOM Trust Systems CO.,LTD., CN=Security Communication RootCA3
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:e3:c9:72:49:f7:30:de:09:7c:a9:40:81:58:d3:
-                    b4:3a:dd:ba:61:0f:93:50:6e:69:3c:35:c2:ee:5b:
-                    73:90:1b:67:4c:21:ec:5f:35:bb:39:3e:2b:0a:60:
-                    ef:bb:6d:2b:86:fb:71:a2:c8:ac:e4:56:94:f9:c9:
-                    af:b1:72:d4:20:ac:74:d2:b8:15:ad:51:fe:85:74:
-                    a1:b9:10:fe:05:80:f9:52:93:b3:40:3d:75:10:ac:
-                    c0:96:b7:a7:7e:76:bc:e3:1b:52:19:ce:11:1f:0b:
-                    04:34:f5:d8:f5:69:3c:77:f3:64:f4:0d:aa:85:de:
-                    e0:09:50:04:17:96:84:b7:c8:8a:bc:4d:72:fc:1c:
-                    bb:cf:f3:06:4d:f9:9f:64:f7:7e:a6:66:86:35:71:
-                    c8:11:80:4c:c1:71:40:58:1e:be:a0:73:f6:fc:3e:
-                    50:e1:e0:2f:26:3d:7e:5c:23:b5:79:70:de:fa:e0:
-                    d1:a5:d6:0c:41:71:7b:f7:ea:8c:1c:88:c7:ec:8b:
-                    f5:d1:2f:55:96:46:7c:5a:3b:58:3b:fb:ba:d8:2d:
-                    b5:25:da:7a:4e:cf:44:ae:21:a6:9e:98:ca:20:6e:
-                    7c:bb:88:85:5b:fb:c0:10:62:bb:f2:f9:27:47:ef:
-                    d1:89:39:43:c4:df:de:e1:41:bf:54:73:20:97:2d:
-                    6c:da:f3:d4:07:a3:e6:b9:d8:6f:ae:fc:8c:19:2e:
-                    d3:67:67:2b:95:db:58:5c:b5:6a:02:f3:b8:83:5e:
-                    b4:6b:be:41:7e:57:09:75:44:50:55:cd:5a:11:61:
-                    21:0a:61:c2:a9:88:fd:13:bc:2d:89:2f:cd:61:e0:
-                    95:be:ca:b5:7b:e1:7b:34:67:0b:1f:b6:0c:c7:7c:
-                    1e:19:53:ca:a7:b1:4a:15:20:56:14:70:3d:2b:82:
-                    2c:0f:9d:15:1d:47:80:47:ff:78:99:0e:31:af:6f:
-                    3e:8f:ed:86:69:1e:7b:18:88:14:b2:c2:fc:82:33:
-                    2e:9c:4b:2d:fb:70:3b:71:aa:2b:7b:26:27:f3:1a:
-                    c2:dc:fb:17:b8:a1:ea:cb:a0:b4:ae:d3:94:7e:7a:
-                    d0:ab:c3:ec:38:2d:11:2e:88:bf:d4:3f:ad:12:3b:
-                    42:ac:8f:02:6e:7d:cc:d1:5f:61:be:a1:bc:3a:6a:
-                    48:ea:26:55:22:16:5d:5f:0d:ff:27:33:9f:18:03:
-                    74:8a:5b:52:20:47:6b:45:4d:22:77:8c:55:27:f0:
-                    af:1e:8c:c9:83:22:54:b7:9a:d0:4f:d9:ce:fc:d9:
-                    2e:1c:96:28:b1:02:d3:03:bd:25:52:1c:34:66:4f:
-                    23:ab:f4:77:82:96:1d:d1:57:30:08:11:05:fd:57:
-                    d1:d9:c7
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                64:14:7C:FC:58:72:16:A6:0A:29:34:15:6F:2A:CB:BC:FC:AF:A8:AB
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-    Signature Algorithm: sha384WithRSAEncryption
-    Signature Value:
-        dc:02:23:08:e2:ef:21:3a:c7:0d:b7:26:d2:62:93:a7:a5:23:
-        72:07:20:82:60:df:18:d7:54:ad:69:25:92:9e:d9:14:cf:99:
-        b9:52:81:cf:ae:6c:8a:3b:5a:39:c8:6c:01:43:c2:22:6d:02:
-        f0:62:cd:4e:63:43:c0:14:da:f4:63:f0:ea:f4:71:ee:4e:87:
-        e3:71:a9:f4:c9:57:e5:2e:5f:1c:79:bb:23:aa:87:44:57:e9:
-        bd:35:4d:41:bb:4b:28:a3:98:b2:1b:d9:0b:17:07:e5:f7:ea:
-        9d:f5:76:d7:bf:c4:b6:81:58:ff:c8:ff:64:69:62:79:ad:6e:
-        0e:1f:7f:ee:1d:69:e5:b7:72:71:b3:fe:a5:01:35:94:54:2b:
-        c0:52:6d:8f:55:c4:c9:d2:b8:cb:ca:34:08:51:85:a0:f5:bc:
-        b4:17:58:ea:0a:5c:7a:bd:63:c6:3a:2f:ff:96:49:19:84:ea:
-        67:d8:04:b1:61:f4:00:5b:4a:b7:9c:71:37:19:85:79:bf:81:
-        b0:c7:13:0e:76:71:3e:3a:80:06:ae:06:16:a7:8d:b5:c2:c4:
-        cb:ff:40:a5:5c:8d:a5:c9:3a:ed:72:81:ca:5c:98:3c:d2:34:
-        03:77:08:fd:f0:29:59:5d:21:08:c7:60:bf:a4:71:7b:b8:d9:
-        1e:82:be:09:af:65:6f:28:ab:bf:4b:b5:ee:3e:08:47:27:a0:
-        0f:6f:0f:8b:3f:ac:95:18:f3:b9:0e:dc:67:55:6e:62:9e:46:
-        0e:d1:04:78:ca:72:ae:76:d9:a5:f8:b2:df:88:09:61:8b:ef:
-        24:4e:d1:59:3f:5a:d4:3d:c9:93:3c:2b:64:f5:81:0d:16:96:
-        f7:92:c3:fe:31:6f:e8:2a:32:74:0e:f4:4c:98:4a:18:0e:30:
-        54:d5:c5:eb:bc:c5:15:9e:e8:99:21:eb:27:2b:09:0a:db:f1:
-        e6:70:18:56:bb:0c:e4:be:f9:e8:10:a4:13:92:b8:1c:e0:db:
-        67:1d:53:03:a4:22:a7:dc:5d:92:10:3c:ea:ff:fc:1b:10:1a:
-        c3:d8:d0:9c:9d:65:cb:d0:2b:27:31:03:1e:36:e1:3d:76:75:
-        0c:ff:45:26:b9:dd:51:bc:23:c7:5f:d8:d8:87:10:40:12:0d:
-        3d:38:37:e7:44:3c:18:c0:53:09:64:8f:ff:d5:9a:a6:7c:70:
-        2e:73:55:21:e8:df:ff:83:b9:1d:3e:32:1e:d6:a6:7d:2c:f1:
-        66:e9:5c:1d:a7:a3:ce:5e:25:32:2b:e3:95:ac:2a:07:ce:b4:
-        28:78:86:3c:2d:a6:9d:4d:d2:74:30:dd:64:51:15:db:83:83:
-        51:d7:af:fd:33:9d:4d:66
-SHA1 Fingerprint=C3:03:C8:22:74:92:E5:61:A2:9C:5F:79:91:2B:1E:44:13:91:30:3A
------BEGIN CERTIFICATE-----
-MIIFfzCCA2egAwIBAgIJAOF8N0D9G/5nMA0GCSqGSIb3DQEBDAUAMF0xCzAJBgNV
-BAYTAkpQMSUwIwYDVQQKExxTRUNPTSBUcnVzdCBTeXN0ZW1zIENPLixMVEQuMScw
-JQYDVQQDEx5TZWN1cml0eSBDb21tdW5pY2F0aW9uIFJvb3RDQTMwHhcNMTYwNjE2
-MDYxNzE2WhcNMzgwMTE4MDYxNzE2WjBdMQswCQYDVQQGEwJKUDElMCMGA1UEChMc
-U0VDT00gVHJ1c3QgU3lzdGVtcyBDTy4sTFRELjEnMCUGA1UEAxMeU2VjdXJpdHkg
-Q29tbXVuaWNhdGlvbiBSb290Q0EzMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIIC
-CgKCAgEA48lySfcw3gl8qUCBWNO0Ot26YQ+TUG5pPDXC7ltzkBtnTCHsXzW7OT4r
-CmDvu20rhvtxosis5FaU+cmvsXLUIKx00rgVrVH+hXShuRD+BYD5UpOzQD11EKzA
-lrenfna84xtSGc4RHwsENPXY9Wk8d/Nk9A2qhd7gCVAEF5aEt8iKvE1y/By7z/MG
-TfmfZPd+pmaGNXHIEYBMwXFAWB6+oHP2/D5Q4eAvJj1+XCO1eXDe+uDRpdYMQXF7
-9+qMHIjH7Iv10S9VlkZ8WjtYO/u62C21Jdp6Ts9EriGmnpjKIG58u4iFW/vAEGK7
-8vknR+/RiTlDxN/e4UG/VHMgly1s2vPUB6PmudhvrvyMGS7TZ2crldtYXLVqAvO4
-g160a75BflcJdURQVc1aEWEhCmHCqYj9E7wtiS/NYeCVvsq1e+F7NGcLH7YMx3we
-GVPKp7FKFSBWFHA9K4IsD50VHUeAR/94mQ4xr28+j+2GaR57GIgUssL8gjMunEst
-+3A7caoreyYn8xrC3PsXuKHqy6C0rtOUfnrQq8PsOC0RLoi/1D+tEjtCrI8Cbn3M
-0V9hvqG8OmpI6iZVIhZdXw3/JzOfGAN0iltSIEdrRU0id4xVJ/CvHozJgyJUt5rQ
-T9nO/NkuHJYosQLTA70lUhw0Zk8jq/R3gpYd0VcwCBEF/VfR2ccCAwEAAaNCMEAw
-HQYDVR0OBBYEFGQUfPxYchamCik0FW8qy7z8r6irMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBDAUAA4ICAQDcAiMI4u8hOscNtybS
-YpOnpSNyByCCYN8Y11StaSWSntkUz5m5UoHPrmyKO1o5yGwBQ8IibQLwYs1OY0PA
-FNr0Y/Dq9HHuTofjcan0yVflLl8cebsjqodEV+m9NU1Bu0soo5iyG9kLFwfl9+qd
-9XbXv8S2gVj/yP9kaWJ5rW4OH3/uHWnlt3Jxs/6lATWUVCvAUm2PVcTJ0rjLyjQI
-UYWg9by0F1jqClx6vWPGOi//lkkZhOpn2ASxYfQAW0q3nHE3GYV5v4GwxxMOdnE+
-OoAGrgYWp421wsTL/0ClXI2lyTrtcoHKXJg80jQDdwj98ClZXSEIx2C/pHF7uNke
-gr4Jr2VvKKu/S7XuPghHJ6APbw+LP6yVGPO5DtxnVW5inkYO0QR4ynKudtml+LLf
-iAlhi+8kTtFZP1rUPcmTPCtk9YENFpb3ksP+MW/oKjJ0DvRMmEoYDjBU1cXrvMUV
-nuiZIesnKwkK2/HmcBhWuwzkvvnoEKQTkrgc4NtnHVMDpCKn3F2SEDzq//wbEBrD
-2NCcnWXL0CsnMQMeNuE9dnUM/0Umud1RvCPHX9jYhxBAEg09ODfnRDwYwFMJZI//
-1ZqmfHAuc1Uh6N//g7kdPjIe1qZ9LPFm6Vwdp6POXiUyK+OVrCoHzrQoeIY8Laad
-TdJ0MN1kURXbg4NR16/9M51NZg==
------END CERTIFICATE-----
diff --git a/secure/caroot/trusted/Starfield_Class_2_CA.pem b/secure/caroot/untrusted/Starfield_Class_2_CA.pem
index b1659abdaeff..b1659abdaeff 100644
--- a/secure/caroot/trusted/Starfield_Class_2_CA.pem
+++ b/secure/caroot/untrusted/Starfield_Class_2_CA.pem
diff --git a/secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem b/secure/caroot/untrusted/SwissSign_Gold_CA_-_G2.pem
index 2157cc62ba68..2157cc62ba68 100644
--- a/secure/caroot/trusted/SwissSign_Gold_CA_-_G2.pem
+++ b/secure/caroot/untrusted/SwissSign_Gold_CA_-_G2.pem
diff --git a/secure/caroot/untrusted/SwissSign_Platinum_CA_-_G2.pem b/secure/caroot/untrusted/SwissSign_Platinum_CA_-_G2.pem
deleted file mode 100644
index 46e52967602b..000000000000
--- a/secure/caroot/untrusted/SwissSign_Platinum_CA_-_G2.pem
+++ /dev/null
@@ -1,137 +0,0 @@
-##
-##  SwissSign Platinum CA - G2
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 5670595323396054351 (0x4eb200670c035d4f)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=CH, O=SwissSign AG, CN=SwissSign Platinum CA - G2
-        Validity
-            Not Before: Oct 25 08:36:00 2006 GMT
-            Not After : Oct 25 08:36:00 2036 GMT
-        Subject: C=CH, O=SwissSign AG, CN=SwissSign Platinum CA - G2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:ca:df:a2:02:e2:da:f8:fc:07:16:b1:de:60:aa:
-                    de:96:5c:64:1f:c7:2f:7e:cf:67:fa:44:42:d6:76:
-                    63:95:ae:eb:af:72:20:8a:45:47:86:62:78:86:d6:
-                    20:39:26:f4:ae:a3:fd:23:e7:a5:9c:b5:22:21:19:
-                    b7:37:93:22:c0:50:9c:82:7b:d4:d5:04:44:5c:cb:
-                    b4:c2:9f:92:be:24:d8:7b:67:22:e2:69:5f:e5:05:
-                    78:d4:87:d9:71:70:33:25:53:b4:87:3b:29:90:28:
-                    36:9a:55:44:30:68:a4:83:97:7f:0d:1e:9c:76:ff:
-                    15:9d:60:97:00:8d:8a:85:03:ec:80:be:ea:2c:6e:
-                    10:51:92:cc:7e:d5:a3:33:d8:d6:49:de:58:2a:af:
-                    f6:16:eb:4b:7b:90:32:97:b9:ba:9d:58:f1:f8:57:
-                    49:04:1e:a2:5d:06:70:dd:71:db:f9:dd:8b:9a:1b:
-                    8c:cf:3d:a3:4d:ce:cb:7c:f6:bb:9c:a0:fa:09:ce:
-                    23:62:b2:e9:0d:1f:e2:72:28:8f:9f:ac:68:20:7d:
-                    6f:3b:a8:85:31:09:7f:0b:c7:e8:65:e9:e3:78:0e:
-                    09:67:30:8b:34:82:fb:5d:e0:cc:9d:81:6d:62:ee:
-                    08:1e:04:2c:4e:9b:ec:fe:a9:4f:5f:fd:69:78:ef:
-                    09:1f:a1:b4:bf:fa:f3:ef:90:1e:4c:05:8b:1e:ea:
-                    7a:91:7a:c3:d7:e5:fb:30:bc:6c:1b:10:58:98:f7:
-                    1a:5f:d0:29:32:03:13:46:4d:61:6a:85:4c:52:74:
-                    2f:06:1f:7b:11:e2:84:97:c6:99:f3:6d:7f:d7:67:
-                    83:7e:13:68:d8:71:28:5a:d8:ce:dd:e8:10:14:9a:
-                    fe:6d:23:87:6e:8e:5a:70:3c:d5:8d:09:00:a7:aa:
-                    bc:b0:31:37:6d:c8:84:14:1e:5b:bd:45:63:20:6b:
-                    4b:74:8c:bd:db:3a:0e:c1:cf:5a:16:8f:a5:98:f2:
-                    76:89:b2:13:12:3b:0b:77:77:ac:bb:e5:3c:29:4a:
-                    92:72:ca:61:1a:2b:5e:4c:e2:83:74:77:fa:35:48:
-                    7a:85:4d:8d:9a:53:c4:df:78:ca:97:91:48:2b:45:
-                    2b:01:f7:1c:1a:a2:ed:18:ba:0a:bd:83:fa:6f:bc:
-                    8d:57:93:3b:d4:d4:a6:ce:1e:f1:a0:b1:ce:ab:fd:
-                    2b:28:9a:4f:1b:d7:c3:72:db:a4:c4:bf:5d:4c:f5:
-                    dd:7b:96:69:ee:68:80:e6:e7:98:ba:36:b7:fe:6e:
-                    ed:2b:bd:20:f8:65:19:da:55:09:7e:25:dc:fe:61:
-                    62:72:f9:7e:18:02:ef:63:b4:d0:fb:af:e5:3b:63:
-                    8c:67:8f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                50:AF:CC:07:87:15:47:6F:38:C5:B4:65:D1:DE:95:AA:E9:DF:9C:CC
-            X509v3 Authority Key Identifier: 
-                50:AF:CC:07:87:15:47:6F:38:C5:B4:65:D1:DE:95:AA:E9:DF:9C:CC
-            X509v3 Certificate Policies: 
-                Policy: 2.16.756.1.89.1.1.1.1
-                  CPS: http://repository.swisssign.com/
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        08:85:a6:f5:16:0c:fc:44:1a:c1:63:e0:f9:55:46:08:fc:70:
-        1c:42:28:96:8e:b7:c5:c1:41:75:4e:09:71:79:e5:6d:96:ca:
-        4b:a5:88:60:d0:30:74:b8:ca:08:dc:b4:30:9e:40:07:16:6b:
-        65:95:77:01:ae:a4:b7:35:0b:81:da:71:15:a9:74:17:38:7b:
-        58:ca:f9:2f:fb:c0:65:76:8d:5b:01:b9:7d:de:82:3d:64:b8:
-        be:14:74:a3:0a:54:d3:2c:95:18:17:35:f5:51:6b:3f:8f:a2:
-        96:61:39:78:6b:4b:e5:a6:a0:f8:53:df:51:10:93:62:e7:80:
-        2f:e2:d1:e0:bc:8e:36:46:77:33:ec:b8:fb:8e:9a:2c:89:4d:
-        31:11:0f:26:9e:04:bb:b7:04:8d:0b:f2:b9:fc:5a:9d:3b:16:
-        b7:2f:c8:98:ab:fe:8a:50:59:2e:a3:3b:fc:29:5d:8b:c1:4b:
-        c9:e2:8a:13:1d:b1:bf:bb:42:1d:52:dd:4e:d8:14:5e:10:c6:
-        31:07:ef:71:27:f7:1b:39:09:dc:82:ea:8b:b3:95:86:5e:fd:
-        f5:da:5d:31:a6:e0:31:b6:94:e6:44:49:74:c5:16:e5:f7:1f:
-        03:61:28:c5:c8:cb:12:a0:42:4b:f9:6b:88:08:8d:b4:32:18:
-        f3:75:9f:c4:7f:00:4f:05:95:9c:a3:17:02:c3:b3:53:9b:aa:
-        20:39:29:2b:66:fa:9d:af:5e:b3:92:d2:b5:a6:e1:1a:f9:2d:
-        41:69:81:14:b4:b4:b5:ed:89:3d:ce:fb:a9:9d:35:42:44:b1:
-        1c:14:73:81:cf:2a:01:35:9a:31:d5:2d:8f:6d:84:df:80:4d:
-        57:e3:3f:c5:84:75:da:89:c6:30:bb:eb:8f:cb:22:08:a0:ae:
-        aa:f1:03:6c:3a:4b:4d:09:a5:0e:72:c6:56:6b:21:42:4e:23:
-        25:14:68:ae:76:0a:7c:0c:07:70:64:f9:9a:2f:f6:05:39:26:
-        c6:0c:8f:19:7f:43:5e:6e:f4:5b:15:2f:db:61:5d:e6:67:2f:
-        3f:08:94:f9:60:b4:98:31:da:74:f1:84:93:71:4d:5f:fb:60:
-        58:d1:fb:c4:c1:6d:89:a2:bb:20:1f:9d:71:91:cb:32:9b:13:
-        3d:3e:7d:92:52:35:ac:92:94:a2:d3:18:c2:7c:c7:ea:af:76:
-        05:16:dd:67:27:c2:7e:1c:07:22:21:f3:40:0a:1b:34:07:44:
-        13:c2:84:6a:8e:df:19:5a:bf:7f:eb:1d:e2:1a:38:d1:5c:af:
-        47:92:6b:80:b5:30:a5:c9:8d:d8:ab:31:81:1f:df:c2:66:37:
-        d3:93:a9:85:86:79:65:d2
-SHA1 Fingerprint=56:E0:FA:C0:3B:8F:18:23:55:18:E5:D3:11:CA:E8:C2:43:31:AB:66
------BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWdu
-IFBsYXRpbnVtIENBIC0gRzIwHhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAw
-WjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMMU3dpc3NTaWduIEFHMSMwIQYDVQQD
-ExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu669y
-IIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2Htn
-IuJpX+UFeNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+
-6ixuEFGSzH7VozPY1kneWCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5ob
-jM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIoj5+saCB9bzuohTEJfwvH6GXp43gOCWcw
-izSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/68++QHkwFix7qepF6w9fl
-+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34TaNhxKFrY
-zt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaP
-pZjydomyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtF
-KwH3HBqi7Ri6Cr2D+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuW
-ae5ogObnmLo2t/5u7Su9IPhlGdpVCX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMB
-AAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0O
-BBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCvzAeHFUdvOMW0
-ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
-IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUA
-A4ICAQAIhab1Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0
-uMoI3LQwnkAHFmtllXcBrqS3NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+
-FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4U99REJNi54Av4tHgvI42Rncz7Lj7
-jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8KV2LwUvJ4ooTHbG/
-u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl9x8D
-YSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1
-puEa+S1BaYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXa
-icYwu+uPyyIIoK6q8QNsOktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbG
-DI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSYMdp08YSTcU1f+2BY0fvEwW2JorsgH51x
-kcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAciIfNAChs0B0QTwoRqjt8Z
-Wr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/SwissSign_RSA_SMIME_Root_CA_2022_-_1.pem b/secure/caroot/untrusted/SwissSign_RSA_SMIME_Root_CA_2022_-_1.pem
new file mode 100644
index 000000000000..ed66d79785ac
--- /dev/null
+++ b/secure/caroot/untrusted/SwissSign_RSA_SMIME_Root_CA_2022_-_1.pem
@@ -0,0 +1,134 @@
+##
+##  SwissSign RSA SMIME Root CA 2022 - 1
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            46:0e:d4:01:71:90:a0:1a:83:2c:4a:42:10:28:15:d2:61:1b:ad:32
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=CH, O=SwissSign AG, CN=SwissSign RSA SMIME Root CA 2022 - 1
+        Validity
+            Not Before: Jun  8 10:53:13 2022 GMT
+            Not After : Jun  8 10:53:13 2047 GMT
+        Subject: C=CH, O=SwissSign AG, CN=SwissSign RSA SMIME Root CA 2022 - 1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:d4:fb:fa:3f:86:a2:99:70:09:3a:c9:d6:a1:4e:
+                    01:ce:46:b5:2d:24:48:0d:45:e9:ac:c9:1a:d7:32:
+                    80:a4:e6:d3:ca:d6:f2:29:37:ec:9a:2c:d6:81:ce:
+                    e6:1b:9d:b1:0f:41:df:58:d3:5f:aa:a0:79:59:0b:
+                    8c:ad:f9:c5:f9:1c:fb:c3:e9:35:40:74:c3:c1:0c:
+                    cb:67:fb:9c:5e:0c:23:f9:d0:2f:fa:4c:82:45:1c:
+                    b5:f5:1f:f8:19:6e:da:93:b7:4e:68:83:7e:62:2d:
+                    1d:8c:95:1f:70:d9:ce:5a:8c:21:5d:a8:be:08:a9:
+                    56:6d:d9:f7:b9:90:99:c7:3b:d7:bd:9e:2e:c9:67:
+                    57:2e:21:ce:f0:32:83:fb:04:01:f9:b7:82:44:0d:
+                    b2:cb:7a:09:a1:48:3e:4f:c0:0b:6a:1b:1b:ec:cf:
+                    1d:9e:7f:06:90:ac:28:05:0b:a8:e6:54:3b:a2:a7:
+                    2c:39:13:99:a8:fb:34:eb:f5:f0:bd:01:d8:88:11:
+                    c8:ae:ba:19:02:49:02:dc:8a:2c:b4:bd:61:60:ec:
+                    9d:78:5c:6a:8b:2f:17:86:5e:f2:4f:93:00:6b:5d:
+                    c5:b2:a9:a5:18:ea:e6:6d:7e:57:05:fb:07:fc:bc:
+                    7c:a1:43:b1:66:1c:a8:67:fb:ab:37:f6:aa:aa:b8:
+                    7a:41:f7:39:d5:8c:9f:ae:72:36:27:e4:62:c6:43:
+                    99:f1:a1:41:e9:ff:89:9f:0f:49:af:c9:14:06:17:
+                    27:64:39:0d:a5:b4:2a:5b:ec:3c:fb:9f:c5:5f:c6:
+                    3b:5d:26:19:f2:84:29:b8:95:44:09:52:fd:6c:30:
+                    d0:62:8f:28:a5:81:96:2b:94:2f:26:75:e4:09:8c:
+                    0a:df:38:f3:7e:5d:38:8e:82:9a:8c:dc:9e:ae:ce:
+                    12:42:3a:22:f2:35:8d:4f:d2:1a:c8:49:33:0b:fa:
+                    36:3f:ff:2c:6b:6a:20:71:4c:cd:ad:10:3f:69:32:
+                    84:8e:5c:ee:53:88:44:e2:dd:cc:03:30:92:86:79:
+                    90:2a:4b:75:fb:52:62:c4:f4:6f:4d:f7:db:23:a1:
+                    18:dd:45:53:17:9a:63:24:48:89:22:cd:7e:9b:01:
+                    1c:80:28:03:8f:5b:2b:fa:1f:e3:7c:19:bd:e6:8f:
+                    b1:40:76:a0:f2:c7:37:b2:32:94:10:32:cd:a7:13:
+                    97:f1:3b:2c:7a:34:22:7b:74:3a:40:e2:af:82:f8:
+                    c1:c1:78:fc:5f:e4:35:7f:c0:f4:4c:f0:4c:b2:ea:
+                    87:03:72:25:59:83:2a:08:a4:51:de:cf:ee:a8:e7:
+                    e8:40:3f:88:f0:36:ab:09:4e:d8:a0:a8:7f:f3:e1:
+                    09:db:b9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                CC:2E:AD:89:8C:83:E3:40:A3:25:69:A5:EA:92:7D:D2:37:3A:C7:C6
+            X509v3 Subject Key Identifier: 
+                CC:2E:AD:89:8C:83:E3:40:A3:25:69:A5:EA:92:7D:D2:37:3A:C7:C6
+    Signature Algorithm: sha256WithRSAEncryption
+    Signature Value:
+        00:07:66:16:a5:ed:c7:b9:bf:bc:c8:91:ad:58:ed:5e:12:05:
+        b3:f6:46:9b:7b:e4:84:10:2f:07:b1:5a:5e:32:6e:6d:00:f0:
+        5e:c7:9a:62:39:87:4d:e4:3c:f3:be:f6:ba:6a:53:6c:84:6d:
+        07:d4:61:ca:67:66:be:9b:3e:45:30:9d:51:d2:d7:5a:42:ae:
+        9d:92:0e:23:ab:d0:15:94:3e:a8:9a:ca:9b:ed:c1:c2:5f:21:
+        a3:99:80:fc:b9:a6:61:0e:50:80:80:27:c7:e8:7d:a0:d4:94:
+        7a:98:03:e7:ee:42:8b:f3:52:50:5c:ef:be:b0:76:5a:1c:09:
+        a1:bf:83:c0:1e:76:65:d0:25:41:5b:69:91:93:77:f9:8c:4b:
+        f0:2c:db:9b:06:00:17:83:fa:5a:94:b4:86:89:ef:bc:0a:0b:
+        12:f8:06:4d:d2:73:e2:91:38:5d:b9:6a:4b:4f:a7:af:da:26:
+        25:92:23:1a:7c:1f:27:0d:91:84:ef:17:72:f6:46:eb:6b:3b:
+        37:a9:d4:d5:9a:63:ba:5e:79:8c:2a:b5:9b:a2:34:b5:cc:96:
+        27:f9:79:08:3c:7f:6d:e0:ff:7c:dc:c5:26:af:c3:a1:7a:69:
+        16:dd:87:35:73:c6:6b:31:6b:56:01:2d:4f:99:d9:ee:ca:e1:
+        d0:83:de:b6:85:e7:16:f8:d1:ae:33:48:fb:1a:cf:5d:5f:8a:
+        84:61:74:07:6f:19:b0:51:21:b2:a1:04:b1:7b:53:8f:ef:a2:
+        45:ad:1f:98:dd:f9:6a:04:6c:aa:36:c5:af:8c:ea:29:49:4a:
+        e7:ff:57:b3:c6:3c:11:49:18:17:e6:66:85:e1:e8:23:f2:8b:
+        0e:3c:93:c4:3f:76:4e:7e:62:a2:29:cb:16:30:de:2c:69:af:
+        91:a7:e2:57:e5:33:4c:bf:d8:8e:07:a2:7f:a1:35:46:69:4a:
+        a8:20:29:ff:eb:de:20:95:59:b1:ae:4d:30:6b:d8:9a:b4:03:
+        1f:c2:38:e4:20:d5:0e:d6:1a:30:4c:68:9c:8c:e0:ed:a1:0f:
+        8e:42:5d:eb:80:2a:12:79:a6:17:17:b4:95:2a:8e:34:91:a7:
+        bd:d1:ac:a8:1a:43:21:8b:de:ef:e0:ac:46:25:65:0a:c6:2b:
+        a1:9b:3e:22:e8:18:38:b5:26:f6:2c:ca:08:20:de:30:d1:ad:
+        54:fd:dc:48:15:9f:cd:a7:41:d7:37:38:85:30:4f:12:88:43:
+        34:83:d7:2a:4d:d4:00:57:5c:e5:ca:f0:dd:e1:92:28:2b:18:
+        75:bd:47:a4:42:13:e9:56:5a:8d:4a:5e:ce:0e:75:35:80:73:
+        19:0f:2c:29:8b:bb:95:b8
+SHA1 Fingerprint=14:D7:65:62:74:10:50:47:9F:8B:32:C6:86:8A:18:FA:E1:19:99:B0
+-----BEGIN CERTIFICATE-----
+MIIFlzCCA3+gAwIBAgIURg7UAXGQoBqDLEpCECgV0mEbrTIwDQYJKoZIhvcNAQEL
+BQAwUzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEtMCsGA1UE
+AxMkU3dpc3NTaWduIFJTQSBTTUlNRSBSb290IENBIDIwMjIgLSAxMB4XDTIyMDYw
+ODEwNTMxM1oXDTQ3MDYwODEwNTMxM1owUzELMAkGA1UEBhMCQ0gxFTATBgNVBAoT
+DFN3aXNzU2lnbiBBRzEtMCsGA1UEAxMkU3dpc3NTaWduIFJTQSBTTUlNRSBSb290
+IENBIDIwMjIgLSAxMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA1Pv6
+P4aimXAJOsnWoU4Bzka1LSRIDUXprMka1zKApObTytbyKTfsmizWgc7mG52xD0Hf
+WNNfqqB5WQuMrfnF+Rz7w+k1QHTDwQzLZ/ucXgwj+dAv+kyCRRy19R/4GW7ak7dO
+aIN+Yi0djJUfcNnOWowhXai+CKlWbdn3uZCZxzvXvZ4uyWdXLiHO8DKD+wQB+beC
+RA2yy3oJoUg+T8ALahsb7M8dnn8GkKwoBQuo5lQ7oqcsOROZqPs06/XwvQHYiBHI
+rroZAkkC3IostL1hYOydeFxqiy8Xhl7yT5MAa13FsqmlGOrmbX5XBfsH/Lx8oUOx
+ZhyoZ/urN/aqqrh6Qfc51YyfrnI2J+RixkOZ8aFB6f+Jnw9Jr8kUBhcnZDkNpbQq
+W+w8+5/FX8Y7XSYZ8oQpuJVECVL9bDDQYo8opYGWK5QvJnXkCYwK3zjzfl04joKa
+jNyers4SQjoi8jWNT9IayEkzC/o2P/8sa2ogcUzNrRA/aTKEjlzuU4hE4t3MAzCS
+hnmQKkt1+1JixPRvTffbI6EY3UVTF5pjJEiJIs1+mwEcgCgDj1sr+h/jfBm95o+x
+QHag8sc3sjKUEDLNpxOX8TssejQie3Q6QOKvgvjBwXj8X+Q1f8D0TPBMsuqHA3Il
+WYMqCKRR3s/uqOfoQD+I8DarCU7YoKh/8+EJ27kCAwEAAaNjMGEwDwYDVR0TAQH/
+BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHwYDVR0jBBgwFoAUzC6tiYyD40CjJWml
+6pJ90jc6x8YwHQYDVR0OBBYEFMwurYmMg+NAoyVppeqSfdI3OsfGMA0GCSqGSIb3
+DQEBCwUAA4ICAQAAB2YWpe3Hub+8yJGtWO1eEgWz9kabe+SEEC8HsVpeMm5tAPBe
+x5piOYdN5Dzzvva6alNshG0H1GHKZ2a+mz5FMJ1R0tdaQq6dkg4jq9AVlD6omsqb
+7cHCXyGjmYD8uaZhDlCAgCfH6H2g1JR6mAPn7kKL81JQXO++sHZaHAmhv4PAHnZl
+0CVBW2mRk3f5jEvwLNubBgAXg/palLSGie+8CgsS+AZN0nPikThduWpLT6ev2iYl
+kiMafB8nDZGE7xdy9kbrazs3qdTVmmO6XnmMKrWbojS1zJYn+XkIPH9t4P983MUm
+r8OhemkW3Yc1c8ZrMWtWAS1PmdnuyuHQg962hecW+NGuM0j7Gs9dX4qEYXQHbxmw
+USGyoQSxe1OP76JFrR+Y3flqBGyqNsWvjOopSUrn/1ezxjwRSRgX5maF4egj8osO
+PJPEP3ZOfmKiKcsWMN4saa+Rp+JX5TNMv9iOB6J/oTVGaUqoICn/694glVmxrk0w
+a9iatAMfwjjkINUO1howTGicjODtoQ+OQl3rgCoSeaYXF7SVKo40kae90ayoGkMh
+i97v4KxGJWUKxiuhmz4i6Bg4tSb2LMoIIN4w0a1U/dxIFZ/Np0HXNziFME8SiEM0
+g9cqTdQAV1zlyvDd4ZIoKxh1vUekQhPpVlqNSl7ODnU1gHMZDywpi7uVuA==
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/SwissSign_Silver_CA_-_G2.pem b/secure/caroot/untrusted/SwissSign_Silver_CA_-_G2.pem
deleted file mode 100644
index ce404d63eb30..000000000000
--- a/secure/caroot/untrusted/SwissSign_Silver_CA_-_G2.pem
+++ /dev/null
@@ -1,137 +0,0 @@
-##
-##  SwissSign Silver CA - G2
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 5700383053117599563 (0x4f1bd42f54bb2f4b)
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=CH, O=SwissSign AG, CN=SwissSign Silver CA - G2
-        Validity
-            Not Before: Oct 25 08:32:46 2006 GMT
-            Not After : Oct 25 08:32:46 2036 GMT
-        Subject: C=CH, O=SwissSign AG, CN=SwissSign Silver CA - G2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:c4:f1:87:7f:d3:78:31:f7:38:c9:f8:c3:99:43:
-                    bc:c7:f7:bc:37:e7:4e:71:ba:4b:8f:a5:73:1d:5c:
-                    6e:98:ae:03:57:ae:38:37:43:2f:17:3d:1f:c8:ce:
-                    68:10:c1:78:ae:19:03:2b:10:fa:2c:79:83:f6:e8:
-                    b9:68:b9:55:f2:04:44:a7:39:f9:fc:04:8b:1e:f1:
-                    a2:4d:27:f9:61:7b:ba:b7:e5:a2:13:b6:eb:61:3e:
-                    d0:6c:d1:e6:fb:fa:5e:ed:1d:b4:9e:a0:35:5b:a1:
-                    92:cb:f0:49:92:fe:85:0a:05:3e:e6:d9:0b:e2:4f:
-                    bb:dc:95:37:fc:91:e9:32:35:22:d1:1f:3a:4e:27:
-                    85:9d:b0:15:94:32:da:61:0d:47:4d:60:42:ae:92:
-                    47:e8:83:5a:50:58:e9:8a:8b:b9:5d:a1:dc:dd:99:
-                    4a:1f:36:67:bb:48:e4:83:b6:37:eb:48:3a:af:0f:
-                    67:8f:17:07:e8:04:ca:ef:6a:31:87:d4:c0:b6:f9:
-                    94:71:7b:67:64:b8:b6:91:4a:42:7b:65:2e:30:6a:
-                    0c:f5:90:ee:95:e6:f2:cd:82:ec:d9:a1:4a:ec:f6:
-                    b2:4b:e5:45:85:e6:6d:78:93:04:2e:9c:82:6d:36:
-                    a9:c4:31:64:1f:86:83:0b:2a:f4:35:0a:78:c9:55:
-                    cf:41:b0:47:e9:30:9f:99:be:61:a8:06:84:b9:28:
-                    7a:5f:38:d9:1b:a9:38:b0:83:7f:73:c1:c3:3b:48:
-                    2a:82:0f:21:9b:b8:cc:a8:35:c3:84:1b:83:b3:3e:
-                    be:a4:95:69:01:3a:89:00:78:04:d9:c9:f4:99:19:
-                    ab:56:7e:5b:8b:86:39:15:91:a4:10:2c:09:32:80:
-                    60:b3:93:c0:2a:b6:18:0b:9d:7e:8d:49:f2:10:4a:
-                    7f:f9:d5:46:2f:19:92:a3:99:a7:26:ac:bb:8c:3c:
-                    e6:0e:bc:47:07:dc:73:51:f1:70:64:2f:08:f9:b4:
-                    47:1d:30:6c:44:ea:29:37:85:92:68:66:bc:83:38:
-                    fe:7b:39:2e:d3:50:f0:1f:fb:5e:60:b6:a9:a6:fa:
-                    27:41:f1:9b:18:72:f2:f5:84:74:4a:c9:67:c4:54:
-                    ae:48:64:df:8c:d1:6e:b0:1d:e1:07:8f:08:1e:99:
-                    9c:71:e9:4c:d8:a5:f7:47:12:1f:74:d1:51:9e:86:
-                    f3:c2:a2:23:40:0b:73:db:4b:a6:e7:73:06:8c:c1:
-                    a0:e9:c1:59:ac:46:fa:e6:2f:f8:cf:71:9c:46:6d:
-                    b9:c4:15:8d:38:79:03:45:48:ef:c4:5d:d7:08:ee:
-                    87:39:22:86:b2:0d:0f:58:43:f7:71:a9:48:2e:fd:
-                    ea:d6:1f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                17:A0:CD:C1:E4:41:B6:3A:5B:3B:CB:45:9D:BD:1C:C2:98:FA:86:58
-            X509v3 Authority Key Identifier: 
-                17:A0:CD:C1:E4:41:B6:3A:5B:3B:CB:45:9D:BD:1C:C2:98:FA:86:58
-            X509v3 Certificate Policies: 
-                Policy: 2.16.756.1.89.1.3.1.1
-                  CPS: http://repository.swisssign.com/
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        73:c6:81:e0:27:d2:2d:0f:e0:95:30:e2:9a:41:7f:50:2c:5f:
-        5f:62:61:a9:86:6a:69:18:0c:74:49:d6:5d:84:ea:41:52:18:
-        6f:58:ad:50:56:20:6a:c6:bd:28:69:58:91:dc:91:11:35:a9:
-        3a:1d:bc:1a:a5:60:9e:d8:1f:7f:45:91:69:d9:7e:bb:78:72:
-        c1:06:0f:2a:ce:8f:85:70:61:ac:a0:cd:0b:b8:39:29:56:84:
-        32:4e:86:bb:3d:c4:2a:d9:d7:1f:72:ee:fe:51:a1:22:41:b1:
-        71:02:63:1a:82:b0:62:ab:5e:57:12:1f:df:cb:dd:75:a0:c0:
-        5d:79:90:8c:1b:e0:50:e6:de:31:fe:98:7b:70:5f:a5:90:d8:
-        ad:f8:02:b6:6f:d3:60:dd:40:4b:22:c5:3d:ad:3a:7a:9f:1a:
-        1a:47:91:79:33:ba:82:dc:32:69:03:96:6e:1f:4b:f0:71:fe:
-        e3:67:72:a0:b1:bf:5c:8b:e4:fa:99:22:c7:84:b9:1b:8d:23:
-        97:3f:ed:25:e0:cf:65:bb:f5:61:04:ef:dd:1e:b2:5a:41:22:
-        5a:a1:9f:5d:2c:e8:5b:c9:6d:a9:0c:0c:78:aa:60:c6:56:8f:
-        01:5a:0c:68:bc:69:19:79:c4:1f:7e:97:05:bf:c5:e9:24:51:
-        5e:d4:d5:4b:53:ed:d9:23:5a:36:03:65:a3:c1:03:ad:41:30:
-        f3:46:1b:85:90:af:65:b5:d5:b1:e4:16:5b:78:75:1d:97:7a:
-        6d:59:a9:2a:8f:7b:de:c3:87:89:10:99:49:73:78:c8:3d:bd:
-        51:35:74:2a:d5:f1:7e:69:1b:2a:bb:3b:bd:25:b8:9a:5a:3d:
-        72:61:90:66:87:ee:0c:d6:4d:d4:11:74:0b:6a:fe:0b:03:fc:
-        a3:55:57:89:fe:4a:cb:ae:5b:17:05:c8:f2:8d:23:31:53:38:
-        d2:2d:6a:3f:82:b9:8d:08:6a:f7:5e:41:74:6e:c3:11:7e:07:
-        ac:29:60:91:3f:38:ca:57:10:0d:bd:30:2f:c7:a5:e6:41:a0:
-        da:ae:05:87:9a:a0:a4:65:6c:4c:09:0c:89:ba:b8:d3:b9:c0:
-        93:8a:30:fa:8d:e5:9a:6b:15:01:4e:67:aa:da:62:56:3e:84:
-        08:66:d2:c4:36:7d:a7:3e:10:fc:88:e0:d4:80:e5:00:bd:aa:
-        f3:4e:06:a3:7a:6a:f9:62:72:e3:09:4f:eb:9b:0e:01:23:f1:
-        9f:bb:7c:dc:dc:6c:11:97:25:b2:f2:b4:63:14:d2:06:2a:67:
-        8c:83:f5:ce:ea:07:d8:9a:6a:1e:ec:e4:0a:bb:2a:4c:eb:09:
-        60:39:ce:ca:62:d8:2e:6e
-SHA1 Fingerprint=9B:AA:E5:9F:56:EE:21:CB:43:5A:BE:25:93:DF:A7:F0:40:D1:1D:CB
------BEGIN CERTIFICATE-----
-MIIFvTCCA6WgAwIBAgIITxvUL1S7L0swDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UE
-BhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMYU3dpc3NTaWdu
-IFNpbHZlciBDQSAtIEcyMB4XDTA2MTAyNTA4MzI0NloXDTM2MTAyNTA4MzI0Nlow
-RzELMAkGA1UEBhMCQ0gxFTATBgNVBAoTDFN3aXNzU2lnbiBBRzEhMB8GA1UEAxMY
-U3dpc3NTaWduIFNpbHZlciBDQSAtIEcyMIICIjANBgkqhkiG9w0BAQEFAAOCAg8A
-MIICCgKCAgEAxPGHf9N4Mfc4yfjDmUO8x/e8N+dOcbpLj6VzHVxumK4DV644N0Mv
-Fz0fyM5oEMF4rhkDKxD6LHmD9ui5aLlV8gREpzn5/ASLHvGiTSf5YXu6t+WiE7br
-YT7QbNHm+/pe7R20nqA1W6GSy/BJkv6FCgU+5tkL4k+73JU3/JHpMjUi0R86TieF
-nbAVlDLaYQ1HTWBCrpJH6INaUFjpiou5XaHc3ZlKHzZnu0jkg7Y360g6rw9njxcH
-6ATK72oxh9TAtvmUcXtnZLi2kUpCe2UuMGoM9ZDulebyzYLs2aFK7PayS+VFheZt
-eJMELpyCbTapxDFkH4aDCyr0NQp4yVXPQbBH6TCfmb5hqAaEuSh6XzjZG6k4sIN/
-c8HDO0gqgg8hm7jMqDXDhBuDsz6+pJVpATqJAHgE2cn0mRmrVn5bi4Y5FZGkECwJ
-MoBgs5PAKrYYC51+jUnyEEp/+dVGLxmSo5mnJqy7jDzmDrxHB9xzUfFwZC8I+bRH
-HTBsROopN4WSaGa8gzj+ezku01DwH/teYLappvonQfGbGHLy9YR0SslnxFSuSGTf
-jNFusB3hB48IHpmccelM2KX3RxIfdNFRnobzwqIjQAtz20um53MGjMGg6cFZrEb6
-5i/4z3GcRm25xBWNOHkDRUjvxF3XCO6HOSKGsg0PWEP3calILv3q1h8CAwEAAaOB
-rDCBqTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU
-F6DNweRBtjpbO8tFnb0cwpj6hlgwHwYDVR0jBBgwFoAUF6DNweRBtjpbO8tFnb0c
-wpj6hlgwRgYDVR0gBD8wPTA7BglghXQBWQEDAQEwLjAsBggrBgEFBQcCARYgaHR0
-cDovL3JlcG9zaXRvcnkuc3dpc3NzaWduLmNvbS8wDQYJKoZIhvcNAQEFBQADggIB
-AHPGgeAn0i0P4JUw4ppBf1AsX19iYamGamkYDHRJ1l2E6kFSGG9YrVBWIGrGvShp
-WJHckRE1qTodvBqlYJ7YH39FkWnZfrt4csEGDyrOj4VwYaygzQu4OSlWhDJOhrs9
-xCrZ1x9y7v5RoSJBsXECYxqCsGKrXlcSH9/L3XWgwF15kIwb4FDm3jH+mHtwX6WQ
-2K34ArZv02DdQEsixT2tOnqfGhpHkXkzuoLcMmkDlm4fS/Bx/uNncqCxv1yL5PqZ
-IseEuRuNI5c/7SXgz2W79WEE790eslpBIlqhn10s6FvJbakMDHiqYMZWjwFaDGi8
-aRl5xB9+lwW/xekkUV7U1UtT7dkjWjYDZaPBA61BMPNGG4WQr2W11bHkFlt4dR2X
-em1ZqSqPe97Dh4kQmUlzeMg9vVE1dCrV8X5pGyq7O70luJpaPXJhkGaH7gzWTdQR
-dAtq/gsD/KNVV4n+SsuuWxcFyPKNIzFTONItaj+CuY0IavdeQXRuwxF+B6wpYJE/
-OMpXEA29MC/HpeZBoNquBYeaoKRlbEwJDIm6uNO5wJOKMPqN5ZprFQFOZ6raYlY+
-hAhm0sQ2fac+EPyI4NSA5QC9qvNOBqN6avlicuMJT+ubDgEj8Z+7fNzcbBGXJbLy
-tGMU0gYqZ4yD9c7qB9iaah7s5Aq7KkzrCWA5zspi2C5u
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem b/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
deleted file mode 100644
index be83923cb38e..000000000000
--- a/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G4.pem
+++ /dev/null
@@ -1,67 +0,0 @@
-##
-##  Symantec Class 1 Public Primary Certification Authority - G4
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            21:6e:33:a5:cb:d3:88:a4:6f:29:07:b4:27:3c:c4:d8
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 1 Public Primary Certification Authority - G4
-        Validity
-            Not Before: Oct  5 00:00:00 2011 GMT
-            Not After : Jan 18 23:59:59 2038 GMT
-        Subject: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 1 Public Primary Certification Authority - G4
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:d7:66:b5:1b:db:ae:b3:60:ee:46:ea:88:63:75:
-                    3b:2a:94:6d:f3:5f:12:f6:e3:0f:9e:b6:0a:14:53:
-                    48:52:c8:dc:3a:b3:cb:48:20:26:12:4e:fa:89:84:
-                    d4:df:91:e4:29:7d:28:01:d9:db:18:43:69:a1:1f:
-                    b5:d3:86:16:dc:c7:7f:67:23:df:df:31:31:83:03:
-                    35:70:b1:4b:b7:c8:17:bb:51:cb:dc:94:17:db:ea:
-                    09:3b:76:12:de:aa:b5
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                65:C0:8D:25:F5:0C:BA:97:77:90:3F:9E:2E:E0:5A:F5:CE:D5:E1:E4
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:66:02:31:00:a5:ae:e3:46:53:f8:98:36:e3:22:fa:2e:28:
-        49:0d:ee:30:7e:33:f3:ec:3f:71:5e:cc:55:89:78:99:ac:b2:
-        fd:dc:1c:5c:33:8e:29:b9:6b:17:c8:11:68:b5:dc:83:07:02:
-        31:00:9c:c8:44:da:69:c2:36:c3:54:19:10:85:02:da:9d:47:
-        ef:41:e7:6c:26:9d:09:3d:f7:6d:90:d1:05:44:2f:b0:bc:83:
-        93:68:f2:0c:45:49:39:bf:99:04:1c:d3:10:a0
-SHA1 Fingerprint=84:F2:E3:DD:83:13:3E:A9:1D:19:52:7F:02:D7:29:BF:C1:5F:E6:67
------BEGIN CERTIFICATE-----
-MIICqDCCAi2gAwIBAgIQIW4zpcvTiKRvKQe0JzzE2DAKBggqhkjOPQQDAzCBlDEL
-MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD
-VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD
-bGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g
-RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC
-VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h
-bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1
-YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATXZrUb266zYO5G6ohjdTsqlG3zXxL24w+etgoUU0hS
-yNw6s8tIICYSTvqJhNTfkeQpfSgB2dsYQ2mhH7XThhbcx39nI9/fMTGDAzVwsUu3
-yBe7UcvclBfb6gk7dhLeqrWjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBRlwI0l9Qy6l3eQP54u4Fr1ztXh5DAKBggqhkjOPQQD
-AwNpADBmAjEApa7jRlP4mDbjIvouKEkN7jB+M/PsP3FezFWJeJmssv3cHFwzjim5
-axfIEWi13IMHAjEAnMhE2mnCNsNUGRCFAtqdR+9B52wmnQk9922Q0QVEL7C8g5No
-8gxFSTm/mQQc0xCg
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
deleted file mode 100644
index e5db4520d76d..000000000000
--- a/secure/caroot/untrusted/Symantec_Class_1_Public_Primary_Certification_Authority_-_G6.pem
+++ /dev/null
@@ -1,93 +0,0 @@
-##
-##  Symantec Class 1 Public Primary Certification Authority - G6
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            24:32:75:f2:1d:2f:d2:09:33:f7:b4:6a:ca:d0:f3:98
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 1 Public Primary Certification Authority - G6
-        Validity
-            Not Before: Oct 18 00:00:00 2011 GMT
-            Not After : Dec  1 23:59:59 2037 GMT
-        Subject: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 1 Public Primary Certification Authority - G6
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c7:39:d7:49:64:a9:99:82:22:4c:ea:45:d9:07:
-                    16:e3:7b:f4:83:e8:99:73:fa:6b:b1:36:e0:9a:77:
-                    a0:40:c2:81:8d:01:c7:cc:8c:bd:8f:7d:f7:79:e3:
-                    7a:4c:03:4d:d9:fb:fd:87:38:28:2c:dd:9a:8b:54:
-                    08:db:67:fb:1b:8c:fe:28:92:2f:be:b7:b2:48:a7:
-                    81:a1:d8:5e:88:c3:cc:39:40:41:5a:d1:dc:e5:da:
-                    10:9f:2f:da:01:4d:fd:2e:46:7c:f9:2e:27:0a:69:
-                    37:ee:91:a3:1b:6a:cc:44:bf:1b:c7:c3:d4:11:b2:
-                    50:60:97:09:bd:2e:22:f5:41:84:66:9f:cd:40:a6:
-                    a9:00:80:c1:1f:95:92:9f:de:f3:48:ef:db:1d:77:
-                    61:fc:7f:df:ee:96:a4:72:d0:b6:3e:ff:78:27:af:
-                    cb:92:15:69:08:db:63:10:e2:e6:97:ac:6e:dc:ac:
-                    f6:a2:ce:1e:47:99:b9:89:b7:12:e6:a1:d4:cd:59:
-                    11:67:c3:6f:85:d8:42:4e:28:be:59:55:59:04:95:
-                    ab:8f:37:80:bf:0d:f0:fc:1f:3a:64:31:58:81:78:
-                    d7:e2:35:f6:20:3f:29:b8:8f:16:6e:3e:48:dc:b5:
-                    4c:07:e1:f2:1a:ea:7e:0a:79:d6:a8:bd:eb:5d:86:
-                    2b:4d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                33:41:E8:C8:39:12:15:93:48:F2:96:32:2E:5A:F5:DA:94:5F:53:60
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        15:e3:73:57:b1:17:b6:5f:49:69:44:a6:f6:5e:7a:67:ac:d2:
-        de:75:49:ab:fe:25:55:c7:3a:c9:44:15:10:6e:bf:31:6b:cb:
-        d9:07:93:7f:1c:85:63:00:e3:32:12:e0:cc:cb:fb:39:6c:8f:
-        e2:53:e2:3c:40:33:d9:a4:8c:47:e6:ad:58:fb:89:af:e3:de:
-        86:29:56:34:2c:45:b8:12:fa:44:89:6e:2d:14:25:28:24:01:
-        65:d6:ea:52:ac:05:6e:56:12:09:3d:d0:74:f4:d7:bd:06:ca:
-        a8:3a:8d:56:42:fa:8d:72:3e:74:f1:03:72:df:87:1b:5e:0e:
-        7a:55:96:2c:38:b7:98:85:cd:4d:33:44:c9:94:8f:5a:31:30:
-        37:4b:a3:3a:12:b3:e7:36:d1:21:68:4b:2d:38:e6:53:ae:1c:
-        25:56:08:56:03:67:84:9d:c6:c3:ce:24:62:c7:4c:36:cf:b0:
-        06:44:b7:f5:5f:02:dd:d9:54:e9:2f:90:4e:7a:c8:4e:83:40:
-        0c:9a:97:3c:37:bf:bf:ec:f6:f0:b4:85:77:28:c1:0b:c8:67:
-        82:10:17:38:a2:b7:06:ea:9b:bf:3a:f8:e9:23:07:bf:74:e0:
-        98:38:15:55:78:ee:72:00:5c:19:a3:f4:d2:33:e0:ff:bd:d1:
-        54:39:29:0f
-SHA1 Fingerprint=51:7F:61:1E:29:91:6B:53:82:FB:72:E7:44:D9:8D:C3:CC:53:6D:64
------BEGIN CERTIFICATE-----
-MIID9jCCAt6gAwIBAgIQJDJ18h0v0gkz97RqytDzmDANBgkqhkiG9w0BAQsFADCB
-lDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8w
-HQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRl
-YyBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRzYwHhcNMTExMDE4MDAwMDAwWhcNMzcxMjAxMjM1OTU5WjCBlDELMAkGA1UE
-BhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZT
-eW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAx
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHOddJZKmZgiJM6kXZBxbje/SD
-6Jlz+muxNuCad6BAwoGNAcfMjL2Pffd543pMA03Z+/2HOCgs3ZqLVAjbZ/sbjP4o
-ki++t7JIp4Gh2F6Iw8w5QEFa0dzl2hCfL9oBTf0uRnz5LicKaTfukaMbasxEvxvH
-w9QRslBglwm9LiL1QYRmn81ApqkAgMEflZKf3vNI79sdd2H8f9/ulqRy0LY+/3gn
-r8uSFWkI22MQ4uaXrG7crPaizh5HmbmJtxLmodTNWRFnw2+F2EJOKL5ZVVkElauP
-N4C/DfD8HzpkMViBeNfiNfYgPym4jxZuPkjctUwH4fIa6n4KedaovetdhitNAgMB
-AAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBQzQejIORIVk0jyljIuWvXalF9TYDANBgkqhkiG9w0BAQsFAAOCAQEAFeNzV7EX
-tl9JaUSm9l56Z6zS3nVJq/4lVcc6yUQVEG6/MWvL2QeTfxyFYwDjMhLgzMv7OWyP
-4lPiPEAz2aSMR+atWPuJr+PehilWNCxFuBL6RIluLRQlKCQBZdbqUqwFblYSCT3Q
-dPTXvQbKqDqNVkL6jXI+dPEDct+HG14OelWWLDi3mIXNTTNEyZSPWjEwN0ujOhKz
-5zbRIWhLLTjmU64cJVYIVgNnhJ3Gw84kYsdMNs+wBkS39V8C3dlU6S+QTnrIToNA
-DJqXPDe/v+z28LSFdyjBC8hnghAXOKK3Buqbvzr46SMHv3TgmDgVVXjucgBcGaP0
-0jPg/73RVDkpDw==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem b/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
deleted file mode 100644
index 54625491ff15..000000000000
--- a/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G4.pem
+++ /dev/null
@@ -1,67 +0,0 @@
-##
-##  Symantec Class 2 Public Primary Certification Authority - G4
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            34:17:65:12:40:3b:b7:56:80:2d:80:cb:79:55:a6:1e
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 2 Public Primary Certification Authority - G4
-        Validity
-            Not Before: Oct  5 00:00:00 2011 GMT
-            Not After : Jan 18 23:59:59 2038 GMT
-        Subject: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 2 Public Primary Certification Authority - G4
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:d1:d9:4a:8e:4c:0d:84:4a:51:ba:7c:ef:d3:cc:
-                    fa:3a:9a:b5:a7:63:13:3d:01:e0:49:3e:fa:c1:47:
-                    c9:92:b3:3a:d7:fe:6f:9c:f7:9a:3a:0f:f5:0e:0a:
-                    0a:c3:3f:c8:e7:12:14:8e:d5:d5:6d:98:2c:b3:71:
-                    32:0a:eb:2a:bd:f6:d7:6a:20:0b:67:45:9c:d2:b2:
-                    bf:53:22:66:09:5d:db:11:f3:f1:05:33:58:a3:e2:
-                    b8:cf:7c:cd:82:9b:bd
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                3D:32:F3:3A:A9:0C:90:84:F9:A2:8C:69:06:61:54:2F:87:72:FE:05
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:66:02:31:00:c8:a6:a9:af:41:7f:b5:c9:11:42:16:68:69:
-        4c:5c:b8:27:18:b6:98:f1:c0:7f:90:6d:87:d3:8c:46:17:f0:
-        3e:4f:fc:ea:b0:08:c4:7a:4b:bc:08:2f:c7:e2:a7:6f:65:02:
-        31:00:d6:59:de:86:ce:5f:0e:ca:54:d5:c6:d0:15:0e:fc:8b:
-        94:72:d4:8e:00:58:53:cf:7e:b1:4b:0d:e5:50:86:eb:9e:6b:
-        df:ff:29:a6:d8:47:d9:a0:96:18:db:f2:45:b3
-SHA1 Fingerprint=67:24:90:2E:48:01:B0:22:96:40:10:46:B4:B1:67:2C:A9:75:FD:2B
------BEGIN CERTIFICATE-----
-MIICqDCCAi2gAwIBAgIQNBdlEkA7t1aALYDLeVWmHjAKBggqhkjOPQQDAzCBlDEL
-MAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYD
-VQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBD
-bGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0g
-RzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCBlDELMAkGA1UEBhMC
-VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1h
-bnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1
-YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcq
-hkjOPQIBBgUrgQQAIgNiAATR2UqOTA2ESlG6fO/TzPo6mrWnYxM9AeBJPvrBR8mS
-szrX/m+c95o6D/UOCgrDP8jnEhSO1dVtmCyzcTIK6yq99tdqIAtnRZzSsr9TImYJ
-XdsR8/EFM1ij4rjPfM2Cm72jQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
-BTADAQH/MB0GA1UdDgQWBBQ9MvM6qQyQhPmijGkGYVQvh3L+BTAKBggqhkjOPQQD
-AwNpADBmAjEAyKapr0F/tckRQhZoaUxcuCcYtpjxwH+QbYfTjEYX8D5P/OqwCMR6
-S7wIL8fip29lAjEA1lnehs5fDspU1cbQFQ78i5Ry1I4AWFPPfrFLDeVQhuuea9//
-KabYR9mglhjb8kWz
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem b/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
deleted file mode 100644
index dc08bee42f23..000000000000
--- a/secure/caroot/untrusted/Symantec_Class_2_Public_Primary_Certification_Authority_-_G6.pem
+++ /dev/null
@@ -1,93 +0,0 @@
-##
-##  Symantec Class 2 Public Primary Certification Authority - G6
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            64:82:9e:fc:37:1e:74:5d:fc:97:ff:97:c8:b1:ff:41
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 2 Public Primary Certification Authority - G6
-        Validity
-            Not Before: Oct 18 00:00:00 2011 GMT
-            Not After : Dec  1 23:59:59 2037 GMT
-        Subject: C=US, O=Symantec Corporation, OU=Symantec Trust Network, CN=Symantec Class 2 Public Primary Certification Authority - G6
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:cd:cc:e9:05:c8:63:85:cb:3f:40:63:17:bd:18:
-                    fa:35:e6:04:67:57:65:98:29:a4:4f:c9:5c:8f:0f:
-                    34:d2:f8:da:a8:13:62:aa:b8:1e:50:67:78:b0:16:
-                    4c:a0:39:a9:15:7a:ae:ed:d2:a2:c0:f0:90:37:29:
-                    18:26:5c:e8:0d:3c:b6:6c:49:3f:c1:e0:dc:d9:4b:
-                    b6:14:19:0b:a6:d3:96:e1:d6:09:e3:19:26:1c:f9:
-                    1f:65:4b:f9:1a:43:1c:00:83:d6:d0:aa:49:a2:d4:
-                    db:e6:62:38:ba:50:14:43:6d:f9:31:f8:56:16:d9:
-                    38:02:91:cf:eb:6c:dd:bb:39:4e:99:e1:30:67:45:
-                    f1:d4:f0:8d:c3:df:fe:f2:38:07:21:7d:00:5e:56:
-                    44:b3:e4:60:bd:91:2b:9c:ab:5b:04:72:0f:b2:28:
-                    d9:72:ab:05:20:42:25:a9:5b:03:6a:20:10:cc:31:
-                    f0:2b:da:35:2c:d0:fb:9a:97:4e:f0:82:4b:2b:d8:
-                    5f:36:a3:0b:2d:af:63:0d:1d:25:7f:a1:6e:5c:62:
-                    a1:8d:28:3e:a1:fc:1c:20:f8:01:2f:ba:55:9a:11:
-                    b0:19:d2:c8:50:79:6b:0e:6a:05:d7:aa:04:36:b2:
-                    a3:f2:e1:5f:77:a7:77:9c:e5:1e:dc:e9:df:6a:c1:
-                    65:5d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                87:8C:20:95:C8:98:4A:D1:D6:80:06:4A:90:34:44:DF:1C:4D:BF:B0
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        81:8e:b2:a5:66:96:b7:21:a5:b6:ef:6f:23:5a:5f:db:81:c5:
-        42:a5:78:c1:69:fd:f4:3c:d7:f9:5c:6b:70:72:1a:fc:5a:97:
-        4d:00:80:88:88:82:8a:c3:71:0d:8e:c5:89:9b:2c:ed:8d:0b:
-        d2:72:54:f5:7d:d4:5c:43:57:e9:f3:ae:a5:02:11:f6:76:2b:
-        81:57:dd:7d:da:74:30:fd:54:47:f6:e0:16:6e:a6:b4:0a:48:
-        e6:e7:75:07:0f:29:19:39:ce:79:f4:b6:6c:c5:5f:99:d5:1f:
-        4b:fa:df:6d:2c:3c:0d:54:80:70:f0:88:0b:80:cf:c6:68:a2:
-        b8:1d:70:d9:76:8c:fc:ee:a5:c9:cf:ad:1d:cf:99:25:57:5a:
-        62:45:cb:16:6b:bd:49:cd:a5:a3:8c:69:79:25:ae:b8:4c:6c:
-        8b:40:66:4b:16:3f:cf:02:1a:dd:e1:6c:6b:07:61:6a:76:15:
-        29:99:7f:1b:dd:88:80:c1:bf:b5:8f:73:c5:a6:96:23:84:a6:
-        28:86:24:33:6a:01:2e:57:73:25:b6:5e:bf:8f:e6:1d:61:a8:
-        40:29:67:1d:87:9b:1d:7f:9b:9f:99:cd:31:d6:54:be:62:bb:
-        39:ac:68:12:48:91:20:a5:cb:b1:dd:fe:6f:fc:5a:e4:82:55:
-        59:af:31:a9
-SHA1 Fingerprint=40:B3:31:A0:E9:BF:E8:55:BC:39:93:CA:70:4F:4E:C2:51:D4:1D:8F
------BEGIN CERTIFICATE-----
-MIID9jCCAt6gAwIBAgIQZIKe/DcedF38l/+XyLH/QTANBgkqhkiG9w0BAQsFADCB
-lDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8w
-HQYDVQQLExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRl
-YyBDbGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRzYwHhcNMTExMDE4MDAwMDAwWhcNMzcxMjAxMjM1OTU5WjCBlDELMAkGA1UE
-BhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZT
-eW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAy
-IFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwggEi
-MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDNzOkFyGOFyz9AYxe9GPo15gRn
-V2WYKaRPyVyPDzTS+NqoE2KquB5QZ3iwFkygOakVeq7t0qLA8JA3KRgmXOgNPLZs
-ST/B4NzZS7YUGQum05bh1gnjGSYc+R9lS/kaQxwAg9bQqkmi1NvmYji6UBRDbfkx
-+FYW2TgCkc/rbN27OU6Z4TBnRfHU8I3D3/7yOAchfQBeVkSz5GC9kSucq1sEcg+y
-KNlyqwUgQiWpWwNqIBDMMfAr2jUs0Pual07wgksr2F82owstr2MNHSV/oW5cYqGN
-KD6h/Bwg+AEvulWaEbAZ0shQeWsOagXXqgQ2sqPy4V93p3ec5R7c6d9qwWVdAgMB
-AAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQW
-BBSHjCCVyJhK0daABkqQNETfHE2/sDANBgkqhkiG9w0BAQsFAAOCAQEAgY6ypWaW
-tyGltu9vI1pf24HFQqV4wWn99DzX+VxrcHIa/FqXTQCAiIiCisNxDY7FiZss7Y0L
-0nJU9X3UXENX6fOupQIR9nYrgVfdfdp0MP1UR/bgFm6mtApI5ud1Bw8pGTnOefS2
-bMVfmdUfS/rfbSw8DVSAcPCIC4DPxmiiuB1w2XaM/O6lyc+tHc+ZJVdaYkXLFmu9
-Sc2lo4xpeSWuuExsi0BmSxY/zwIa3eFsawdhanYVKZl/G92IgMG/tY9zxaaWI4Sm
-KIYkM2oBLldzJbZev4/mHWGoQClnHYebHX+bn5nNMdZUvmK7OaxoEkiRIKXLsd3+
-b/xa5IJVWa8xqQ==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/TWCA_Global_Root_CA_G2.pem b/secure/caroot/untrusted/TWCA_Global_Root_CA_G2.pem
new file mode 100644
index 000000000000..5075b26ce80c
--- /dev/null
+++ b/secure/caroot/untrusted/TWCA_Global_Root_CA_G2.pem
@@ -0,0 +1,134 @@
+##
+##  TWCA Global Root CA G2
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            40:01:34:8c:c2:00:00:00:00:00:00:00:01:97:58:f4
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=TW, O=TAIWAN-CA, OU=Root CA, CN=TWCA Global Root CA G2
+        Validity
+            Not Before: Nov 22 06:42:21 2022 GMT
+            Not After : Nov 22 15:59:59 2047 GMT
+        Subject: C=TW, O=TAIWAN-CA, OU=Root CA, CN=TWCA Global Root CA G2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:aa:0e:d5:20:92:01:ad:82:f9:0c:08:91:34:6b:
+                    8a:16:d0:46:16:ff:03:b8:d8:8d:ea:93:34:fb:ff:
+                    2b:bd:fd:6e:aa:dc:9b:f2:86:81:55:f5:89:1c:c4:
+                    8d:75:6a:58:78:91:13:1e:02:13:70:3d:ef:be:0a:
+                    e7:00:8f:b8:31:e5:74:c5:30:be:ff:7d:d6:99:e5:
+                    c2:42:a3:cf:21:d6:b3:08:7f:91:d5:61:e6:a2:95:
+                    10:0d:ef:5e:97:0b:49:38:d5:22:b0:d7:8b:59:6f:
+                    9f:35:9b:7f:d2:91:cc:7a:7f:bb:a0:9f:de:55:33:
+                    f6:4b:8d:0a:ea:7d:09:c0:79:dc:bd:44:e2:fe:1c:
+                    e7:64:21:28:cf:04:4a:e2:b4:bf:86:79:2a:bb:0e:
+                    93:c9:8f:5e:ac:30:39:52:90:07:b9:ea:9c:26:42:
+                    14:c4:67:46:fe:d1:1a:68:a1:3e:50:19:a3:26:0a:
+                    27:29:90:c2:f6:b4:eb:73:9a:78:1e:e1:98:f4:65:
+                    0c:35:21:06:f8:0b:de:62:e5:4d:c1:b3:5d:d9:b9:
+                    fa:61:97:2a:e3:ea:c7:44:55:24:92:fe:12:a7:3f:
+                    c4:77:e0:2d:02:81:07:d5:fb:7d:e6:10:9e:3a:b4:
+                    a8:ef:ec:fb:50:ea:35:cf:cc:7e:bb:42:b9:44:6c:
+                    52:e9:bf:2a:72:1f:3f:de:9b:70:e9:dc:5a:c5:3b:
+                    bb:bf:f0:59:85:af:2f:c1:b0:14:79:05:ac:75:9f:
+                    25:f5:11:27:06:60:21:c7:6d:65:be:a8:89:9c:e5:
+                    ac:46:df:f8:5d:44:03:8d:60:bd:f7:b1:0d:cc:2f:
+                    ef:41:54:2f:ee:6b:95:b9:4e:7c:34:df:3b:f9:77:
+                    9d:7d:cd:07:3d:1c:06:33:12:80:ec:72:9c:f2:2d:
+                    82:da:d5:3b:c4:c7:f9:04:c3:64:02:7c:f5:35:60:
+                    a7:b4:46:29:2e:1b:ef:a5:58:80:2e:7a:89:51:38:
+                    36:3c:fd:a1:77:b8:80:30:d0:8a:de:8d:a7:34:26:
+                    ec:23:bb:18:55:18:36:45:ee:ed:01:06:aa:4d:bf:
+                    64:0c:ca:98:97:1a:31:02:66:f8:78:68:5b:88:df:
+                    09:a8:e7:9b:fa:34:6d:70:1c:21:ad:08:8b:f2:a1:
+                    b6:ac:76:6a:bf:f1:80:25:00:be:3c:1e:4d:ae:b9:
+                    3c:b6:95:63:bd:6b:7e:47:12:90:55:45:11:8d:ec:
+                    17:1f:c1:be:27:81:93:57:63:69:00:26:77:8b:c3:
+                    59:e5:7b:d1:0d:44:f2:a8:f0:f7:85:9a:05:f7:c2:
+                    2e:70:9a:93:85:d8:95:90:31:90:54:a6:ec:0b:9f:
+                    37:45:0f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                92:8C:D4:36:D1:5B:47:53:C4:71:0D:84:DD:64:2A:F5:36:64:40:E7
+            X509v3 Subject Key Identifier: 
+                92:8C:D4:36:D1:5B:47:53:C4:71:0D:84:DD:64:2A:F5:36:64:40:E7
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        25:fc:4b:da:90:b4:da:75:e7:41:3a:81:d1:a6:fe:a0:6a:f3:
+        18:71:62:6a:24:08:8b:a9:7a:4d:c9:55:ce:cf:10:28:2e:04:
+        19:96:05:cf:5d:02:20:2a:3b:b3:55:3f:01:cd:42:cd:b2:77:
+        ed:ff:75:f3:7c:77:db:96:a5:cf:8c:67:06:f4:a4:9b:72:f6:
+        21:49:09:98:a3:32:5e:77:5a:63:09:ef:62:43:97:02:38:b5:
+        ea:3c:18:50:68:fc:59:5b:d9:79:d4:f1:e4:56:48:13:56:d8:
+        d3:71:0b:5e:78:94:38:11:45:fa:05:17:f5:0e:75:1e:62:52:
+        61:46:ba:2e:19:ad:86:b4:88:0f:b1:50:e6:40:00:34:1a:95:
+        9d:93:e0:51:f9:d4:55:46:e9:95:3c:25:86:2e:97:d7:01:31:
+        18:44:ec:1c:60:e9:7d:69:af:32:f8:97:40:25:24:b6:8d:1a:
+        55:3c:c5:b7:f7:bc:06:52:3b:71:30:70:3e:71:17:7e:f1:66:
+        04:5e:5d:bc:8a:31:43:a6:92:1d:7b:54:d2:a5:36:8b:6f:8d:
+        d6:5e:da:d4:c3:2e:1d:df:39:55:60:82:30:9e:27:ff:8e:80:
+        dd:63:4c:a6:55:35:d8:d0:33:a9:80:6d:3e:5e:9d:cc:a8:67:
+        80:66:fa:99:57:0c:52:ca:19:75:b0:38:35:55:2a:81:c5:8c:
+        1e:56:d7:5f:90:f2:20:d8:da:e0:66:71:e9:b2:78:ab:67:b9:
+        24:6e:6b:36:72:fc:6f:8d:fd:7f:72:39:28:67:52:91:05:1f:
+        57:65:d2:a3:a7:0d:61:fa:a1:e7:d5:35:46:95:c9:06:87:f6:
+        30:ec:32:51:a9:ac:56:c0:21:4e:a3:14:74:05:3a:bc:e3:bf:
+        6d:3d:4e:3f:5e:a5:a4:6d:29:bf:84:51:75:53:8e:86:1a:f5:
+        51:70:2a:0d:1c:4e:40:e1:fd:a3:e3:a5:2b:67:90:92:c7:6c:
+        ae:85:bf:3a:9b:17:15:ca:9c:2a:93:d4:4d:39:0d:bc:20:08:
+        a3:8d:88:6c:09:0d:8c:ae:44:21:4d:c9:71:ec:d8:26:d7:17:
+        9e:2d:11:18:3c:a3:22:7d:b8:27:54:bf:68:c8:3b:42:cc:8f:
+        5e:4e:e7:dc:c2:c5:fa:6a:44:0f:8d:56:88:7a:df:89:84:6c:
+        a0:b3:3e:3d:f1:65:00:09:88:ea:2a:eb:40:ce:b3:5d:ac:32:
+        17:ae:c1:9b:e9:d0:c1:f5:49:94:dd:a7:ce:7c:5a:07:eb:ae:
+        20:9c:17:30:92:69:93:72:f3:9a:5b:71:9b:fe:6a:df:7a:30:
+        69:8e:b3:2e:db:0f:2c:dd
+SHA1 Fingerprint=73:FE:92:2F:83:63:91:FF:C8:C6:C4:DA:D6:20:2F:6B:07:2E:7F:1B
+-----BEGIN CERTIFICATE-----
+MIIFlTCCA32gAwIBAgIQQAE0jMIAAAAAAAAAAZdY9DANBgkqhkiG9w0BAQwFADBU
+MQswCQYDVQQGEwJUVzESMBAGA1UEChMJVEFJV0FOLUNBMRAwDgYDVQQLEwdSb290
+IENBMR8wHQYDVQQDExZUV0NBIEdsb2JhbCBSb290IENBIEcyMB4XDTIyMTEyMjA2
+NDIyMVoXDTQ3MTEyMjE1NTk1OVowVDELMAkGA1UEBhMCVFcxEjAQBgNVBAoTCVRB
+SVdBTi1DQTEQMA4GA1UECxMHUm9vdCBDQTEfMB0GA1UEAxMWVFdDQSBHbG9iYWwg
+Um9vdCBDQSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAKoO1SCS
+Aa2C+QwIkTRrihbQRhb/A7jYjeqTNPv/K739bqrcm/KGgVX1iRzEjXVqWHiREx4C
+E3A9774K5wCPuDHldMUwvv991pnlwkKjzyHWswh/kdVh5qKVEA3vXpcLSTjVIrDX
+i1lvnzWbf9KRzHp/u6Cf3lUz9kuNCup9CcB53L1E4v4c52QhKM8ESuK0v4Z5KrsO
+k8mPXqwwOVKQB7nqnCZCFMRnRv7RGmihPlAZoyYKJymQwva063OaeB7hmPRlDDUh
+BvgL3mLlTcGzXdm5+mGXKuPqx0RVJJL+Eqc/xHfgLQKBB9X7feYQnjq0qO/s+1Dq
+Nc/MfrtCuURsUum/KnIfP96bcOncWsU7u7/wWYWvL8GwFHkFrHWfJfURJwZgIcdt
+Zb6oiZzlrEbf+F1EA41gvfexDcwv70FUL+5rlblOfDTfO/l3nX3NBz0cBjMSgOxy
+nPItgtrVO8TH+QTDZAJ89TVgp7RGKS4b76VYgC56iVE4Njz9oXe4gDDQit6NpzQm
+7CO7GFUYNkXu7QEGqk2/ZAzKmJcaMQJm+HhoW4jfCajnm/o0bXAcIa0Ii/Khtqx2
+ar/xgCUAvjweTa65PLaVY71rfkcSkFVFEY3sFx/BvieBk1djaQAmd4vDWeV70Q1E
+8qjw94WaBffCLnCak4XYlZAxkFSm7AufN0UPAgMBAAGjYzBhMA4GA1UdDwEB/wQE
+AwIBBjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFJKM1DbRW0dTxHENhN1k
+KvU2ZEDnMB0GA1UdDgQWBBSSjNQ20VtHU8RxDYTdZCr1NmRA5zANBgkqhkiG9w0B
+AQwFAAOCAgEAJfxL2pC02nXnQTqB0ab+oGrzGHFiaiQIi6l6TclVzs8QKC4EGZYF
+z10CICo7s1U/Ac1CzbJ37f9183x325alz4xnBvSkm3L2IUkJmKMyXndaYwnvYkOX
+Aji16jwYUGj8WVvZedTx5FZIE1bY03ELXniUOBFF+gUX9Q51HmJSYUa6LhmthrSI
+D7FQ5kAANBqVnZPgUfnUVUbplTwlhi6X1wExGETsHGDpfWmvMviXQCUkto0aVTzF
+t/e8BlI7cTBwPnEXfvFmBF5dvIoxQ6aSHXtU0qU2i2+N1l7a1MMuHd85VWCCMJ4n
+/46A3WNMplU12NAzqYBtPl6dzKhngGb6mVcMUsoZdbA4NVUqgcWMHlbXX5DyINja
+4GZx6bJ4q2e5JG5rNnL8b439f3I5KGdSkQUfV2XSo6cNYfqh59U1RpXJBof2MOwy
+UamsVsAhTqMUdAU6vOO/bT1OP16lpG0pv4RRdVOOhhr1UXAqDRxOQOH9o+OlK2eQ
+ksdsroW/OpsXFcqcKpPUTTkNvCAIo42IbAkNjK5EIU3JcezYJtcXni0RGDyjIn24
+J1S/aMg7QsyPXk7n3MLF+mpED41WiHrfiYRsoLM+PfFlAAmI6irrQM6zXawyF67B
+m+nQwfVJlN2nznxaB+uuIJwXMJJpk3Lzmltxm/5q33owaY6zLtsPLN0=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Taiwan_GRCA.pem b/secure/caroot/untrusted/Taiwan_GRCA.pem
deleted file mode 100644
index aa93a2b0e215..000000000000
--- a/secure/caroot/untrusted/Taiwan_GRCA.pem
+++ /dev/null
@@ -1,132 +0,0 @@
-##
-##  Taiwan GRCA
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            1f:9d:59:5a:d7:2f:c2:06:44:a5:80:08:69:e3:5e:f6
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=TW, O=Government Root Certification Authority
-        Validity
-            Not Before: Dec  5 13:23:33 2002 GMT
-            Not After : Dec  5 13:23:33 2032 GMT
-        Subject: C=TW, O=Government Root Certification Authority
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:9a:25:b8:ec:cc:a2:75:a8:7b:f7:ce:5b:59:8a:
-                    c9:d1:86:12:08:54:ec:9c:f2:e7:46:f6:88:f3:7c:
-                    e9:a5:df:4c:47:36:a4:1b:01:1c:7f:1e:57:8a:8d:
-                    c3:c5:d1:21:e3:da:24:3f:48:2b:fb:9f:2e:a1:94:
-                    e7:2c:1c:93:d1:bf:1b:01:87:53:99:ce:a7:f5:0a:
-                    21:76:77:ff:a9:b7:c6:73:94:4f:46:f7:10:49:37:
-                    fa:a8:59:49:5d:6a:81:07:56:f2:8a:f9:06:d0:f7:
-                    70:22:4d:b4:b7:41:b9:32:b8:b1:f0:b1:c3:9c:3f:
-                    70:fd:53:dd:81:aa:d8:63:78:f6:d8:53:6e:a1:ac:
-                    6a:84:24:72:54:86:c6:d2:b2:ca:1c:0e:79:81:d6:
-                    b5:70:62:08:01:2e:4e:4f:0e:d5:11:af:a9:af:e5:
-                    9a:bf:dc:cc:87:6d:26:e4:c9:57:a2:fb:96:f9:cc:
-                    e1:3f:53:8c:6c:4c:7e:9b:53:08:0b:6c:17:fb:67:
-                    c8:c2:ad:b1:cd:80:b4:97:dc:76:01:16:15:e9:6a:
-                    d7:a4:e1:78:47:ce:86:d5:fb:31:f3:fa:31:be:34:
-                    aa:28:fb:70:4c:1d:49:c7:af:2c:9d:6d:66:a6:b6:
-                    8d:64:7e:b5:20:6a:9d:3b:81:b6:8f:40:00:67:4b:
-                    89:86:b8:cc:65:fe:15:53:e9:04:c1:d6:5f:1d:44:
-                    d7:0a:2f:27:9a:46:7d:a1:0d:75:ad:54:86:15:dc:
-                    49:3b:f1:96:ce:0f:9b:a0:ec:a3:7a:5d:be:d5:2a:
-                    75:42:e5:7b:de:a5:b6:aa:af:28:ac:ac:90:ac:38:
-                    b7:d5:68:35:26:7a:dc:f7:3b:f3:fd:45:9b:d1:bb:
-                    43:78:6e:6f:f1:42:54:6a:98:f0:0d:ad:97:e9:52:
-                    5e:e9:d5:6a:72:de:6a:f7:1b:60:14:f4:a5:e4:b6:
-                    71:67:aa:1f:ea:e2:4d:c1:42:40:fe:67:46:17:38:
-                    2f:47:3f:71:9c:ae:e5:21:ca:61:2d:6d:07:a8:84:
-                    7c:2d:ee:51:25:f1:63:90:9e:fd:e1:57:88:6b:ef:
-                    8a:23:6d:b1:e6:bd:3f:ad:d1:3d:96:0b:85:8d:cd:
-                    6b:27:bb:b7:05:9b:ec:bb:91:a9:0a:07:12:02:97:
-                    4e:20:90:f0:ff:0d:1e:e2:41:3b:d3:40:3a:e7:8d:
-                    5d:da:66:e4:02:b0:07:52:98:5c:0e:8e:33:9c:c2:
-                    a6:95:fb:55:19:6e:4c:8e:ae:4b:0f:bd:c1:38:4d:
-                    5e:8f:84:1d:66:cd:c5:60:96:b4:52:5a:05:89:8e:
-                    95:7a:98:c1:91:3c:95:23:b2:0e:f4:79:b4:c9:7c:
-                    c1:4a:21
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                CC:CC:EF:CC:29:60:A4:3B:B1:92:B6:3C:FA:32:62:8F:AC:25:15:3B
-            X509v3 Basic Constraints: 
-                CA:TRUE
-            setCext-hashedRoot: 
-                0/0-...0...+......0...g*........"...(6....2.1:.Qe
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        40:80:4a:fa:26:c9:ce:5e:30:dd:4f:86:74:76:58:f5:ae:b3:
-        83:33:78:a4:7a:74:17:19:4e:e9:52:b5:b9:e0:0a:74:62:aa:
-        68:ca:78:a0:4c:9a:8e:2c:23:2e:d5:6a:12:24:bf:d4:68:d3:
-        8a:d0:d8:9c:9f:b4:1f:0c:de:38:7e:57:38:fc:8d:e2:4f:5e:
-        0c:9f:ab:3b:d2:ff:75:97:cb:a4:e3:67:08:ff:e5:c0:16:b5:
-        48:01:7d:e9:f9:0a:ff:1b:e5:6a:69:bf:78:21:a8:c2:a7:23:
-        a9:86:ab:76:56:e8:0e:0c:f6:13:dd:2a:66:8a:64:49:3d:1a:
-        18:87:90:04:9f:42:52:b7:4f:cb:fe:47:41:76:35:ef:ff:00:
-        76:36:45:32:9b:c6:46:85:5d:e2:24:b0:1e:e3:48:96:98:57:
-        47:94:55:7a:0f:41:b1:44:24:f3:c1:fe:1a:6b:bf:88:fd:c1:
-        a6:da:93:60:5e:81:4a:99:20:9c:48:66:19:b5:00:79:54:0f:
-        b8:2c:2f:4b:bc:a9:5d:5b:60:7f:8c:87:a5:e0:52:63:2a:be:
-        d8:3b:85:40:15:fe:1e:b6:65:3f:c5:4b:da:7e:b5:7a:35:29:
-        a3:2e:7a:98:60:22:a3:f4:7d:27:4e:2d:ea:b4:74:3c:e9:0f:
-        a4:33:0f:10:11:bc:13:01:d6:e5:0e:d3:bf:b5:12:a2:e1:45:
-        23:c0:cc:08:6e:61:b7:89:ab:83:e3:24:1e:e6:5d:07:e7:1f:
-        20:3e:cf:67:c8:e7:ac:30:6d:27:4b:68:6e:4b:2a:5c:02:08:
-        34:db:f8:76:e4:67:a3:26:9c:3f:a2:32:c2:4a:c5:81:18:31:
-        10:56:aa:84:ef:2d:0a:ff:b8:1f:77:d2:bf:a5:58:a0:62:e4:
-        d7:4b:91:75:8d:89:80:98:7e:6d:cb:53:4e:5e:af:f6:b2:97:
-        85:97:b9:da:55:06:b9:24:ee:d7:c6:38:1e:63:1b:12:3b:95:
-        e1:58:ac:f2:df:84:d5:5f:99:2f:0d:55:5b:e6:38:db:2e:3f:
-        72:e9:48:85:cb:bb:29:13:8f:1e:38:55:b9:f3:b2:c4:30:99:
-        23:4e:5d:f2:48:a1:12:0c:dc:12:90:09:90:54:91:03:3c:47:
-        e5:d5:c9:65:e0:b7:4b:7d:ec:47:d3:b3:0b:3e:ad:9e:d0:74:
-        00:0e:eb:bd:51:ad:c0:de:2c:c0:c3:6a:fe:ef:dc:0b:a7:fa:
-        46:df:60:db:9c:a6:59:50:75:23:69:73:93:b2:f9:fc:02:d3:
-        47:e6:71:ce:10:02:ee:27:8c:84:ff:ac:45:0d:13:5c:83:32:
-        e0:25:a5:86:2c:7c:f4:12
-SHA1 Fingerprint=F4:8B:11:BF:DE:AB:BE:94:54:20:71:E6:41:DE:6B:BE:88:2B:40:B9
------BEGIN CERTIFICATE-----
-MIIFcjCCA1qgAwIBAgIQH51ZWtcvwgZEpYAIaeNe9jANBgkqhkiG9w0BAQUFADA/
-MQswCQYDVQQGEwJUVzEwMC4GA1UECgwnR292ZXJubWVudCBSb290IENlcnRpZmlj
-YXRpb24gQXV0aG9yaXR5MB4XDTAyMTIwNTEzMjMzM1oXDTMyMTIwNTEzMjMzM1ow
-PzELMAkGA1UEBhMCVFcxMDAuBgNVBAoMJ0dvdmVybm1lbnQgUm9vdCBDZXJ0aWZp
-Y2F0aW9uIEF1dGhvcml0eTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
-AJoluOzMonWoe/fOW1mKydGGEghU7Jzy50b2iPN86aXfTEc2pBsBHH8eV4qNw8XR
-IePaJD9IK/ufLqGU5ywck9G/GwGHU5nOp/UKIXZ3/6m3xnOUT0b3EEk3+qhZSV1q
-gQdW8or5BtD3cCJNtLdBuTK4sfCxw5w/cP1T3YGq2GN49thTbqGsaoQkclSGxtKy
-yhwOeYHWtXBiCAEuTk8O1RGvqa/lmr/czIdtJuTJV6L7lvnM4T9TjGxMfptTCAts
-F/tnyMKtsc2AtJfcdgEWFelq16TheEfOhtX7MfP6Mb40qij7cEwdScevLJ1tZqa2
-jWR+tSBqnTuBto9AAGdLiYa4zGX+FVPpBMHWXx1E1wovJ5pGfaENda1UhhXcSTvx
-ls4Pm6Dso3pdvtUqdULle96ltqqvKKyskKw4t9VoNSZ63Pc78/1Fm9G7Q3hub/FC
-VGqY8A2tl+lSXunVanLeavcbYBT0peS2cWeqH+riTcFCQP5nRhc4L0c/cZyu5SHK
-YS1tB6iEfC3uUSXxY5Ce/eFXiGvviiNtsea9P63RPZYLhY3Naye7twWb7LuRqQoH
-EgKXTiCQ8P8NHuJBO9NAOueNXdpm5AKwB1KYXA6OM5zCppX7VRluTI6uSw+9wThN
-Xo+EHWbNxWCWtFJaBYmOlXqYwZE8lSOyDvR5tMl8wUohAgMBAAGjajBoMB0GA1Ud
-DgQWBBTMzO/MKWCkO7GStjz6MmKPrCUVOzAMBgNVHRMEBTADAQH/MDkGBGcqBwAE
-MTAvMC0CAQAwCQYFKw4DAhoFADAHBgVnKgMAAAQUA5vwIhP/lSg209yewDL7MTqK
-UWUwDQYJKoZIhvcNAQEFBQADggIBAECASvomyc5eMN1PhnR2WPWus4MzeKR6dBcZ
-TulStbngCnRiqmjKeKBMmo4sIy7VahIkv9Ro04rQ2JyftB8M3jh+Vzj8jeJPXgyf
-qzvS/3WXy6TjZwj/5cAWtUgBfen5Cv8b5Wppv3ghqMKnI6mGq3ZW6A4M9hPdKmaK
-ZEk9GhiHkASfQlK3T8v+R0F2Ne//AHY2RTKbxkaFXeIksB7jSJaYV0eUVXoPQbFE
-JPPB/hprv4j9wabak2BegUqZIJxIZhm1AHlUD7gsL0u8qV1bYH+Mh6XgUmMqvtg7
-hUAV/h62ZT/FS9p+tXo1KaMuephgIqP0fSdOLeq0dDzpD6QzDxARvBMB1uUO07+1
-EqLhRSPAzAhuYbeJq4PjJB7mXQfnHyA+z2fI56wwbSdLaG5LKlwCCDTb+HbkZ6Mm
-nD+iMsJKxYEYMRBWqoTvLQr/uB930r+lWKBi5NdLkXWNiYCYfm3LU05er/ayl4WX
-udpVBrkk7tfGOB5jGxI7leFYrPLfhNVfmS8NVVvmONsuP3LpSIXLuykTjx44Vbnz
-ssQwmSNOXfJIoRIM3BKQCZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDe
-LMDDav7v3Aun+kbfYNucpllQdSNpc5Oy+fwC00fmcc4QAu4njIT/rEUNE1yDMuAl
-pYYsfPQS
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Telekom_Security_SMIME_ECC_Root_2021.pem b/secure/caroot/untrusted/Telekom_Security_SMIME_ECC_Root_2021.pem
new file mode 100644
index 000000000000..4146cf74781b
--- /dev/null
+++ b/secure/caroot/untrusted/Telekom_Security_SMIME_ECC_Root_2021.pem
@@ -0,0 +1,65 @@
+##
+##  Telekom Security SMIME ECC Root 2021
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            15:2a:dd:14:c9:18:d1:a4:56:40:86:a6:25:af:07:5f
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=DE, O=Deutsche Telekom Security GmbH, CN=Telekom Security SMIME ECC Root 2021
+        Validity
+            Not Before: Mar 18 11:08:30 2021 GMT
+            Not After : Mar 17 23:59:59 2046 GMT
+        Subject: C=DE, O=Deutsche Telekom Security GmbH, CN=Telekom Security SMIME ECC Root 2021
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:b0:19:8f:a2:6b:b5:c7:cd:0f:30:99:37:0c:c3:
+                    60:5b:f1:f1:27:20:55:3d:c0:92:8b:ab:57:a1:6f:
+                    73:83:21:c2:43:13:0c:5e:89:aa:c7:05:35:79:93:
+                    62:90:d6:5d:13:1f:d1:7a:a0:bc:9e:10:a7:66:7c:
+                    46:0a:b0:57:6c:bf:e6:54:39:38:21:6c:12:5c:71:
+                    cc:d3:5a:5f:6d:b7:a7:86:df:b3:df:ee:c2:e7:89:
+                    41:96:35:f6:2f:4a:b5
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                2B:CB:01:0C:63:C3:53:12:A5:A8:57:AF:D0:9C:83:FB:BD:90:3A:4B
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:65:02:31:00:d6:bc:48:92:87:47:03:c7:70:3b:25:b6:1f:
+        ae:46:67:73:74:00:27:4b:e4:a5:04:a2:03:df:5e:28:ad:6e:
+        5e:03:c8:dd:68:9c:b6:bf:94:10:48:95:2f:0f:ff:18:8b:02:
+        30:01:40:33:9e:97:97:4d:05:f2:74:54:0c:cd:39:fd:6a:6b:
+        09:c1:24:3f:61:8e:38:a1:b7:e8:d7:44:15:11:62:ff:0e:61:
+        37:47:4b:40:7f:4a:5f:b2:67:5a:73:75:c2
+SHA1 Fingerprint=B7:F9:1D:98:EC:25:93:F3:50:14:84:9A:A8:7E:22:10:3C:C4:39:27
+-----BEGIN CERTIFICATE-----
+MIICRzCCAc2gAwIBAgIQFSrdFMkY0aRWQIamJa8HXzAKBggqhkjOPQQDAzBlMQsw
+CQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBH
+bWJIMS0wKwYDVQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIEVDQyBSb290IDIw
+MjEwHhcNMjEwMzE4MTEwODMwWhcNNDYwMzE3MjM1OTU5WjBlMQswCQYDVQQGEwJE
+RTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMS0wKwYD
+VQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIEVDQyBSb290IDIwMjEwdjAQBgcq
+hkjOPQIBBgUrgQQAIgNiAASwGY+ia7XHzQ8wmTcMw2Bb8fEnIFU9wJKLq1ehb3OD
+IcJDEwxeiarHBTV5k2KQ1l0TH9F6oLyeEKdmfEYKsFdsv+ZUOTghbBJccczTWl9t
+t6eG37Pf7sLniUGWNfYvSrWjQjBAMB0GA1UdDgQWBBQrywEMY8NTEqWoV6/QnIP7
+vZA6SzAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQD
+AwNoADBlAjEA1rxIkodHA8dwOyW2H65GZ3N0ACdL5KUEogPfXiitbl4DyN1onLa/
+lBBIlS8P/xiLAjABQDOel5dNBfJ0VAzNOf1qawnBJD9hjjiht+jXRBURYv8OYTdH
+S0B/Sl+yZ1pzdcI=
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Telekom_Security_SMIME_RSA_Root_2023.pem b/secure/caroot/untrusted/Telekom_Security_SMIME_RSA_Root_2023.pem
new file mode 100644
index 000000000000..2f1a77771c04
--- /dev/null
+++ b/secure/caroot/untrusted/Telekom_Security_SMIME_RSA_Root_2023.pem
@@ -0,0 +1,135 @@
+##
+##  Telekom Security SMIME RSA Root 2023
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            0c:7e:62:f5:79:73:3b:9d:43:8e:8b:63:ed:91:95:b8
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=DE, O=Deutsche Telekom Security GmbH, CN=Telekom Security SMIME RSA Root 2023
+        Validity
+            Not Before: Mar 28 12:09:22 2023 GMT
+            Not After : Mar 27 23:59:59 2048 GMT
+        Subject: C=DE, O=Deutsche Telekom Security GmbH, CN=Telekom Security SMIME RSA Root 2023
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:ef:c5:0e:8b:be:32:d2:67:47:ff:0a:4c:67:b3:
+                    2a:bf:c8:c3:c5:91:eb:b5:c7:1e:91:e1:66:a8:88:
+                    8b:55:20:80:1f:51:5e:77:97:9e:19:0a:5c:c7:6b:
+                    37:21:7c:03:36:01:f4:88:25:d9:a8:2e:41:aa:fc:
+                    d8:26:e0:96:40:62:79:ae:57:9e:03:38:1a:1c:b2:
+                    77:14:3e:e9:a1:72:d0:e4:e0:37:d1:17:46:ed:50:
+                    5c:7a:58:c5:f8:2b:f7:75:2f:cf:81:9e:5a:2c:b7:
+                    3a:ac:a0:59:98:04:51:0c:ff:49:c5:50:fd:1e:d3:
+                    47:85:4b:33:4f:a2:37:b5:af:04:9a:27:32:9d:56:
+                    d5:3f:55:61:e3:8b:6f:ae:51:fe:97:fe:69:07:fa:
+                    62:5b:26:e6:14:79:15:a5:13:38:ae:5f:37:be:94:
+                    4a:d6:0d:80:16:69:a4:91:b2:3a:49:98:75:9d:46:
+                    10:8a:5c:7a:7f:84:a5:e8:af:1e:c7:ab:b3:5a:46:
+                    b5:a3:4b:f5:a6:23:36:00:46:b1:db:05:b6:1b:ce:
+                    9e:7a:32:5c:9a:d5:72:c3:9d:86:4d:2b:84:d3:1e:
+                    b5:88:da:10:78:9c:22:c3:3b:23:b5:eb:13:07:bd:
+                    6f:53:ec:9b:ec:9b:d3:65:f5:07:09:e3:5d:a7:99:
+                    b5:7e:86:8e:d5:02:ff:b7:85:09:e3:47:14:dd:96:
+                    66:18:34:de:08:d5:df:cb:18:99:62:0b:2b:ec:00:
+                    5d:52:44:d3:c6:96:fc:32:56:25:91:cf:cd:19:3b:
+                    95:39:3e:02:87:99:63:b6:d5:3e:34:7a:0f:11:75:
+                    81:bc:7d:04:ca:60:b4:28:75:d7:02:51:dd:52:00:
+                    2e:c7:fd:89:f1:5c:f3:cb:a4:27:12:38:8f:bb:fb:
+                    89:f0:e4:c4:38:2c:be:82:a0:71:61:62:91:8f:48:
+                    0c:2f:2b:a9:b0:f1:cb:10:04:e7:74:bf:37:90:ef:
+                    4f:2a:43:35:97:12:c6:2a:70:0d:de:2c:55:47:79:
+                    63:29:f5:ca:1f:6a:06:52:1c:ae:2d:24:22:83:22:
+                    af:d0:aa:30:b7:2a:1f:ff:65:23:58:65:93:c8:8e:
+                    7d:40:10:31:86:78:d9:55:cb:3c:30:f0:de:51:2a:
+                    00:36:d2:27:45:5f:d8:e8:a1:21:3d:7e:46:56:3b:
+                    29:45:f1:1d:05:09:ce:b6:43:30:dc:45:90:10:30:
+                    4c:a4:6b:86:8b:3f:3d:2f:31:91:71:ef:26:b9:f6:
+                    be:9d:b0:6c:df:11:ee:58:3f:43:79:86:39:80:f1:
+                    26:17:07:98:f0:99:aa:30:2c:43:59:14:ce:ed:e2:
+                    40:13:85
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                9A:CE:AC:2A:EC:01:FA:65:70:DE:97:9D:F1:D2:00:8C:A5:A3:64:BB
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                9A:CE:AC:2A:EC:01:FA:65:70:DE:97:9D:F1:D2:00:8C:A5:A3:64:BB
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        e3:50:fd:f5:40:16:22:09:96:3a:0d:a9:ef:81:e7:2e:32:f0:
+        a1:f1:49:5e:7b:88:0d:04:72:d7:be:67:a8:ba:1d:ee:50:bb:
+        72:6e:7a:d1:bb:0c:72:30:46:c8:d5:d7:02:12:16:99:4e:1e:
+        df:5a:96:ee:8f:91:be:ae:86:f8:10:77:a5:c4:6e:47:61:c0:
+        f2:26:d9:4f:61:68:05:48:75:08:15:a5:a1:7b:d5:b8:b3:89:
+        79:e6:ed:f1:f3:61:00:86:7b:2e:31:fe:a3:5c:f8:79:3d:b4:
+        5b:88:7b:e0:23:bb:0d:a1:17:fa:cb:68:0d:98:77:71:08:e2:
+        6d:43:74:6b:c4:36:c5:94:41:a4:00:d6:57:2d:99:8a:8b:20:
+        12:15:02:32:0e:d2:49:ec:81:48:c5:6a:27:52:d7:b2:73:55:
+        53:96:3c:9e:4f:4c:b5:a0:d0:4f:57:d0:67:28:48:64:be:c6:
+        b8:ba:ec:64:cf:c8:7b:c5:6a:e7:2a:e6:59:57:b6:d6:d4:d6:
+        c0:67:5c:d9:9e:28:09:40:bf:f3:a9:35:31:65:60:03:cb:19:
+        6c:82:95:03:1e:5f:3f:e1:bd:ea:49:71:e5:5b:b7:0b:47:16:
+        1b:20:89:6d:94:99:0c:7e:88:6c:1d:0d:f4:b7:21:1a:59:97:
+        ac:cb:e8:be:17:1f:95:7c:53:9b:af:50:52:aa:8d:0b:2e:af:
+        5a:d7:60:f2:2a:69:2a:b9:ee:54:70:18:aa:bd:f5:a1:3f:d2:
+        dd:a1:63:19:00:f8:a7:0c:eb:a3:79:f2:70:59:a3:f8:a2:12:
+        03:ec:13:ff:e4:02:86:36:d7:c1:c3:a4:b5:d4:a4:c2:37:45:
+        b6:94:70:3d:c5:bd:eb:a3:15:1d:e3:36:7a:15:69:2a:56:34:
+        39:cf:a5:9a:36:aa:c8:ed:79:bc:cf:f6:ce:04:53:0b:da:b2:
+        50:23:7c:bc:3e:26:ad:f0:0e:43:bb:26:cb:ae:c2:40:de:37:
+        1f:0a:a0:51:cd:63:9d:b6:4f:d8:c6:47:7c:bc:d8:b4:ed:9e:
+        8b:f3:11:e2:a8:b5:3e:ec:ae:70:3e:7e:22:bb:35:48:17:60:
+        62:14:91:30:a3:76:3d:a6:51:36:8b:1f:0d:dd:6a:31:1c:a5:
+        ed:dd:96:a3:6e:72:0f:13:4d:aa:a7:a9:5c:78:f9:03:12:18:
+        93:37:45:12:89:3d:f8:be:ca:bd:d9:be:0c:d9:18:64:a7:c8:
+        41:3e:75:82:21:38:7d:65:f4:a0:d4:13:4b:07:78:29:f9:9d:
+        7e:cc:87:3f:c4:da:2e:88:dd:e3:0b:dc:5a:51:5a:e9:d9:12:
+        4f:9e:02:db:f7:05:25:51
+SHA1 Fingerprint=89:3F:6F:1C:E2:4D:7F:FB:C3:D3:14:7A:05:80:A7:DE:E1:0A:5E:4D
+-----BEGIN CERTIFICATE-----
+MIIFtzCCA5+gAwIBAgIQDH5i9XlzO51Djotj7ZGVuDANBgkqhkiG9w0BAQwFADBl
+MQswCQYDVQQGEwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0
+eSBHbWJIMS0wKwYDVQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIFJTQSBSb290
+IDIwMjMwHhcNMjMwMzI4MTIwOTIyWhcNNDgwMzI3MjM1OTU5WjBlMQswCQYDVQQG
+EwJERTEnMCUGA1UECgweRGV1dHNjaGUgVGVsZWtvbSBTZWN1cml0eSBHbWJIMS0w
+KwYDVQQDDCRUZWxla29tIFNlY3VyaXR5IFNNSU1FIFJTQSBSb290IDIwMjMwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDvxQ6LvjLSZ0f/Ckxnsyq/yMPF
+keu1xx6R4WaoiItVIIAfUV53l54ZClzHazchfAM2AfSIJdmoLkGq/Ngm4JZAYnmu
+V54DOBocsncUPumhctDk4DfRF0btUFx6WMX4K/d1L8+BnlostzqsoFmYBFEM/0nF
+UP0e00eFSzNPoje1rwSaJzKdVtU/VWHji2+uUf6X/mkH+mJbJuYUeRWlEziuXze+
+lErWDYAWaaSRsjpJmHWdRhCKXHp/hKXorx7Hq7NaRrWjS/WmIzYARrHbBbYbzp56
+Mlya1XLDnYZNK4TTHrWI2hB4nCLDOyO16xMHvW9T7Jvsm9Nl9QcJ412nmbV+ho7V
+Av+3hQnjRxTdlmYYNN4I1d/LGJliCyvsAF1SRNPGlvwyViWRz80ZO5U5PgKHmWO2
+1T40eg8RdYG8fQTKYLQoddcCUd1SAC7H/YnxXPPLpCcSOI+7+4nw5MQ4LL6CoHFh
+YpGPSAwvK6mw8csQBOd0vzeQ708qQzWXEsYqcA3eLFVHeWMp9cofagZSHK4tJCKD
+Iq/QqjC3Kh//ZSNYZZPIjn1AEDGGeNlVyzww8N5RKgA20idFX9jooSE9fkZWOylF
+8R0FCc62QzDcRZAQMEyka4aLPz0vMZFx7ya59r6dsGzfEe5YP0N5hjmA8SYXB5jw
+maowLENZFM7t4kAThQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE
+FJrOrCrsAfplcN6XnfHSAIylo2S7MA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgw
+FoAUms6sKuwB+mVw3ped8dIAjKWjZLswDQYJKoZIhvcNAQEMBQADggIBAONQ/fVA
+FiIJljoNqe+B5y4y8KHxSV57iA0Ecte+Z6i6He5Qu3JuetG7DHIwRsjV1wISFplO
+Ht9alu6Pkb6uhvgQd6XEbkdhwPIm2U9haAVIdQgVpaF71biziXnm7fHzYQCGey4x
+/qNc+Hk9tFuIe+Ajuw2hF/rLaA2Yd3EI4m1DdGvENsWUQaQA1lctmYqLIBIVAjIO
+0knsgUjFaidS17JzVVOWPJ5PTLWg0E9X0GcoSGS+xri67GTPyHvFaucq5llXttbU
+1sBnXNmeKAlAv/OpNTFlYAPLGWyClQMeXz/hvepJceVbtwtHFhsgiW2UmQx+iGwd
+DfS3IRpZl6zL6L4XH5V8U5uvUFKqjQsur1rXYPIqaSq57lRwGKq99aE/0t2hYxkA
++KcM66N58nBZo/iiEgPsE//kAoY218HDpLXUpMI3RbaUcD3FveujFR3jNnoVaSpW
+NDnPpZo2qsjtebzP9s4EUwvaslAjfLw+Jq3wDkO7JsuuwkDeNx8KoFHNY522T9jG
+R3y82LTtnovzEeKotT7srnA+fiK7NUgXYGIUkTCjdj2mUTaLHw3dajEcpe3dlqNu
+cg8TTaqnqVx4+QMSGJM3RRKJPfi+yr3ZvgzZGGSnyEE+dYIhOH1l9KDUE0sHeCn5
+nX7Mhz/E2i6I3eML3FpRWunZEk+eAtv3BSVR
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/TrustAsia_SMIME_ECC_Root_CA.pem b/secure/caroot/untrusted/TrustAsia_SMIME_ECC_Root_CA.pem
new file mode 100644
index 000000000000..49efae85f3b4
--- /dev/null
+++ b/secure/caroot/untrusted/TrustAsia_SMIME_ECC_Root_CA.pem
@@ -0,0 +1,64 @@
+##
+##  TrustAsia SMIME ECC Root CA
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            5a:c2:f8:29:4f:e3:7d:c5:5e:1d:18:6f:3b:93:20:1f:ff:7b:ba:2d
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia SMIME ECC Root CA
+        Validity
+            Not Before: May 15 05:41:59 2024 GMT
+            Not After : May 15 05:41:58 2044 GMT
+        Subject: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia SMIME ECC Root CA
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:cd:d9:fb:27:bd:69:ec:86:c9:90:43:b1:70:17:
+                    94:a7:c9:77:23:3a:3f:23:65:d3:1c:a3:1d:1e:42:
+                    54:20:eb:d0:42:bb:59:b9:8b:ac:f2:86:8d:4b:8e:
+                    1d:aa:96:22:23:39:76:6d:92:9b:eb:22:cb:7a:43:
+                    a2:73:fd:73:4b:c2:25:0f:2a:b1:69:c6:ff:45:df:
+                    a9:3c:95:80:bb:a9:1e:4a:93:2f:ec:1c:1d:88:f4:
+                    11:92:37:9f:37:98:72
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                31:67:E6:72:B2:0D:E6:22:A0:AC:CF:7E:22:A7:59:32:E3:66:23:A5
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: ecdsa-with-SHA384
+    Signature Value:
+        30:66:02:31:00:dd:3a:4c:8d:a4:c6:7f:ed:bd:a5:c6:4f:3e:
+        fd:31:4b:28:d6:8a:56:df:65:16:77:87:4d:fb:ba:32:08:81:
+        e0:9e:33:48:8b:9f:94:86:ef:01:2b:94:e6:8c:d6:d4:8e:02:
+        31:00:9f:81:9c:b0:26:fd:2b:d6:f2:f5:71:84:9e:a8:c7:8a:
+        8c:d6:58:11:52:b5:b8:04:cb:cc:71:75:63:e2:c6:19:38:d9:
+        6d:6c:19:71:a4:16:19:21:93:ba:06:44:28:6c
+SHA1 Fingerprint=8C:0D:AA:FE:13:FA:59:F2:DB:9D:0C:97:DA:12:A2:45:1A:02:13:54
+-----BEGIN CERTIFICATE-----
+MIICNjCCAbugAwIBAgIUWsL4KU/jfcVeHRhvO5MgH/97ui0wCgYIKoZIzj0EAwMw
+WjELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dpZXMs
+IEluYy4xJDAiBgNVBAMTG1RydXN0QXNpYSBTTUlNRSBFQ0MgUm9vdCBDQTAeFw0y
+NDA1MTUwNTQxNTlaFw00NDA1MTUwNTQxNThaMFoxCzAJBgNVBAYTAkNOMSUwIwYD
+VQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtUcnVz
+dEFzaWEgU01JTUUgRUNDIFJvb3QgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATN
+2fsnvWnshsmQQ7FwF5SnyXcjOj8jZdMcox0eQlQg69BCu1m5i6zyho1Ljh2qliIj
+OXZtkpvrIst6Q6Jz/XNLwiUPKrFpxv9F36k8lYC7qR5Kky/sHB2I9BGSN583mHKj
+QjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFDFn5nKyDeYioKzPfiKnWTLj
+ZiOlMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNpADBmAjEA3TpMjaTGf+29
+pcZPPv0xSyjWilbfZRZ3h037ujIIgeCeM0iLn5SG7wErlOaM1tSOAjEAn4GcsCb9
+K9by9XGEnqjHiozWWBFStbgEy8xxdWPixhk42W1sGXGkFhkhk7oGRChs
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/TrustAsia_SMIME_RSA_Root_CA.pem b/secure/caroot/untrusted/TrustAsia_SMIME_RSA_Root_CA.pem
new file mode 100644
index 000000000000..4d93814cc4aa
--- /dev/null
+++ b/secure/caroot/untrusted/TrustAsia_SMIME_RSA_Root_CA.pem
@@ -0,0 +1,132 @@
+##
+##  TrustAsia SMIME RSA Root CA
+##
+##  This is a single X.509 certificate for a public Certificate
+##  Authority (CA). It was automatically extracted from Mozilla's
+##  root CA list (the file `certdata.txt' in security/nss)
+##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
+##
+##  @generated
+##
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            5a:ee:71:df:de:0c:57:85:b5:bb:36:22:d7:b8:76:46:02:73:ca:ff
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia SMIME RSA Root CA
+        Validity
+            Not Before: May 15 05:42:01 2024 GMT
+            Not After : May 15 05:42:00 2044 GMT
+        Subject: C=CN, O=TrustAsia Technologies, Inc., CN=TrustAsia SMIME RSA Root CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (4096 bit)
+                Modulus:
+                    00:98:95:9c:ad:3c:59:73:d3:93:76:a6:48:54:a6:
+                    1c:88:72:4c:4d:e1:82:ff:1a:13:1f:50:de:8c:d9:
+                    90:42:d1:bc:99:d3:37:a3:d7:71:3a:ca:dd:5e:1b:
+                    90:61:42:6e:8f:40:01:73:7d:1f:31:ba:d4:1d:6e:
+                    04:d2:aa:90:84:4a:33:0a:44:9f:5a:19:1f:b4:6e:
+                    2d:68:fc:af:c0:9f:4a:10:12:bf:3e:82:c2:82:b0:
+                    2f:e7:90:6f:90:64:10:83:ec:ec:36:94:0c:7c:4f:
+                    e0:02:0d:3d:87:79:42:4d:00:e5:30:ae:70:1f:15:
+                    fd:fa:cf:52:25:36:4d:79:20:bb:f1:10:98:e0:60:
+                    87:c9:f5:78:0c:22:ed:02:e6:11:6c:f1:9b:5a:91:
+                    11:74:86:d0:fe:78:92:96:04:c3:98:ef:c6:70:af:
+                    a9:90:aa:16:f6:22:ed:d8:fa:46:28:71:e2:c9:08:
+                    c0:50:bc:76:a3:ba:2d:96:f2:11:f9:a4:bd:10:56:
+                    f8:27:6d:2b:4b:64:88:dc:17:5d:cf:00:08:8a:92:
+                    ae:1a:cc:12:d7:df:f0:10:28:f3:cd:3a:ea:3a:12:
+                    8c:1b:e7:61:09:43:6a:e4:38:e9:fe:74:39:db:cd:
+                    0a:3b:c3:4f:53:d6:ae:71:d5:38:83:87:1f:ce:e7:
+                    4c:f3:11:55:87:df:b7:af:f7:eb:1a:86:10:6d:a8:
+                    ed:48:dd:32:d0:db:aa:2a:0b:72:77:29:77:fd:7a:
+                    e8:3f:78:20:2a:68:be:de:6f:08:e6:b5:85:47:80:
+                    37:f9:71:96:8b:a5:98:56:97:7c:11:65:16:8e:d4:
+                    ce:d8:27:d4:f9:5a:c5:a7:8d:bb:d1:37:0d:a5:ab:
+                    65:5d:da:74:93:88:5e:db:75:f6:7f:9b:c2:9a:b1:
+                    6d:08:02:0c:98:4a:bb:cd:30:af:76:35:02:85:56:
+                    23:51:09:40:09:05:f7:f0:3d:1e:c2:c8:7a:1a:ba:
+                    c5:41:15:b9:0d:76:b4:b4:a4:b8:45:fd:8d:a3:3b:
+                    3d:03:2a:cd:b3:95:7f:34:7b:dd:a1:4f:d9:3a:ff:
+                    27:f5:0d:c2:01:9c:ff:59:75:5a:1a:c9:e7:d2:fd:
+                    7f:4f:0f:b5:fe:0d:3c:e6:a0:d6:fb:b5:76:5c:b4:
+                    30:4d:10:3f:fe:e2:eb:5a:0e:b1:4f:4f:50:7e:08:
+                    33:02:91:57:32:49:89:a7:40:10:50:17:6b:9f:63:
+                    ba:b2:b2:56:98:76:f4:ff:72:e9:04:9c:d4:a7:4c:
+                    4f:f6:3a:1f:5a:54:31:6f:cb:ba:32:ad:f8:6d:af:
+                    45:c7:7b:63:44:df:c2:fd:78:e8:4a:8a:b0:74:75:
+                    16:de:8f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                80:1A:AA:43:C1:C9:7F:8B:1A:96:45:BC:3D:BB:6B:48:52:6C:5B:AB
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha384WithRSAEncryption
+    Signature Value:
+        2a:75:81:a1:82:20:ea:7f:56:ae:09:30:97:10:78:f4:d9:40:
+        14:52:a4:ee:6a:7f:f0:09:28:d6:10:63:e0:4e:7b:c9:31:c7:
+        08:a5:17:eb:af:86:e2:97:07:4f:a9:0e:a2:85:cc:ed:a4:80:
+        81:1d:5a:53:06:3c:4c:1a:a9:b7:84:86:cf:7c:f5:85:0a:70:
+        99:d0:ed:36:91:8d:e7:77:2e:ce:84:9c:28:86:2d:25:35:8c:
+        4c:01:e6:7d:db:61:5d:e2:77:84:d3:01:d1:62:dd:0c:a2:0a:
+        64:a4:fc:f0:ed:3a:48:f2:39:ec:35:d6:a1:7a:17:71:ec:d3:
+        d2:ec:b8:26:fb:ad:15:70:56:4a:cf:64:c0:b9:60:5b:f7:e6:
+        cd:a0:c2:03:2b:f9:b2:e5:da:ba:a5:37:1c:d8:8d:da:79:74:
+        2a:67:e4:a2:7a:c7:2c:8d:a5:c1:6a:81:6c:cc:f5:a9:39:6a:
+        22:7d:a2:e2:08:cd:e9:93:db:ba:cb:1f:75:77:9e:f7:98:af:
+        14:e4:3b:a0:4c:a7:72:e7:b5:5e:53:49:cc:ff:92:57:f1:59:
+        2b:09:ba:e9:52:93:c0:0f:45:0b:61:d6:6c:59:73:0b:d8:f9:
+        01:2f:da:03:4f:37:1c:f4:df:83:5e:0b:41:a0:b1:7c:39:00:
+        a1:6c:d0:d8:b4:91:72:2b:1b:3f:a2:9a:d1:c4:df:2b:d5:c8:
+        95:7d:84:cd:76:1b:dc:e4:24:c6:3f:15:22:3d:85:a7:42:2b:
+        ed:7e:71:59:61:48:c2:3d:91:63:40:7c:29:b3:80:16:0a:25:
+        fc:18:60:0e:53:ad:0e:2a:ce:fc:41:3a:cd:b1:e4:6a:6b:cc:
+        39:6d:c8:4d:65:b8:aa:93:88:78:6e:0f:02:8b:e0:96:8e:74:
+        1f:d0:7e:e1:74:b7:f6:81:6a:e4:23:ac:8e:fd:8f:35:1d:9a:
+        71:0a:4f:2a:55:2f:fe:18:c1:00:f7:7b:48:8a:65:af:6f:08:
+        1d:43:e7:5a:b8:1f:a4:e8:03:eb:fd:4c:b5:b4:93:a8:31:de:
+        43:9d:12:bd:e7:e9:a4:d2:df:6f:fc:6f:46:a3:ef:31:4e:8d:
+        17:ab:1b:a9:e0:f8:a9:34:56:a1:0e:e7:74:ec:a8:87:85:d8:
+        77:35:4b:8d:3e:6e:72:7c:48:cc:1f:72:b3:71:74:d4:24:86:
+        bc:c8:c0:e3:79:14:01:ce:d9:fa:81:c6:5c:b3:f9:5d:0c:38:
+        be:ce:f2:8e:8d:5f:3d:25:e1:51:39:23:a8:ea:00:8e:04:b3:
+        bf:72:a0:c2:ba:83:fb:cd:a4:97:75:20:9a:bf:a7:50:e2:dd:
+        ad:2c:1f:f4:3f:a3:c8:31
+SHA1 Fingerprint=8C:69:21:7C:CE:49:73:36:5A:5C:EF:2B:B0:86:97:50:E3:E3:33:65
+-----BEGIN CERTIFICATE-----
+MIIFhDCCA2ygAwIBAgIUWu5x394MV4W1uzYi17h2RgJzyv8wDQYJKoZIhvcNAQEM
+BQAwWjELMAkGA1UEBhMCQ04xJTAjBgNVBAoTHFRydXN0QXNpYSBUZWNobm9sb2dp
+ZXMsIEluYy4xJDAiBgNVBAMTG1RydXN0QXNpYSBTTUlNRSBSU0EgUm9vdCBDQTAe
+Fw0yNDA1MTUwNTQyMDFaFw00NDA1MTUwNTQyMDBaMFoxCzAJBgNVBAYTAkNOMSUw
+IwYDVQQKExxUcnVzdEFzaWEgVGVjaG5vbG9naWVzLCBJbmMuMSQwIgYDVQQDExtU
+cnVzdEFzaWEgU01JTUUgUlNBIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4IC
+DwAwggIKAoICAQCYlZytPFlz05N2pkhUphyIckxN4YL/GhMfUN6M2ZBC0byZ0zej
+13E6yt1eG5BhQm6PQAFzfR8xutQdbgTSqpCESjMKRJ9aGR+0bi1o/K/An0oQEr8+
+gsKCsC/nkG+QZBCD7Ow2lAx8T+ACDT2HeUJNAOUwrnAfFf36z1IlNk15ILvxEJjg
+YIfJ9XgMIu0C5hFs8ZtakRF0htD+eJKWBMOY78Zwr6mQqhb2Iu3Y+kYoceLJCMBQ
+vHajui2W8hH5pL0QVvgnbStLZIjcF13PAAiKkq4azBLX3/AQKPPNOuo6Eowb52EJ
+Q2rkOOn+dDnbzQo7w09T1q5x1TiDhx/O50zzEVWH37ev9+sahhBtqO1I3TLQ26oq
+C3J3KXf9eug/eCAqaL7ebwjmtYVHgDf5cZaLpZhWl3wRZRaO1M7YJ9T5WsWnjbvR
+Nw2lq2Vd2nSTiF7bdfZ/m8KasW0IAgyYSrvNMK92NQKFViNRCUAJBffwPR7CyHoa
+usVBFbkNdrS0pLhF/Y2jOz0DKs2zlX80e92hT9k6/yf1DcIBnP9ZdVoayefS/X9P
+D7X+DTzmoNb7tXZctDBNED/+4utaDrFPT1B+CDMCkVcySYmnQBBQF2ufY7qyslaY
+dvT/cukEnNSnTE/2Oh9aVDFvy7oyrfhtr0XHe2NE38L9eOhKirB0dRbejwIDAQAB
+o0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSAGqpDwcl/ixqWRbw9u2tI
+UmxbqzAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQEMBQADggIBACp1gaGCIOp/
+Vq4JMJcQePTZQBRSpO5qf/AJKNYQY+BOe8kxxwilF+uvhuKXB0+pDqKFzO2kgIEd
+WlMGPEwaqbeEhs989YUKcJnQ7TaRjed3Ls6EnCiGLSU1jEwB5n3bYV3id4TTAdFi
+3QyiCmSk/PDtOkjyOew11qF6F3Hs09LsuCb7rRVwVkrPZMC5YFv35s2gwgMr+bLl
+2rqlNxzYjdp5dCpn5KJ6xyyNpcFqgWzM9ak5aiJ9ouIIzemT27rLH3V3nveYrxTk
+O6BMp3LntV5TScz/klfxWSsJuulSk8APRQth1mxZcwvY+QEv2gNPNxz034NeC0Gg
+sXw5AKFs0Ni0kXIrGz+imtHE3yvVyJV9hM12G9zkJMY/FSI9hadCK+1+cVlhSMI9
+kWNAfCmzgBYKJfwYYA5TrQ4qzvxBOs2x5GprzDltyE1luKqTiHhuDwKL4JaOdB/Q
+fuF0t/aBauQjrI79jzUdmnEKTypVL/4YwQD3e0iKZa9vCB1D51q4H6ToA+v9TLW0
+k6gx3kOdEr3n6aTS32/8b0aj7zFOjRerG6ng+Kk0VqEO53TsqIeF2Hc1S40+bnJ8
+SMwfcrNxdNQkhrzIwON5FAHO2fqBxlyz+V0MOL7O8o6NXz0l4VE5I6jqAI4Es79y
+oMK6g/vNpJd1IJq/p1Di3a0sH/Q/o8gx
+-----END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/TrustCor_ECA-1.pem b/secure/caroot/untrusted/TrustCor_ECA-1.pem
deleted file mode 100644
index 5644e386320a..000000000000
--- a/secure/caroot/untrusted/TrustCor_ECA-1.pem
+++ /dev/null
@@ -1,96 +0,0 @@
-##
-##  TrustCor ECA-1
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            84:82:2c:5f:1c:62:d0:40
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor ECA-1
-        Validity
-            Not Before: Feb  4 12:32:33 2016 GMT
-            Not After : Dec 31 17:28:07 2029 GMT
-        Subject: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor ECA-1
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:cf:8f:e0:11:b5:9f:a8:76:76:db:df:0f:54:ef:
-                    73:63:29:82:ad:47:c6:a3:6b:ed:fe:5f:33:f8:43:
-                    51:e9:1a:33:91:31:17:a0:74:c4:d4:a7:01:e6:b2:
-                    92:3e:6a:9d:ed:0e:f9:74:98:40:d3:3f:03:80:06:
-                    82:40:e8:b1:e2:a7:51:a7:1d:83:26:6b:ab:de:fa:
-                    17:91:2b:d8:c6:ac:1e:b1:9e:19:01:d5:97:a6:ea:
-                    0d:b7:c4:55:1f:27:7c:d2:08:d5:76:1f:29:15:87:
-                    40:39:dd:38:45:11:75:d0:9a:a7:34:e0:bf:cd:c8:
-                    52:1d:b9:47:7e:0d:b8:bb:c6:0c:f6:73:57:16:5a:
-                    7e:43:91:1f:55:3a:c6:6d:44:04:aa:9c:a9:9c:a7:
-                    4c:89:17:83:ae:a3:04:5e:52:80:8b:1e:12:25:11:
-                    19:d7:0c:7d:7d:31:44:41:ea:db:af:b0:1c:ef:81:
-                    d0:2c:c5:9a:21:9b:3d:ed:42:3b:50:26:f2:ec:ce:
-                    71:61:06:62:21:54:4e:7f:c1:9d:3e:7f:20:8c:80:
-                    cb:2a:d8:97:62:c8:83:33:91:7d:b0:a2:5a:0f:57:
-                    e8:3b:cc:f2:25:b2:d4:7c:2f:ec:4d:c6:a1:3a:15:
-                    7a:e7:b6:5d:35:f5:f6:48:4a:36:45:66:d4:ba:98:
-                    58:c1
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                44:9E:48:F5:CC:6D:48:D4:A0:4B:7F:FE:59:24:2F:83:97:99:9A:86
-            X509v3 Authority Key Identifier: 
-                44:9E:48:F5:CC:6D:48:D4:A0:4B:7F:FE:59:24:2F:83:97:99:9A:86
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Digital Signature, Certificate Sign, CRL Sign
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        05:3e:35:5c:15:70:9b:c9:c7:73:61:6f:72:2b:d4:c2:8f:f2:
-        43:5d:02:ce:c4:94:b9:94:11:83:67:5d:e2:67:6c:75:76:bf:
-        bb:0c:aa:36:c6:ad:47:93:63:dc:1e:7e:d6:de:2e:fe:e9:19:
-        32:38:03:7f:14:f6:00:73:2c:59:b1:21:06:e1:fb:ac:18:95:
-        0c:a3:ff:99:96:f7:2b:27:9b:d5:24:cc:1d:dd:c1:3a:e0:98:
-        44:b0:c4:e4:3e:77:b1:73:a9:64:2c:f6:1c:01:7c:3f:5d:45:
-        85:c0:85:e7:25:8f:95:dc:17:f3:3c:9f:1a:6e:b0:ca:e3:1d:
-        2a:e9:4c:63:fa:24:61:62:d6:da:7e:b6:1c:6c:f5:02:1d:d4:
-        2a:dd:55:90:eb:2a:11:47:3c:2e:5e:74:b2:82:22:a5:7d:53:
-        1f:45:ec:27:91:7d:e7:22:16:e8:c0:68:36:d8:c6:f1:4f:80:
-        44:32:f9:e1:d1:d1:1d:aa:de:a8:ab:9c:04:af:ad:20:0e:64:
-        98:4d:a5:6b:c0:48:58:96:69:4d:dc:07:8c:51:93:a2:df:9f:
-        0f:3d:8b:60:b4:82:8d:aa:08:4e:62:45:e0:f9:0b:d2:e0:e0:
-        3c:5b:de:5c:71:27:25:c2:e6:03:81:8b:10:53:e3:c7:55:a2:
-        b4:9f:d7:e6
-SHA1 Fingerprint=58:D1:DF:95:95:67:6B:63:C0:F0:5B:1C:17:4D:8B:84:0B:C8:78:BD
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYD
-VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk
-MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxFzAVBgNVBAMMDlRydXN0Q29y
-IEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3MjgwN1owgZwxCzAJBgNV
-BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw
-IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy
-dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3Ig
-RUNBLTEwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb
-3w9U73NjKYKtR8aja+3+XzP4Q1HpGjORMRegdMTUpwHmspI+ap3tDvl0mEDTPwOA
-BoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23xFUfJ3zSCNV2HykVh0A5
-3ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmcp0yJF4Ou
-owReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/
-wZ0+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZF
-ZtS6mFjBAgMBAAGjYzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAf
-BgNVHSMEGDAWgBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/
-MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsFAAOCAQEABT41XBVwm8nHc2Fv
-civUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u/ukZMjgDfxT2
-AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
-hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50
-soIipX1TH0XsJ5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BI
-WJZpTdwHjFGTot+fDz2LYLSCjaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1Wi
-tJ/X5g==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/TrustCor_RootCert_CA-1.pem b/secure/caroot/untrusted/TrustCor_RootCert_CA-1.pem
deleted file mode 100644
index f5b3147e4248..000000000000
--- a/secure/caroot/untrusted/TrustCor_RootCert_CA-1.pem
+++ /dev/null
@@ -1,96 +0,0 @@
-##
-##  TrustCor RootCert CA-1
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            da:9b:ec:71:f3:03:b0:19
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor RootCert CA-1
-        Validity
-            Not Before: Feb  4 12:32:16 2016 GMT
-            Not After : Dec 31 17:23:16 2029 GMT
-        Subject: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor RootCert CA-1
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:bf:8e:b7:95:e2:c2:26:12:6b:33:19:c7:40:58:
-                    0a:ab:59:aa:8d:00:a3:fc:80:c7:50:7b:8e:d4:20:
-                    26:ba:32:12:d8:23:54:49:25:10:22:98:9d:46:d2:
-                    c1:c9:9e:4e:1b:2e:2c:0e:38:f3:1a:25:68:1c:a6:
-                    5a:05:e6:1e:8b:48:bf:98:96:74:3e:69:ca:e9:b5:
-                    78:a5:06:bc:d5:00:5e:09:0a:f2:27:7a:52:fc:2d:
-                    d5:b1:ea:b4:89:61:24:f3:1a:13:db:a9:cf:52:ed:
-                    0c:24:ba:b9:9e:ec:7e:00:74:fa:93:ad:6c:29:92:
-                    ae:51:b4:bb:d3:57:bf:b3:f3:a8:8d:9c:f4:24:4b:
-                    2a:d6:99:9e:f4:9e:fe:c0:7e:42:3a:e7:0b:95:53:
-                    da:b7:68:0e:90:4c:fb:70:3f:8f:4a:2c:94:f3:26:
-                    dd:63:69:a9:94:d8:10:4e:c5:47:08:90:99:1b:17:
-                    4d:b9:6c:6e:ef:60:95:11:8e:21:80:b5:bd:a0:73:
-                    d8:d0:b2:77:c4:45:ea:5a:26:fb:66:76:76:f8:06:
-                    1f:61:6d:0f:55:c5:83:b7:10:56:72:06:07:a5:f3:
-                    b1:1a:03:05:64:0e:9d:5a:8a:d6:86:70:1b:24:de:
-                    fe:28:8a:2b:d0:6a:b0:fc:7a:a2:dc:b2:79:0e:8b:
-                    65:0f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                EE:6B:49:3C:7A:3F:0D:E3:B1:09:B7:8A:C8:AB:19:9F:73:33:50:E7
-            X509v3 Authority Key Identifier: 
-                EE:6B:49:3C:7A:3F:0D:E3:B1:09:B7:8A:C8:AB:19:9F:73:33:50:E7
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Digital Signature, Certificate Sign, CRL Sign
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        25:18:d4:91:8f:13:ee:8f:1e:1d:11:53:da:2d:44:29:19:a0:
-        1e:6b:31:9e:4d:0e:9e:ad:3d:5c:41:6f:95:2b:24:a1:79:98:
-        3a:38:36:fb:bb:66:9e:48:ff:90:90:ef:3d:d4:b8:9b:b4:87:
-        75:3f:20:9b:ce:72:cf:a1:55:c1:4d:64:a2:19:06:a1:07:33:
-        0c:0b:29:e5:f1:ea:ab:a3:ec:b5:0a:74:90:c7:7d:72:f2:d7:
-        5c:9f:91:ef:91:8b:b7:dc:ed:66:a2:cf:8e:66:3b:bc:9f:3a:
-        02:e0:27:dd:16:98:c0:95:d4:0a:a4:e4:81:9a:75:94:35:9c:
-        90:5f:88:37:06:ad:59:95:0a:b0:d1:67:d3:19:ca:89:e7:32:
-        5a:36:1c:3e:82:a8:5a:93:be:c6:d0:64:91:b6:cf:d9:b6:18:
-        cf:db:7e:d2:65:a3:a6:c4:8e:17:31:c1:fb:7e:76:db:d3:85:
-        e3:58:b2:77:7a:76:3b:6c:2f:50:1c:e7:db:f6:67:79:1f:f5:
-        82:95:9a:07:a7:14:af:8f:dc:28:21:67:09:d2:d6:4d:5a:1c:
-        19:1c:8e:77:5c:c3:94:24:3d:32:6b:4b:7e:d4:78:94:83:be:
-        37:4d:ce:5f:c7:1e:4e:3c:e0:89:33:95:0b:0f:a5:32:d6:3c:
-        5a:79:2c:19
-SHA1 Fingerprint=FF:BD:CD:E7:82:C8:43:5E:3C:6F:26:86:5C:CA:A8:3A:45:5B:C3:0A
------BEGIN CERTIFICATE-----
-MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYD
-VQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEk
-MCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
-cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29y
-IFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkxMjMxMTcyMzE2WjCB
-pDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFuYW1h
-IENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUG
-A1UECwweVHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZU
-cnVzdENvciBSb290Q2VydCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAv463leLCJhJrMxnHQFgKq1mqjQCj/IDHUHuO1CAmujIS2CNUSSUQIpid
-RtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4pQa81QBeCQryJ3pS/C3V
-seq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0JEsq1pme
-9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CV
-EY4hgLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorW
-hnAbJN7+KIor0Gqw/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/
-DeOxCbeKyKsZn3MzUOcwHwYDVR0jBBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcw
-DwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQAD
-ggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5mDo4Nvu7Zp5I
-/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
-ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZ
-yonnMlo2HD6CqFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djts
-L1Ac59v2Z3kf9YKVmgenFK+P3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdN
-zl/HHk484IkzlQsPpTLWPFp5LBk=
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/TrustCor_RootCert_CA-2.pem b/secure/caroot/untrusted/TrustCor_RootCert_CA-2.pem
deleted file mode 100644
index 7553719dbb9e..000000000000
--- a/secure/caroot/untrusted/TrustCor_RootCert_CA-2.pem
+++ /dev/null
@@ -1,137 +0,0 @@
-##
-##  TrustCor RootCert CA-2
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2711694510199101698 (0x25a1dfca33cb5902)
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor RootCert CA-2
-        Validity
-            Not Before: Feb  4 12:32:23 2016 GMT
-            Not After : Dec 31 17:26:39 2034 GMT
-        Subject: C=PA, ST=Panama, L=Panama City, O=TrustCor Systems S. de R.L., OU=TrustCor Certificate Authority, CN=TrustCor RootCert CA-2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:a7:20:6e:c2:2a:a2:62:24:95:90:76:c8:38:7e:
-                    80:d2:ab:c1:9b:65:05:94:f4:c1:0a:10:d5:02:ac:
-                    ed:9f:93:c7:87:c8:b0:27:2b:42:0c:3d:0a:3e:41:
-                    5a:9e:75:dd:8d:ca:e0:9b:ec:68:32:a4:69:92:68:
-                    8c:0b:81:0e:56:a0:3e:1a:dd:2c:25:14:82:2f:97:
-                    d3:64:46:f4:54:a9:dc:3a:54:2d:31:2b:99:82:f2:
-                    d9:2a:d7:ef:71:00:b8:31:a4:be:7a:24:07:c3:42:
-                    20:f2:8a:d4:92:04:1b:65:56:4c:6c:d4:fb:b6:61:
-                    5a:47:23:b4:d8:69:b4:b7:3a:d0:74:3c:0c:75:a1:
-                    8c:4e:76:a1:e9:db:2a:a5:3b:fa:ce:b0:ff:7e:6a:
-                    28:fd:27:1c:c8:b1:e9:29:f1:57:6e:64:b4:d0:c1:
-                    15:6d:0e:be:2e:0e:46:c8:5e:f4:51:fe:ef:0e:63:
-                    3a:3b:71:ba:cf:6f:59:ca:0c:e3:9b:5d:49:b8:4c:
-                    e2:57:b1:98:8a:42:57:9c:76:ef:ef:bd:d1:68:a8:
-                    d2:f4:09:bb:77:35:be:25:82:08:c4:16:2c:44:20:
-                    56:a9:44:11:77:ef:5d:b4:1d:aa:5e:6b:3e:8b:32:
-                    f6:07:2f:57:04:92:ca:f5:fe:9d:c2:e9:e8:b3:8e:
-                    4c:4b:02:31:d9:e4:3c:48:82:27:f7:18:82:76:48:
-                    3a:71:b1:13:a1:39:d5:2e:c5:34:c2:1d:62:85:df:
-                    03:fe:4d:f4:af:3d:df:5c:5b:8d:fa:70:e1:a5:7e:
-                    27:c7:86:2e:6a:8f:12:c6:84:5e:43:51:50:9c:19:
-                    9b:78:e6:fc:f6:ed:47:7e:7b:3d:66:ef:13:13:88:
-                    5f:3c:a1:63:fb:f9:ac:87:35:9f:f3:82:9e:a4:3f:
-                    0a:9c:31:69:8b:99:a4:88:4a:8e:6e:66:4d:ef:16:
-                    c4:0f:79:28:21:60:0d:85:16:7d:d7:54:38:f1:92:
-                    56:fd:b5:33:4c:83:dc:d7:10:9f:4b:fd:c6:f8:42:
-                    bd:ba:7c:73:02:e0:ff:7d:cd:5b:e1:d4:ac:61:7b:
-                    57:d5:4a:7b:5b:d4:85:58:27:5d:bf:f8:2b:60:ac:
-                    a0:26:ae:14:21:27:c6:77:9a:33:80:3c:5e:46:3f:
-                    f7:c3:b1:a3:86:33:c6:e8:5e:0d:b9:35:2c:aa:46:
-                    c1:85:02:75:80:a0:eb:24:fb:15:aa:e4:67:7f:6e:
-                    77:3f:f4:04:8a:2f:7c:7b:e3:17:61:f0:dd:09:a9:
-                    20:c8:be:09:a4:d0:7e:44:c3:b2:30:4a:38:aa:a9:
-                    ec:18:9a:07:82:2b:db:b8:9c:18:ad:da:e0:46:17:
-                    ac:cf:5d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                D9:FE:21:40:6E:94:9E:BC:9B:3D:9C:7D:98:20:19:E5:8C:30:62:B2
-            X509v3 Authority Key Identifier: 
-                D9:FE:21:40:6E:94:9E:BC:9B:3D:9C:7D:98:20:19:E5:8C:30:62:B2
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Digital Signature, Certificate Sign, CRL Sign
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        9e:45:9e:0c:3b:b6:ef:e1:3a:c8:7c:d1:00:3d:cf:e2:ea:06:
-        b5:b2:3a:bb:06:4b:68:7a:d0:23:97:74:a7:2c:f0:08:d8:79:
-        5a:d7:5a:84:8a:d8:12:9a:1b:d9:7d:5c:4d:70:c5:a5:f9:ab:
-        e5:a3:89:89:dd:01:fa:ec:dd:f9:e9:92:97:db:b0:46:42:f3:
-        d3:62:aa:95:fe:31:67:14:69:58:90:0a:aa:0b:ee:37:23:c7:
-        50:51:b4:f5:7e:9e:e3:7b:f7:e4:cc:42:32:2d:49:0c:cb:ff:
-        49:0c:9b:1e:34:fd:6e:6e:96:8a:79:03:b6:6f:db:09:cb:fd:
-        5f:65:14:37:e1:38:f5:f3:61:16:58:e4:b5:6d:0d:0b:04:1b:
-        3f:50:2d:7f:b3:c7:7a:1a:16:80:60:f8:8a:1f:e9:1b:2a:c6:
-        f9:ba:01:1a:69:bf:d2:58:c7:54:57:08:8f:e1:39:60:77:4b:
-        ac:59:84:1a:88:f1:dd:cb:4f:78:d7:e7:e1:33:2d:fc:ee:41:
-        fa:20:b0:be:cb:f7:38:94:c0:e1:d0:85:0f:bb:ed:2c:73:ab:
-        ed:fe:92:76:1a:64:7f:5b:0d:33:09:07:33:7b:06:3f:11:a4:
-        5c:70:3c:85:c0:cf:e3:90:a8:83:77:fa:db:e6:c5:8c:68:67:
-        10:67:a5:52:2d:f0:c4:99:8f:7f:bf:d1:6b:e2:b5:47:d6:d9:
-        d0:85:99:4d:94:9b:0f:4b:8d:ee:00:5a:47:1d:11:03:ac:41:
-        18:af:87:b7:6f:0c:3a:8f:ca:cf:dc:03:c1:a2:09:c8:e5:fd:
-        80:5e:c8:60:42:01:1b:1a:53:5a:bb:37:a6:b7:bc:ba:84:e9:
-        1e:6c:1a:d4:64:da:d4:43:fe:93:8b:4b:f2:2c:79:16:10:d4:
-        93:0b:88:8f:a1:d8:86:14:46:91:47:9b:28:24:ef:57:52:4e:
-        5c:42:9c:aa:f7:49:ec:27:e8:40:1e:b3:a6:89:22:72:9c:f5:
-        0d:33:b4:58:a3:30:3b:dd:d4:6a:54:93:be:1a:4d:f3:93:94:
-        f7:fc:84:0b:3f:84:20:5c:34:03:44:c5:da:ad:bc:0a:c1:02:
-        cf:1e:e5:94:d9:f3:8e:5b:d8:4c:f0:9d:ec:61:17:bb:14:32:
-        54:0c:02:29:93:1e:92:86:f6:7f:ef:e7:92:05:0e:59:dd:99:
-        08:2e:2e:fa:9c:00:52:d3:c5:66:29:e4:a7:97:44:a4:0e:28:
-        81:13:35:c5:f6:6f:64:e6:41:c4:d5:2f:cc:34:45:25:cf:41:
-        00:96:3d:4a:2e:c2:96:98:4f:4e:4a:9c:97:b7:db:1f:92:32:
-        c8:ff:0f:51:6e:d6:ec:09
-SHA1 Fingerprint=B8:BE:6D:CB:56:F1:55:B9:63:D4:12:CA:4E:06:34:C7:94:B2:1C:C0
------BEGIN CERTIFICATE-----
-MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNV
-BAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQw
-IgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRy
-dXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0eTEfMB0GA1UEAwwWVHJ1c3RDb3Ig
-Um9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEyMzExNzI2MzlaMIGk
-MQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEg
-Q2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYD
-VQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRy
-dXN0Q29yIFJvb3RDZXJ0IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
-AoICAQCnIG7CKqJiJJWQdsg4foDSq8GbZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+
-QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9NkRvRUqdw6VC0xK5mC8tkq
-1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1oYxOdqHp
-2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nK
-DOObXUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hape
-az6LMvYHL1cEksr1/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF
-3wP+TfSvPd9cW436cOGlfifHhi5qjxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88
-oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQPeSghYA2FFn3XVDjxklb9tTNM
-g9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+CtgrKAmrhQhJ8Z3
-mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
-8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAd
-BgNVHQ4EFgQU2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6U
-nrybPZx9mCAZ5YwwYrIwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYw
-DQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/hOsh80QA9z+LqBrWyOrsGS2h60COX
-dKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnpkpfbsEZC89NiqpX+
-MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv2wnL
-/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RX
-CI/hOWB3S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYa
-ZH9bDTMJBzN7Bj8RpFxwPIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW
-2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dvDDqPys/cA8GiCcjl/YBeyGBCARsaU1q7
-N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYURpFHmygk71dSTlxCnKr3
-Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANExdqtvArB
-As8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp
-5KeXRKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu
-1uwJ
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem b/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
deleted file mode 100644
index cb20bae95f7d..000000000000
--- a/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G4.pem
+++ /dev/null
@@ -1,73 +0,0 @@
-##
-##  VeriSign Class 3 Public Primary Certification Authority - G4
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            2f:80:fe:23:8c:0e:22:0f:48:67:12:28:91:87:ac:b3
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2007 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G4
-        Validity
-            Not Before: Nov  5 00:00:00 2007 GMT
-            Not After : Jan 18 23:59:59 2038 GMT
-        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2007 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G4
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:a7:56:7a:7c:52:da:64:9b:0e:2d:5c:d8:5e:ac:
-                    92:3d:fe:01:e6:19:4a:3d:14:03:4b:fa:60:27:20:
-                    d9:83:89:69:fa:54:c6:9a:18:5e:55:2a:64:de:06:
-                    f6:8d:4a:3b:ad:10:3c:65:3d:90:88:04:89:e0:30:
-                    61:b3:ae:5d:01:a7:7b:de:7c:b2:be:ca:65:61:00:
-                    86:ae:da:8f:7b:d0:89:ad:4d:1d:59:9a:41:b1:bc:
-                    47:80:dc:9e:62:c3:f9
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            1.3.6.1.5.5.7.1.12: 
-                0_.].[0Y0W0U..image/gif0!0.0...+..............k...j.H.,{..0%.#http://logo.verisign.com/vslogo.gif
-            X509v3 Subject Key Identifier: 
-                B3:16:91:FD:EE:A6:6E:E4:B5:2E:49:8F:87:78:81:80:EC:E5:B1:B5
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:65:02:30:66:21:0c:18:26:60:5a:38:7b:56:42:e0:a7:fc:
-        36:84:51:91:20:2c:76:4d:43:3d:c4:1d:84:23:d0:ac:d6:7c:
-        35:06:ce:cd:69:bd:90:0d:db:6c:48:42:1d:0e:aa:42:02:31:
-        00:9c:3d:48:39:23:39:58:1a:15:12:59:6a:9e:ef:d5:59:b2:
-        1d:52:2c:99:71:cd:c7:29:df:1b:2a:61:7b:71:d1:de:f3:c0:
-        e5:0d:3a:4a:aa:2d:a7:d8:86:2a:dd:2e:10
-SHA1 Fingerprint=22:D5:D8:DF:8F:02:31:D1:8D:F7:9D:B7:CF:8A:2D:64:C9:3F:6C:3A
------BEGIN CERTIFICATE-----
-MIIDhDCCAwqgAwIBAgIQL4D+I4wOIg9IZxIokYesszAKBggqhkjOPQQDAzCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzQwHhcNMDcxMTA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCByjELMAkG
-A1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZWZXJp
-U2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNyBWZXJpU2lnbiwg
-SW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJpU2ln
-biBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5
-IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAASnVnp8Utpkmw4tXNherJI9/gHm
-GUo9FANL+mAnINmDiWn6VMaaGF5VKmTeBvaNSjutEDxlPZCIBIngMGGzrl0Bp3ve
-fLK+ymVhAIau2o970ImtTR1ZmkGxvEeA3J5iw/mjgbIwga8wDwYDVR0TAQH/BAUw
-AwEB/zAOBgNVHQ8BAf8EBAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJ
-aW1hZ2UvZ2lmMCEwHzAHBgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYj
-aHR0cDovL2xvZ28udmVyaXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFLMW
-kf3upm7ktS5Jj4d4gYDs5bG1MAoGCCqGSM49BAMDA2gAMGUCMGYhDBgmYFo4e1ZC
-4Kf8NoRRkSAsdk1DPcQdhCPQrNZ8NQbOzWm9kA3bbEhCHQ6qQgIxAJw9SDkjOVga
-FRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem b/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
deleted file mode 100644
index 332690c8a88f..000000000000
--- a/secure/caroot/untrusted/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G5.pem
+++ /dev/null
@@ -1,99 +0,0 @@
-##
-##  VeriSign Class 3 Public Primary Certification Authority - G5
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2006 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G5
-        Validity
-            Not Before: Nov  8 00:00:00 2006 GMT
-            Not After : Jul 16 23:59:59 2036 GMT
-        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2006 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G5
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:af:24:08:08:29:7a:35:9e:60:0c:aa:e7:4b:3b:
-                    4e:dc:7c:bc:3c:45:1c:bb:2b:e0:fe:29:02:f9:57:
-                    08:a3:64:85:15:27:f5:f1:ad:c8:31:89:5d:22:e8:
-                    2a:aa:a6:42:b3:8f:f8:b9:55:b7:b1:b7:4b:b3:fe:
-                    8f:7e:07:57:ec:ef:43:db:66:62:15:61:cf:60:0d:
-                    a4:d8:de:f8:e0:c3:62:08:3d:54:13:eb:49:ca:59:
-                    54:85:26:e5:2b:8f:1b:9f:eb:f5:a1:91:c2:33:49:
-                    d8:43:63:6a:52:4b:d2:8f:e8:70:51:4d:d1:89:69:
-                    7b:c7:70:f6:b3:dc:12:74:db:7b:5d:4b:56:d3:96:
-                    bf:15:77:a1:b0:f4:a2:25:f2:af:1c:92:67:18:e5:
-                    f4:06:04:ef:90:b9:e4:00:e4:dd:3a:b5:19:ff:02:
-                    ba:f4:3c:ee:e0:8b:eb:37:8b:ec:f4:d7:ac:f2:f6:
-                    f0:3d:af:dd:75:91:33:19:1d:1c:40:cb:74:24:19:
-                    21:93:d9:14:fe:ac:2a:52:c7:8f:d5:04:49:e4:8d:
-                    63:47:88:3c:69:83:cb:fe:47:bd:2b:7e:4f:c5:95:
-                    ae:0e:9d:d4:d1:43:c0:67:73:e3:14:08:7e:e5:3f:
-                    9f:73:b8:33:0a:cf:5d:3f:34:87:96:8a:ee:53:e8:
-                    25:15
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            1.3.6.1.5.5.7.1.12: 
-                0_.].[0Y0W0U..image/gif0!0.0...+..............k...j.H.,{..0%.#http://logo.verisign.com/vslogo.gif
-            X509v3 Subject Key Identifier: 
-                7F:D3:65:A7:C2:DD:EC:BB:F0:30:09:F3:43:39:FA:02:AF:33:31:33
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        93:24:4a:30:5f:62:cf:d8:1a:98:2f:3d:ea:dc:99:2d:bd:77:
-        f6:a5:79:22:38:ec:c4:a7:a0:78:12:ad:62:0e:45:70:64:c5:
-        e7:97:66:2d:98:09:7e:5f:af:d6:cc:28:65:f2:01:aa:08:1a:
-        47:de:f9:f9:7c:92:5a:08:69:20:0d:d9:3e:6d:6e:3c:0d:6e:
-        d8:e6:06:91:40:18:b9:f8:c1:ed:df:db:41:aa:e0:96:20:c9:
-        cd:64:15:38:81:c9:94:ee:a2:84:29:0b:13:6f:8e:db:0c:dd:
-        25:02:db:a4:8b:19:44:d2:41:7a:05:69:4a:58:4f:60:ca:7e:
-        82:6a:0b:02:aa:25:17:39:b5:db:7f:e7:84:65:2a:95:8a:bd:
-        86:de:5e:81:16:83:2d:10:cc:de:fd:a8:82:2a:6d:28:1f:0d:
-        0b:c4:e5:e7:1a:26:19:e1:f4:11:6f:10:b5:95:fc:e7:42:05:
-        32:db:ce:9d:51:5e:28:b6:9e:85:d3:5b:ef:a5:7d:45:40:72:
-        8e:b7:0e:6b:0e:06:fb:33:35:48:71:b8:9d:27:8b:c4:65:5f:
-        0d:86:76:9c:44:7a:f6:95:5c:f6:5d:32:08:33:a4:54:b6:18:
-        3f:68:5c:f2:42:4a:85:38:54:83:5f:d1:e8:2c:f2:ac:11:d6:
-        a8:ed:63:6a
-SHA1 Fingerprint=4E:B6:D5:78:49:9B:1C:CF:5F:58:1E:AD:56:BE:3D:9B:67:44:A5:E5
------BEGIN CERTIFICATE-----
-MIIE0zCCA7ugAwIBAgIQGNrRniZ96LtKIVjNzGs7SjANBgkqhkiG9w0BAQUFADCB
-yjELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxW
-ZXJpU2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5IC0gRzUwHhcNMDYxMTA4MDAwMDAwWhcNMzYwNzE2MjM1OTU5WjCByjEL
-MAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQLExZW
-ZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwNiBWZXJpU2ln
-biwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MUUwQwYDVQQDEzxWZXJp
-U2lnbiBDbGFzcyAzIFB1YmxpYyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9y
-aXR5IC0gRzUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCvJAgIKXo1
-nmAMqudLO07cfLw8RRy7K+D+KQL5VwijZIUVJ/XxrcgxiV0i6CqqpkKzj/i5Vbex
-t0uz/o9+B1fs70PbZmIVYc9gDaTY3vjgw2IIPVQT60nKWVSFJuUrjxuf6/WhkcIz
-SdhDY2pSS9KP6HBRTdGJaXvHcPaz3BJ023tdS1bTlr8Vd6Gw9KIl8q8ckmcY5fQG
-BO+QueQA5N06tRn/Arr0PO7gi+s3i+z016zy9vA9r911kTMZHRxAy3QkGSGT2RT+
-rCpSx4/VBEnkjWNHiDxpg8v+R70rfk/Fla4OndTRQ8Bnc+MUCH7lP59zuDMKz10/
-NIeWiu5T6CUVAgMBAAGjgbIwga8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8E
-BAMCAQYwbQYIKwYBBQUHAQwEYTBfoV2gWzBZMFcwVRYJaW1hZ2UvZ2lmMCEwHzAH
-BgUrDgMCGgQUj+XTGoasjY5rw8+AatRIGCx7GS4wJRYjaHR0cDovL2xvZ28udmVy
-aXNpZ24uY29tL3ZzbG9nby5naWYwHQYDVR0OBBYEFH/TZafC3ey78DAJ80M5+gKv
-MzEzMA0GCSqGSIb3DQEBBQUAA4IBAQCTJEowX2LP2BqYLz3q3JktvXf2pXkiOOzE
-p6B4Eq1iDkVwZMXnl2YtmAl+X6/WzChl8gGqCBpH3vn5fJJaCGkgDdk+bW48DW7Y
-5gaRQBi5+MHt39tBquCWIMnNZBU4gcmU7qKEKQsTb47bDN0lAtukixlE0kF6BWlK
-WE9gyn6CagsCqiUXObXbf+eEZSqVir2G3l6BFoMtEMze/aiCKm0oHw0LxOXnGiYZ
-4fQRbxC1lfznQgUy286dUV4otp6F01vvpX1FQHKOtw5rDgb7MzVIcbidJ4vEZV8N
-hnacRHr2lVz2XTIIM6RUthg/aFzyQkqFOFSDX9HoLPKsEdao7WNq
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/VeriSign_Universal_Root_Certification_Authority.pem b/secure/caroot/untrusted/VeriSign_Universal_Root_Certification_Authority.pem
deleted file mode 100644
index 411b4bd9b5b7..000000000000
--- a/secure/caroot/untrusted/VeriSign_Universal_Root_Certification_Authority.pem
+++ /dev/null
@@ -1,99 +0,0 @@
-##
-##  VeriSign Universal Root Certification Authority
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            40:1a:c4:64:21:b3:13:21:03:0e:bb:e4:12:1a:c5:1d
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2008 VeriSign, Inc. - For authorized use only, CN=VeriSign Universal Root Certification Authority
-        Validity
-            Not Before: Apr  2 00:00:00 2008 GMT
-            Not After : Dec  1 23:59:59 2037 GMT
-        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
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:c7:61:37:5e:b1:01:34:db:62:d7:15:9b:ff:58:
-                    5a:8c:23:23:d6:60:8e:91:d7:90:98:83:7a:e6:58:
-                    19:38:8c:c5:f6:e5:64:85:b4:a2:71:fb:ed:bd:b9:
-                    da:cd:4d:00:b4:c8:2d:73:a5:c7:69:71:95:1f:39:
-                    3c:b2:44:07:9c:e8:0e:fa:4d:4a:c4:21:df:29:61:
-                    8f:32:22:61:82:c5:87:1f:6e:8c:7c:5f:16:20:51:
-                    44:d1:70:4f:57:ea:e3:1c:e3:cc:79:ee:58:d8:0e:
-                    c2:b3:45:93:c0:2c:e7:9a:17:2b:7b:00:37:7a:41:
-                    33:78:e1:33:e2:f3:10:1a:7f:87:2c:be:f6:f5:f7:
-                    42:e2:e5:bf:87:62:89:5f:00:4b:df:c5:dd:e4:75:
-                    44:32:41:3a:1e:71:6e:69:cb:0b:75:46:08:d1:ca:
-                    d2:2b:95:d0:cf:fb:b9:40:6b:64:8c:57:4d:fc:13:
-                    11:79:84:ed:5e:54:f6:34:9f:08:01:f3:10:25:06:
-                    17:4a:da:f1:1d:7a:66:6b:98:60:66:a4:d9:ef:d2:
-                    2e:82:f1:f0:ef:09:ea:44:c9:15:6a:e2:03:6e:33:
-                    d3:ac:9f:55:00:c7:f6:08:6a:94:b9:5f:dc:e0:33:
-                    f1:84:60:f9:5b:27:11:b4:fc:16:f2:bb:56:6a:80:
-                    25:8d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            1.3.6.1.5.5.7.1.12: 
-                0_.].[0Y0W0U..image/gif0!0.0...+..............k...j.H.,{..0%.#http://logo.verisign.com/vslogo.gif
-            X509v3 Subject Key Identifier: 
-                B6:77:FA:69:48:47:9F:53:12:D5:C2:EA:07:32:76:07:D1:97:07:19
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        4a:f8:f8:b0:03:e6:2c:67:7b:e4:94:77:63:cc:6e:4c:f9:7d:
-        0e:0d:dc:c8:b9:35:b9:70:4f:63:fa:24:fa:6c:83:8c:47:9d:
-        3b:63:f3:9a:f9:76:32:95:91:b1:77:bc:ac:9a:be:b1:e4:31:
-        21:c6:81:95:56:5a:0e:b1:c2:d4:b1:a6:59:ac:f1:63:cb:b8:
-        4c:1d:59:90:4a:ef:90:16:28:1f:5a:ae:10:fb:81:50:38:0c:
-        6c:cc:f1:3d:c3:f5:63:e3:b3:e3:21:c9:24:39:e9:fd:15:66:
-        46:f4:1b:11:d0:4d:73:a3:7d:46:f9:3d:ed:a8:5f:62:d4:f1:
-        3f:f8:e0:74:57:2b:18:9d:81:b4:c4:28:da:94:97:a5:70:eb:
-        ac:1d:be:07:11:f0:d5:db:dd:e5:8c:f0:d5:32:b0:83:e6:57:
-        e2:8f:bf:be:a1:aa:bf:3d:1d:b5:d4:38:ea:d7:b0:5c:3a:4f:
-        6a:3f:8f:c0:66:6c:63:aa:e9:d9:a4:16:f4:81:d1:95:14:0e:
-        7d:cd:95:34:d9:d2:8f:70:73:81:7b:9c:7e:bd:98:61:d8:45:
-        87:98:90:c5:eb:86:30:c6:35:bf:f0:ff:c3:55:88:83:4b:ef:
-        05:92:06:71:f2:b8:98:93:b7:ec:cd:82:61:f1:38:e6:4f:97:
-        98:2a:5a:8d
-SHA1 Fingerprint=36:79:CA:35:66:87:72:30:4D:30:A5:FB:87:3B:0F:A7:7B:B7:0D:54
------BEGIN CERTIFICATE-----
-MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
-vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
-ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
-U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
-ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
-Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
-MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
-IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
-IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
-bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
-9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
-H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
-LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
-/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
-rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
-EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
-WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
-exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
-DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
-sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
-seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
-4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
-BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
-lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
-7M2CYfE45k+XmCpajQ==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
deleted file mode 100644
index 9a548c55bcc9..000000000000
--- a/secure/caroot/untrusted/Verisign_Class_1_Public_Primary_Certification_Authority_-_G3.pem
+++ /dev/null
@@ -1,86 +0,0 @@
-##
-##  Verisign Class 1 Public Primary Certification Authority - G3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number:
-            8b:5b:75:56:84:54:85:0b:00:cf:af:38:48:ce:b1:a4
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 1 Public Primary Certification Authority - G3
-        Validity
-            Not Before: Oct  1 00:00:00 1999 GMT
-            Not After : Jul 16 23:59:59 2036 GMT
-        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 1 Public Primary Certification Authority - G3
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:dd:84:d4:b9:b4:f9:a7:d8:f3:04:78:9c:de:3d:
-                    dc:6c:13:16:d9:7a:dd:24:51:66:c0:c7:26:59:0d:
-                    ac:06:08:c2:94:d1:33:1f:f0:83:35:1f:6e:1b:c8:
-                    de:aa:6e:15:4e:54:27:ef:c4:6d:1a:ec:0b:e3:0e:
-                    f0:44:a5:57:c7:40:58:1e:a3:47:1f:71:ec:60:f6:
-                    6d:94:c8:18:39:ed:fe:42:18:56:df:e4:4c:49:10:
-                    78:4e:01:76:35:63:12:36:dd:66:bc:01:04:36:a3:
-                    55:68:d5:a2:36:09:ac:ab:21:26:54:06:ad:3f:ca:
-                    14:e0:ac:ca:ad:06:1d:95:e2:f8:9d:f1:e0:60:ff:
-                    c2:7f:75:2b:4c:cc:da:fe:87:99:21:ea:ba:fe:3e:
-                    54:d7:d2:59:78:db:3c:6e:cf:a0:13:00:1a:b8:27:
-                    a1:e4:be:67:96:ca:a0:c5:b3:9c:dd:c9:75:9e:eb:
-                    30:9a:5f:a3:cd:d9:ae:78:19:3f:23:e9:5c:db:29:
-                    bd:ad:55:c8:1b:54:8c:63:f6:e8:a6:ea:c7:37:12:
-                    5c:a3:29:1e:02:d9:db:1f:3b:b4:d7:0f:56:47:81:
-                    15:04:4a:af:83:27:d1:c5:58:88:c1:dd:f6:aa:a7:
-                    a3:18:da:68:aa:6d:11:51:e1:bf:65:6b:9f:96:76:
-                    d1:3d
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        ab:66:8d:d7:b3:ba:c7:9a:b6:e6:55:d0:05:f1:9f:31:8d:5a:
-        aa:d9:aa:46:26:0f:71:ed:a5:ad:53:56:62:01:47:2a:44:e9:
-        fe:3f:74:0b:13:9b:b9:f4:4d:1b:b2:d1:5f:b2:b6:d2:88:5c:
-        b3:9f:cd:cb:d4:a7:d9:60:95:84:3a:f8:c1:37:1d:61:ca:e7:
-        b0:c5:e5:91:da:54:a6:ac:31:81:ae:97:de:cd:08:ac:b8:c0:
-        97:80:7f:6e:72:a4:e7:69:13:95:65:1f:c4:93:3c:fd:79:8f:
-        04:d4:3e:4f:ea:f7:9e:ce:cd:67:7c:4f:65:02:ff:91:85:54:
-        73:c7:ff:36:f7:86:2d:ec:d0:5e:4f:ff:11:9f:72:06:d6:b8:
-        1a:f1:4c:0d:26:65:e2:44:80:1e:c7:9f:e3:dd:e8:0a:da:ec:
-        a5:20:80:69:68:a1:4f:7e:e1:6b:cf:07:41:fa:83:8e:bc:38:
-        dd:b0:2e:11:b1:6b:b2:42:cc:9a:bc:f9:48:22:79:4a:19:0f:
-        b2:1c:3e:20:74:d9:6a:c3:be:f2:28:78:13:56:79:4f:6d:50:
-        ea:1b:b0:b5:57:b1:37:66:58:23:f3:dc:0f:df:0a:87:c4:ef:
-        86:05:d5:38:14:60:99:a3:4b:de:06:96:71:2c:f2:db:b6:1f:
-        a4:ef:3f:ee
-SHA1 Fingerprint=20:42:85:DC:F7:EB:76:41:95:57:8E:13:6B:D4:B7:D1:E9:8E:46:A5
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN2E1Lm0+afY8wR4
-nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/EbRrsC+MO
-8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjV
-ojYJrKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjb
-PG7PoBMAGrgnoeS+Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP2
-6KbqxzcSXKMpHgLZ2x87tNcPVkeBFQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vr
-n5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAq2aN17O6x5q25lXQBfGfMY1a
-qtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/Ny9Sn2WCVhDr4
-wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
-ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrs
-pSCAaWihT37ha88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4
-E1Z5T21Q6huwtVexN2ZYI/PcD98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
deleted file mode 100644
index 0952b7a366ef..000000000000
--- a/secure/caroot/untrusted/Verisign_Class_2_Public_Primary_Certification_Authority_-_G3.pem
+++ /dev/null
@@ -1,86 +0,0 @@
-##
-##  Verisign Class 2 Public Primary Certification Authority - G3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number:
-            61:70:cb:49:8c:5f:98:45:29:e7:b0:a6:d9:50:5b:7a
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 2 Public Primary Certification Authority - G3
-        Validity
-            Not Before: Oct  1 00:00:00 1999 GMT
-            Not After : Jul 16 23:59:59 2036 GMT
-        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 2 Public Primary Certification Authority - G3
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:af:0a:0d:c2:d5:2c:db:67:b9:2d:e5:94:27:dd:
-                    a5:be:e0:b0:4d:8f:b3:61:56:3c:d6:7c:c3:f4:cd:
-                    3e:86:cb:a2:88:e2:e1:d8:a4:69:c5:b5:e2:bf:c1:
-                    a6:47:50:5e:46:39:8b:d5:96:ba:b5:6f:14:bf:10:
-                    ce:27:13:9e:05:47:9b:31:7a:13:d8:1f:d9:d3:02:
-                    37:8b:ad:2c:47:f0:8e:81:06:a7:0d:30:0c:eb:f7:
-                    3c:0f:20:1d:dc:72:46:ee:a5:02:c8:5b:c3:c9:56:
-                    69:4c:c5:18:c1:91:7b:0b:d5:13:00:9b:bc:ef:c3:
-                    48:3e:46:60:20:85:2a:d5:90:b6:cd:8b:a0:cc:32:
-                    dd:b7:fd:40:55:b2:50:1c:56:ae:cc:8d:77:4d:c7:
-                    20:4d:a7:31:76:ef:68:92:8a:90:1e:08:81:56:b2:
-                    ad:69:a3:52:d0:cb:1c:c4:23:3d:1f:99:fe:4c:e8:
-                    16:63:8e:c6:08:8e:f6:31:f6:d2:fa:e5:76:dd:b5:
-                    1c:92:a3:49:cd:cd:01:cd:68:cd:a9:69:ba:a3:eb:
-                    1d:0d:9c:a4:20:a6:c1:a0:c5:d1:46:4c:17:6d:d2:
-                    ac:66:3f:96:8c:e0:84:d4:36:ff:22:59:c5:f9:11:
-                    60:a8:5f:04:7d:f2:1a:f6:25:42:61:0f:c4:4a:b8:
-                    3e:89
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        34:26:15:3c:c0:8d:4d:43:49:1d:bd:e9:21:92:d7:66:9c:b7:
-        de:c5:b8:d0:e4:5d:5f:76:22:c0:26:f9:84:3a:3a:f9:8c:b5:
-        fb:ec:60:f1:e8:ce:04:b0:c8:dd:a7:03:8f:30:f3:98:df:a4:
-        e6:a4:31:df:d3:1c:0b:46:dc:72:20:3f:ae:ee:05:3c:a4:33:
-        3f:0b:39:ac:70:78:73:4b:99:2b:df:30:c2:54:b0:a8:3b:55:
-        a1:fe:16:28:cd:42:bd:74:6e:80:db:27:44:a7:ce:44:5d:d4:
-        1b:90:98:0d:1e:42:94:b1:00:2c:04:d0:74:a3:02:05:22:63:
-        63:cd:83:b5:fb:c1:6d:62:6b:69:75:fd:5d:70:41:b9:f5:bf:
-        7c:df:be:c1:32:73:22:21:8b:58:81:7b:15:91:7a:ba:e3:64:
-        48:b0:7f:fb:36:25:da:95:d0:f1:24:14:17:dd:18:80:6b:46:
-        23:39:54:f5:8e:62:09:04:1d:94:90:a6:9b:e6:25:e2:42:45:
-        aa:b8:90:ad:be:08:8f:a9:0b:42:18:94:cf:72:39:e1:b1:43:
-        e0:28:cf:b7:e7:5a:6c:13:6b:49:b3:ff:e3:18:7c:89:8b:33:
-        5d:ac:33:d7:a7:f9:da:3a:55:c9:58:10:f9:aa:ef:5a:b6:cf:
-        4b:4b:df:2a
-SHA1 Fingerprint=61:EF:43:D7:7F:CA:D4:61:51:BC:98:E0:C3:59:12:AF:9F:EB:63:11
------BEGIN CERTIFICATE-----
-MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVy
-aVNpZ24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24s
-IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNp
-Z24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJBgNV
-BAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNp
-Z24gVHJ1c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIElu
-Yy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24g
-Q2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAt
-IEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArwoNwtUs22e5LeWU
-J92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6tW8UvxDO
-JxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUY
-wZF7C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9o
-koqQHgiBVrKtaaNS0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjN
-qWm6o+sdDZykIKbBoMXRRkwXbdKsZj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/E
-Srg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0JhU8wI1NQ0kdvekhktdmnLfe
-xbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf0xwLRtxyID+u
-7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
-sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RI
-sH/7NiXaldDxJBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTP
-cjnhsUPgKM+351psE2tJs//jGHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem b/secure/caroot/untrusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
deleted file mode 100644
index f522219536fa..000000000000
--- a/secure/caroot/untrusted/Verisign_Class_3_Public_Primary_Certification_Authority_-_G3.pem
+++ /dev/null
@@ -1,86 +0,0 @@
-##
-##  Verisign Class 3 Public Primary Certification Authority - G3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 1 (0x0)
-        Serial Number:
-            9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G3
-        Validity
-            Not Before: Oct  1 00:00:00 1999 GMT
-            Not After : Jul 16 23:59:59 2036 GMT
-        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 1999 VeriSign, Inc. - For authorized use only, CN=VeriSign Class 3 Public Primary Certification Authority - G3
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:cb:ba:9c:52:fc:78:1f:1a:1e:6f:1b:37:73:bd:
-                    f8:c9:6b:94:12:30:4f:f0:36:47:f5:d0:91:0a:f5:
-                    17:c8:a5:61:c1:16:40:4d:fb:8a:61:90:e5:76:20:
-                    c1:11:06:7d:ab:2c:6e:a6:f5:11:41:8e:fa:2d:ad:
-                    2a:61:59:a4:67:26:4c:d0:e8:bc:52:5b:70:20:04:
-                    58:d1:7a:c9:a4:69:bc:83:17:64:ad:05:8b:bc:d0:
-                    58:ce:8d:8c:f5:eb:f0:42:49:0b:9d:97:27:67:32:
-                    6e:e1:ae:93:15:1c:70:bc:20:4d:2f:18:de:92:88:
-                    e8:6c:85:57:11:1a:e9:7e:e3:26:11:54:a2:45:96:
-                    55:83:ca:30:89:e8:dc:d8:a3:ed:2a:80:3f:7f:79:
-                    65:57:3e:15:20:66:08:2f:95:93:bf:aa:47:2f:a8:
-                    46:97:f0:12:e2:fe:c2:0a:2b:51:e6:76:e6:b7:46:
-                    b7:e2:0d:a6:cc:a8:c3:4c:59:55:89:e6:e8:53:5c:
-                    1c:ea:9d:f0:62:16:0b:a7:c9:5f:0c:f0:de:c2:76:
-                    ce:af:f7:6a:f2:fa:41:a6:a2:33:14:c9:e5:7a:63:
-                    d3:9e:62:37:d5:85:65:9e:0e:e6:53:24:74:1b:5e:
-                    1d:12:53:5b:c7:2c:e7:83:49:3b:15:ae:8a:68:b9:
-                    57:97
-                Exponent: 65537 (0x10001)
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        11:14:96:c1:ab:92:08:f7:3f:2f:c9:b2:fe:e4:5a:9f:64:de:
-        db:21:4f:86:99:34:76:36:57:dd:d0:15:2f:c5:ad:7f:15:1f:
-        37:62:73:3e:d4:e7:5f:ce:17:03:db:35:fa:2b:db:ae:60:09:
-        5f:1e:5f:8f:6e:bb:0b:3d:ea:5a:13:1e:0c:60:6f:b5:c0:b5:
-        23:22:2e:07:0b:cb:a9:74:cb:47:bb:1d:c1:d7:a5:6b:cc:2f:
-        d2:42:fd:49:dd:a7:89:cf:53:ba:da:00:5a:28:bf:82:df:f8:
-        ba:13:1d:50:86:82:fd:8e:30:8f:29:46:b0:1e:3d:35:da:38:
-        62:16:18:4a:ad:e6:b6:51:6c:de:af:62:eb:01:d0:1e:24:fe:
-        7a:8f:12:1a:12:68:b8:fb:66:99:14:14:45:5c:ae:e7:ae:69:
-        17:81:2b:5a:37:c9:5e:2a:f4:c6:e2:a1:5c:54:9b:a6:54:00:
-        cf:f0:f1:c1:c7:98:30:1a:3b:36:16:db:a3:6e:ea:fd:ad:b2:
-        c2:da:ef:02:47:13:8a:c0:f1:b3:31:ad:4f:1c:e1:4f:9c:af:
-        0f:0c:9d:f7:78:0d:d8:f4:35:56:80:da:b7:6d:17:8f:9d:1e:
-        81:64:e1:fe:c5:45:ba:ad:6b:b9:0a:7a:4e:4f:4b:84:ee:4b:
-        f1:7d:dd:11
-SHA1 Fingerprint=13:2D:0D:45:53:4B:69:97:CD:B2:D5:C3:39:E2:55:76:60:9B:5C:C6
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCbfgZJoz5iudXukEhxKe9XMA0GCSqGSIb3DQEBBQUAMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZl
-cmlTaWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWdu
-LCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlT
-aWduIENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQswCQYD
-VQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlT
-aWduIFRydXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJ
-bmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWdu
-IENsYXNzIDMgUHVibGljIFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMu6nFL8eB8aHm8b
-N3O9+MlrlBIwT/A2R/XQkQr1F8ilYcEWQE37imGQ5XYgwREGfassbqb1EUGO+i2t
-KmFZpGcmTNDovFJbcCAEWNF6yaRpvIMXZK0Fi7zQWM6NjPXr8EJJC52XJ2cybuGu
-kxUccLwgTS8Y3pKI6GyFVxEa6X7jJhFUokWWVYPKMIno3Nij7SqAP395ZVc+FSBm
-CC+Vk7+qRy+oRpfwEuL+wgorUeZ25rdGt+INpsyow0xZVYnm6FNcHOqd8GIWC6fJ
-Xwzw3sJ2zq/3avL6QaaiMxTJ5Xpj055iN9WFZZ4O5lMkdBteHRJTW8cs54NJOxWu
-imi5V5cCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAERSWwauSCPc/L8my/uRan2Te
-2yFPhpk0djZX3dAVL8WtfxUfN2JzPtTnX84XA9s1+ivbrmAJXx5fj267Cz3qWhMe
-DGBvtcC1IyIuBwvLqXTLR7sdwdela8wv0kL9Sd2nic9TutoAWii/gt/4uhMdUIaC
-/Y4wjylGsB49Ndo4YhYYSq3mtlFs3q9i6wHQHiT+eo8SGhJouPtmmRQURVyu565p
-F4ErWjfJXir0xuKhXFSbplQAz/DxwceYMBo7Nhbbo27q/a2ywtrvAkcTisDxszGt
-TxzhT5yvDwyd93gN2PQ1VoDat20Xj50egWTh/sVFuq1ruQp6Tk9LhO5L8X3dEQ==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/thawte_Primary_Root_CA.pem b/secure/caroot/untrusted/thawte_Primary_Root_CA.pem
deleted file mode 100644
index 49b7ece70bec..000000000000
--- a/secure/caroot/untrusted/thawte_Primary_Root_CA.pem
+++ /dev/null
@@ -1,94 +0,0 @@
-##
-##  thawte Primary Root CA
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d
-        Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, O=thawte, Inc., OU=Certification Services Division, OU=(c) 2006 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA
-        Validity
-            Not Before: Nov 17 00:00:00 2006 GMT
-            Not After : Jul 16 23:59:59 2036 GMT
-        Subject: C=US, O=thawte, Inc., OU=Certification Services Division, OU=(c) 2006 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:ac:a0:f0:fb:80:59:d4:9c:c7:a4:cf:9d:a1:59:
-                    73:09:10:45:0c:0d:2c:6e:68:f1:6c:5b:48:68:49:
-                    59:37:fc:0b:33:19:c2:77:7f:cc:10:2d:95:34:1c:
-                    e6:eb:4d:09:a7:1c:d2:b8:c9:97:36:02:b7:89:d4:
-                    24:5f:06:c0:cc:44:94:94:8d:02:62:6f:eb:5a:dd:
-                    11:8d:28:9a:5c:84:90:10:7a:0d:bd:74:66:2f:6a:
-                    38:a0:e2:d5:54:44:eb:1d:07:9f:07:ba:6f:ee:e9:
-                    fd:4e:0b:29:f5:3e:84:a0:01:f1:9c:ab:f8:1c:7e:
-                    89:a4:e8:a1:d8:71:65:0d:a3:51:7b:ee:bc:d2:22:
-                    60:0d:b9:5b:9d:df:ba:fc:51:5b:0b:af:98:b2:e9:
-                    2e:e9:04:e8:62:87:de:2b:c8:d7:4e:c1:4c:64:1e:
-                    dd:cf:87:58:ba:4a:4f:ca:68:07:1d:1c:9d:4a:c6:
-                    d5:2f:91:cc:7c:71:72:1c:c5:c0:67:eb:32:fd:c9:
-                    92:5c:94:da:85:c0:9b:bf:53:7d:2b:09:f4:8c:9d:
-                    91:1f:97:6a:52:cb:de:09:36:a4:77:d8:7b:87:50:
-                    44:d5:3e:6e:29:69:fb:39:49:26:1e:09:a5:80:7b:
-                    40:2d:eb:e8:27:85:c9:fe:61:fd:7e:e6:7c:97:1d:
-                    d5:9d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                7B:5B:45:CF:AF:CE:CB:7A:FD:31:92:1A:6A:B6:F3:46:EB:57:48:50
-    Signature Algorithm: sha1WithRSAEncryption
-    Signature Value:
-        79:11:c0:4b:b3:91:b6:fc:f0:e9:67:d4:0d:6e:45:be:55:e8:
-        93:d2:ce:03:3f:ed:da:25:b0:1d:57:cb:1e:3a:76:a0:4c:ec:
-        50:76:e8:64:72:0c:a4:a9:f1:b8:8b:d6:d6:87:84:bb:32:e5:
-        41:11:c0:77:d9:b3:60:9d:eb:1b:d5:d1:6e:44:44:a9:a6:01:
-        ec:55:62:1d:77:b8:5c:8e:48:49:7c:9c:3b:57:11:ac:ad:73:
-        37:8e:2f:78:5c:90:68:47:d9:60:60:e6:fc:07:3d:22:20:17:
-        c4:f7:16:e9:c4:d8:72:f9:c8:73:7c:df:16:2f:15:a9:3e:fd:
-        6a:27:b6:a1:eb:5a:ba:98:1f:d5:e3:4d:64:0a:9d:13:c8:61:
-        ba:f5:39:1c:87:ba:b8:bd:7b:22:7f:f6:fe:ac:40:79:e5:ac:
-        10:6f:3d:8f:1b:79:76:8b:c4:37:b3:21:18:84:e5:36:00:eb:
-        63:20:99:b9:e9:fe:33:04:bb:41:c8:c1:02:f9:44:63:20:9e:
-        81:ce:42:d3:d6:3f:2c:76:d3:63:9c:59:dd:8f:a6:e1:0e:a0:
-        2e:41:f7:2e:95:47:cf:bc:fd:33:f3:f6:0b:61:7e:7e:91:2b:
-        81:47:c2:27:30:ee:a7:10:5d:37:8f:5c:39:2b:e4:04:f0:7b:
-        8d:56:8c:68
-SHA1 Fingerprint=91:C6:D6:EE:3E:8A:C8:63:84:E5:48:C2:99:29:5C:75:6C:81:7B:81
------BEGIN CERTIFICATE-----
-MIIEIDCCAwigAwIBAgIQNE7VVyDV7exJ9C/ON9srbTANBgkqhkiG9w0BAQUFADCB
-qTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxHzAdBgNV
-BAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwHhcNMDYxMTE3MDAwMDAwWhcNMzYw
-NzE2MjM1OTU5WjCBqTELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5j
-LjEoMCYGA1UECxMfQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYG
-A1UECxMvKGMpIDIwMDYgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxHzAdBgNVBAMTFnRoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCsoPD7gFnUnMekz52hWXMJEEUMDSxuaPFs
-W0hoSVk3/AszGcJ3f8wQLZU0HObrTQmnHNK4yZc2AreJ1CRfBsDMRJSUjQJib+ta
-3RGNKJpchJAQeg29dGYvajig4tVUROsdB58Hum/u6f1OCyn1PoSgAfGcq/gcfomk
-6KHYcWUNo1F77rzSImANuVud37r8UVsLr5iy6S7pBOhih94ryNdOwUxkHt3Ph1i6
-Sk/KaAcdHJ1KxtUvkcx8cXIcxcBn6zL9yZJclNqFwJu/U30rCfSMnZEfl2pSy94J
-NqR32HuHUETVPm4pafs5SSYeCaWAe0At6+gnhcn+Yf1+5nyXHdWdAgMBAAGjQjBA
-MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBR7W0XP
-r87Lev0xkhpqtvNG61dIUDANBgkqhkiG9w0BAQUFAAOCAQEAeRHAS7ORtvzw6WfU
-DW5FvlXok9LOAz/t2iWwHVfLHjp2oEzsUHboZHIMpKnxuIvW1oeEuzLlQRHAd9mz
-YJ3rG9XRbkREqaYB7FViHXe4XI5ISXycO1cRrK1zN44veFyQaEfZYGDm/Ac9IiAX
-xPcW6cTYcvnIc3zfFi8VqT79aie2oetaupgf1eNNZAqdE8hhuvU5HIe6uL17In/2
-/qxAeeWsEG89jxt5dovEN7MhGITlNgDrYyCZuen+MwS7QcjBAvlEYyCegc5C09Y/
-LHbTY5xZ3Y+m4Q6gLkH3LpVHz7z9M/P2C2F+fpErgUfCJzDupxBdN49cOSvkBPB7
-jVaMaA==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G2.pem b/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G2.pem
deleted file mode 100644
index 40aaff8992e5..000000000000
--- a/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G2.pem
+++ /dev/null
@@ -1,66 +0,0 @@
-##
-##  thawte Primary Root CA - G2
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            35:fc:26:5c:d9:84:4f:c9:3d:26:3d:57:9b:ae:d7:56
-        Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=US, O=thawte, Inc., OU=(c) 2007 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA - G2
-        Validity
-            Not Before: Nov  5 00:00:00 2007 GMT
-            Not After : Jan 18 23:59:59 2038 GMT
-        Subject: C=US, O=thawte, Inc., OU=(c) 2007 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA - G2
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:a2:d5:9c:82:7b:95:9d:f1:52:78:87:fe:8a:16:
-                    bf:05:e6:df:a3:02:4f:0d:07:c6:00:51:ba:0c:02:
-                    52:2d:22:a4:42:39:c4:fe:8f:ea:c9:c1:be:d4:4d:
-                    ff:9f:7a:9e:e2:b1:7c:9a:ad:a7:86:09:73:87:d1:
-                    e7:9a:e3:7a:a5:aa:6e:fb:ba:b3:70:c0:67:88:a2:
-                    35:d4:a3:9a:b1:fd:ad:c2:ef:31:fa:a8:b9:f3:fb:
-                    08:c6:91:d1:fb:29:95
-                ASN1 OID: secp384r1
-                NIST CURVE: P-384
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                9A:D8:00:30:00:E7:6B:7F:85:18:EE:8B:B6:CE:8A:0C:F8:11:E1:BB
-    Signature Algorithm: ecdsa-with-SHA384
-    Signature Value:
-        30:66:02:31:00:dd:f8:e0:57:47:5b:a7:e6:0a:c3:bd:f5:80:
-        8a:97:35:0d:1b:89:3c:54:86:77:28:ca:a1:f4:79:de:b5:e6:
-        38:b0:f0:65:70:8c:7f:02:54:c2:bf:ff:d8:a1:3e:d9:cf:02:
-        31:00:c4:8d:94:fc:dc:53:d2:dc:9d:78:16:1f:15:33:23:53:
-        52:e3:5a:31:5d:9d:ca:ae:bd:13:29:44:0d:27:5b:a8:e7:68:
-        9c:12:f7:58:3f:2e:72:02:57:a3:8f:a1:14:2e
-SHA1 Fingerprint=AA:DB:BC:22:23:8F:C4:01:A1:27:BB:38:DD:F4:1D:DB:08:9E:F0:12
------BEGIN CERTIFICATE-----
-MIICiDCCAg2gAwIBAgIQNfwmXNmET8k9Jj1Xm67XVjAKBggqhkjOPQQDAzCBhDEL
-MAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjE4MDYGA1UECxMvKGMp
-IDIwMDcgdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAi
-BgNVBAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMjAeFw0wNzExMDUwMDAw
-MDBaFw0zODAxMTgyMzU5NTlaMIGEMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhh
-d3RlLCBJbmMuMTgwNgYDVQQLEy8oYykgMjAwNyB0aGF3dGUsIEluYy4gLSBGb3Ig
-YXV0aG9yaXplZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9v
-dCBDQSAtIEcyMHYwEAYHKoZIzj0CAQYFK4EEACIDYgAEotWcgnuVnfFSeIf+iha/
-BebfowJPDQfGAFG6DAJSLSKkQjnE/o/qycG+1E3/n3qe4rF8mq2nhglzh9HnmuN6
-papu+7qzcMBniKI11KOasf2twu8x+qi58/sIxpHR+ymVo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUmtgAMADna3+FGO6Lts6K
-DPgR4bswCgYIKoZIzj0EAwMDaQAwZgIxAN344FdHW6fmCsO99YCKlzUNG4k8VIZ3
-KMqh9HneteY4sPBlcIx/AlTCv//YoT7ZzwIxAMSNlPzcU9LcnXgWHxUzI1NS41ox
-XZ3Krr0TKUQNJ1uo52icEvdYPy5yAlejj6EULg==
------END CERTIFICATE-----
diff --git a/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G3.pem b/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G3.pem
deleted file mode 100644
index 06cfdfdeb87e..000000000000
--- a/secure/caroot/untrusted/thawte_Primary_Root_CA_-_G3.pem
+++ /dev/null
@@ -1,94 +0,0 @@
-##
-##  thawte Primary Root CA - G3
-##
-##  This is a single X.509 certificate for a public Certificate
-##  Authority (CA). It was automatically extracted from Mozilla's
-##  root CA list (the file `certdata.txt' in security/nss)
-##  licensed under the MPL 2.0, http://mozilla.org/MPL/2.0/.
-##
-##  @generated
-##
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb
-        Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=US, O=thawte, Inc., OU=Certification Services Division, OU=(c) 2008 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA - G3
-        Validity
-            Not Before: Apr  2 00:00:00 2008 GMT
-            Not After : Dec  1 23:59:59 2037 GMT
-        Subject: C=US, O=thawte, Inc., OU=Certification Services Division, OU=(c) 2008 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA - G3
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:b2:bf:27:2c:fb:db:d8:5b:dd:78:7b:1b:9e:77:
-                    66:81:cb:3e:bc:7c:ae:f3:a6:27:9a:34:a3:68:31:
-                    71:38:33:62:e4:f3:71:66:79:b1:a9:65:a3:a5:8b:
-                    d5:8f:60:2d:3f:42:cc:aa:6b:32:c0:23:cb:2c:41:
-                    dd:e4:df:fc:61:9c:e2:73:b2:22:95:11:43:18:5f:
-                    c4:b6:1f:57:6c:0a:05:58:22:c8:36:4c:3a:7c:a5:
-                    d1:cf:86:af:88:a7:44:02:13:74:71:73:0a:42:59:
-                    02:f8:1b:14:6b:42:df:6f:5f:ba:6b:82:a2:9d:5b:
-                    e7:4a:bd:1e:01:72:db:4b:74:e8:3b:7f:7f:7d:1f:
-                    04:b4:26:9b:e0:b4:5a:ac:47:3d:55:b8:d7:b0:26:
-                    52:28:01:31:40:66:d8:d9:24:bd:f6:2a:d8:ec:21:
-                    49:5c:9b:f6:7a:e9:7f:55:35:7e:96:6b:8d:93:93:
-                    27:cb:92:bb:ea:ac:40:c0:9f:c2:f8:80:cf:5d:f4:
-                    5a:dc:ce:74:86:a6:3e:6c:0b:53:ca:bd:92:ce:19:
-                    06:72:e6:0c:5c:38:69:c7:04:d6:bc:6c:ce:5b:f6:
-                    f7:68:9c:dc:25:15:48:88:a1:e9:a9:f8:98:9c:e0:
-                    f3:d5:31:28:61:11:6c:67:96:8d:39:99:cb:c2:45:
-                    24:39
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                AD:6C:AA:94:60:9C:ED:E4:FF:FA:3E:0A:74:2B:63:03:F7:B6:59:BF
-    Signature Algorithm: sha256WithRSAEncryption
-    Signature Value:
-        1a:40:d8:95:65:ac:09:92:89:c6:39:f4:10:e5:a9:0e:66:53:
-        5d:78:de:fa:24:91:bb:e7:44:51:df:c6:16:34:0a:ef:6a:44:
-        51:ea:2b:07:8a:03:7a:c3:eb:3f:0a:2c:52:16:a0:2b:43:b9:
-        25:90:3f:70:a9:33:25:6d:45:1a:28:3b:27:cf:aa:c3:29:42:
-        1b:df:3b:4c:c0:33:34:5b:41:88:bf:6b:2b:65:af:28:ef:b2:
-        f5:c3:aa:66:ce:7b:56:ee:b7:c8:cb:67:c1:c9:9c:1a:18:b8:
-        c4:c3:49:03:f1:60:0e:50:cd:46:c5:f3:77:79:f7:b6:15:e0:
-        38:db:c7:2f:28:a0:0c:3f:77:26:74:d9:25:12:da:31:da:1a:
-        1e:dc:29:41:91:22:3c:69:a7:bb:02:f2:b6:5c:27:03:89:f4:
-        06:ea:9b:e4:72:82:e3:a1:09:c1:e9:00:19:d3:3e:d4:70:6b:
-        ba:71:a6:aa:58:ae:f4:bb:e9:6c:b6:ef:87:cc:9b:bb:ff:39:
-        e6:56:61:d3:0a:a7:c4:5c:4c:60:7b:05:77:26:7a:bf:d8:07:
-        52:2c:62:f7:70:63:d9:39:bc:6f:1c:c2:79:dc:76:29:af:ce:
-        c5:2c:64:04:5e:88:36:6e:31:d4:40:1a:62:34:36:3f:35:01:
-        ae:ac:63:a0
-SHA1 Fingerprint=F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2
------BEGIN CERTIFICATE-----
-MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
-rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
-Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
-MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
-BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
-Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
-LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
-MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
-ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
-gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
-YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
-b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
-9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
-zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
-OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
-HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
-2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
-oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
-t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
-KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
-m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
-MdRAGmI0Nj81Aa6sY6A=
------END CERTIFICATE-----