Merge Android R

Bug: 168057903
Merged-In: I5f7f3e51d58b8447db8001bba59af73cc9a6bbf1
Change-Id: I7f10efc7a632856c38f8dae7b83a86a5db40170c
diff --git a/files/00673b5b.0 b/files/00673b5b.0
index ccea509..e09c8f7 100644
--- a/files/00673b5b.0
+++ b/files/00673b5b.0
@@ -28,7 +28,7 @@
         Version: 3 (0x2)
         Serial Number:
             34:4e:d5:57:20:d5:ed:ec:49:f4:2f:ce:37:db:2b:6d
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -36,7 +36,7 @@
         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)
+                RSA 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:
diff --git a/files/04f60c28.0 b/files/04f60c28.0
index 2988872..2afdb1b 100644
--- a/files/04f60c28.0
+++ b/files/04f60c28.0
@@ -19,7 +19,7 @@
         Version: 3 (0x2)
         Serial Number:
             5c:8b:99:c5:5a:94:c5:d2:71:56:de:cd:89:80:cc:26
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, ST=New Jersey, L=Jersey City, O=The USERTRUST Network, CN=USERTrust ECC Certification Authority
         Validity
             Not Before: Feb  1 00:00:00 2010 GMT
diff --git a/files/0d69c7e1.0 b/files/0d69c7e1.0
index 9ac71c4..36f0a98 100644
--- a/files/0d69c7e1.0
+++ b/files/0d69c7e1.0
@@ -16,7 +16,7 @@
         Version: 3 (0x2)
         Serial Number:
             2a:38:a4:1c:96:0a:04:de:42:b2:28:a5:0b:e8:34:98:02
-    Signature Algorithm: ecdsa-with-SHA256
+        Signature Algorithm: ecdsa-with-SHA256
         Issuer: OU=GlobalSign ECC Root CA - R4, O=GlobalSign, CN=GlobalSign
         Validity
             Not Before: Nov 13 00:00:00 2012 GMT
diff --git a/files/10531352.0 b/files/10531352.0
index be3e88c..3052868 100644
--- a/files/10531352.0
+++ b/files/10531352.0
@@ -26,7 +26,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, Inc., CN=Starfield Services Root Certificate Authority - G2
         Validity
             Not Before: Sep  1 00:00:00 2009 GMT
@@ -34,7 +34,7 @@
         Subject: C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, Inc., CN=Starfield Services Root Certificate Authority - G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:d5:0c:3a:c4:2a:f9:4e:e2:f5:be:19:97:5f:8e:
                     88:53:b1:1f:3f:cb:cf:9f:20:13:6d:29:3a:c8:0f:
diff --git a/files/111e6273.0 b/files/111e6273.0
index 97aa17a..4753f64 100644
--- a/files/111e6273.0
+++ b/files/111e6273.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             04:00:00:00:00:01:0f:86:26:e6:0d
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: OU=GlobalSign Root CA - R2, O=GlobalSign, CN=GlobalSign
         Validity
             Not Before: Dec 15 08:00:00 2006 GMT
@@ -33,7 +33,7 @@
         Subject: OU=GlobalSign Root CA - R2, O=GlobalSign, CN=GlobalSign
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:a6:cf:24:0e:be:2e:6f:28:99:45:42:c4:ab:3e:
                     21:54:9b:0b:d3:7f:84:70:fa:12:b3:cb:bf:87:5f:
diff --git a/files/12d55845.0 b/files/12d55845.0
index 29cbb95..1b02631 100644
--- a/files/12d55845.0
+++ b/files/12d55845.0
@@ -23,7 +23,7 @@
         Version: 3 (0x2)
         Serial Number:
             44:af:b0:80:d6:a3:27:ba:89:30:39:86:2e:f8:40:6b
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: O=Digital Signature Trust Co., CN=DST Root CA X3
         Validity
             Not Before: Sep 30 21:12:19 2000 GMT
@@ -31,7 +31,7 @@
         Subject: O=Digital Signature Trust Co., CN=DST Root CA X3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:df:af:e9:97:50:08:83:57:b4:cc:62:65:f6:90:
                     82:ec:c7:d3:2c:6b:30:ca:5b:ec:d9:c3:7d:c7:40:
diff --git a/files/17b51fe6.0 b/files/17b51fe6.0
deleted file mode 100644
index f47a60f..0000000
--- a/files/17b51fe6.0
+++ /dev/null
@@ -1,87 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw
-PTELMAkGA1UEBhMCRlIxETAPBgNVBAoTCENlcnRwbHVzMRswGQYDVQQDExJDbGFz
-cyAyIFByaW1hcnkgQ0EwHhcNOTkwNzA3MTcwNTAwWhcNMTkwNzA2MjM1OTU5WjA9
-MQswCQYDVQQGEwJGUjERMA8GA1UEChMIQ2VydHBsdXMxGzAZBgNVBAMTEkNsYXNz
-IDIgUHJpbWFyeSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANxQ
-ltAS+DXSCHh6tlJw/W/uz7kRy1134ezpfgSN1sxvc0NXYKwzCkTsA18cgCSR5aiR
-VhKC9+Ar9NuuYS6JEI1rbLqzAr3VNsVINyPi8Fo3UjMXEuLRYE2+L0ER4/YXJQyL
-kcAbmXuZVg2v7tK8R1fjeUl7NIknJITesezpWE7+Tt9avkGtrAjFGA7v0lPubNCd
-EgETjdyAYveVqUSISnFOYFWe2yMZeVYHDD9jC1yw4r5+FfyUM1hBOHTE4Y+L3yas
-H7WLO7dDWWuwJKZtkIvEcupdM5i3y95ee++U8Rs+yskhwcWYAqqi9lt3m/V+llU0
-HGdpwPFC40es/CgcZlUCAwEAAaOBjDCBiTAPBgNVHRMECDAGAQH/AgEKMAsGA1Ud
-DwQEAwIBBjAdBgNVHQ4EFgQU43Mt38sOKAze3bOkynm4jrvoMIkwEQYJYIZIAYb4
-QgEBBAQDAgEGMDcGA1UdHwQwMC4wLKAqoCiGJmh0dHA6Ly93d3cuY2VydHBsdXMu
-Y29tL0NSTC9jbGFzczIuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQCnVM+IRBnL39R/
-AN9WM2K191EBkOvDP9GIROkkXe/nFL0gt5o8AP5tn9uQ3Nf0YtaLcF3n5QRIqWh8
-yfFC82x/xXp8HVGIutIKPidd3i1RTtMTZGnkLuPT55sJmabglZvOGtd/vjzOUrMR
-FcEPF80Du5wlFbqidon8BvEY0JNLDnyCt6X09l/+7UCmnYR0ObncHoUW2ikbhiMA
-ybuJfm6AiB4vFLQDJKgybwOaRywwvlbGp0ICcBvqQNi6BQNwB6SW//1IMwrh3KWB
-kJtN3X3n57LNXMhqlfil9o3EXXgIvnsG1knPGTZQIy4I5p4FTUcY1Rbpsda2ENW7
-l7+ijrRU
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            85:bd:4b:f3:d8:da:e3:69:f6:94:d7:5f:c3:a5:44:23
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=FR, O=Certplus, CN=Class 2 Primary CA
-        Validity
-            Not Before: Jul  7 17:05:00 1999 GMT
-            Not After : Jul  6 23:59:59 2019 GMT
-        Subject: C=FR, O=Certplus, CN=Class 2 Primary CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:dc:50:96:d0:12:f8:35:d2:08:78:7a:b6:52:70:
-                    fd:6f:ee:cf:b9:11:cb:5d:77:e1:ec:e9:7e:04:8d:
-                    d6:cc:6f:73:43:57:60:ac:33:0a:44:ec:03:5f:1c:
-                    80:24:91:e5:a8:91:56:12:82:f7:e0:2b:f4:db:ae:
-                    61:2e:89:10:8d:6b:6c:ba:b3:02:bd:d5:36:c5:48:
-                    37:23:e2:f0:5a:37:52:33:17:12:e2:d1:60:4d:be:
-                    2f:41:11:e3:f6:17:25:0c:8b:91:c0:1b:99:7b:99:
-                    56:0d:af:ee:d2:bc:47:57:e3:79:49:7b:34:89:27:
-                    24:84:de:b1:ec:e9:58:4e:fe:4e:df:5a:be:41:ad:
-                    ac:08:c5:18:0e:ef:d2:53:ee:6c:d0:9d:12:01:13:
-                    8d:dc:80:62:f7:95:a9:44:88:4a:71:4e:60:55:9e:
-                    db:23:19:79:56:07:0c:3f:63:0b:5c:b0:e2:be:7e:
-                    15:fc:94:33:58:41:38:74:c4:e1:8f:8b:df:26:ac:
-                    1f:b5:8b:3b:b7:43:59:6b:b0:24:a6:6d:90:8b:c4:
-                    72:ea:5d:33:98:b7:cb:de:5e:7b:ef:94:f1:1b:3e:
-                    ca:c9:21:c1:c5:98:02:aa:a2:f6:5b:77:9b:f5:7e:
-                    96:55:34:1c:67:69:c0:f1:42:e3:47:ac:fc:28:1c:
-                    66:55
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:TRUE, pathlen:10
-            X509v3 Key Usage: 
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                E3:73:2D:DF:CB:0E:28:0C:DE:DD:B3:A4:CA:79:B8:8E:BB:E8:30:89
-            Netscape Cert Type: 
-                SSL CA, S/MIME CA
-            X509v3 CRL Distribution Points: 
-
-                Full Name:
-                  URI:http://www.certplus.com/CRL/class2.crl
-
-    Signature Algorithm: sha1WithRSAEncryption
-         a7:54:cf:88:44:19:cb:df:d4:7f:00:df:56:33:62:b5:f7:51:
-         01:90:eb:c3:3f:d1:88:44:e9:24:5d:ef:e7:14:bd:20:b7:9a:
-         3c:00:fe:6d:9f:db:90:dc:d7:f4:62:d6:8b:70:5d:e7:e5:04:
-         48:a9:68:7c:c9:f1:42:f3:6c:7f:c5:7a:7c:1d:51:88:ba:d2:
-         0a:3e:27:5d:de:2d:51:4e:d3:13:64:69:e4:2e:e3:d3:e7:9b:
-         09:99:a6:e0:95:9b:ce:1a:d7:7f:be:3c:ce:52:b3:11:15:c1:
-         0f:17:cd:03:bb:9c:25:15:ba:a2:76:89:fc:06:f1:18:d0:93:
-         4b:0e:7c:82:b7:a5:f4:f6:5f:fe:ed:40:a6:9d:84:74:39:b9:
-         dc:1e:85:16:da:29:1b:86:23:00:c9:bb:89:7e:6e:80:88:1e:
-         2f:14:b4:03:24:a8:32:6f:03:9a:47:2c:30:be:56:c6:a7:42:
-         02:70:1b:ea:40:d8:ba:05:03:70:07:a4:96:ff:fd:48:33:0a:
-         e1:dc:a5:81:90:9b:4d:dd:7d:e7:e7:b2:cd:5c:c8:6a:95:f8:
-         a5:f6:8d:c4:5d:78:08:be:7b:06:d6:49:cf:19:36:50:23:2e:
-         08:e6:9e:05:4d:47:18:d5:16:e9:b1:d6:b6:10:d5:bb:97:bf:
-         a2:8e:b4:54
-SHA1 Fingerprint=74:20:74:41:72:9C:DD:92:EC:79:31:D8:23:10:8D:C2:81:92:E2:BB
diff --git a/files/1dcd6f4c.0 b/files/1dcd6f4c.0
index d21efc6..194211a 100644
--- a/files/1dcd6f4c.0
+++ b/files/1dcd6f4c.0
@@ -35,7 +35,7 @@
         Version: 3 (0x2)
         Serial Number:
             1f:9d:59:5a:d7:2f:c2:06:44:a5:80:08:69:e3:5e:f6
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=TW, O=Government Root Certification Authority
         Validity
             Not Before: Dec  5 13:23:33 2002 GMT
@@ -43,7 +43,7 @@
         Subject: C=TW, O=Government Root Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA 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:
diff --git a/files/1df5a75f.0 b/files/1df5a75f.0
index d325e83..c0ec131 100644
--- a/files/1df5a75f.0
+++ b/files/1df5a75f.0
@@ -27,7 +27,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 623603 (0x983f3)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, O=D-Trust GmbH, CN=D-TRUST Root Class 3 CA 2 2009
         Validity
             Not Before: Nov  5 08:35:58 2009 GMT
@@ -35,7 +35,7 @@
         Subject: C=DE, O=D-Trust GmbH, CN=D-TRUST Root Class 3 CA 2 2009
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:d3:b2:4a:cf:7a:47:ef:75:9b:23:fa:3a:2f:d6:
                     50:45:89:35:3a:c6:6b:db:fe:db:00:68:a8:e0:03:
diff --git a/files/1e1eab7c.0 b/files/1e1eab7c.0
index 6a4788c..17b9940 100644
--- a/files/1e1eab7c.0
+++ b/files/1e1eab7c.0
@@ -25,7 +25,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, O=T-Systems Enterprise Services GmbH, OU=T-Systems Trust Center, CN=T-TeleSec GlobalRoot Class 3
         Validity
             Not Before: Oct  1 10:29:56 2008 GMT
@@ -33,7 +33,7 @@
         Subject: C=DE, O=T-Systems Enterprise Services GmbH, OU=T-Systems Trust Center, CN=T-TeleSec GlobalRoot Class 3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:bd:75:93:f0:62:22:6f:24:ae:e0:7a:76:ac:7d:
                     bd:d9:24:d5:b8:b7:fc:cd:f0:42:e0:eb:78:88:56:
diff --git a/files/1e8e7201.0 b/files/1e8e7201.0
index 224b3d5..7141d84 100644
--- a/files/1e8e7201.0
+++ b/files/1e8e7201.0
@@ -24,7 +24,7 @@
         Version: 3 (0x2)
         Serial Number:
             04:00:00:00:00:01:21:58:53:08:a2
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: OU=GlobalSign Root CA - R3, O=GlobalSign, CN=GlobalSign
         Validity
             Not Before: Mar 18 10:00:00 2009 GMT
@@ -32,7 +32,7 @@
         Subject: OU=GlobalSign Root CA - R3, O=GlobalSign, CN=GlobalSign
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:cc:25:76:90:79:06:78:22:16:f5:c0:83:b6:84:
                     ca:28:9e:fd:05:76:11:c5:ad:88:72:fc:46:02:43:
diff --git a/files/1eb37bdf.0 b/files/1eb37bdf.0
index 5a572a7..8878324 100644
--- a/files/1eb37bdf.0
+++ b/files/1eb37bdf.0
@@ -45,7 +45,7 @@
         Version: 3 (0x2)
         Serial Number:
             a3:da:42:7e:a4:b1:ae:da
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -53,7 +53,7 @@
         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)
+                RSA 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:
diff --git a/files/1f58a078.0 b/files/1f58a078.0
index ac07485..45ac1a9 100644
--- a/files/1f58a078.0
+++ b/files/1f58a078.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             44:57:34:24:5b:81:89:9b:35:f2:ce:b8:2b:3b:5b:a7:26:f0:75:28
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 2 G3
         Validity
             Not Before: Jan 12 18:59:32 2012 GMT
@@ -42,7 +42,7 @@
         Subject: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 2 G3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:a1:ae:25:b2:01:18:dc:57:88:3f:46:eb:f9:af:
                     e2:eb:23:71:e2:9a:d1:61:66:21:5f:aa:af:27:51:
diff --git a/files/21855f49.0 b/files/21855f49.0
deleted file mode 100644
index e92db4b..0000000
--- a/files/21855f49.0
+++ /dev/null
@@ -1,120 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFaTCCA1GgAwIBAgIJAMMDmu5QkG4oMA0GCSqGSIb3DQEBBQUAMFIxCzAJBgNV
-BAYTAlNLMRMwEQYDVQQHEwpCcmF0aXNsYXZhMRMwEQYDVQQKEwpEaXNpZyBhLnMu
-MRkwFwYDVQQDExBDQSBEaXNpZyBSb290IFIxMB4XDTEyMDcxOTA5MDY1NloXDTQy
-MDcxOTA5MDY1NlowUjELMAkGA1UEBhMCU0sxEzARBgNVBAcTCkJyYXRpc2xhdmEx
-EzARBgNVBAoTCkRpc2lnIGEucy4xGTAXBgNVBAMTEENBIERpc2lnIFJvb3QgUjEw
-ggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCqw3j33Jijp1pedxiy3QRk
-D2P9m5YJgNXoqqXinCaUOuiZc4yd39ffg/N4T0Dhf9Kn0uXKE5Pn7cZ3Xza1lK/o
-OI7bm+V8u8yN63Vz4STN5qctGS7Y1oprFOsIYgrY3LMATcMjfF9DCCMyEtztDK3A
-fQ+lekLZWnDZv6fXARz2m6uOt0qGeKAeVjGu74IKgEH3G8muqzIm1Cxr7X1r5OJe
-IgpFy4QxTaz+29FHuvlglzmxZcfe+5nkCiKxLU3lSCZpq+Kq8/v8kiky6bM+TR8n
-oc2OuRf7JT7JbvN32g0S9l3HuzYQ1VTW8+DiR0jm3hTaYVKvJrT1cU/J19IG32PK
-/yHoWQbgCNWEFVP3Q+V8xaCJmGtzxmjOZd69fwX3se72V6FglcXM6pM6vpmumwKj
-rckWtc7dXpl4fho5frLABaTAgqWjR56M6ly2vGfb5ipN0gTco65F97yLnByn1tUD
-3AjLLhbKXEAz6GfDLuemROoRRRw1ZS0eRWEkG4IupZ0zXWX4Qfkuy5Q/H6MMMSRE
-7cderVC6xkGbrPAXZcD4XW9boAo0PO7X6oifmPmvTiT6l7Jkdtqr9O3jw2Dv1fkC
-yC2fg69naQanMVXVz0tv/wQFx1isXxYb5dKj6zHbHzMVTdDypVP1y+E9Tmgt2BLd
-qvLmTZtJ5cUoobqwWsagtQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud
-DwEB/wQEAwIBBjAdBgNVHQ4EFgQUiQq0OJMa5qvum5EY+fU8PjXQ04IwDQYJKoZI
-hvcNAQEFBQADggIBADKL9p1Kyb4U5YysOMo6CdQbzoaz3evUuii+Eq5FLAR0rBNR
-xVgYZk2C2tXck8An4b58n1KeElb21Zyp9HWc+jcSjxyT7Ff+Bw+r1RL3D65hXlaA
-SfX8MPWbTx9BLxyE04nH4toCdu0Jz2zBuByDHBb6lM19oMgY0sidbvW9adRtPTXo
-HqJPYNcHKfyyo6SdbhWSVhlMCrDpfNIZTUJG7L399ldb3Zh+pE3McgODWF3vkzpB
-emOqfDqo9ayk0d2iLbYq/J8BjuIQscTK5GfbVSUZP/3oNn6z4eGBrxEWi1CXYBmC
-AMBrTXO40RMHPuq2MU/wQppt4hF05ZSsjYSVPCGvxdpHyN85YmLLW1AL14FABZyb
-7bq2ix4Eb5YgOe2kfSnbSM6C3NQCjR0EMVrHS/BsYVLXtFHCgWzN4funodKSds+x
-DzdYpPJScWc/DIh4gInByLUfkmO+p3qKViwaqKactV2zY9ATIKHrkWzQjX2v3wvk
-F7mGnjixlAxYjOBVqjtjbZqJYLhkKpLGN/R+Q0O3c+gB53+XD9fyexn9GtePyfqF
-a3qdnom2piiZk4hA9z7NUaPK6u95RyG1/jLix8NRb76AdPCkwzryT+lf3xkK8jsT
-Q6wxpLPn6/wY1gGp8yqPNg7rtLG8t0zJa7+h89n07eLw4+1knj0vllJPgFOL
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            c3:03:9a:ee:50:90:6e:28
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=SK, L=Bratislava, O=Disig a.s., CN=CA Disig Root R1
-        Validity
-            Not Before: Jul 19 09:06:56 2012 GMT
-            Not After : Jul 19 09:06:56 2042 GMT
-        Subject: C=SK, L=Bratislava, O=Disig a.s., CN=CA Disig Root R1
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:aa:c3:78:f7:dc:98:a3:a7:5a:5e:77:18:b2:dd:
-                    04:64:0f:63:fd:9b:96:09:80:d5:e8:aa:a5:e2:9c:
-                    26:94:3a:e8:99:73:8c:9d:df:d7:df:83:f3:78:4f:
-                    40:e1:7f:d2:a7:d2:e5:ca:13:93:e7:ed:c6:77:5f:
-                    36:b5:94:af:e8:38:8e:db:9b:e5:7c:bb:cc:8d:eb:
-                    75:73:e1:24:cd:e6:a7:2d:19:2e:d8:d6:8a:6b:14:
-                    eb:08:62:0a:d8:dc:b3:00:4d:c3:23:7c:5f:43:08:
-                    23:32:12:dc:ed:0c:ad:c0:7d:0f:a5:7a:42:d9:5a:
-                    70:d9:bf:a7:d7:01:1c:f6:9b:ab:8e:b7:4a:86:78:
-                    a0:1e:56:31:ae:ef:82:0a:80:41:f7:1b:c9:ae:ab:
-                    32:26:d4:2c:6b:ed:7d:6b:e4:e2:5e:22:0a:45:cb:
-                    84:31:4d:ac:fe:db:d1:47:ba:f9:60:97:39:b1:65:
-                    c7:de:fb:99:e4:0a:22:b1:2d:4d:e5:48:26:69:ab:
-                    e2:aa:f3:fb:fc:92:29:32:e9:b3:3e:4d:1f:27:a1:
-                    cd:8e:b9:17:fb:25:3e:c9:6e:f3:77:da:0d:12:f6:
-                    5d:c7:bb:36:10:d5:54:d6:f3:e0:e2:47:48:e6:de:
-                    14:da:61:52:af:26:b4:f5:71:4f:c9:d7:d2:06:df:
-                    63:ca:ff:21:e8:59:06:e0:08:d5:84:15:53:f7:43:
-                    e5:7c:c5:a0:89:98:6b:73:c6:68:ce:65:de:bd:7f:
-                    05:f7:b1:ee:f6:57:a1:60:95:c5:cc:ea:93:3a:be:
-                    99:ae:9b:02:a3:ad:c9:16:b5:ce:dd:5e:99:78:7e:
-                    1a:39:7e:b2:c0:05:a4:c0:82:a5:a3:47:9e:8c:ea:
-                    5c:b6:bc:67:db:e6:2a:4d:d2:04:dc:a3:ae:45:f7:
-                    bc:8b:9c:1c:a7:d6:d5:03:dc:08:cb:2e:16:ca:5c:
-                    40:33:e8:67:c3:2e:e7:a6:44:ea:11:45:1c:35:65:
-                    2d:1e:45:61:24:1b:82:2e:a5:9d:33:5d:65:f8:41:
-                    f9:2e:cb:94:3f:1f:a3:0c:31:24:44:ed:c7:5e:ad:
-                    50:ba:c6:41:9b:ac:f0:17:65:c0:f8:5d:6f:5b:a0:
-                    0a:34:3c:ee:d7:ea:88:9f:98:f9:af:4e:24:fa:97:
-                    b2:64:76:da:ab:f4:ed:e3:c3:60:ef:d5:f9:02:c8:
-                    2d:9f:83:af:67:69:06:a7:31:55:d5:cf:4b:6f:ff:
-                    04:05:c7:58:ac:5f:16:1b:e5:d2:a3:eb:31:db:1f:
-                    33:15:4d:d0:f2:a5:53:f5:cb:e1:3d:4e:68:2d:d8:
-                    12:dd:aa:f2:e6:4d:9b:49:e5:c5:28:a1:ba:b0:5a:
-                    c6:a0:b5
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Subject Key Identifier: 
-                89:0A:B4:38:93:1A:E6:AB:EE:9B:91:18:F9:F5:3C:3E:35:D0:D3:82
-    Signature Algorithm: sha1WithRSAEncryption
-         32:8b:f6:9d:4a:c9:be:14:e5:8c:ac:38:ca:3a:09:d4:1b:ce:
-         86:b3:dd:eb:d4:ba:28:be:12:ae:45:2c:04:74:ac:13:51:c5:
-         58:18:66:4d:82:da:d5:dc:93:c0:27:e1:be:7c:9f:52:9e:12:
-         56:f6:d5:9c:a9:f4:75:9c:fa:37:12:8f:1c:93:ec:57:fe:07:
-         0f:ab:d5:12:f7:0f:ae:61:5e:56:80:49:f5:fc:30:f5:9b:4f:
-         1f:41:2f:1c:84:d3:89:c7:e2:da:02:76:ed:09:cf:6c:c1:b8:
-         1c:83:1c:16:fa:94:cd:7d:a0:c8:18:d2:c8:9d:6e:f5:bd:69:
-         d4:6d:3d:35:e8:1e:a2:4f:60:d7:07:29:fc:b2:a3:a4:9d:6e:
-         15:92:56:19:4c:0a:b0:e9:7c:d2:19:4d:42:46:ec:bd:fd:f6:
-         57:5b:dd:98:7e:a4:4d:cc:72:03:83:58:5d:ef:93:3a:41:7a:
-         63:aa:7c:3a:a8:f5:ac:a4:d1:dd:a2:2d:b6:2a:fc:9f:01:8e:
-         e2:10:b1:c4:ca:e4:67:db:55:25:19:3f:fd:e8:36:7e:b3:e1:
-         e1:81:af:11:16:8b:50:97:60:19:82:00:c0:6b:4d:73:b8:d1:
-         13:07:3e:ea:b6:31:4f:f0:42:9a:6d:e2:11:74:e5:94:ac:8d:
-         84:95:3c:21:af:c5:da:47:c8:df:39:62:62:cb:5b:50:0b:d7:
-         81:40:05:9c:9b:ed:ba:b6:8b:1e:04:6f:96:20:39:ed:a4:7d:
-         29:db:48:ce:82:dc:d4:02:8d:1d:04:31:5a:c7:4b:f0:6c:61:
-         52:d7:b4:51:c2:81:6c:cd:e1:fb:a7:a1:d2:92:76:cf:b1:0f:
-         37:58:a4:f2:52:71:67:3f:0c:88:78:80:89:c1:c8:b5:1f:92:
-         63:be:a7:7a:8a:56:2c:1a:a8:a6:9c:b5:5d:b3:63:d0:13:20:
-         a1:eb:91:6c:d0:8d:7d:af:df:0b:e4:17:b9:86:9e:38:b1:94:
-         0c:58:8c:e0:55:aa:3b:63:6d:9a:89:60:b8:64:2a:92:c6:37:
-         f4:7e:43:43:b7:73:e8:01:e7:7f:97:0f:d7:f2:7b:19:fd:1a:
-         d7:8f:c9:fa:85:6b:7a:9d:9e:89:b6:a6:28:99:93:88:40:f7:
-         3e:cd:51:a3:ca:ea:ef:79:47:21:b5:fe:32:e2:c7:c3:51:6f:
-         be:80:74:f0:a4:c3:3a:f2:4f:e9:5f:df:19:0a:f2:3b:13:43:
-         ac:31:a4:b3:e7:eb:fc:18:d6:01:a9:f3:2a:8f:36:0e:eb:b4:
-         b1:bc:b7:4c:c9:6b:bf:a1:f3:d9:f4:ed:e2:f0:e3:ed:64:9e:
-         3d:2f:96:52:4f:80:53:8b
-SHA1 Fingerprint=8E:1C:74:F8:A6:20:B9:E5:8A:F4:61:FA:EC:2B:47:56:51:1A:52:C6
diff --git a/files/219d9499.0 b/files/219d9499.0
index 90790d3..c10f1e9 100644
--- a/files/219d9499.0
+++ b/files/219d9499.0
@@ -26,7 +26,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=The Go Daddy Group, Inc., OU=Go Daddy Class 2 Certification Authority
         Validity
             Not Before: Jun 29 17:06:20 2004 GMT
@@ -34,7 +34,7 @@
         Subject: C=US, O=The Go Daddy Group, Inc., OU=Go Daddy Class 2 Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:de:9d:d7:ea:57:18:49:a1:5b:eb:d7:5f:48:86:
                     ea:be:dd:ff:e4:ef:67:1c:f4:65:68:b3:57:71:a0:
diff --git a/files/23f4c490.0 b/files/23f4c490.0
index 22c6ee2..82ef1ad 100644
--- a/files/23f4c490.0
+++ b/files/23f4c490.0
@@ -26,7 +26,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=Starfield Technologies, Inc., OU=Starfield Class 2 Certification Authority
         Validity
             Not Before: Jun 29 17:39:16 2004 GMT
@@ -34,7 +34,7 @@
         Subject: C=US, O=Starfield Technologies, Inc., OU=Starfield Class 2 Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:b7:32:c8:fe:e9:71:a6:04:85:ad:0c:11:64:df:
                     ce:4d:ef:c8:03:18:87:3f:a1:ab:fb:3c:a6:9f:f0:
diff --git a/files/27af790d.0 b/files/27af790d.0
index 820147a..19f1bdc 100644
--- a/files/27af790d.0
+++ b/files/27af790d.0
@@ -20,7 +20,7 @@
         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
+        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
diff --git a/files/2add47b6.0 b/files/2add47b6.0
index 08c48c4..8c5089c 100644
--- a/files/2add47b6.0
+++ b/files/2add47b6.0
@@ -17,7 +17,7 @@
         Version: 3 (0x2)
         Serial Number:
             60:59:49:e0:26:2e:bb:55:f9:0a:77:8a:71:f9:4a:d8:6c
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: OU=GlobalSign ECC Root CA - R5, O=GlobalSign, CN=GlobalSign
         Validity
             Not Before: Nov 13 00:00:00 2012 GMT
diff --git a/files/2d9dafe4.0 b/files/2d9dafe4.0
index b99db95..31e7283 100644
--- a/files/2d9dafe4.0
+++ b/files/2d9dafe4.0
@@ -33,7 +33,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=NO, O=Buypass AS-983163327, CN=Buypass Class 3 Root CA
         Validity
             Not Before: Oct 26 08:28:58 2010 GMT
@@ -41,7 +41,7 @@
         Subject: C=NO, O=Buypass AS-983163327, CN=Buypass Class 3 Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:a5:da:0a:95:16:50:e3:95:f2:5e:9d:76:31:06:
                     32:7a:9b:f1:10:76:b8:00:9a:b5:52:36:cd:24:47:
diff --git a/files/2fa87019.0 b/files/2fa87019.0
index 5303927..ce1f69e 100644
--- a/files/2fa87019.0
+++ b/files/2fa87019.0
@@ -26,7 +26,7 @@
         Version: 3 (0x2)
         Serial Number:
             57:cb:33:6f:c2:5c:16:e6:47:16:17:e3:90:31:68:e0
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -34,7 +34,7 @@
         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)
+                RSA 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:
diff --git a/files/302904dd.0 b/files/302904dd.0
index 64817c3..1b116df 100644
--- a/files/302904dd.0
+++ b/files/302904dd.0
@@ -39,7 +39,7 @@
         Version: 3 (0x2)
         Serial Number:
             ca:e9:1b:89:f1:55:03:0d:a3:e6:41:6d:c4:e3:a6:e1
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=FR, O=Dhimyotis, OU=0002 48146308100036, CN=Certigna Root CA
         Validity
             Not Before: Oct  1 08:32:27 2013 GMT
@@ -47,7 +47,7 @@
         Subject: C=FR, O=Dhimyotis, OU=0002 48146308100036, CN=Certigna Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:cd:18:39:65:1a:59:b1:ea:64:16:0e:8c:94:24:
                     95:7c:83:d3:c5:39:26:dc:0c:ef:16:57:8d:d7:d8:
diff --git a/files/304d27c3.0 b/files/304d27c3.0
index 77594a2..e30c58c 100644
--- a/files/304d27c3.0
+++ b/files/304d27c3.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             5d:df:b1:da:5a:a3:ed:5d:be:5a:65:20:65:03:90:ef
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=CN, O=UniTrust, CN=UCA Global G2 Root
         Validity
             Not Before: Mar 11 00:00:00 2016 GMT
@@ -42,7 +42,7 @@
         Subject: C=CN, O=UniTrust, CN=UCA Global G2 Root
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:c5:e6:2b:6f:7c:ef:26:05:27:a3:81:24:da:6f:
                     cb:01:f9:99:9a:a9:32:c2:22:87:61:41:91:3b:cb:
diff --git a/files/31188b5e.0 b/files/31188b5e.0
index 6d4419c..00dadb6 100644
--- a/files/31188b5e.0
+++ b/files/31188b5e.0
@@ -28,7 +28,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=TR, L=Gebze - Kocaeli, O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK, OU=Kamu Sertifikasyon Merkezi - Kamu SM, CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
         Validity
             Not Before: Nov 25 08:25:55 2013 GMT
@@ -36,7 +36,7 @@
         Subject: C=TR, L=Gebze - Kocaeli, O=Turkiye Bilimsel ve Teknolojik Arastirma Kurumu - TUBITAK, OU=Kamu Sertifikasyon Merkezi - Kamu SM, CN=TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:af:75:30:33:aa:bb:6b:d3:99:2c:12:37:84:d9:
                     8d:7b:97:80:d3:6e:e7:ff:9b:50:95:3e:90:95:56:
diff --git a/files/33ee480d.0 b/files/33ee480d.0
index c0a7b21..4636458 100644
--- a/files/33ee480d.0
+++ b/files/33ee480d.0
@@ -36,7 +36,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 8875640296558310041 (0x7b2c9bd316803299)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=Texas, L=Houston, O=SSL Corporation, CN=SSL.com Root Certification Authority RSA
         Validity
             Not Before: Feb 12 17:39:39 2016 GMT
@@ -44,7 +44,7 @@
         Subject: C=US, ST=Texas, L=Houston, O=SSL Corporation, CN=SSL.com Root Certification Authority RSA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:f9:0f:dd:a3:2b:7d:cb:d0:2a:fe:ec:67:85:a6:
                     e7:2e:1b:ba:77:e1:e3:f5:af:a4:ec:fa:4a:5d:91:
diff --git a/files/343eb6cb.0 b/files/343eb6cb.0
index ef2f406..4f7b9e5 100644
--- a/files/343eb6cb.0
+++ b/files/343eb6cb.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             04:00:00:00:00:01:0f:85:aa:2d:48
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: O=Cybertrust, Inc, CN=Cybertrust Global Root
         Validity
             Not Before: Dec 15 08:00:00 2006 GMT
@@ -33,7 +33,7 @@
         Subject: O=Cybertrust, Inc, CN=Cybertrust Global Root
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:f8:c8:bc:bd:14:50:66:13:ff:f0:d3:79:ec:23:
                     f2:b7:1a:c7:8e:85:f1:12:73:a6:19:aa:10:db:9c:
diff --git a/files/35105088.0 b/files/35105088.0
index 3728c3b..ff58900 100644
--- a/files/35105088.0
+++ b/files/35105088.0
@@ -37,7 +37,7 @@
         Version: 3 (0x2)
         Serial Number:
             01:fd:6d:30:fc:a3:ca:51:a8:1b:bc:64:0e:35:03:2d
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: C=US, ST=New Jersey, L=Jersey City, O=The USERTRUST Network, CN=USERTrust RSA Certification Authority
         Validity
             Not Before: Feb  1 00:00:00 2010 GMT
@@ -45,7 +45,7 @@
         Subject: C=US, ST=New Jersey, L=Jersey City, O=The USERTRUST Network, CN=USERTrust RSA Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:80:12:65:17:36:0e:c3:db:08:b3:d0:ac:57:0d:
                     76:ed:cd:27:d3:4c:ad:50:83:61:e2:aa:20:4d:09:
diff --git a/files/399e7759.0 b/files/399e7759.0
index e73ab67..6301f4b 100644
--- a/files/399e7759.0
+++ b/files/399e7759.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             08:3b:e0:56:90:42:46:b1:a1:75:6a:c9:59:91:c7:4a
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Global Root CA
         Validity
             Not Before: Nov 10 00:00:00 2006 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Global Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:e2:3b:e1:11:72:de:a8:a4:d3:a3:57:aa:50:a2:
                     8f:0b:77:90:c9:a2:a5:ee:12:ce:96:5b:01:09:20:
diff --git a/files/3a3b02ce.0 b/files/3a3b02ce.0
index 4a01f1c..6d87615 100644
--- a/files/3a3b02ce.0
+++ b/files/3a3b02ce.0
@@ -27,7 +27,7 @@
         Version: 3 (0x2)
         Serial Number:
             41:3d:72:c7:f4:6b:1f:81:43:7d:f1:d2:28:54:df:9a
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=CH, O=WISeKey, OU=Copyright (c) 2005, OU=OISTE Foundation Endorsed, CN=OISTE WISeKey Global Root GA CA
         Validity
             Not Before: Dec 11 16:03:44 2005 GMT
@@ -35,7 +35,7 @@
         Subject: C=CH, O=WISeKey, OU=Copyright (c) 2005, OU=OISTE Foundation Endorsed, CN=OISTE WISeKey Global Root GA CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:cb:4f:b3:00:9b:3d:36:dd:f9:d1:49:6a:6b:10:
                     49:1f:ec:d8:2b:b2:c6:f8:32:81:29:43:95:4c:9a:
diff --git a/files/3ad48a91.0 b/files/3ad48a91.0
index d4bda9f..db80cf2 100644
--- a/files/3ad48a91.0
+++ b/files/3ad48a91.0
@@ -23,7 +23,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 33554617 (0x20000b9)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=IE, O=Baltimore, OU=CyberTrust, CN=Baltimore CyberTrust Root
         Validity
             Not Before: May 12 18:46:00 2000 GMT
@@ -31,7 +31,7 @@
         Subject: C=IE, O=Baltimore, OU=CyberTrust, CN=Baltimore CyberTrust Root
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/3c58f906.0 b/files/3c58f906.0
index 4d776ba..35419a9 100644
--- a/files/3c58f906.0
+++ b/files/3c58f906.0
@@ -27,7 +27,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=SE, O=AddTrust AB, OU=AddTrust External TTP Network, CN=AddTrust External CA Root
         Validity
             Not Before: May 30 10:48:38 2000 GMT
@@ -35,7 +35,7 @@
         Subject: C=SE, O=AddTrust AB, OU=AddTrust External TTP Network, CN=AddTrust External CA Root
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:b7:f7:1a:33:e6:f2:00:04:2d:39:e0:4e:5b:ed:
                     1f:bc:6c:0f:cd:b5:fa:23:b6:ce:de:9b:11:33:97:
diff --git a/files/3c6676aa.0 b/files/3c6676aa.0
index 2905a24..1693994 100644
--- a/files/3c6676aa.0
+++ b/files/3c6676aa.0
@@ -34,7 +34,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 10000013 (0x98968d)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden EV Root CA
         Validity
             Not Before: Dec  8 11:19:29 2010 GMT
@@ -42,7 +42,7 @@
         Subject: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden EV Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:e3:c7:7e:89:f9:24:4b:3a:d2:33:83:35:2c:69:
                     ec:dc:09:a4:e3:51:a8:25:2b:79:b8:08:3d:e0:91:
diff --git a/files/3c860d51.0 b/files/3c860d51.0
index 73378b3..8b46c87 100644
--- a/files/3c860d51.0
+++ b/files/3c860d51.0
@@ -36,7 +36,7 @@
         Version: 3 (0x2)
         Serial Number:
             bb:40:1c:43:f5:5e:4f:b0
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=CH, O=SwissSign AG, CN=SwissSign Gold CA - G2
         Validity
             Not Before: Oct 25 08:30:35 2006 GMT
@@ -44,7 +44,7 @@
         Subject: C=CH, O=SwissSign AG, CN=SwissSign Gold CA - G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:af:e4:ee:7e:8b:24:0e:12:6e:a9:50:2d:16:44:
                     3b:92:92:5c:ca:b8:5d:84:92:42:13:2a:bc:65:57:
diff --git a/files/3c899c73.0 b/files/3c899c73.0
index 588d7b7..c23dcc7 100644
--- a/files/3c899c73.0
+++ b/files/3c899c73.0
@@ -18,7 +18,7 @@
         Version: 3 (0x2)
         Serial Number:
             21:2a:56:0c:ae:da:0c:ab:40:45:bf:2b:a2:2d:3a:ea
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=CH, O=WISeKey, OU=OISTE Foundation Endorsed, CN=OISTE WISeKey Global Root GC CA
         Validity
             Not Before: May  9 09:48:34 2017 GMT
diff --git a/files/3c9a4d3b.0 b/files/3c9a4d3b.0
index c6e312c..58b0022 100644
--- a/files/3c9a4d3b.0
+++ b/files/3c9a4d3b.0
@@ -46,7 +46,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 6828503384748696800 (0x5ec3b7a6437fa4e0)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: CN=ACCVRAIZ1, OU=PKIACCV, O=ACCV, C=ES
         Validity
             Not Before: May  5 09:37:37 2011 GMT
@@ -54,7 +54,7 @@
         Subject: CN=ACCVRAIZ1, OU=PKIACCV, O=ACCV, C=ES
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:9b:a9:ab:bf:61:4a:97:af:2f:97:66:9a:74:5f:
                     d0:d9:96:fd:cf:e2:e4:66:ef:1f:1f:47:33:c2:44:
diff --git a/files/3d441de8.0 b/files/3d441de8.0
index d8c9824..faab810 100644
--- a/files/3d441de8.0
+++ b/files/3d441de8.0
@@ -35,7 +35,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 10000012 (0x98968c)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G2
         Validity
             Not Before: Mar 26 11:18:17 2008 GMT
@@ -43,7 +43,7 @@
         Subject: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:c5:59:e7:6f:75:aa:3e:4b:9c:b5:b8:ac:9e:0b:
                     e4:f9:d9:ca:ab:5d:8f:b5:39:10:82:d7:af:51:e0:
diff --git a/files/3e7271e8.0 b/files/3e7271e8.0
index 91dd4f9..a7c62a3 100644
--- a/files/3e7271e8.0
+++ b/files/3e7271e8.0
@@ -27,7 +27,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 946069240 (0x3863def8)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: O=Entrust.net, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Certification Authority (2048)
         Validity
             Not Before: Dec 24 17:50:51 1999 GMT
@@ -35,7 +35,7 @@
         Subject: O=Entrust.net, OU=www.entrust.net/CPS_2048 incorp. by ref. (limits liab.), OU=(c) 1999 Entrust.net Limited, CN=Entrust.net Certification Authority (2048)
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:ad:4d:4b:a9:12:86:b2:ea:a3:20:07:15:16:64:
                     2a:2b:4b:d1:bf:0b:4a:4d:8e:ed:80:76:a5:67:b7:
diff --git a/files/40dc992e.0 b/files/40dc992e.0
index 847cec6..259a549 100644
--- a/files/40dc992e.0
+++ b/files/40dc992e.0
@@ -27,7 +27,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -35,7 +35,7 @@
         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)
+                RSA 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:
diff --git a/files/455f1b52.0 b/files/455f1b52.0
index f1d0471..4f46c77 100644
--- a/files/455f1b52.0
+++ b/files/455f1b52.0
@@ -27,7 +27,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1246989352 (0x4a538c28)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=Entrust, Inc., OU=See www.entrust.net/legal-terms, OU=(c) 2009 Entrust, Inc. - for authorized use only, CN=Entrust Root Certification Authority - G2
         Validity
             Not Before: Jul  7 17:25:54 2009 GMT
@@ -35,7 +35,7 @@
         Subject: C=US, O=Entrust, Inc., OU=See www.entrust.net/legal-terms, OU=(c) 2009 Entrust, Inc. - for authorized use only, CN=Entrust Root Certification Authority - G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:ba:84:b6:72:db:9e:0c:6b:e2:99:e9:30:01:a7:
                     76:ea:32:b8:95:41:1a:c9:da:61:4e:58:72:cf:fe:
diff --git a/files/48a195d8.0 b/files/48a195d8.0
index 46530f1..83714a2 100644
--- a/files/48a195d8.0
+++ b/files/48a195d8.0
@@ -37,7 +37,7 @@
         Version: 3 (0x2)
         Serial Number:
             b0:b7:5a:16:48:5f:bf:e1:cb:f5:8b:d7:19:e6:7d
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=ES, O=IZENPE S.A., CN=Izenpe.com
         Validity
             Not Before: Dec 13 13:08:28 2007 GMT
@@ -45,7 +45,7 @@
         Subject: C=ES, O=IZENPE S.A., CN=Izenpe.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:c9:d3:7a:ca:0f:1e:ac:a7:86:e8:16:65:6a:b1:
                     c2:1b:45:32:71:95:d9:fe:10:5b:cc:af:e7:a5:79:
diff --git a/files/4be590e0.0 b/files/4be590e0.0
index 788aff7..ed8db77 100644
--- a/files/4be590e0.0
+++ b/files/4be590e0.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             0a:01:42:80:00:00:01:45:23:cf:46:7c:00:00:00:02
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=IdenTrust, CN=IdenTrust Public Sector Root CA 1
         Validity
             Not Before: Jan 16 17:53:32 2014 GMT
@@ -42,7 +42,7 @@
         Subject: C=US, O=IdenTrust, CN=IdenTrust Public Sector Root CA 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:b6:22:94:fc:a4:48:af:e8:47:6b:0a:fb:27:76:
                     e4:f2:3f:8a:3b:7a:4a:2c:31:2a:8c:8d:b0:a9:c3:
diff --git a/files/4e18c148.0 b/files/4e18c148.0
deleted file mode 100644
index 23828ec..0000000
--- a/files/4e18c148.0
+++ /dev/null
@@ -1,79 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDnzCCAoegAwIBAgIBJjANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJERTEc
-MBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxlU2Vj
-IFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290IENB
-IDIwHhcNOTkwNzA5MTIxMTAwWhcNMTkwNzA5MjM1OTAwWjBxMQswCQYDVQQGEwJE
-RTEcMBoGA1UEChMTRGV1dHNjaGUgVGVsZWtvbSBBRzEfMB0GA1UECxMWVC1UZWxl
-U2VjIFRydXN0IENlbnRlcjEjMCEGA1UEAxMaRGV1dHNjaGUgVGVsZWtvbSBSb290
-IENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrC6M14IspFLEU
-ha88EOQ5bzVdSq7d6mGNlUn0b2SjGmBmpKlAIoTZ1KXleJMOaAGtuU1cOs7TuKhC
-QN/Po7qCWWqSG6wcmtoIKyUn+WkjR/Hg6yx6m/UTAtB+NHzCnjwAWav12gz1Mjwr
-rFDa1sPeg5TKqAyZMg4ISFZbavva4VhYAUlfckE8FQYBjl2tqriTtM2e66foai1S
-NNs671x1Udrb8zH57nGYMsRUFUQM+ZtV7a3fGAigo4aKSe5TBY8ZTNXeWHmb0moc
-QqvF1afPaA+W5OFhmHZhyJF81j4A4pFQh+GdCuatl9Idxjp9y7zaAzTVjlsB9WoH
-txa2bkp/AgMBAAGjQjBAMB0GA1UdDgQWBBQxw3kbuvVT1xfgiXotF2wKsyudMzAP
-BgNVHRMECDAGAQH/AgEFMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOC
-AQEAlGRZrTlk5ynrE/5aw4sTV8gEJPB0d8Bg42f76Ymmg7+Wgnxu1MM9756Abrsp
-tJh6sTtU6zkXR34ajgv8HzFZMQSyzhfzLMdiNlXiItiJVbSYSKpk+tYcNthEeFpa
-IzpXl/V6ME+un2pMSyuOoAPjPuCp1NJ70rOo4nI8rZ7/gFnkm0W09juwzTkZmDLl
-6iFhkOQxIY40sfcvNUqFENrnijchvllj4PKFiDFT1FQUhXB59C4Gdyd1Lx+4ivn+
-xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
-Cm26OWMohpLzGITY+9HPBVZkVw==
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 38 (0x26)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=DE, O=Deutsche Telekom AG, OU=T-TeleSec Trust Center, CN=Deutsche Telekom Root CA 2
-        Validity
-            Not Before: Jul  9 12:11:00 1999 GMT
-            Not After : Jul  9 23:59:00 2019 GMT
-        Subject: C=DE, O=Deutsche Telekom AG, OU=T-TeleSec Trust Center, CN=Deutsche Telekom Root CA 2
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
-                Modulus:
-                    00:ab:0b:a3:35:e0:8b:29:14:b1:14:85:af:3c:10:
-                    e4:39:6f:35:5d:4a:ae:dd:ea:61:8d:95:49:f4:6f:
-                    64:a3:1a:60:66:a4:a9:40:22:84:d9:d4:a5:e5:78:
-                    93:0e:68:01:ad:b9:4d:5c:3a:ce:d3:b8:a8:42:40:
-                    df:cf:a3:ba:82:59:6a:92:1b:ac:1c:9a:da:08:2b:
-                    25:27:f9:69:23:47:f1:e0:eb:2c:7a:9b:f5:13:02:
-                    d0:7e:34:7c:c2:9e:3c:00:59:ab:f5:da:0c:f5:32:
-                    3c:2b:ac:50:da:d6:c3:de:83:94:ca:a8:0c:99:32:
-                    0e:08:48:56:5b:6a:fb:da:e1:58:58:01:49:5f:72:
-                    41:3c:15:06:01:8e:5d:ad:aa:b8:93:b4:cd:9e:eb:
-                    a7:e8:6a:2d:52:34:db:3a:ef:5c:75:51:da:db:f3:
-                    31:f9:ee:71:98:32:c4:54:15:44:0c:f9:9b:55:ed:
-                    ad:df:18:08:a0:a3:86:8a:49:ee:53:05:8f:19:4c:
-                    d5:de:58:79:9b:d2:6a:1c:42:ab:c5:d5:a7:cf:68:
-                    0f:96:e4:e1:61:98:76:61:c8:91:7c:d6:3e:00:e2:
-                    91:50:87:e1:9d:0a:e6:ad:97:d2:1d:c6:3a:7d:cb:
-                    bc:da:03:34:d5:8e:5b:01:f5:6a:07:b7:16:b6:6e:
-                    4a:7f
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                31:C3:79:1B:BA:F5:53:D7:17:E0:89:7A:2D:17:6C:0A:B3:2B:9D:33
-            X509v3 Basic Constraints: 
-                CA:TRUE, pathlen:5
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-    Signature Algorithm: sha1WithRSAEncryption
-         94:64:59:ad:39:64:e7:29:eb:13:fe:5a:c3:8b:13:57:c8:04:
-         24:f0:74:77:c0:60:e3:67:fb:e9:89:a6:83:bf:96:82:7c:6e:
-         d4:c3:3d:ef:9e:80:6e:bb:29:b4:98:7a:b1:3b:54:eb:39:17:
-         47:7e:1a:8e:0b:fc:1f:31:59:31:04:b2:ce:17:f3:2c:c7:62:
-         36:55:e2:22:d8:89:55:b4:98:48:aa:64:fa:d6:1c:36:d8:44:
-         78:5a:5a:23:3a:57:97:f5:7a:30:4f:ae:9f:6a:4c:4b:2b:8e:
-         a0:03:e3:3e:e0:a9:d4:d2:7b:d2:b3:a8:e2:72:3c:ad:9e:ff:
-         80:59:e4:9b:45:b4:f6:3b:b0:cd:39:19:98:32:e5:ea:21:61:
-         90:e4:31:21:8e:34:b1:f7:2f:35:4a:85:10:da:e7:8a:37:21:
-         be:59:63:e0:f2:85:88:31:53:d4:54:14:85:70:79:f4:2e:06:
-         77:27:75:2f:1f:b8:8a:f9:fe:c5:ba:d8:36:e4:83:ec:e7:65:
-         b7:bf:63:5a:f3:46:af:81:94:37:d4:41:8c:d6:23:d6:1e:cf:
-         f5:68:1b:44:63:a2:5a:ba:a7:35:59:a1:e5:70:05:9b:0e:23:
-         57:99:94:0a:6d:ba:39:63:28:86:92:f3:18:84:d8:fb:d1:cf:
-         05:56:64:57
-SHA1 Fingerprint=85:A4:08:C0:9C:19:3E:5D:51:58:7D:CD:D6:13:30:FD:8C:DE:37:BF
diff --git a/files/5046c355.0 b/files/5046c355.0
index 229de34..1283579 100644
--- a/files/5046c355.0
+++ b/files/5046c355.0
@@ -35,7 +35,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 5700383053117599563 (0x4f1bd42f54bb2f4b)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=CH, O=SwissSign AG, CN=SwissSign Silver CA - G2
         Validity
             Not Before: Oct 25 08:32:46 2006 GMT
@@ -43,7 +43,7 @@
         Subject: C=CH, O=SwissSign AG, CN=SwissSign Silver CA - G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA 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:
diff --git a/files/524d9b43.0 b/files/524d9b43.0
index 0fa8453..06e6760 100644
--- a/files/524d9b43.0
+++ b/files/524d9b43.0
@@ -31,7 +31,7 @@
         Version: 3 (0x2)
         Serial Number:
             40:1a:c4:64:21:b3:13:21:03:0e:bb:e4:12:1a:c5:1d
-    Signature Algorithm: sha256WithRSAEncryption
+        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
@@ -39,7 +39,7 @@
         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)
+                RSA 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:
diff --git a/files/52b525c7.0 b/files/52b525c7.0
index 98adef0..29ef958 100644
--- a/files/52b525c7.0
+++ b/files/52b525c7.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             78:58:5f:2e:ad:2c:19:4b:e3:37:07:35:34:13:28:b5:96:d4:65:93
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 1 G3
         Validity
             Not Before: Jan 12 17:27:44 2012 GMT
@@ -42,7 +42,7 @@
         Subject: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 1 G3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:a0:be:50:10:8e:e9:f2:6c:40:b4:04:9c:85:b9:
                     31:ca:dc:2d:e4:11:a9:04:3c:1b:55:c1:e7:58:30:
diff --git a/files/559f7c71.0 b/files/559f7c71.0
deleted file mode 100644
index bf403e8..0000000
--- a/files/559f7c71.0
+++ /dev/null
@@ -1,56 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAx
-CzAJBgNVBAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5U
-cnVzdCBSb290IENBIEczMB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFow
-QDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9wZW5UcnVzdDEdMBsGA1UEAwwUT3Bl
-blRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAARK7liuTcpm
-3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5Bta1d
-oYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4G
-A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5
-DMlv4VBN0BBY3JWIbTAfBgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAK
-BggqhkjOPQQDAwNpADBmAjEAj6jcnboMBBf6Fek9LykBl7+BFjNAk2z8+e2AcG+q
-j9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta3U1fJAuwACEl74+nBCZx
-4nxp5V2a+EEfOzmTk51V6s2N8fvB
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            11:20:e6:f8:4c:fc:24:b0:be:05:40:ac:da:83:1b:34:60:3f
-    Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=FR, O=OpenTrust, CN=OpenTrust Root CA G3
-        Validity
-            Not Before: May 26 00:00:00 2014 GMT
-            Not After : Jan 15 00:00:00 2038 GMT
-        Subject: C=FR, O=OpenTrust, CN=OpenTrust Root CA G3
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:4a:ee:58:ae:4d:ca:66:de:06:3a:a3:11:fc:e0:
-                    18:f0:6e:1c:ba:2d:30:0c:89:d9:d6:ee:9b:73:83:
-                    a9:23:15:8c:2f:59:8a:5a:dd:14:ea:9d:59:2b:43:
-                    b7:06:ec:32:b6:ba:ee:41:b5:ad:5d:a1:85:cc:ea:
-                    1d:14:66:a3:67:7e:46:e2:94:f3:e7:b6:56:a1:15:
-                    59:a1:4f:37:97:b9:22:1e:bd:11:eb:f4:b2:1f:5e:
-                    c3:14:9a:e5:d9:97:99
-                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: 
-                47:77:C3:14:8B:62:39:0C:C9:6F:E1:50:4D:D0:10:58:DC:95:88:6D
-            X509v3 Authority Key Identifier: 
-                keyid:47:77:C3:14:8B:62:39:0C:C9:6F:E1:50:4D:D0:10:58:DC:95:88:6D
-
-    Signature Algorithm: ecdsa-with-SHA384
-         30:66:02:31:00:8f:a8:dc:9d:ba:0c:04:17:fa:15:e9:3d:2f:
-         29:01:97:bf:81:16:33:40:93:6c:fc:f9:ed:80:70:6f:aa:8f:
-         db:84:c2:8b:f5:35:ca:06:dc:64:6f:68:16:e1:8f:91:b9:02:
-         31:00:d8:4b:a5:cb:c2:d0:08:6c:e9:18:fb:5a:dd:4d:5f:24:
-         0b:b0:00:21:25:ef:8f:a7:04:26:71:e2:7c:69:e5:5d:9a:f8:
-         41:1f:3b:39:93:93:9d:55:ea:cd:8d:f1:fb:c1
-SHA1 Fingerprint=6E:26:64:F3:56:BF:34:55:BF:D1:93:3F:7C:01:DE:D8:13:DA:8A:A6
diff --git a/files/583d0756.0 b/files/583d0756.0
index 65a1ae8..4540abc 100644
--- a/files/583d0756.0
+++ b/files/583d0756.0
@@ -36,7 +36,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 6248227494352943350 (0x56b629cd34bc78f6)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=Texas, L=Houston, O=SSL Corporation, CN=SSL.com EV Root Certification Authority RSA R2
         Validity
             Not Before: May 31 18:14:37 2017 GMT
@@ -44,7 +44,7 @@
         Subject: C=US, ST=Texas, L=Houston, O=SSL Corporation, CN=SSL.com EV Root Certification Authority RSA R2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:8f:36:65:40:e1:d6:4d:c0:d7:b4:e9:46:da:6b:
                     ea:33:47:cd:4c:f9:7d:7d:be:bd:2d:3d:f0:db:78:
diff --git a/files/5a250ea7.0 b/files/5a250ea7.0
index 4561d51..c63ddde 100644
--- a/files/5a250ea7.0
+++ b/files/5a250ea7.0
@@ -34,7 +34,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 10003001 (0x98a239)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G3
         Validity
             Not Before: Nov 14 11:28:42 2013 GMT
@@ -42,7 +42,7 @@
         Subject: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:be:32:a2:54:0f:70:fb:2c:5c:59:eb:6c:c4:a4:
                     51:e8:85:2a:b3:cc:4a:34:f2:b0:5f:f3:0e:c7:1c:
diff --git a/files/5a3f0ff8.0 b/files/5a3f0ff8.0
index 0c27347..35cfa10 100644
--- a/files/5a3f0ff8.0
+++ b/files/5a3f0ff8.0
@@ -28,7 +28,7 @@
         Version: 3 (0x2)
         Serial Number:
             4e:81:2d:8a:82:65:e0:0b:02:ee:3e:35:02:46:e5:3d
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO Certification Authority
         Validity
             Not Before: Dec  1 00:00:00 2006 GMT
@@ -36,7 +36,7 @@
         Subject: C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:d0:40:8b:8b:72:e3:91:1b:f7:51:c1:1b:54:04:
                     98:d3:a9:bf:c1:e6:8a:5d:3b:87:fb:bb:88:ce:0d:
diff --git a/files/5acf816d.0 b/files/5acf816d.0
index f3670b5..0a1d1fa 100644
--- a/files/5acf816d.0
+++ b/files/5acf816d.0
@@ -16,7 +16,7 @@
         Version: 3 (0x2)
         Serial Number:
             6e:47:a9:c8:8b:94:b6:e8:bb:3b:2a:d8:a2:b2:c1:99
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=Google Trust Services LLC, CN=GTS Root R4
         Validity
             Not Before: Jun 22 00:00:00 2016 GMT
diff --git a/files/5cf9d536.0 b/files/5cf9d536.0
index 2232561..bb7a9df 100644
--- a/files/5cf9d536.0
+++ b/files/5cf9d536.0
@@ -36,7 +36,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 985026699 (0x3ab6508b)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=BM, O=QuoVadis Limited, OU=Root Certification Authority, CN=QuoVadis Root Certification Authority
         Validity
             Not Before: Mar 19 18:33:33 2001 GMT
@@ -44,7 +44,7 @@
         Subject: C=BM, O=QuoVadis Limited, OU=Root Certification Authority, CN=QuoVadis Root Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:bf:61:b5:95:53:ba:57:fc:fa:f2:67:0b:3a:1a:
                     df:11:80:64:95:b4:d1:bc:cd:7a:cf:f6:29:96:2e:
diff --git a/files/5e4e69e7.0 b/files/5e4e69e7.0
index 541c474..d882306 100644
--- a/files/5e4e69e7.0
+++ b/files/5e4e69e7.0
@@ -24,7 +24,7 @@
         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
+        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
diff --git a/files/5f47b495.0 b/files/5f47b495.0
index 87cd715..5cb5c0c 100644
--- a/files/5f47b495.0
+++ b/files/5f47b495.0
@@ -35,7 +35,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 6271844772424770508 (0x570a119742c4e3cc)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=IT, L=Milan, O=Actalis S.p.A./03358520967, CN=Actalis Authentication Root CA
         Validity
             Not Before: Sep 22 11:22:02 2011 GMT
@@ -43,7 +43,7 @@
         Subject: C=IT, L=Milan, O=Actalis S.p.A./03358520967, CN=Actalis Authentication Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:a7:c6:c4:a5:29:a4:2c:ef:e5:18:c5:b0:50:a3:
                     6f:51:3b:9f:0a:5a:c9:c2:48:38:0a:c2:1c:a0:18:
diff --git a/files/60afe812.0 b/files/60afe812.0
index f673145..050a6f0 100644
--- a/files/60afe812.0
+++ b/files/60afe812.0
@@ -26,7 +26,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 80544274841616 (0x49412ce40010)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=HU, L=Budapest, O=NetLock Kft., OU=Tan\xC3\xBAs\xC3\xADtv\xC3\xA1nykiad\xC3\xB3k (Certification Services), CN=NetLock Arany (Class Gold) F\xC5\x91tan\xC3\xBAs\xC3\xADtv\xC3\xA1ny
         Validity
             Not Before: Dec 11 15:08:21 2008 GMT
@@ -34,7 +34,7 @@
         Subject: C=HU, L=Budapest, O=NetLock Kft., OU=Tan\xC3\xBAs\xC3\xADtv\xC3\xA1nykiad\xC3\xB3k (Certification Services), CN=NetLock Arany (Class Gold) F\xC5\x91tan\xC3\xBAs\xC3\xADtv\xC3\xA1ny
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:c4:24:5e:73:be:4b:6d:14:c3:a1:f4:e3:97:90:
                     6e:d2:30:45:1e:3c:ee:67:d9:64:e0:1a:8a:7f:ca:
diff --git a/files/6187b673.0 b/files/6187b673.0
index 7aa7982..5395bc3 100644
--- a/files/6187b673.0
+++ b/files/6187b673.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             82:10:cf:b0:d2:40:e3:59:44:63:e0:bb:63:82:8b:00
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=Internet Security Research Group, CN=ISRG Root X1
         Validity
             Not Before: Jun  4 11:04:38 2015 GMT
@@ -42,7 +42,7 @@
         Subject: C=US, O=Internet Security Research Group, CN=ISRG Root X1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:ad:e8:24:73:f4:14:37:f3:9b:9e:2b:57:28:1c:
                     87:be:dc:b7:df:38:90:8c:6e:3c:e6:57:a0:78:f7:
diff --git a/files/63a2c897.0 b/files/63a2c897.0
index 46f7b14..671abc6 100644
--- a/files/63a2c897.0
+++ b/files/63a2c897.0
@@ -33,7 +33,7 @@
         Version: 3 (0x2)
         Serial Number:
             95:be:16:a0:f7:2e:46:f1:7b:39:82:72:fa:8b:cd:96
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: O=TeliaSonera, CN=TeliaSonera Root CA v1
         Validity
             Not Before: Oct 18 12:00:50 2007 GMT
@@ -41,7 +41,7 @@
         Subject: O=TeliaSonera, CN=TeliaSonera Root CA v1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA 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:
diff --git a/files/67495436.0 b/files/67495436.0
index 23a6ebe..1631f10 100644
--- a/files/67495436.0
+++ b/files/67495436.0
@@ -28,7 +28,7 @@
         Version: 3 (0x2)
         Serial Number:
             60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb
-    Signature Algorithm: sha256WithRSAEncryption
+        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
@@ -36,7 +36,7 @@
         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)
+                RSA 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:
diff --git a/files/69105f4f.0 b/files/69105f4f.0
index a9364ac..adebaf9 100644
--- a/files/69105f4f.0
+++ b/files/69105f4f.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             0c:e7:e0:e5:17:d8:46:fe:8f:e5:60:fc:1b:f0:30:39
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Assured ID Root CA
         Validity
             Not Before: Nov 10 00:00:00 2006 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Assured ID Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:ad:0e:15:ce:e4:43:80:5c:b1:87:f3:b7:60:f9:
                     71:12:a5:ae:dc:26:94:88:aa:f4:ce:f5:20:39:28:
diff --git a/files/6b03dec0.0 b/files/6b03dec0.0
index 5704861..0e07740 100644
--- a/files/6b03dec0.0
+++ b/files/6b03dec0.0
@@ -16,7 +16,7 @@
         Version: 3 (0x2)
         Serial Number:
             6e:47:a9:c7:6c:a9:73:24:40:89:0f:03:55:dd:8d:1d
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=Google Trust Services LLC, CN=GTS Root R3
         Validity
             Not Before: Jun 22 00:00:00 2016 GMT
diff --git a/files/75680d2e.0 b/files/75680d2e.0
index 59329ba..eeeab3f 100644
--- a/files/75680d2e.0
+++ b/files/75680d2e.0
@@ -27,7 +27,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=GB, ST=Greater Manchester, L=Salford, O=Comodo CA Limited, CN=AAA Certificate Services
         Validity
             Not Before: Jan  1 00:00:00 2004 GMT
@@ -35,7 +35,7 @@
         Subject: C=GB, ST=Greater Manchester, L=Salford, O=Comodo CA Limited, CN=AAA Certificate Services
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:be:40:9d:f4:6e:e1:ea:76:87:1c:4d:45:44:8e:
                     be:46:c8:83:06:9d:c1:2a:fe:18:1f:8e:e4:02:fa:
diff --git a/files/76579174.0 b/files/76579174.0
index 9672db2..afc84d2 100644
--- a/files/76579174.0
+++ b/files/76579174.0
@@ -28,7 +28,7 @@
         Version: 3 (0x2)
         Serial Number:
             50:94:6c:ec:18:ea:d5:9c:4d:d5:97:ef:75:8f:a0:ad
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -36,7 +36,7 @@
         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)
+                RSA 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:
diff --git a/files/7892ad52.0 b/files/7892ad52.0
index 0101e9d..b7faafa 100644
--- a/files/7892ad52.0
+++ b/files/7892ad52.0
@@ -18,7 +18,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 3182246526754555285 (0x2c299c5b16ed0595)
-    Signature Algorithm: ecdsa-with-SHA256
+        Signature Algorithm: ecdsa-with-SHA256
         Issuer: C=US, ST=Texas, L=Houston, O=SSL Corporation, CN=SSL.com EV Root Certification Authority ECC
         Validity
             Not Before: Feb 12 18:15:23 2016 GMT
diff --git a/files/7999be0d.0 b/files/7999be0d.0
index 077c03b..662bcb7 100644
--- a/files/7999be0d.0
+++ b/files/7999be0d.0
@@ -22,7 +22,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 144470 (0x23456)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=GeoTrust Inc., CN=GeoTrust Global CA
         Validity
             Not Before: May 21 04:00:00 2002 GMT
@@ -30,7 +30,7 @@
         Subject: C=US, O=GeoTrust Inc., CN=GeoTrust Global CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:da:cc:18:63:30:fd:f4:17:23:1a:56:7e:5b:df:
                     3c:6c:38:e4:71:b7:78:91:d4:bc:a1:d8:4c:f8:a8:
diff --git a/files/7a7c655d.0 b/files/7a7c655d.0
index 678195b..3292992 100644
--- a/files/7a7c655d.0
+++ b/files/7a7c655d.0
@@ -15,7 +15,7 @@
         Version: 3 (0x2)
         Serial Number:
             06:6c:9f:d5:74:97:36:66:3f:3b:0b:9a:d9:e8:9e:76:03:f2:4a
-    Signature Algorithm: ecdsa-with-SHA256
+        Signature Algorithm: ecdsa-with-SHA256
         Issuer: C=US, O=Amazon, CN=Amazon Root CA 3
         Validity
             Not Before: May 26 00:00:00 2015 GMT
diff --git a/files/7a819ef2.0 b/files/7a819ef2.0
index 091009f..7ac8550 100644
--- a/files/7a819ef2.0
+++ b/files/7a819ef2.0
@@ -35,7 +35,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1289 (0x509)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 2
         Validity
             Not Before: Nov 24 18:27:00 2006 GMT
@@ -43,7 +43,7 @@
         Subject: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:9a:18:ca:4b:94:0d:00:2d:af:03:29:8a:f0:0f:
                     81:c8:ae:4c:19:85:1d:08:9f:ab:29:44:85:f3:2f:
diff --git a/files/7c302982.0 b/files/7c302982.0
index 74312af..51c8ed3 100644
--- a/files/7c302982.0
+++ b/files/7c302982.0
@@ -28,7 +28,7 @@
         Version: 3 (0x2)
         Serial Number:
             da:9b:ec:71:f3:03:b0:19
-    Signature Algorithm: sha256WithRSAEncryption
+        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
@@ -36,7 +36,7 @@
         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)
+                RSA 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:
diff --git a/files/7d453d8f.0 b/files/7d453d8f.0
index 8320018..685cf61 100644
--- a/files/7d453d8f.0
+++ b/files/7d453d8f.0
@@ -27,7 +27,7 @@
         Version: 1 (0x0)
         Serial Number:
             9b:7e:06:49:a3:3e:62:b9:d5:ee:90:48:71:29:ef:57
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -35,7 +35,7 @@
         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)
+                RSA 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:
diff --git a/files/81b9768f.0 b/files/81b9768f.0
index 3593254..8872ea1 100644
--- a/files/81b9768f.0
+++ b/files/81b9768f.0
@@ -26,7 +26,7 @@
         Version: 3 (0x2)
         Serial Number:
             02:ac:5c:26:6a:0b:40:9b:8f:0b:79:f2:ae:46:25:77
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert High Assurance EV Root CA
         Validity
             Not Before: Nov 10 00:00:00 2006 GMT
@@ -34,7 +34,7 @@
         Subject: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert High Assurance EV Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:c6:cc:e5:73:e6:fb:d4:bb:e5:2d:2d:32:a6:df:
                     e5:81:3f:c9:cd:25:49:b6:71:2a:c3:d5:94:34:67:
diff --git a/files/82223c44.0 b/files/82223c44.0
index ab5bf83..71cc88e 100644
--- a/files/82223c44.0
+++ b/files/82223c44.0
@@ -33,7 +33,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 2 (0x2)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=NO, O=Buypass AS-983163327, CN=Buypass Class 2 Root CA
         Validity
             Not Before: Oct 26 08:38:03 2010 GMT
@@ -41,7 +41,7 @@
         Subject: C=NO, O=Buypass AS-983163327, CN=Buypass Class 2 Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:d7:c7:5e:f7:c1:07:d4:77:fb:43:21:f4:f4:f5:
                     69:e4:ee:32:01:db:a3:86:1f:e4:59:0d:ba:e7:75:
diff --git a/files/85cde254.0 b/files/85cde254.0
index 08be8a6..f76b3d7 100644
--- a/files/85cde254.0
+++ b/files/85cde254.0
@@ -25,7 +25,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, Inc., CN=Starfield Root Certificate Authority - G2
         Validity
             Not Before: Sep  1 00:00:00 2009 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, ST=Arizona, L=Scottsdale, O=Starfield Technologies, Inc., CN=Starfield Root Certificate Authority - G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:bd:ed:c1:03:fc:f6:8f:fc:02:b1:6f:5b:9f:48:
                     d9:9d:79:e2:a2:b7:03:61:56:18:c3:47:b6:d7:ca:
diff --git a/files/86212b19.0 b/files/86212b19.0
index ac1ad6b..9107239 100644
--- a/files/86212b19.0
+++ b/files/86212b19.0
@@ -22,7 +22,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 8957382827206547757 (0x7c4f04391cd4992d)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Networking
         Validity
             Not Before: Jan 29 14:08:24 2010 GMT
@@ -30,7 +30,7 @@
         Subject: C=US, O=AffirmTrust, CN=AffirmTrust Networking
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/869fbf79.0 b/files/869fbf79.0
new file mode 100644
index 0000000..ee9120e
--- /dev/null
+++ b/files/869fbf79.0
@@ -0,0 +1,53 @@
+-----BEGIN CERTIFICATE-----
+MIICKzCCAbGgAwIBAgIKe3G2gla4EnycqDAKBggqhkjOPQQDAzBaMQswCQYDVQQG
+EwJVUzETMBEGA1UECxMKZW1TaWduIFBLSTEUMBIGA1UEChMLZU11ZGhyYSBJbmMx
+IDAeBgNVBAMTF2VtU2lnbiBFQ0MgUm9vdCBDQSAtIEMzMB4XDTE4MDIxODE4MzAw
+MFoXDTQzMDIxODE4MzAwMFowWjELMAkGA1UEBhMCVVMxEzARBgNVBAsTCmVtU2ln
+biBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMSAwHgYDVQQDExdlbVNpZ24gRUND
+IFJvb3QgQ0EgLSBDMzB2MBAGByqGSM49AgEGBSuBBAAiA2IABP2lYa57JhAd6bci
+MK4G9IGzsUJxlTm801Ljr6/58pc1kjZGDoeVjbk5Wum739D+yAdBPLtVb4Ojavti
+sIGJAnB9SMVK4+kiVCJNk7tCDK93nCOmfddhEc5lx/h//vXyqaNCMEAwHQYDVR0O
+BBYEFPtaSNCAIEDyqOkAB2kZd6fmw/TPMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMB
+Af8EBTADAQH/MAoGCCqGSM49BAMDA2gAMGUCMQC02C8Cif22TGK6Q04ThHK1rt0c
+3ta13FaPWEBaLd4gTCKDypOofu4SQMfWh0/434UCMBwUZOR8loMRnLDRWmFLpg9J
+0wD8ofzkpf9/rdcw0Md3f76BB1UwUCAU9Vc4CqgxUQ==
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            7b:71:b6:82:56:b8:12:7c:9c:a8
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=US, OU=emSign PKI, O=eMudhra Inc, CN=emSign ECC Root CA - C3
+        Validity
+            Not Before: Feb 18 18:30:00 2018 GMT
+            Not After : Feb 18 18:30:00 2043 GMT
+        Subject: C=US, OU=emSign PKI, O=eMudhra Inc, CN=emSign ECC Root CA - C3
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:fd:a5:61:ae:7b:26:10:1d:e9:b7:22:30:ae:06:
+                    f4:81:b3:b1:42:71:95:39:bc:d3:52:e3:af:af:f9:
+                    f2:97:35:92:36:46:0e:87:95:8d:b9:39:5a:e9:bb:
+                    df:d0:fe:c8:07:41:3c:bb:55:6f:83:a3:6a:fb:62:
+                    b0:81:89:02:70:7d:48:c5:4a:e3:e9:22:54:22:4d:
+                    93:bb:42:0c:af:77:9c:23:a6:7d:d7:61:11:ce:65:
+                    c7:f8:7f:fe:f5:f2:a9
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                FB:5A:48:D0:80:20:40:F2:A8:E9:00:07:69:19:77:A7:E6:C3:F4:CF
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: ecdsa-with-SHA384
+         30:65:02:31:00:b4:d8:2f:02:89:fd:b6:4c:62:ba:43:4e:13:
+         84:72:b5:ae:dd:1c:de:d6:b5:dc:56:8f:58:40:5a:2d:de:20:
+         4c:22:83:ca:93:a8:7e:ee:12:40:c7:d6:87:4f:f8:df:85:02:
+         30:1c:14:64:e4:7c:96:83:11:9c:b0:d1:5a:61:4b:a6:0f:49:
+         d3:00:fc:a1:fc:e4:a5:ff:7f:ad:d7:30:d0:c7:77:7f:be:81:
+         07:55:30:50:20:14:f5:57:38:0a:a8:31:51
+SHA1 Fingerprint=B6:AF:43:C2:9B:81:53:7D:F6:EF:6B:C3:1F:1F:60:15:0C:EE:48:66
diff --git a/files/87753b0d.0 b/files/87753b0d.0
index 18405ec..bba9d3d 100644
--- a/files/87753b0d.0
+++ b/files/87753b0d.0
@@ -33,7 +33,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA 2
         Validity
             Not Before: Mar  4 05:00:00 2004 GMT
@@ -41,7 +41,7 @@
         Subject: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA 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:
diff --git a/files/882de061.0 b/files/882de061.0
index e15b2af..7d86dcd 100644
--- a/files/882de061.0
+++ b/files/882de061.0
@@ -22,7 +22,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 35210227249154 (0x200605167002)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=RO, O=certSIGN, OU=certSIGN ROOT CA
         Validity
             Not Before: Jul  4 17:20:04 2006 GMT
@@ -30,7 +30,7 @@
         Subject: C=RO, O=certSIGN, OU=certSIGN ROOT CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/88950faa.0 b/files/88950faa.0
index 29a1858..6337347 100644
--- a/files/88950faa.0
+++ b/files/88950faa.0
@@ -18,7 +18,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 8495723813297216424 (0x75e6dfcbc1685ba8)
-    Signature Algorithm: ecdsa-with-SHA256
+        Signature Algorithm: ecdsa-with-SHA256
         Issuer: C=US, ST=Texas, L=Houston, O=SSL Corporation, CN=SSL.com Root Certification Authority ECC
         Validity
             Not Before: Feb 12 18:14:03 2016 GMT
diff --git a/files/89c02a45.0 b/files/89c02a45.0
index f496c92..4dc5464 100644
--- a/files/89c02a45.0
+++ b/files/89c02a45.0
@@ -19,7 +19,7 @@
         Version: 3 (0x2)
         Serial Number:
             1f:47:af:aa:62:00:70:50:54:4c:01:9e:9b:63:99:2a
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO ECC Certification Authority
         Validity
             Not Before: Mar  6 00:00:00 2008 GMT
diff --git a/files/8d6437c3.0 b/files/8d6437c3.0
index 2097b64..94f5115 100644
--- a/files/8d6437c3.0
+++ b/files/8d6437c3.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             0b:93:1c:3a:d6:39:67:ea:67:23:bf:c3:af:9a:f4:4b
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Assured ID Root G2
         Validity
             Not Before: Aug  1 12:00:00 2013 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Assured ID Root G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:d9:e7:28:2f:52:3f:36:72:49:88:93:34:f3:f8:
                     6a:1e:31:54:80:9f:ad:54:41:b5:47:df:96:a8:d4:
diff --git a/files/91739615.0 b/files/91739615.0
index 3549e54..75de296 100644
--- a/files/91739615.0
+++ b/files/91739615.0
@@ -27,7 +27,7 @@
         Version: 3 (0x2)
         Serial Number:
             54:80:f9:a0:73:ed:3f:00:4c:ca:89:d8:e3:71:e6:4a
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -35,7 +35,7 @@
         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)
+                RSA 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:
diff --git a/files/9282e51c.0 b/files/9282e51c.0
index f2a9f94..8eea2fe 100644
--- a/files/9282e51c.0
+++ b/files/9282e51c.0
@@ -34,7 +34,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 407555286 (0x184accd6)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=CN, O=China Financial Certification Authority, CN=CFCA EV ROOT
         Validity
             Not Before: Aug  8 03:07:01 2012 GMT
@@ -42,7 +42,7 @@
         Subject: C=CN, O=China Financial Certification Authority, CN=CFCA EV ROOT
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:d7:5d:6b:cd:10:3f:1f:05:59:d5:05:4d:37:b1:
                     0e:ec:98:2b:8e:15:1d:fa:93:4b:17:82:21:71:10:
diff --git a/files/9339512a.0 b/files/9339512a.0
index c6dc40c..61f30ca 100644
--- a/files/9339512a.0
+++ b/files/9339512a.0
@@ -40,7 +40,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1478 (0x5c6)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 3
         Validity
             Not Before: Nov 24 19:11:23 2006 GMT
@@ -48,7 +48,7 @@
         Subject: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:cc:57:42:16:54:9c:e6:98:d3:d3:4d:ee:fe:ed:
                     c7:9f:43:39:4a:65:b3:e8:16:88:34:db:0d:59:91:
diff --git a/files/9479c8c3.0 b/files/9479c8c3.0
index 7a4a49f..ebf95d5 100644
--- a/files/9479c8c3.0
+++ b/files/9479c8c3.0
@@ -19,7 +19,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: ecdsa-with-SHA256
+        Signature Algorithm: ecdsa-with-SHA256
         Issuer: C=GR, L=Athens, O=Hellenic Academic and Research Institutions Cert. Authority, CN=Hellenic Academic and Research Institutions ECC RootCA 2015
         Validity
             Not Before: Jul  7 10:37:12 2015 GMT
diff --git a/files/9576d26b.0 b/files/9576d26b.0
index 48eb7eb..b20a0e5 100644
--- a/files/9576d26b.0
+++ b/files/9576d26b.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             92:b8:88:db:b0:8a:c1:63
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=SK, L=Bratislava, O=Disig a.s., CN=CA Disig Root R2
         Validity
             Not Before: Jul 19 09:15:30 2012 GMT
@@ -42,7 +42,7 @@
         Subject: C=SK, L=Bratislava, O=Disig a.s., CN=CA Disig Root R2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:a2:a3:c4:00:09:d6:85:5d:2d:6d:14:f6:c2:c3:
                     73:9e:35:c2:71:55:7e:81:fb:ab:46:50:e0:c1:7c:
diff --git a/files/95aff9e3.0 b/files/95aff9e3.0
index a063620..1b8d4c0 100644
--- a/files/95aff9e3.0
+++ b/files/95aff9e3.0
@@ -24,7 +24,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 279744 (0x444c0)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=PL, O=Unizeto Technologies S.A., OU=Certum Certification Authority, CN=Certum Trusted Network CA
         Validity
             Not Before: Oct 22 12:07:37 2008 GMT
@@ -32,7 +32,7 @@
         Subject: C=PL, O=Unizeto Technologies S.A., OU=Certum Certification Authority, CN=Certum Trusted Network CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:e3:fb:7d:a3:72:ba:c2:f0:c9:14:87:f5:6b:01:
                     4e:e1:6e:40:07:ba:6d:27:5d:7f:f7:5b:2d:b3:5a:
diff --git a/files/9685a493.0 b/files/9685a493.0
index 2f3a792..6982ee1 100644
--- a/files/9685a493.0
+++ b/files/9685a493.0
@@ -22,7 +22,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1000 (0x3e8)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=HK, O=Hongkong Post, CN=Hongkong Post Root CA 1
         Validity
             Not Before: May 15 05:13:14 2003 GMT
@@ -30,7 +30,7 @@
         Subject: C=HK, O=Hongkong Post, CN=Hongkong Post Root CA 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:ac:ff:38:b6:e9:66:02:49:e3:a2:b4:e1:90:f9:
                     40:8f:79:f9:e2:bd:79:fe:02:bd:ee:24:92:1d:22:
diff --git a/files/9772ca32.0 b/files/9772ca32.0
index 70fbfbb..d5391b3 100644
--- a/files/9772ca32.0
+++ b/files/9772ca32.0
@@ -24,7 +24,7 @@
         Version: 3 (0x2)
         Serial Number:
             18:ac:b5:6a:fd:69:b6:15:3a:63:6c:af:da:fa:c4:a1
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=GeoTrust Inc., CN=GeoTrust Primary Certification Authority
         Validity
             Not Before: Nov 27 00:00:00 2006 GMT
@@ -32,7 +32,7 @@
         Subject: C=US, O=GeoTrust Inc., CN=GeoTrust Primary Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/985c1f52.0 b/files/985c1f52.0
index fd843e0..8a3a427 100644
--- a/files/985c1f52.0
+++ b/files/985c1f52.0
@@ -35,7 +35,7 @@
         Version: 3 (0x2)
         Serial Number:
             45:e6:bb:03:83:33:c3:85:65:48:e6:ff:45:51
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: OU=GlobalSign Root CA - R6, O=GlobalSign, CN=GlobalSign
         Validity
             Not Before: Dec 10 00:00:00 2014 GMT
@@ -43,7 +43,7 @@
         Subject: OU=GlobalSign Root CA - R6, O=GlobalSign, CN=GlobalSign
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:95:07:e8:73:ca:66:f9:ec:14:ca:7b:3c:f7:0d:
                     08:f1:b4:45:0b:2c:82:b4:48:c6:eb:5b:3c:ae:83:
diff --git a/files/9d6523ce.0 b/files/9d6523ce.0
index 6053f55..1fccbf7 100644
--- a/files/9d6523ce.0
+++ b/files/9d6523ce.0
@@ -36,7 +36,7 @@
         Version: 3 (0x2)
         Serial Number:
             15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=TW, O=Chunghwa Telecom Co., Ltd., OU=ePKI Root Certification Authority
         Validity
             Not Before: Dec 20 02:31:27 2004 GMT
@@ -44,7 +44,7 @@
         Subject: C=TW, O=Chunghwa Telecom Co., Ltd., OU=ePKI Root Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:e1:25:0f:ee:8d:db:88:33:75:67:cd:ad:1f:7d:
                     3a:4e:6d:9d:d3:2f:14:f3:63:74:cb:01:21:6a:37:
diff --git a/files/9f533518.0 b/files/9f533518.0
index 0002928..2404062 100644
--- a/files/9f533518.0
+++ b/files/9f533518.0
@@ -44,7 +44,7 @@
         Version: 3 (0x2)
         Serial Number:
             c9:cd:d3:e9:d5:7d:23:ce
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -52,7 +52,7 @@
         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)
+                RSA 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:
diff --git a/files/a2c66da8.0 b/files/a2c66da8.0
index f922408..c590fcb 100644
--- a/files/a2c66da8.0
+++ b/files/a2c66da8.0
@@ -35,7 +35,7 @@
         Version: 3 (0x2)
         Serial Number:
             05:9b:1b:57:9e:8e:21:32:e2:39:07:bd:a7:77:75:5c
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Trusted Root G4
         Validity
             Not Before: Aug  1 12:00:00 2013 GMT
@@ -43,7 +43,7 @@
         Subject: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Trusted Root G4
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:bf:e6:90:73:68:de:bb:e4:5d:4a:3c:30:22:30:
                     69:33:ec:c2:a7:25:2e:c9:21:3d:f2:8a:d8:59:c2:
diff --git a/files/a3896b44.0 b/files/a3896b44.0
index f570c1d..c5bbeff 100644
--- a/files/a3896b44.0
+++ b/files/a3896b44.0
@@ -22,7 +22,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=JP, O=SECOM Trust.net, OU=Security Communication RootCA1
         Validity
             Not Before: Sep 30 04:20:49 2003 GMT
@@ -30,7 +30,7 @@
         Subject: C=JP, O=SECOM Trust.net, OU=Security Communication RootCA1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:b3:b3:fe:7f:d3:6d:b1:ef:16:7c:57:a5:0c:6d:
                     76:8a:2f:4b:bf:64:fb:4c:ee:8a:f0:f3:29:7c:f5:
diff --git a/files/a7605362.0 b/files/a7605362.0
index 112d40f..9020f00 100644
--- a/files/a7605362.0
+++ b/files/a7605362.0
@@ -21,7 +21,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 29 (0x1d)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=FI, O=Sonera, CN=Sonera Class2 CA
         Validity
             Not Before: Apr  6 07:29:40 2001 GMT
@@ -29,7 +29,7 @@
         Subject: C=FI, O=Sonera, CN=Sonera Class2 CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:90:17:4a:35:9d:ca:f0:0d:96:c7:44:fa:16:37:
                     fc:48:bd:bd:7f:80:2d:35:3b:e1:6f:a8:67:a9:bf:
diff --git a/files/a7d2cf64.0 b/files/a7d2cf64.0
index a4402cd..b2c5c31 100644
--- a/files/a7d2cf64.0
+++ b/files/a7d2cf64.0
@@ -19,7 +19,7 @@
         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
+        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
diff --git a/files/a81e292b.0 b/files/a81e292b.0
index cf52a80..18d0039 100644
--- a/files/a81e292b.0
+++ b/files/a81e292b.0
@@ -24,7 +24,7 @@
         Version: 3 (0x2)
         Serial Number:
             3e:8a:5d:07:ec:55:d2:32:d5:b7:e3:b6:5f:01:eb:2d:dc:e4:d6:e4
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=PL, O=Krajowa Izba Rozliczeniowa S.A., CN=SZAFIR ROOT CA2
         Validity
             Not Before: Oct 19 07:43:30 2015 GMT
@@ -32,7 +32,7 @@
         Subject: C=PL, O=Krajowa Izba Rozliczeniowa S.A., CN=SZAFIR ROOT CA2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:b7:bc:3e:50:a8:4b:cd:40:b5:ce:61:e7:96:ca:
                     b4:a1:da:0c:22:b0:fa:b5:7b:76:00:77:8c:0b:cf:
diff --git a/files/ab5346f4.0 b/files/ab5346f4.0
index cd7e378..7a63ead 100644
--- a/files/ab5346f4.0
+++ b/files/ab5346f4.0
@@ -23,7 +23,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=JP, O=Japan Certification Services, Inc., CN=SecureSign RootCA11
         Validity
             Not Before: Apr  8 04:56:47 2009 GMT
@@ -31,7 +31,7 @@
         Subject: C=JP, O=Japan Certification Services, Inc., CN=SecureSign RootCA11
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/ab59055e.0 b/files/ab59055e.0
index c370e86..67cf3cd 100644
--- a/files/ab59055e.0
+++ b/files/ab59055e.0
@@ -34,7 +34,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 9009899650740120186 (0x7d0997fef047ea7a)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=CN, O=GUANG DONG CERTIFICATE AUTHORITY CO.,LTD., CN=GDCA TrustAUTH R5 ROOT
         Validity
             Not Before: Nov 26 05:13:15 2014 GMT
@@ -42,7 +42,7 @@
         Subject: C=CN, O=GUANG DONG CERTIFICATE AUTHORITY CO.,LTD., CN=GDCA TrustAUTH R5 ROOT
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:d9:a3:16:f0:c8:74:74:77:9b:ef:33:0d:3b:06:
                     7e:55:fc:b5:60:8f:76:86:12:42:7d:56:66:3e:88:
diff --git a/files/aeb67534.0 b/files/aeb67534.0
index fdabb5f..e5ad219 100644
--- a/files/aeb67534.0
+++ b/files/aeb67534.0
@@ -34,7 +34,7 @@
         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
+        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
@@ -42,7 +42,7 @@
         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)
+                RSA 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:
diff --git a/files/b0ed035a.0 b/files/b0ed035a.0
index b06f963..a6bb93e 100644
--- a/files/b0ed035a.0
+++ b/files/b0ed035a.0
@@ -33,7 +33,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 3262 (0xcbe)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=TW, O=TAIWAN-CA, OU=Root CA, CN=TWCA Global Root CA
         Validity
             Not Before: Jun 27 06:28:33 2012 GMT
@@ -41,7 +41,7 @@
         Subject: C=TW, O=TAIWAN-CA, OU=Root CA, CN=TWCA Global Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:b0:05:db:c8:eb:8c:c4:6e:8a:21:ef:8e:4d:9c:
                     71:0a:1f:52:70:ed:6d:82:9c:97:c5:d7:4c:4e:45:
diff --git a/files/b0f3e76e.0 b/files/b0f3e76e.0
index 929f29f..945b721 100644
--- a/files/b0f3e76e.0
+++ b/files/b0f3e76e.0
@@ -24,7 +24,7 @@
         Version: 3 (0x2)
         Serial Number:
             04:00:00:00:00:01:15:4b:5a:c3:94
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
         Validity
             Not Before: Sep  1 12:00:00 1998 GMT
@@ -32,7 +32,7 @@
         Subject: C=BE, O=GlobalSign nv-sa, OU=Root CA, CN=GlobalSign Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:da:0e:e6:99:8d:ce:a3:e3:4f:8a:7e:fb:f1:8b:
                     83:25:6b:ea:48:1f:f1:2a:b0:b9:95:11:04:bd:f0:
diff --git a/files/b3fb433b.0 b/files/b3fb433b.0
index 8f7ba15..57aca24 100644
--- a/files/b3fb433b.0
+++ b/files/b3fb433b.0
@@ -21,7 +21,7 @@
         Version: 3 (0x2)
         Serial Number:
             a6:8b:79:29:00:00:00:00:50:d0:91:f9
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=Entrust, Inc., OU=See www.entrust.net/legal-terms, OU=(c) 2012 Entrust, Inc. - for authorized use only, CN=Entrust Root Certification Authority - EC1
         Validity
             Not Before: Dec 18 15:25:36 2012 GMT
diff --git a/files/b74d2bd5.0 b/files/b74d2bd5.0
new file mode 100644
index 0000000..d822c32
--- /dev/null
+++ b/files/b74d2bd5.0
@@ -0,0 +1,54 @@
+-----BEGIN CERTIFICATE-----
+MIICTjCCAdOgAwIBAgIKPPYHqWhwDtqLhDAKBggqhkjOPQQDAzBrMQswCQYDVQQG
+EwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNo
+bm9sb2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0g
+RzMwHhcNMTgwMjE4MTgzMDAwWhcNNDMwMjE4MTgzMDAwWjBrMQswCQYDVQQGEwJJ
+TjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBUZWNobm9s
+b2dpZXMgTGltaXRlZDEgMB4GA1UEAxMXZW1TaWduIEVDQyBSb290IENBIC0gRzMw
+djAQBgcqhkjOPQIBBgUrgQQAIgNiAAQjpQy4LRL1KPOxst3iAhKAnjlfSU2fySU0
+WXTsuwYc58Byr+iuL+FBVIcUqEqy6HyC5ltqtdyzdc6LBtCGI79G1Y4PPwT01xyS
+fvalY8L1X44uT6EYGQIrMgqCZH0Wk9GjQjBAMB0GA1UdDgQWBBR8XQKEE9TMipuB
+zhccLikenEhjQjAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAKBggq
+hkjOPQQDAwNpADBmAjEAvvNhzwIQHWSVB7gYboiFBS+DCBeQyh+KTOgNG3qxrdWB
+CUfvO6wIBHxcmbHtRwfSAjEAnbpV/KlK6O3t5nYBQnvI+GDZjVGLVTv7jHvrZQnD
++JbNR6iC8hZVdyR+EhCVBCyj
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            3c:f6:07:a9:68:70:0e:da:8b:84
+        Signature Algorithm: ecdsa-with-SHA384
+        Issuer: C=IN, OU=emSign PKI, O=eMudhra Technologies Limited, CN=emSign ECC Root CA - G3
+        Validity
+            Not Before: Feb 18 18:30:00 2018 GMT
+            Not After : Feb 18 18:30:00 2043 GMT
+        Subject: C=IN, OU=emSign PKI, O=eMudhra Technologies Limited, CN=emSign ECC Root CA - G3
+        Subject Public Key Info:
+            Public Key Algorithm: id-ecPublicKey
+                Public-Key: (384 bit)
+                pub:
+                    04:23:a5:0c:b8:2d:12:f5:28:f3:b1:b2:dd:e2:02:
+                    12:80:9e:39:5f:49:4d:9f:c9:25:34:59:74:ec:bb:
+                    06:1c:e7:c0:72:af:e8:ae:2f:e1:41:54:87:14:a8:
+                    4a:b2:e8:7c:82:e6:5b:6a:b5:dc:b3:75:ce:8b:06:
+                    d0:86:23:bf:46:d5:8e:0f:3f:04:f4:d7:1c:92:7e:
+                    f6:a5:63:c2:f5:5f:8e:2e:4f:a1:18:19:02:2b:32:
+                    0a:82:64:7d:16:93:d1
+                ASN1 OID: secp384r1
+                NIST CURVE: P-384
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                7C:5D:02:84:13:D4:CC:8A:9B:81:CE:17:1C:2E:29:1E:9C:48:63:42
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: ecdsa-with-SHA384
+         30:66:02:31:00:be:f3:61:cf:02:10:1d:64:95:07:b8:18:6e:
+         88:85:05:2f:83:08:17:90:ca:1f:8a:4c:e8:0d:1b:7a:b1:ad:
+         d5:81:09:47:ef:3b:ac:08:04:7c:5c:99:b1:ed:47:07:d2:02:
+         31:00:9d:ba:55:fc:a9:4a:e8:ed:ed:e6:76:01:42:7b:c8:f8:
+         60:d9:8d:51:8b:55:3b:fb:8c:7b:eb:65:09:c3:f8:96:cd:47:
+         a8:82:f2:16:55:77:24:7e:12:10:95:04:2c:a3
+SHA1 Fingerprint=30:43:FA:4F:F2:57:DC:A0:C3:80:EE:2E:58:EA:78:B2:3F:E6:BB:C1
diff --git a/files/b7db1890.0 b/files/b7db1890.0
index 626e5a3..ecabaa7 100644
--- a/files/b7db1890.0
+++ b/files/b7db1890.0
@@ -23,7 +23,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=TW, O=TAIWAN-CA, OU=Root CA, CN=TWCA Root Certification Authority
         Validity
             Not Before: Aug 28 07:24:33 2008 GMT
@@ -31,7 +31,7 @@
         Subject: C=TW, O=TAIWAN-CA, OU=Root CA, CN=TWCA Root Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:b0:7e:72:b8:a4:03:94:e6:a7:de:09:38:91:4a:
                     11:40:87:a7:7c:59:64:14:7b:b5:11:10:dd:fe:bf:
diff --git a/files/b872f2b4.0 b/files/b872f2b4.0
index e99bbe9..37b6284 100644
--- a/files/b872f2b4.0
+++ b/files/b872f2b4.0
@@ -23,7 +23,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 6643877497813316402 (0x5c33cb622c5fb332)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: CN=Atos TrustedRoot 2011, O=Atos, C=DE
         Validity
             Not Before: Jul  7 14:58:30 2011 GMT
@@ -31,7 +31,7 @@
         Subject: CN=Atos TrustedRoot 2011, O=Atos, C=DE
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:95:85:3b:97:6f:2a:3b:2e:3b:cf:a6:f3:29:35:
                     be:cf:18:ac:3e:aa:d9:f8:4d:a0:3e:1a:47:b9:bc:
diff --git a/files/b936d1c6.0 b/files/b936d1c6.0
index 5a8d8e6..029f864 100644
--- a/files/b936d1c6.0
+++ b/files/b936d1c6.0
@@ -35,7 +35,7 @@
         Version: 3 (0x2)
         Serial Number:
             5d:93:8d:30:67:36:c8:06:1d:1a:c7:54:84:69:07
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=ES, O=FNMT-RCM, OU=AC RAIZ FNMT-RCM
         Validity
             Not Before: Oct 29 15:59:56 2008 GMT
@@ -43,7 +43,7 @@
         Subject: C=ES, O=FNMT-RCM, OU=AC RAIZ FNMT-RCM
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:ba:71:80:7a:4c:86:6e:7f:c8:13:6d:c0:c6:7d:
                     1c:00:97:8f:2c:0c:23:bb:10:9a:40:a9:1a:b7:87:
diff --git a/files/bc3f2570.0 b/files/bc3f2570.0
index b8fd426..f85d643 100644
--- a/files/bc3f2570.0
+++ b/files/bc3f2570.0
@@ -25,7 +25,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, ST=Arizona, L=Scottsdale, O=GoDaddy.com, Inc., CN=Go Daddy Root Certificate Authority - G2
         Validity
             Not Before: Sep  1 00:00:00 2009 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, ST=Arizona, L=Scottsdale, O=GoDaddy.com, Inc., CN=Go Daddy Root Certificate Authority - G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:bf:71:62:08:f1:fa:59:34:f7:1b:c9:18:a3:f7:
                     80:49:58:e9:22:83:13:a6:c5:20:43:01:3b:84:f1:
diff --git a/files/bd43e1dd.0 b/files/bd43e1dd.0
new file mode 100644
index 0000000..594d13d
--- /dev/null
+++ b/files/bd43e1dd.0
@@ -0,0 +1,126 @@
+-----BEGIN CERTIFICATE-----
+MIIFzzCCA7egAwIBAgIUCBZfikyl7ADJk0DfxMauI7gcWqQwDQYJKoZIhvcNAQEL
+BQAwbzELMAkGA1UEBhMCSEsxEjAQBgNVBAgTCUhvbmcgS29uZzESMBAGA1UEBxMJ
+SG9uZyBLb25nMRYwFAYDVQQKEw1Ib25na29uZyBQb3N0MSAwHgYDVQQDExdIb25n
+a29uZyBQb3N0IFJvb3QgQ0EgMzAeFw0xNzA2MDMwMjI5NDZaFw00MjA2MDMwMjI5
+NDZaMG8xCzAJBgNVBAYTAkhLMRIwEAYDVQQIEwlIb25nIEtvbmcxEjAQBgNVBAcT
+CUhvbmcgS29uZzEWMBQGA1UEChMNSG9uZ2tvbmcgUG9zdDEgMB4GA1UEAxMXSG9u
+Z2tvbmcgUG9zdCBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIK
+AoICAQCziNfqzg8gTr7m1gNt7ln8wlffKWihgw4+aMdoWJwcYEuJQwy51BWy7sFO
+dem1p+/l6TWZ5Mwc50tfjTMwIDNT2aa71T4Tjukfh0mtUC1Qyhi+AViiE3CWu4mI
+VoBc+L0sPOFMV4i707mV78vH9toxdCim5lSJ9UExyuUmGs2C4HDaOym71QP1mbpV
+9WTRYA6ziUm4ii8F0oRFKHyPaFASePwLtVPLwpgchKOesL4jpNrcyCse2m5FHomY
+2vkALgbpDDtw1VAliJnLzXNg99X/NWfFobxeq81KuEXryGgeDQ0URhLj0mRiikKY
+vLTGCAj4/ahMZJx2Ab0vqWwzD9g/KLg8aQFChn5pwckGyuV6RmXpwtZQQS4/t+Tt
+bNe/JgERohYpSms0BpDsE9K2+2p20jzt8NYt3eEV7KObLyzJPivkaTv/ciWxNoZb
+x39ri1UbSsUgYT2uy1DhCDq+sI9jQVMwCFk8mB13umOResoQUGC/8Ne8lYePl8X+
+l2oBlKN8W4UdKjk60FSh0Tlxnf0h+bV78OLgAo9uliQlLKAeLKjEiafv7ZkGL7YK
+TE/bosw3Gq9HhS2KX8Q0NEwA/RiTZxPRN+ZItIsGxVd7GYYKecsAyVKvQv83j+Gj
+Hno9UKtjBucVtT+2RTeUN7F+8kjDf8V1/peNRY8apxpyKBpADwIDAQABo2MwYTAP
+BgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQXnc0e
+i9Y5K3DTXNSguB+wAPzFYTAdBgNVHQ4EFgQUF53NHovWOStw01zUoLgfsAD8xWEw
+DQYJKoZIhvcNAQELBQADggIBAFbVe27mIgHSQpsY1Q7XZiNc4/6gx5LS6ZStS6LG
+7BJ8dNVI0lkUmcDrudHr9EgwW62nV3OZqdPlt9EuWSRY3GguLmLYauRwCy0gUCCk
+MpXRAJi70/33MvJJrsZ64Ee+bs7Lo3I6LWldy8joRTnU+kLBEUx3XZL7av9YROXr
+gZ6voJmtvqkBZss4HTzfQx/0TW60uhdG/H39h4F5ag0zD/ov+BS5gLNdTaqX4fnk
+GMX41TiMJjz98iji7lpJiCzfeT2OnpA8vUFKOt1b9pq0zj8lMH8yfaIDlNDceqFS
+3m6TjRgm/VWsvY+b0s+v54Ysyx8Jb6NvqYTUc79NoXQbTiNg8swOqn+knEwlqLJm
+Ozj/2ZQw9nKEvmhVEA/GcywWaZMH/rFF7buiVWqw2rVKAiUnhde3t4ZEFolsgCs+
+l6mc1X5VTMbeRRAc6uk7nwNT7u56AQIWeNTowr5GdogTPyK7SBIdUgC0An4hGh6c
+JfTzPV4e0hz5sy229zdcxsshTrD3mUcYhcErulWuBurQB7Lcq9CClnXO0lD+mefP
+L5/ndtFhKvshuzHQqp9HpLIiyhY6UFfEW0NnxWViA0kB60PZ2Pierc+xYw5F9KBa
+LJstxabArahH9CdMOA0uG0k7UvToiIMrVCjU8jVStDKDYmlkDJGcn5fqdBb9HxEG
+mpv0
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            08:16:5f:8a:4c:a5:ec:00:c9:93:40:df:c4:c6:ae:23:b8:1c:5a:a4
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=HK, ST=Hong Kong, L=Hong Kong, O=Hongkong Post, CN=Hongkong Post Root CA 3
+        Validity
+            Not Before: Jun  3 02:29:46 2017 GMT
+            Not After : Jun  3 02:29:46 2042 GMT
+        Subject: C=HK, ST=Hong Kong, L=Hong Kong, O=Hongkong Post, CN=Hongkong Post Root CA 3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (4096 bit)
+                Modulus:
+                    00:b3:88:d7:ea:ce:0f:20:4e:be:e6:d6:03:6d:ee:
+                    59:fc:c2:57:df:29:68:a1:83:0e:3e:68:c7:68:58:
+                    9c:1c:60:4b:89:43:0c:b9:d4:15:b2:ee:c1:4e:75:
+                    e9:b5:a7:ef:e5:e9:35:99:e4:cc:1c:e7:4b:5f:8d:
+                    33:30:20:33:53:d9:a6:bb:d5:3e:13:8e:e9:1f:87:
+                    49:ad:50:2d:50:ca:18:be:01:58:a2:13:70:96:bb:
+                    89:88:56:80:5c:f8:bd:2c:3c:e1:4c:57:88:bb:d3:
+                    b9:95:ef:cb:c7:f6:da:31:74:28:a6:e6:54:89:f5:
+                    41:31:ca:e5:26:1a:cd:82:e0:70:da:3b:29:bb:d5:
+                    03:f5:99:ba:55:f5:64:d1:60:0e:b3:89:49:b8:8a:
+                    2f:05:d2:84:45:28:7c:8f:68:50:12:78:fc:0b:b5:
+                    53:cb:c2:98:1c:84:a3:9e:b0:be:23:a4:da:dc:c8:
+                    2b:1e:da:6e:45:1e:89:98:da:f9:00:2e:06:e9:0c:
+                    3b:70:d5:50:25:88:99:cb:cd:73:60:f7:d5:ff:35:
+                    67:c5:a1:bc:5e:ab:cd:4a:b8:45:eb:c8:68:1e:0d:
+                    0d:14:46:12:e3:d2:64:62:8a:42:98:bc:b4:c6:08:
+                    08:f8:fd:a8:4c:64:9c:76:01:bd:2f:a9:6c:33:0f:
+                    d8:3f:28:b8:3c:69:01:42:86:7e:69:c1:c9:06:ca:
+                    e5:7a:46:65:e9:c2:d6:50:41:2e:3f:b7:e4:ed:6c:
+                    d7:bf:26:01:11:a2:16:29:4a:6b:34:06:90:ec:13:
+                    d2:b6:fb:6a:76:d2:3c:ed:f0:d6:2d:dd:e1:15:ec:
+                    a3:9b:2f:2c:c9:3e:2b:e4:69:3b:ff:72:25:b1:36:
+                    86:5b:c7:7f:6b:8b:55:1b:4a:c5:20:61:3d:ae:cb:
+                    50:e1:08:3a:be:b0:8f:63:41:53:30:08:59:3c:98:
+                    1d:77:ba:63:91:7a:ca:10:50:60:bf:f0:d7:bc:95:
+                    87:8f:97:c5:fe:97:6a:01:94:a3:7c:5b:85:1d:2a:
+                    39:3a:d0:54:a1:d1:39:71:9d:fd:21:f9:b5:7b:f0:
+                    e2:e0:02:8f:6e:96:24:25:2c:a0:1e:2c:a8:c4:89:
+                    a7:ef:ed:99:06:2f:b6:0a:4c:4f:db:a2:cc:37:1a:
+                    af:47:85:2d:8a:5f:c4:34:34:4c:00:fd:18:93:67:
+                    13:d1:37:e6:48:b4:8b:06:c5:57:7b:19:86:0a:79:
+                    cb:00:c9:52:af:42:ff:37:8f:e1:a3:1e:7a:3d:50:
+                    ab:63:06:e7:15:b5:3f:b6:45:37:94:37:b1:7e:f2:
+                    48:c3:7f:c5:75:fe:97:8d:45:8f:1a:a7:1a:72:28:
+                    1a:40:0f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Authority Key Identifier: 
+                keyid:17:9D:CD:1E:8B:D6:39:2B:70:D3:5C:D4:A0:B8:1F:B0:00:FC:C5:61
+
+            X509v3 Subject Key Identifier: 
+                17:9D:CD:1E:8B:D6:39:2B:70:D3:5C:D4:A0:B8:1F:B0:00:FC:C5:61
+    Signature Algorithm: sha256WithRSAEncryption
+         56:d5:7b:6e:e6:22:01:d2:42:9b:18:d5:0e:d7:66:23:5c:e3:
+         fe:a0:c7:92:d2:e9:94:ad:4b:a2:c6:ec:12:7c:74:d5:48:d2:
+         59:14:99:c0:eb:b9:d1:eb:f4:48:30:5b:ad:a7:57:73:99:a9:
+         d3:e5:b7:d1:2e:59:24:58:dc:68:2e:2e:62:d8:6a:e4:70:0b:
+         2d:20:50:20:a4:32:95:d1:00:98:bb:d3:fd:f7:32:f2:49:ae:
+         c6:7a:e0:47:be:6e:ce:cb:a3:72:3a:2d:69:5d:cb:c8:e8:45:
+         39:d4:fa:42:c1:11:4c:77:5d:92:fb:6a:ff:58:44:e5:eb:81:
+         9e:af:a0:99:ad:be:a9:01:66:cb:38:1d:3c:df:43:1f:f4:4d:
+         6e:b4:ba:17:46:fc:7d:fd:87:81:79:6a:0d:33:0f:fa:2f:f8:
+         14:b9:80:b3:5d:4d:aa:97:e1:f9:e4:18:c5:f8:d5:38:8c:26:
+         3c:fd:f2:28:e2:ee:5a:49:88:2c:df:79:3d:8e:9e:90:3c:bd:
+         41:4a:3a:dd:5b:f6:9a:b4:ce:3f:25:30:7f:32:7d:a2:03:94:
+         d0:dc:7a:a1:52:de:6e:93:8d:18:26:fd:55:ac:bd:8f:9b:d2:
+         cf:af:e7:86:2c:cb:1f:09:6f:a3:6f:a9:84:d4:73:bf:4d:a1:
+         74:1b:4e:23:60:f2:cc:0e:aa:7f:a4:9c:4c:25:a8:b2:66:3b:
+         38:ff:d9:94:30:f6:72:84:be:68:55:10:0f:c6:73:2c:16:69:
+         93:07:fe:b1:45:ed:bb:a2:55:6a:b0:da:b5:4a:02:25:27:85:
+         d7:b7:b7:86:44:16:89:6c:80:2b:3e:97:a9:9c:d5:7e:55:4c:
+         c6:de:45:10:1c:ea:e9:3b:9f:03:53:ee:ee:7a:01:02:16:78:
+         d4:e8:c2:be:46:76:88:13:3f:22:bb:48:12:1d:52:00:b4:02:
+         7e:21:1a:1e:9c:25:f4:f3:3d:5e:1e:d2:1c:f9:b3:2d:b6:f7:
+         37:5c:c6:cb:21:4e:b0:f7:99:47:18:85:c1:2b:ba:55:ae:06:
+         ea:d0:07:b2:dc:ab:d0:82:96:75:ce:d2:50:fe:99:e7:cf:2f:
+         9f:e7:76:d1:61:2a:fb:21:bb:31:d0:aa:9f:47:a4:b2:22:ca:
+         16:3a:50:57:c4:5b:43:67:c5:65:62:03:49:01:eb:43:d9:d8:
+         f8:9e:ad:cf:b1:63:0e:45:f4:a0:5a:2c:9b:2d:c5:a6:c0:ad:
+         a8:47:f4:27:4c:38:0d:2e:1b:49:3b:52:f4:e8:88:83:2b:54:
+         28:d4:f2:35:52:b4:32:83:62:69:64:0c:91:9c:9f:97:ea:74:
+         16:fd:1f:11:06:9a:9b:f4
+SHA1 Fingerprint=58:A2:D0:EC:20:52:81:5B:C1:F3:F8:64:02:24:4E:C2:8E:02:4B:02
diff --git a/files/bdacca6f.0 b/files/bdacca6f.0
index f08bdcf..f8ff00f 100644
--- a/files/bdacca6f.0
+++ b/files/bdacca6f.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             07:56:22:a4:e8:d4:8a:89:4d:f4:13:c8:f0:f8:ea:a5
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=SecureTrust Corporation, CN=Secure Global CA
         Validity
             Not Before: Nov  7 19:42:28 2006 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, O=SecureTrust Corporation, CN=Secure Global CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/bf64f35b.0 b/files/bf64f35b.0
index f75710b..33b5468 100644
--- a/files/bf64f35b.0
+++ b/files/bf64f35b.0
@@ -29,7 +29,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1164660820 (0x456b5054)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=Entrust, Inc., OU=www.entrust.net/CPS is incorporated by reference, OU=(c) 2006 Entrust, Inc., CN=Entrust Root Certification Authority
         Validity
             Not Before: Nov 27 20:23:42 2006 GMT
@@ -37,7 +37,7 @@
         Subject: C=US, O=Entrust, Inc., OU=www.entrust.net/CPS is incorporated by reference, OU=(c) 2006 Entrust, Inc., CN=Entrust Root Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:b6:95:b6:43:42:fa:c6:6d:2a:6f:48:df:94:4c:
                     39:57:05:ee:c3:79:11:41:68:36:ed:ec:fe:9a:01:
diff --git a/files/c2c1704e.0 b/files/c2c1704e.0
index 6171b66..50d9e26 100644
--- a/files/c2c1704e.0
+++ b/files/c2c1704e.0
@@ -28,7 +28,7 @@
         Version: 3 (0x2)
         Serial Number:
             84:82:2c:5f:1c:62:d0:40
-    Signature Algorithm: sha256WithRSAEncryption
+        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
@@ -36,7 +36,7 @@
         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)
+                RSA 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:
diff --git a/files/c491639e.0 b/files/c491639e.0
index 21d36ff..9d4df03 100644
--- a/files/c491639e.0
+++ b/files/c491639e.0
@@ -18,7 +18,7 @@
         Version: 3 (0x2)
         Serial Number:
             0b:a1:5a:fa:1d:df:a0:b5:49:44:af:cd:24:a0:6c:ec
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Assured ID Root G3
         Validity
             Not Before: Aug  1 12:00:00 2013 GMT
diff --git a/files/c51c224c.0 b/files/c51c224c.0
index 6bf7f22..87d7d50 100644
--- a/files/c51c224c.0
+++ b/files/c51c224c.0
@@ -24,7 +24,7 @@
         Version: 3 (0x2)
         Serial Number:
             1b:1f:ad:b6:20:f9:24:d3:36:6b:f7:c7:f1:8c:a0:59
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=GB, O=Trustis Limited, OU=Trustis FPS Root CA
         Validity
             Not Before: Dec 23 12:14:06 2003 GMT
@@ -32,7 +32,7 @@
         Subject: C=GB, O=Trustis Limited, OU=Trustis FPS Root CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:c5:50:7b:9e:3b:35:d0:df:c4:8c:cd:8e:9b:ed:
                     a3:c0:36:99:f4:42:ea:a7:3e:80:83:0f:a6:a7:59:
diff --git a/files/c559d742.0 b/files/c559d742.0
index 393fcf2..0e3e9f9 100644
--- a/files/c559d742.0
+++ b/files/c559d742.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             6e:47:a9:c6:5a:b3:e7:20:c5:30:9a:3f:68:52:f2:6f
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: C=US, O=Google Trust Services LLC, CN=GTS Root R2
         Validity
             Not Before: Jun 22 00:00:00 2016 GMT
@@ -42,7 +42,7 @@
         Subject: C=US, O=Google Trust Services LLC, CN=GTS Root R2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:ce:de:fd:a6:fb:ec:ec:14:34:3c:07:06:5a:6c:
                     59:f7:19:35:dd:f7:c1:9d:55:aa:d3:cd:3b:a4:93:
diff --git a/files/c7e2a638.0 b/files/c7e2a638.0
index c5a3c92..1189a01 100644
--- a/files/c7e2a638.0
+++ b/files/c7e2a638.0
@@ -27,7 +27,7 @@
         Version: 3 (0x2)
         Serial Number:
             15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f
-    Signature Algorithm: sha256WithRSAEncryption
+        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
@@ -35,7 +35,7 @@
         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)
+                RSA 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:
diff --git a/files/c907e29b.0 b/files/c907e29b.0
index 934468f..f0657fc 100644
--- a/files/c907e29b.0
+++ b/files/c907e29b.0
@@ -36,7 +36,7 @@
         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
+        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
@@ -44,7 +44,7 @@
         Subject: C=LU, O=LuxTrust S.A., CN=LuxTrust Global Root 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA 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:
diff --git a/files/c90bc37d.0 b/files/c90bc37d.0
index e4460c1..c99a365 100644
--- a/files/c90bc37d.0
+++ b/files/c90bc37d.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             03:3a:f1:e6:a7:11:a9:a0:bb:28:64:b1:1d:09:fa:e5
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Global Root G2
         Validity
             Not Before: Aug  1 12:00:00 2013 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Global Root G2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:bb:37:cd:34:dc:7b:6b:c9:b2:68:90:ad:4a:75:
                     ff:46:ba:21:0a:08:8d:f5:19:54:c9:fb:88:db:f3:
diff --git a/files/cb156124.0 b/files/cb156124.0
index a5311ba..27a4727 100644
--- a/files/cb156124.0
+++ b/files/cb156124.0
@@ -38,7 +38,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 7667447206703254355 (0x6a683e9c519bcb53)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=TR, L=Ankara, O=E-Tu\xC4\x9Fra EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E., OU=E-Tugra Sertifikasyon Merkezi, CN=E-Tugra Certification Authority
         Validity
             Not Before: Mar  5 12:09:48 2013 GMT
@@ -46,7 +46,7 @@
         Subject: C=TR, L=Ankara, O=E-Tu\xC4\x9Fra EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E., OU=E-Tugra Sertifikasyon Merkezi, CN=E-Tugra Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:e2:f5:3f:93:05:51:1e:85:62:54:5e:7a:0b:f5:
                     18:07:83:ae:7e:af:7c:f7:d4:8a:6b:a5:63:43:39:
diff --git a/files/cb1c3204.0 b/files/cb1c3204.0
index 36e988c..bc9617d 100644
--- a/files/cb1c3204.0
+++ b/files/cb1c3204.0
@@ -37,7 +37,7 @@
         Version: 3 (0x2)
         Serial Number:
             21:d6:d0:4a:4f:25:0f:c9:32:37:fc:aa:5e:12:8d:e9
-    Signature Algorithm: sha512WithRSAEncryption
+        Signature Algorithm: sha512WithRSAEncryption
         Issuer: C=PL, O=Unizeto Technologies S.A., OU=Certum Certification Authority, CN=Certum Trusted Network CA 2
         Validity
             Not Before: Oct  6 08:39:56 2011 GMT
@@ -45,7 +45,7 @@
         Subject: C=PL, O=Unizeto Technologies S.A., OU=Certum Certification Authority, CN=Certum Trusted Network CA 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:bd:f9:78:f8:e6:d5:80:0c:64:9d:86:1b:96:64:
                     67:3f:22:3a:1e:75:01:7d:ef:fb:5c:67:8c:c9:cc:
diff --git a/files/ccc52f49.0 b/files/ccc52f49.0
index 39b68dd..751b613 100644
--- a/files/ccc52f49.0
+++ b/files/ccc52f49.0
@@ -15,7 +15,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 8401224907861490260 (0x7497258ac73f7a54)
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Premium ECC
         Validity
             Not Before: Jan 29 14:20:24 2010 GMT
diff --git a/files/cf701eeb.0 b/files/cf701eeb.0
index 3f6e70a..b20e894 100644
--- a/files/cf701eeb.0
+++ b/files/cf701eeb.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             0c:f0:8e:5c:08:16:a5:ad:42:7f:f0:eb:27:18:59:d0
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=SecureTrust Corporation, CN=SecureTrust CA
         Validity
             Not Before: Nov  7 19:31:18 2006 GMT
@@ -33,7 +33,7 @@
         Subject: C=US, O=SecureTrust Corporation, CN=SecureTrust CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/d06393bb.0 b/files/d06393bb.0
index 0029410..e976d6a 100644
--- a/files/d06393bb.0
+++ b/files/d06393bb.0
@@ -25,7 +25,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, O=T-Systems Enterprise Services GmbH, OU=T-Systems Trust Center, CN=T-TeleSec GlobalRoot Class 2
         Validity
             Not Before: Oct  1 10:40:14 2008 GMT
@@ -33,7 +33,7 @@
         Subject: C=DE, O=T-Systems Enterprise Services GmbH, OU=T-Systems Trust Center, CN=T-TeleSec GlobalRoot Class 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:aa:5f:da:1b:5f:e8:73:91:e5:da:5c:f4:a2:e6:
                     47:e5:f3:68:55:60:05:1d:02:a4:b3:9b:59:f3:1e:
diff --git a/files/d0cddf45.0 b/files/d0cddf45.0
index bee7260..e41f666 100644
--- a/files/d0cddf45.0
+++ b/files/d0cddf45.0
@@ -38,7 +38,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 2711694510199101698 (0x25a1dfca33cb5902)
-    Signature Algorithm: sha256WithRSAEncryption
+        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
@@ -46,7 +46,7 @@
         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)
+                RSA 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:
diff --git a/files/d16a5865.0 b/files/d16a5865.0
index 35228a3..43e210a 100644
--- a/files/d16a5865.0
+++ b/files/d16a5865.0
@@ -37,7 +37,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 6047274297262753887 (0x53ec3beefbb2485f)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=ES, CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
         Validity
             Not Before: May 20 08:38:15 2009 GMT
@@ -45,7 +45,7 @@
         Subject: C=ES, CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:ca:96:6b:8e:ea:f8:fb:f1:a2:35:e0:7f:4c:da:
                     e0:c3:52:d7:7d:b6:10:c8:02:5e:b3:43:2a:c4:4f:
diff --git a/files/d18e9066.0 b/files/d18e9066.0
index fd686a6..585eb7f 100644
--- a/files/d18e9066.0
+++ b/files/d18e9066.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             0a:01:42:80:00:00:01:45:23:c8:44:b5:00:00:00:02
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=IdenTrust, CN=IdenTrust Commercial Root CA 1
         Validity
             Not Before: Jan 16 18:12:23 2014 GMT
@@ -42,7 +42,7 @@
         Subject: C=US, O=IdenTrust, CN=IdenTrust Commercial Root CA 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:a7:50:19:de:3f:99:3d:d4:33:46:f1:6f:51:61:
                     82:b2:a9:4f:8f:67:89:5d:84:d9:53:dd:0c:28:d9:
diff --git a/files/d41b5e2a.0 b/files/d41b5e2a.0
index df43ec5..acae170 100644
--- a/files/d41b5e2a.0
+++ b/files/d41b5e2a.0
@@ -16,7 +16,7 @@
         Version: 3 (0x2)
         Serial Number:
             06:6c:9f:d7:c1:bb:10:4c:29:43:e5:71:7b:7b:2c:c8:1a:c1:0e
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=Amazon, CN=Amazon Root CA 4
         Validity
             Not Before: May 26 00:00:00 2015 GMT
diff --git a/files/d4c339cb.0 b/files/d4c339cb.0
index 3f5e924..44ba782 100644
--- a/files/d4c339cb.0
+++ b/files/d4c339cb.0
@@ -37,7 +37,7 @@
         Version: 3 (0x2)
         Serial Number:
             4c:aa:f9:ca:db:63:6f:e0:1f:f7:4e:d8:5b:03:86:9d
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO RSA Certification Authority
         Validity
             Not Before: Jan 19 00:00:00 2010 GMT
@@ -45,7 +45,7 @@
         Subject: C=GB, ST=Greater Manchester, L=Salford, O=COMODO CA Limited, CN=COMODO RSA Certification Authority
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:91:e8:54:92:d2:0a:56:b1:ac:0d:24:dd:c5:cf:
                     44:67:74:99:2b:37:a3:7d:23:70:00:71:bc:53:df:
diff --git a/files/d59297b8.0 b/files/d59297b8.0
index 31c3e8a..e41bd1f 100644
--- a/files/d59297b8.0
+++ b/files/d59297b8.0
@@ -23,7 +23,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=JP, O=SECOM Trust Systems CO.,LTD., OU=Security Communication RootCA2
         Validity
             Not Before: May 29 05:00:39 2009 GMT
@@ -31,7 +31,7 @@
         Subject: C=JP, O=SECOM Trust Systems CO.,LTD., OU=Security Communication RootCA2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:d0:15:39:52:b1:52:b3:ba:c5:59:82:c4:5d:52:
                     ae:3a:43:65:80:4b:c7:f2:96:bc:db:36:97:d6:a6:
diff --git a/files/d6e6eab9.0 b/files/d6e6eab9.0
deleted file mode 100644
index aff6bdf..0000000
--- a/files/d6e6eab9.0
+++ /dev/null
@@ -1,123 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjET
-MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAb
-BgNVBAMTFENlcnRpbm9taXMgLSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMz
-MTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMx
-FzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRDZXJ0aW5vbWlzIC0g
-Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQosP5L2
-fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJfl
-LieY6pOod5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQV
-WZUKxkd8aRi5pwP5ynapz8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDF
-TKWrteoB4owuZH9kb/2jJZOLyKIOSY008B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb
-5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09xRLWtwHkziOC/7aOgFLSc
-CbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE6OXWk6Ri
-wsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJ
-wx3tFvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SG
-m/lg0h9tkQPTYKbVPZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4
-F2iw4lNVYC2vPsKD2NkJK/DAZNuHi5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZng
-WVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I6tNxIqSSaHh0
-2TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/
-0KGRHCwPT5iVWVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWw
-F6YSjNRieOpWauwK0kDDPAUwPk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZS
-g081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAXlCOotQqSD7J6wWAsOMwaplv/8gzj
-qh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJy29SWwNyhlCVCNSN
-h4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9Iff/
-ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8V
-btaw5BngDwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwj
-Y/M50n92Uaf0yKHxDHYiI0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ
-8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nMcyrDflOR1m749fPH0FFNjkulW+YZFzvW
-gQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVrhkIGuUE=
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1 (0x1)
-    Signature Algorithm: sha256WithRSAEncryption
-        Issuer: C=FR, O=Certinomis, OU=0002 433998903, CN=Certinomis - Root CA
-        Validity
-            Not Before: Oct 21 09:17:18 2013 GMT
-            Not After : Oct 21 09:17:18 2033 GMT
-        Subject: C=FR, O=Certinomis, OU=0002 433998903, CN=Certinomis - Root CA
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
-                Modulus:
-                    00:d4:cc:09:0a:2c:3f:92:f6:7f:14:9e:0b:9c:9a:
-                    6a:1d:40:30:64:fd:aa:df:0e:1e:06:5b:9f:50:85:
-                    ea:cd:8d:ab:43:67:de:b0:fa:7e:80:96:9e:84:78:
-                    92:48:d6:e3:39:ee:ce:e4:59:58:97:e5:2e:27:98:
-                    ea:93:a8:77:9b:4a:f0:ef:74:80:2d:eb:30:1f:b5:
-                    d9:c7:80:9c:62:27:91:88:f0:4a:89:dd:dc:88:e6:
-                    14:f9:d5:03:2f:ff:95:db:bd:9f:ec:2c:fa:14:15:
-                    59:95:0a:c6:47:7c:69:18:b9:a7:03:f9:ca:76:a9:
-                    cf:c7:6f:b4:5e:05:fe:ee:c1:52:b2:75:32:87:ec:
-                    ed:29:66:3b:f3:4a:16:82:f6:d6:9a:db:72:98:e9:
-                    de:f0:c5:4c:a5:ab:b5:ea:01:e2:8c:2e:64:7f:64:
-                    6f:fd:a3:25:93:8b:c8:a2:0e:49:8d:34:f0:1f:ec:
-                    58:45:2e:34:aa:84:50:bd:e7:b2:4a:13:b8:b0:0f:
-                    ae:38:5d:b0:a9:1b:e6:73:c9:5a:a1:d9:66:40:aa:
-                    a9:4d:a6:34:02:ad:84:7e:b2:23:c1:fb:2a:c6:67:
-                    f4:34:b6:b0:95:6a:33:4f:71:44:b5:ad:c0:79:33:
-                    88:e0:bf:ed:a3:a0:14:b4:9c:09:b0:0a:e3:60:be:
-                    f8:f8:66:88:cd:5b:f1:77:05:e0:b5:73:6e:c1:7d:
-                    46:2e:8e:4b:27:a6:cd:35:0a:fd:e5:4d:7d:aa:2a:
-                    a3:29:c7:5a:68:04:e8:e5:d6:93:a4:62:c2:c5:e6:
-                    f4:4f:c6:f9:9f:1a:8d:82:49:19:8a:ca:59:43:3a:
-                    e8:0d:32:c1:f4:4c:13:03:6f:6e:a6:3f:91:73:cb:
-                    ca:73:6f:12:20:8b:ee:c0:82:78:de:4b:2e:c2:49:
-                    c3:1d:ed:16:f6:24:f4:27:1b:5c:57:31:dc:55:ee:
-                    a8:1e:6f:6c:ac:e2:45:cc:57:57:8a:75:57:19:e0:
-                    b5:58:99:49:36:31:3c:33:01:6d:16:4a:cd:b8:2a:
-                    83:84:86:9b:f9:60:d2:1f:6d:91:03:d3:60:a6:d5:
-                    3d:9a:dd:77:90:3d:35:a4:9f:0f:5e:f5:52:44:69:
-                    b9:c0:ba:dc:cf:7d:df:7c:d9:c4:ac:86:22:32:bc:
-                    7b:6b:91:ef:7a:f8:17:68:b0:e2:53:55:60:2d:af:
-                    3e:c2:83:d8:d9:09:2b:f0:c0:64:db:87:8b:91:cc:
-                    91:eb:04:fd:76:b4:95:9a:e6:14:06:1b:d5:34:1d:
-                    be:d8:ff:74:1c:53:85:99:e0:59:52:4a:61:ed:88:
-                    9e:6b:49:89:46:7e:20:5a:d9:e7:4a:e5:6a:ee:d2:
-                    65:11:43
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Key Usage: critical
-                Certificate Sign, CRL Sign
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Subject Key Identifier: 
-                EF:91:4C:F5:A5:C3:30:E8:2F:08:EA:D3:71:22:A4:92:68:78:74:D9
-            X509v3 Authority Key Identifier: 
-                keyid:EF:91:4C:F5:A5:C3:30:E8:2F:08:EA:D3:71:22:A4:92:68:78:74:D9
-
-    Signature Algorithm: sha256WithRSAEncryption
-         7e:3d:54:da:22:5d:1a:58:3e:3b:54:27:ba:ba:cc:c8:e3:1a:
-         6a:ea:3e:f9:12:eb:56:5f:3d:50:ce:e0:ea:48:26:26:cf:79:
-         56:7e:91:1c:99:3f:d0:a1:91:1c:2c:0f:4f:98:95:59:53:bd:
-         d0:22:d8:88:5d:9c:37:fc:fb:64:c1:78:8c:8b:9a:60:09:ea:
-         d5:fa:21:5f:d0:74:65:e7:50:c5:bf:2e:b9:0b:0b:ad:b5:b0:
-         17:a6:12:8c:d4:62:78:ea:56:6a:ec:0a:d2:40:c3:3c:05:30:
-         3e:4d:94:b7:9f:4a:03:d3:7d:27:4b:b6:fe:44:ce:fa:19:33:
-         1a:6d:a4:42:d1:dd:cc:c8:c8:d7:16:52:83:4f:35:94:b3:12:
-         55:7d:e5:e2:42:eb:e4:9c:93:09:c0:4c:5b:07:ab:c7:6d:11:
-         a0:50:17:94:23:a8:b5:0a:92:0f:b2:7a:c1:60:2c:38:cc:1a:
-         a6:5b:ff:f2:0c:e3:aa:1f:1c:dc:b8:a0:93:27:de:63:e3:7f:
-         21:9f:3a:e5:9e:fa:e0:13:6a:75:eb:96:5c:62:91:94:8e:67:
-         53:b6:89:f8:12:09:cb:6f:52:5b:03:72:86:50:95:08:d4:8d:
-         87:86:15:1f:95:24:d8:a4:6f:9a:ce:a4:9d:9b:6d:d2:b2:76:
-         06:86:c6:56:08:c5:eb:09:da:36:c2:1b:5b:41:be:61:2a:e3:
-         70:e6:b8:a6:f8:b6:5a:c4:bd:21:f7:ff:aa:5f:a1:6c:76:39:
-         66:d6:ea:4c:55:e1:00:33:9b:13:98:63:c9:6f:d0:01:20:09:
-         37:52:e7:0c:4f:3e:cd:bc:f5:5f:96:27:a7:20:02:95:e0:2e:
-         e8:07:41:05:1f:15:6e:d6:b0:e4:19:e0:0f:02:93:00:27:72:
-         c5:8b:d1:54:1f:5d:4a:c3:40:97:7e:55:a6:7c:c1:33:04:14:
-         01:1d:49:20:69:0b:19:93:9d:6e:58:22:f7:40:0c:46:0c:23:
-         63:f3:39:d2:7f:76:51:a7:f4:c8:a1:f1:0c:76:22:23:46:52:
-         29:2d:e2:a3:41:07:56:69:98:d2:05:09:bc:69:c7:5a:61:cd:
-         8f:81:60:15:4d:80:dd:90:e2:7d:c4:50:f2:8c:3b:6e:4a:c7:
-         c6:e6:80:2b:3c:81:bc:11:80:16:10:27:d7:f0:cd:3f:79:cc:
-         73:2a:c3:7e:53:91:d6:6e:f8:f5:f3:c7:d0:51:4d:8e:4b:a5:
-         5b:e6:19:17:3b:d6:81:09:dc:22:dc:ee:8e:b9:c4:8f:53:e1:
-         67:bb:33:b8:88:15:46:cf:ed:69:35:ff:75:0d:46:f3:ce:71:
-         e1:c5:6b:86:42:06:b9:41
-SHA1 Fingerprint=9D:70:BB:01:A5:A4:A0:18:11:2E:F7:1C:01:B9:32:C5:34:E7:88:A8
diff --git a/files/d7746a63.0 b/files/d7746a63.0
index 507ab70..946c467 100644
--- a/files/d7746a63.0
+++ b/files/d7746a63.0
@@ -27,7 +27,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 623604 (0x983f4)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=DE, O=D-Trust GmbH, CN=D-TRUST Root Class 3 CA 2 EV 2009
         Validity
             Not Before: Nov  5 08:50:46 2009 GMT
@@ -35,7 +35,7 @@
         Subject: C=DE, O=D-Trust GmbH, CN=D-TRUST Root Class 3 CA 2 EV 2009
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:99:f1:84:34:70:ba:2f:b7:30:a0:8e:bd:7c:04:
                     cf:be:62:bc:99:fd:82:97:d2:7a:0a:67:96:38:09:
diff --git a/files/d8317ada.0 b/files/d8317ada.0
deleted file mode 100644
index 754637b..0000000
--- a/files/d8317ada.0
+++ /dev/null
@@ -1,56 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4x
-CzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBs
-dXMgUm9vdCBDQSBHMjAeFw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4x
-CzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBs
-dXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABM0PW1aC3/BFGtat
-93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uNAm8x
-Ik0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0P
-AQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwj
-FNiPwyCrKGBZMB8GA1UdIwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqG
-SM49BAMDA2gAMGUCMHD+sAvZ94OX7PNVHdTcswYO/jOYnYs5kGuUIe22113WTNch
-p+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjlvPl5adytRSv3tjFzzAal
-U5ORGpOucGpnutee5WEaXw==
------END CERTIFICATE-----
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            11:20:d9:91:ce:ae:a3:e8:c5:e7:ff:e9:02:af:cf:73:bc:55
-    Signature Algorithm: ecdsa-with-SHA384
-        Issuer: C=FR, O=Certplus, CN=Certplus Root CA G2
-        Validity
-            Not Before: May 26 00:00:00 2014 GMT
-            Not After : Jan 15 00:00:00 2038 GMT
-        Subject: C=FR, O=Certplus, CN=Certplus Root CA G2
-        Subject Public Key Info:
-            Public Key Algorithm: id-ecPublicKey
-                Public-Key: (384 bit)
-                pub:
-                    04:cd:0f:5b:56:82:df:f0:45:1a:d6:ad:f7:79:f0:
-                    1d:c9:ac:96:d6:9e:4e:9c:1f:b4:42:11:ca:86:bf:
-                    6d:fb:85:a3:c5:e5:19:5c:d7:ee:a6:3f:69:67:d8:
-                    78:e2:a6:c9:c4:db:2d:79:2e:e7:8b:8d:02:6f:31:
-                    22:4d:06:e3:60:72:45:9d:0e:42:77:9e:ce:cf:e5:
-                    7f:85:9b:18:e4:fc:cc:2e:72:d3:16:93:4e:ca:99:
-                    63:5c:a1:05:2a:6c:06
-                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: 
-                DA:83:63:02:79:8E:DA:4C:C6:3C:23:14:D8:8F:C3:20:AB:28:60:59
-            X509v3 Authority Key Identifier: 
-                keyid:DA:83:63:02:79:8E:DA:4C:C6:3C:23:14:D8:8F:C3:20:AB:28:60:59
-
-    Signature Algorithm: ecdsa-with-SHA384
-         30:65:02:30:70:fe:b0:0b:d9:f7:83:97:ec:f3:55:1d:d4:dc:
-         b3:06:0e:fe:33:98:9d:8b:39:90:6b:94:21:ed:b6:d7:5d:d6:
-         4c:d7:21:a7:e7:bf:21:0f:2b:cd:f7:2a:dc:85:07:9d:02:31:
-         00:86:14:16:e5:dc:b0:65:c2:c0:8e:14:9f:bf:24:16:68:e5:
-         bc:f9:79:69:dc:ad:45:2b:f7:b6:31:73:cc:06:a5:53:93:91:
-         1a:93:ae:70:6a:67:ba:d7:9e:e5:61:1a:5f
-SHA1 Fingerprint=4F:65:8E:1F:E9:06:D8:28:02:E9:54:47:41:C9:54:25:5D:69:CC:1A
diff --git a/files/da7377f6.0 b/files/da7377f6.0
index 04deff9..42879ad 100644
--- a/files/da7377f6.0
+++ b/files/da7377f6.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             4f:d2:2b:8f:f5:64:c8:33:9e:4f:34:58:66:23:70:60
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=CN, O=UniTrust, CN=UCA Extended Validation Root
         Validity
             Not Before: Mar 13 00:00:00 2015 GMT
@@ -42,7 +42,7 @@
         Subject: C=CN, O=UniTrust, CN=UCA Extended Validation Root
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:a9:09:07:28:13:02:b0:99:e0:64:aa:1e:43:16:
                     7a:73:b1:91:a0:75:3e:a8:fa:e3:38:00:7a:ec:89:
diff --git a/files/dbc54cab.0 b/files/dbc54cab.0
index 904ac73..f647e80 100644
--- a/files/dbc54cab.0
+++ b/files/dbc54cab.0
@@ -33,7 +33,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 7893706540734352110 (0x6d8c1446b1a60aee)
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Premium
         Validity
             Not Before: Jan 29 14:10:36 2010 GMT
@@ -41,7 +41,7 @@
         Subject: C=US, O=AffirmTrust, CN=AffirmTrust Premium
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA 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:
diff --git a/files/dbff3a01.0 b/files/dbff3a01.0
new file mode 100644
index 0000000..dd62aa2
--- /dev/null
+++ b/files/dbff3a01.0
@@ -0,0 +1,79 @@
+-----BEGIN CERTIFICATE-----
+MIIDczCCAlugAwIBAgILAK7PALrEzzL4Q7IwDQYJKoZIhvcNAQELBQAwVjELMAkG
+A1UEBhMCVVMxEzARBgNVBAsTCmVtU2lnbiBQS0kxFDASBgNVBAoTC2VNdWRocmEg
+SW5jMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEMxMB4XDTE4MDIxODE4MzAw
+MFoXDTQzMDIxODE4MzAwMFowVjELMAkGA1UEBhMCVVMxEzARBgNVBAsTCmVtU2ln
+biBQS0kxFDASBgNVBAoTC2VNdWRocmEgSW5jMRwwGgYDVQQDExNlbVNpZ24gUm9v
+dCBDQSAtIEMxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz+upufGZ
+BczYKCFK83M0UYRWEPWgTywS4/oTmifQz/l5GnRfHXk5/Fv4cI7gklL35CX5VIPZ
+HdPIWoU/Xse2B+4+wM6ar6xWQio5JXDWv7V7Nq2s9nPczdcdioOl+yuQFTdrHCZH
+3DspVpNqs8FqOp099cGXOFgFixwR4+S0uF2FHYP+eF8LRWgYSKVGczQ7/g/IdrvH
+GPMF0Ybzhe3nudkyrVWIzqa2kbBPrH4VI5b2P/AgNBbeCsbEBEV5f6f9vtKppa+c
+xSMq9zwhbL2vj07FOrLzNBL834AaSaTUqZX3noleoomslMuoaJuvimUnzYnu3Yy1
+aylwQ6BpC+S5DwIDAQABo0IwQDAdBgNVHQ4EFgQU/qHgcB4qAzlSWkK+XJGFehiq
+TbUwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEL
+BQADggEBAMJKVvoVIXsoounlHfv4LcQ5lkFMOycsxGwYFYDGrK9HWS8mC+M2sO87
+/kOXSTKZEhVb3xEp/6tT+LvBeA+snFOvV71ojD1pM/CjoCNjO2RnIkSt1XHLVip4
+kqNPEjE2NuLe/gDEo2APJ62gsIq1NnpSob0n9CAnYuhNlCQT5AoE6TyrLshDCUrG
+YQTlSTR+08TI9Q/Aqum6VF7zYytPT1DU/rl7mYw9wC68AivTxEDkigcxHpvOJpkT
++xHqmiIMERnHXhuBUDDIlhJu58tBf5E7oke3VIAb3ADMmpDqw8NQBmIMMMAVSKeo
+WXzhriKi4gp6D/piq1JM4fHfyr6DDUI=
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            ae:cf:00:ba:c4:cf:32:f8:43:b2
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, OU=emSign PKI, O=eMudhra Inc, CN=emSign Root CA - C1
+        Validity
+            Not Before: Feb 18 18:30:00 2018 GMT
+            Not After : Feb 18 18:30:00 2043 GMT
+        Subject: C=US, OU=emSign PKI, O=eMudhra Inc, CN=emSign Root CA - C1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:cf:eb:a9:b9:f1:99:05:cc:d8:28:21:4a:f3:73:
+                    34:51:84:56:10:f5:a0:4f:2c:12:e3:fa:13:9a:27:
+                    d0:cf:f9:79:1a:74:5f:1d:79:39:fc:5b:f8:70:8e:
+                    e0:92:52:f7:e4:25:f9:54:83:d9:1d:d3:c8:5a:85:
+                    3f:5e:c7:b6:07:ee:3e:c0:ce:9a:af:ac:56:42:2a:
+                    39:25:70:d6:bf:b5:7b:36:ad:ac:f6:73:dc:cd:d7:
+                    1d:8a:83:a5:fb:2b:90:15:37:6b:1c:26:47:dc:3b:
+                    29:56:93:6a:b3:c1:6a:3a:9d:3d:f5:c1:97:38:58:
+                    05:8b:1c:11:e3:e4:b4:b8:5d:85:1d:83:fe:78:5f:
+                    0b:45:68:18:48:a5:46:73:34:3b:fe:0f:c8:76:bb:
+                    c7:18:f3:05:d1:86:f3:85:ed:e7:b9:d9:32:ad:55:
+                    88:ce:a6:b6:91:b0:4f:ac:7e:15:23:96:f6:3f:f0:
+                    20:34:16:de:0a:c6:c4:04:45:79:7f:a7:fd:be:d2:
+                    a9:a5:af:9c:c5:23:2a:f7:3c:21:6c:bd:af:8f:4e:
+                    c5:3a:b2:f3:34:12:fc:df:80:1a:49:a4:d4:a9:95:
+                    f7:9e:89:5e:a2:89:ac:94:cb:a8:68:9b:af:8a:65:
+                    27:cd:89:ee:dd:8c:b5:6b:29:70:43:a0:69:0b:e4:
+                    b9:0f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                FE:A1:E0:70:1E:2A:03:39:52:5A:42:BE:5C:91:85:7A:18:AA:4D:B5
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         c2:4a:56:fa:15:21:7b:28:a2:e9:e5:1d:fb:f8:2d:c4:39:96:
+         41:4c:3b:27:2c:c4:6c:18:15:80:c6:ac:af:47:59:2f:26:0b:
+         e3:36:b0:ef:3b:fe:43:97:49:32:99:12:15:5b:df:11:29:ff:
+         ab:53:f8:bb:c1:78:0f:ac:9c:53:af:57:bd:68:8c:3d:69:33:
+         f0:a3:a0:23:63:3b:64:67:22:44:ad:d5:71:cb:56:2a:78:92:
+         a3:4f:12:31:36:36:e2:de:fe:00:c4:a3:60:0f:27:ad:a0:b0:
+         8a:b5:36:7a:52:a1:bd:27:f4:20:27:62:e8:4d:94:24:13:e4:
+         0a:04:e9:3c:ab:2e:c8:43:09:4a:c6:61:04:e5:49:34:7e:d3:
+         c4:c8:f5:0f:c0:aa:e9:ba:54:5e:f3:63:2b:4f:4f:50:d4:fe:
+         b9:7b:99:8c:3d:c0:2e:bc:02:2b:d3:c4:40:e4:8a:07:31:1e:
+         9b:ce:26:99:13:fb:11:ea:9a:22:0c:11:19:c7:5e:1b:81:50:
+         30:c8:96:12:6e:e7:cb:41:7f:91:3b:a2:47:b7:54:80:1b:dc:
+         00:cc:9a:90:ea:c3:c3:50:06:62:0c:30:c0:15:48:a7:a8:59:
+         7c:e1:ae:22:a2:e2:0a:7a:0f:fa:62:ab:52:4c:e1:f1:df:ca:
+         be:83:0d:42
+SHA1 Fingerprint=E7:2E:F1:DF:FC:B2:09:28:CF:5D:D4:D5:67:37:B1:51:CB:86:4F:01
diff --git a/files/dc99f41e.0 b/files/dc99f41e.0
index 04eb046..e23f81a 100644
--- a/files/dc99f41e.0
+++ b/files/dc99f41e.0
@@ -37,7 +37,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 0 (0x0)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=GR, L=Athens, O=Hellenic Academic and Research Institutions Cert. Authority, CN=Hellenic Academic and Research Institutions RootCA 2015
         Validity
             Not Before: Jul  7 10:11:21 2015 GMT
@@ -45,7 +45,7 @@
         Subject: C=GR, L=Athens, O=Hellenic Academic and Research Institutions Cert. Authority, CN=Hellenic Academic and Research Institutions RootCA 2015
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:c2:f8:a9:3f:1b:89:fc:3c:3c:04:5d:3d:90:36:
                     b0:91:3a:79:3c:66:5a:ef:6d:39:01:49:1a:b4:b7:
diff --git a/files/dfc0fe80.0 b/files/dfc0fe80.0
index 9fc2890..c660aab 100644
--- a/files/dfc0fe80.0
+++ b/files/dfc0fe80.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             76:b1:20:52:74:f0:85:87:46:b3:f8:23:1a:f6:c2:c0
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=CH, O=WISeKey, OU=OISTE Foundation Endorsed, CN=OISTE WISeKey Global Root GB CA
         Validity
             Not Before: Dec  1 15:00:32 2014 GMT
@@ -33,7 +33,7 @@
         Subject: C=CH, O=WISeKey, OU=OISTE Foundation Endorsed, CN=OISTE WISeKey Global Root GB CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:d8:17:b7:1c:4a:24:2a:d6:97:b1:ca:e2:1e:fb:
                     7d:38:ef:98:f5:b2:39:98:4e:27:b8:11:5d:7b:d2:
diff --git a/files/e442e424.0 b/files/e442e424.0
index c715660..efa4015 100644
--- a/files/e442e424.0
+++ b/files/e442e424.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             2e:f5:9b:02:28:a7:db:7a:ff:d5:a3:a9:ee:bd:03:a0:cf:12:6a:1d
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 3 G3
         Validity
             Not Before: Jan 12 20:26:32 2012 GMT
@@ -42,7 +42,7 @@
         Subject: C=BM, O=QuoVadis Limited, CN=QuoVadis Root CA 3 G3
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:b3:cb:0e:10:67:8e:ea:14:97:a7:32:2a:0a:56:
                     36:7f:68:4c:c7:b3:6f:3a:23:14:91:ff:19:7f:a5:
diff --git a/files/e48193cf.0 b/files/e48193cf.0
index 7883ef3..172ec0e 100644
--- a/files/e48193cf.0
+++ b/files/e48193cf.0
@@ -22,7 +22,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 8608355977964138876 (0x7777062726a9b17c)
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Commercial
         Validity
             Not Before: Jan 29 14:06:06 2010 GMT
@@ -30,7 +30,7 @@
         Subject: C=US, O=AffirmTrust, CN=AffirmTrust Commercial
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA 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:
diff --git a/files/e775ed2d.0 b/files/e775ed2d.0
index ec2620f..e1aeab7 100644
--- a/files/e775ed2d.0
+++ b/files/e775ed2d.0
@@ -33,7 +33,7 @@
     Data:
         Version: 3 (0x2)
         Serial Number: 1 (0x1)
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA
         Validity
             Not Before: Mar  4 05:00:00 2004 GMT
@@ -41,7 +41,7 @@
         Subject: C=US, O=GeoTrust Inc., CN=GeoTrust Universal CA
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA 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:
diff --git a/files/e8651083.0 b/files/e8651083.0
index 79b853d..2cc3a91 100644
--- a/files/e8651083.0
+++ b/files/e8651083.0
@@ -27,7 +27,7 @@
         Version: 3 (0x2)
         Serial Number:
             c2:7e:43:04:4e:47:3f:19
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=HU, L=Budapest, O=Microsec Ltd., CN=Microsec e-Szigno Root CA 2009/emailAddress=info@e-szigno.hu
         Validity
             Not Before: Jun 16 11:30:18 2009 GMT
@@ -35,7 +35,7 @@
         Subject: C=HU, L=Budapest, O=Microsec Ltd., CN=Microsec e-Szigno Root CA 2009/emailAddress=info@e-szigno.hu
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:e9:f8:8f:f3:63:ad:da:86:d8:a7:e0:42:fb:cf:
                     91:de:a6:26:f8:99:a5:63:70:ad:9b:ae:ca:33:40:
diff --git a/files/ed39abd0.0 b/files/ed39abd0.0
index 88b44a6..c9f1355 100644
--- a/files/ed39abd0.0
+++ b/files/ed39abd0.0
@@ -18,7 +18,7 @@
         Version: 3 (0x2)
         Serial Number:
             05:55:56:bc:f2:5e:a4:35:35:c3:a4:0f:d5:ab:45:72
-    Signature Algorithm: ecdsa-with-SHA384
+        Signature Algorithm: ecdsa-with-SHA384
         Issuer: C=US, O=DigiCert Inc, OU=www.digicert.com, CN=DigiCert Global Root G3
         Validity
             Not Before: Aug  1 12:00:00 2013 GMT
diff --git a/files/f013ecaf.0 b/files/f013ecaf.0
index 1dab890..006c362 100644
--- a/files/f013ecaf.0
+++ b/files/f013ecaf.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             6e:47:a9:c5:4b:47:0c:0d:ec:33:d0:89:b9:1c:f4:e1
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: C=US, O=Google Trust Services LLC, CN=GTS Root R1
         Validity
             Not Before: Jun 22 00:00:00 2016 GMT
@@ -42,7 +42,7 @@
         Subject: C=US, O=Google Trust Services LLC, CN=GTS Root R1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:b6:11:02:8b:1e:e3:a1:77:9b:3b:dc:bf:94:3e:
                     b7:95:a7:40:3c:a1:fd:82:f9:7d:32:06:82:71:f6:
diff --git a/files/f0cd152c.0 b/files/f0cd152c.0
new file mode 100644
index 0000000..6d2b6e9
--- /dev/null
+++ b/files/f0cd152c.0
@@ -0,0 +1,125 @@
+-----BEGIN CERTIFICATE-----
+MIIGSzCCBDOgAwIBAgIRANm1Q3+vqTkPAAAAAFVlrVgwDQYJKoZIhvcNAQELBQAw
+gb4xCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQL
+Ex9TZWUgd3d3LmVudHJ1c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykg
+MjAxNSBFbnRydXN0LCBJbmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAw
+BgNVBAMTKUVudHJ1c3QgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0
+MB4XDTE1MDUyNzExMTExNloXDTM3MTIyNzExNDExNlowgb4xCzAJBgNVBAYTAlVT
+MRYwFAYDVQQKEw1FbnRydXN0LCBJbmMuMSgwJgYDVQQLEx9TZWUgd3d3LmVudHJ1
+c3QubmV0L2xlZ2FsLXRlcm1zMTkwNwYDVQQLEzAoYykgMjAxNSBFbnRydXN0LCBJ
+bmMuIC0gZm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxMjAwBgNVBAMTKUVudHJ1c3Qg
+Um9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEc0MIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEAsewsQu7i0TD/pZJH4i3DumSXbcr3DbVZwbPLqGgZ
+2K+EbTBwXX7zLtJTmeH+H17ZSK9dE43b/2MzTdMAArzE+NEGCJR5WIoV3imz/f3E
+T+iq4qA7ec2/a0My3dl0ELn39GjUu9CH1apLiipvKgS1sqbHoHrmSKvS0VnM1n4j
+5pds8ELl3FFLFUHtSUrJ3hCX1nbB76W1NhSXNdh4IjVS70O92yfbYVaCNNzLiGAM
+C1rlLAHGVK/XqsEQe9IFWrhAnoanw5CGAlZSCXqc0ieCU0plUmr1POeo8pyvi73T
+DtTUXm6Hnmo9RR3RXRv06QqsYJn7ibT/mCzPfB3pAqoEmh643IhuJbNsZvc8kPNX
+wbMv9W3y+8qh+CmdRouzavbmZwe+LGcKKh9asj5XxNMhIWNlUpEbsZmOeX7m640A
+2Vqq6nPopIICR5b+W45UYaPrL0swsIsjdXJ8ITzI9vF01Bx7owVV7rtNOzK+mndm
+nqxpkCIHH2E6lr7lmk/MBTwoWdPBDFSoWWG9yHJM6Nyfh3+9nEg2XpWjDrk4JFX8
+dWbrAuMINClKxuMrLzOg2qOGpRKX/YAr2hRC45K9PvJdXmd0LhyIRyk0X+IyqJwl
+N4y6mACXi0mWHv0liqzc2thddG5msP9E36EYxr5ILzeUePiVSj9/E15dWf10hkNj
+c0kCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
+VR0OBBYEFJ84xFYjwznooHFs6FRM5Og6sb9nMA0GCSqGSIb3DQEBCwUAA4ICAQAS
+5UKme4sPDORGpbZgQIeMJX6tuGguW8ZAdjwD+MlZ9POrYs4QjbRaZIxowLByQzTS
+Gwv2LFPSypBLhmb8qoMi9IsabyZIrHZ3CL/FmFz0Jomee8O5ZDIBf9PD3Vht7LGr
+hFV0d4QEJ1JrhkzO3bll/9bGXp+aEJlLdWr+aumXIOTkdnrG0CSqkM0gkLpHZPt/
+B7NTeLUKYvJzQ85BK4FqLoUWlFPUa19yIqtRLULVAJyZv967lDtX/Zr1hstWO1uI
+AeV8KEsD+UmDfLJ/fOPtjqF/YFOOVZ1QNBIPt5d7bIdKROf1beyAN/BYGW5KaHbw
+H5Lk6rWS02FREAutp9lfx1/cH6NcjKF+m7ee01ZvZl4HliDtC3T7Zk6LERXpgUl+
+b7DUUH8i119lAg2m9IUe2K4GS0qn0jFmwvjO5QimpAKWRGhXxNUzzxkvFMSUHHuk
+2fCfDrGA4tGeEWSpiBE6doLlYsKA2KSD7ZPvfC+QsDJMlhVoSFLUmQjAJOgc47Ol
+IQ6SwJAfzyBfyjs4x7dtOvPmRLgOMWuIjnDrnBdSqEGULoe256YSxXXfW8AKbnuk
+5F6G+TaU33fD6Q3AOfF5u0aOq0NZJ7cguyPpVkAh7DE9ZapD8j3fcEThuk0mEDuY
+n/PIjhs4ViFqUZPTkcpG2om3PVODLAgfi49T3f+sHw==
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            d9:b5:43:7f:af:a9:39:0f:00:00:00:00:55:65:ad:58
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=Entrust, Inc., OU=See www.entrust.net/legal-terms, OU=(c) 2015 Entrust, Inc. - for authorized use only, CN=Entrust Root Certification Authority - G4
+        Validity
+            Not Before: May 27 11:11:16 2015 GMT
+            Not After : Dec 27 11:41:16 2037 GMT
+        Subject: C=US, O=Entrust, Inc., OU=See www.entrust.net/legal-terms, OU=(c) 2015 Entrust, Inc. - for authorized use only, CN=Entrust Root Certification Authority - G4
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (4096 bit)
+                Modulus:
+                    00:b1:ec:2c:42:ee:e2:d1:30:ff:a5:92:47:e2:2d:
+                    c3:ba:64:97:6d:ca:f7:0d:b5:59:c1:b3:cb:a8:68:
+                    19:d8:af:84:6d:30:70:5d:7e:f3:2e:d2:53:99:e1:
+                    fe:1f:5e:d9:48:af:5d:13:8d:db:ff:63:33:4d:d3:
+                    00:02:bc:c4:f8:d1:06:08:94:79:58:8a:15:de:29:
+                    b3:fd:fd:c4:4f:e8:aa:e2:a0:3b:79:cd:bf:6b:43:
+                    32:dd:d9:74:10:b9:f7:f4:68:d4:bb:d0:87:d5:aa:
+                    4b:8a:2a:6f:2a:04:b5:b2:a6:c7:a0:7a:e6:48:ab:
+                    d2:d1:59:cc:d6:7e:23:e6:97:6c:f0:42:e5:dc:51:
+                    4b:15:41:ed:49:4a:c9:de:10:97:d6:76:c1:ef:a5:
+                    b5:36:14:97:35:d8:78:22:35:52:ef:43:bd:db:27:
+                    db:61:56:82:34:dc:cb:88:60:0c:0b:5a:e5:2c:01:
+                    c6:54:af:d7:aa:c1:10:7b:d2:05:5a:b8:40:9e:86:
+                    a7:c3:90:86:02:56:52:09:7a:9c:d2:27:82:53:4a:
+                    65:52:6a:f5:3c:e7:a8:f2:9c:af:8b:bd:d3:0e:d4:
+                    d4:5e:6e:87:9e:6a:3d:45:1d:d1:5d:1b:f4:e9:0a:
+                    ac:60:99:fb:89:b4:ff:98:2c:cf:7c:1d:e9:02:aa:
+                    04:9a:1e:b8:dc:88:6e:25:b3:6c:66:f7:3c:90:f3:
+                    57:c1:b3:2f:f5:6d:f2:fb:ca:a1:f8:29:9d:46:8b:
+                    b3:6a:f6:e6:67:07:be:2c:67:0a:2a:1f:5a:b2:3e:
+                    57:c4:d3:21:21:63:65:52:91:1b:b1:99:8e:79:7e:
+                    e6:eb:8d:00:d9:5a:aa:ea:73:e8:a4:82:02:47:96:
+                    fe:5b:8e:54:61:a3:eb:2f:4b:30:b0:8b:23:75:72:
+                    7c:21:3c:c8:f6:f1:74:d4:1c:7b:a3:05:55:ee:bb:
+                    4d:3b:32:be:9a:77:66:9e:ac:69:90:22:07:1f:61:
+                    3a:96:be:e5:9a:4f:cc:05:3c:28:59:d3:c1:0c:54:
+                    a8:59:61:bd:c8:72:4c:e8:dc:9f:87:7f:bd:9c:48:
+                    36:5e:95:a3:0e:b9:38:24:55:fc:75:66:eb:02:e3:
+                    08:34:29:4a:c6:e3:2b:2f:33:a0:da:a3:86:a5:12:
+                    97:fd:80:2b:da:14:42:e3:92:bd:3e:f2:5d:5e:67:
+                    74:2e:1c:88:47:29:34:5f:e2:32:a8:9c:25:37:8c:
+                    ba:98:00:97:8b:49:96:1e:fd:25:8a:ac:dc:da:d8:
+                    5d:74:6e:66:b0:ff:44:df:a1:18:c6:be:48:2f:37:
+                    94:78:f8:95:4a:3f:7f:13:5e:5d:59:fd:74:86:43:
+                    63:73:49
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                9F:38:C4:56:23:C3:39:E8:A0:71:6C:E8:54:4C:E4:E8:3A:B1:BF:67
+    Signature Algorithm: sha256WithRSAEncryption
+         12:e5:42:a6:7b:8b:0f:0c:e4:46:a5:b6:60:40:87:8c:25:7e:
+         ad:b8:68:2e:5b:c6:40:76:3c:03:f8:c9:59:f4:f3:ab:62:ce:
+         10:8d:b4:5a:64:8c:68:c0:b0:72:43:34:d2:1b:0b:f6:2c:53:
+         d2:ca:90:4b:86:66:fc:aa:83:22:f4:8b:1a:6f:26:48:ac:76:
+         77:08:bf:c5:98:5c:f4:26:89:9e:7b:c3:b9:64:32:01:7f:d3:
+         c3:dd:58:6d:ec:b1:ab:84:55:74:77:84:04:27:52:6b:86:4c:
+         ce:dd:b9:65:ff:d6:c6:5e:9f:9a:10:99:4b:75:6a:fe:6a:e9:
+         97:20:e4:e4:76:7a:c6:d0:24:aa:90:cd:20:90:ba:47:64:fb:
+         7f:07:b3:53:78:b5:0a:62:f2:73:43:ce:41:2b:81:6a:2e:85:
+         16:94:53:d4:6b:5f:72:22:ab:51:2d:42:d5:00:9c:99:bf:de:
+         bb:94:3b:57:fd:9a:f5:86:cb:56:3b:5b:88:01:e5:7c:28:4b:
+         03:f9:49:83:7c:b2:7f:7c:e3:ed:8e:a1:7f:60:53:8e:55:9d:
+         50:34:12:0f:b7:97:7b:6c:87:4a:44:e7:f5:6d:ec:80:37:f0:
+         58:19:6e:4a:68:76:f0:1f:92:e4:ea:b5:92:d3:61:51:10:0b:
+         ad:a7:d9:5f:c7:5f:dc:1f:a3:5c:8c:a1:7e:9b:b7:9e:d3:56:
+         6f:66:5e:07:96:20:ed:0b:74:fb:66:4e:8b:11:15:e9:81:49:
+         7e:6f:b0:d4:50:7f:22:d7:5f:65:02:0d:a6:f4:85:1e:d8:ae:
+         06:4b:4a:a7:d2:31:66:c2:f8:ce:e5:08:a6:a4:02:96:44:68:
+         57:c4:d5:33:cf:19:2f:14:c4:94:1c:7b:a4:d9:f0:9f:0e:b1:
+         80:e2:d1:9e:11:64:a9:88:11:3a:76:82:e5:62:c2:80:d8:a4:
+         83:ed:93:ef:7c:2f:90:b0:32:4c:96:15:68:48:52:d4:99:08:
+         c0:24:e8:1c:e3:b3:a5:21:0e:92:c0:90:1f:cf:20:5f:ca:3b:
+         38:c7:b7:6d:3a:f3:e6:44:b8:0e:31:6b:88:8e:70:eb:9c:17:
+         52:a8:41:94:2e:87:b6:e7:a6:12:c5:75:df:5b:c0:0a:6e:7b:
+         a4:e4:5e:86:f9:36:94:df:77:c3:e9:0d:c0:39:f1:79:bb:46:
+         8e:ab:43:59:27:b7:20:bb:23:e9:56:40:21:ec:31:3d:65:aa:
+         43:f2:3d:df:70:44:e1:ba:4d:26:10:3b:98:9f:f3:c8:8e:1b:
+         38:56:21:6a:51:93:d3:91:ca:46:da:89:b7:3d:53:83:2c:08:
+         1f:8b:8f:53:dd:ff:ac:1f
+SHA1 Fingerprint=14:88:4E:86:26:37:B0:26:AF:59:62:5C:40:77:EC:35:29:BA:96:01
diff --git a/files/f459871d.0 b/files/f459871d.0
new file mode 100644
index 0000000..b03d8b2
--- /dev/null
+++ b/files/f459871d.0
@@ -0,0 +1,80 @@
+-----BEGIN CERTIFICATE-----
+MIIDlDCCAnygAwIBAgIKMfXkYgxsWO3W2DANBgkqhkiG9w0BAQsFADBnMQswCQYD
+VQQGEwJJTjETMBEGA1UECxMKZW1TaWduIFBLSTElMCMGA1UEChMcZU11ZGhyYSBU
+ZWNobm9sb2dpZXMgTGltaXRlZDEcMBoGA1UEAxMTZW1TaWduIFJvb3QgQ0EgLSBH
+MTAeFw0xODAyMTgxODMwMDBaFw00MzAyMTgxODMwMDBaMGcxCzAJBgNVBAYTAklO
+MRMwEQYDVQQLEwplbVNpZ24gUEtJMSUwIwYDVQQKExxlTXVkaHJhIFRlY2hub2xv
+Z2llcyBMaW1pdGVkMRwwGgYDVQQDExNlbVNpZ24gUm9vdCBDQSAtIEcxMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk0u76WaK7p1b1TST0Bsew+eeuGQz
+f2N4aLTNLnF115sgxk0pvLZoYIr3IZpWNVrzdr3YzZr/k1ZLpVkGoZM0Kd0WNHVO
+8oG0x5ZOrRkVUkr+PHB1cM2vK6sVmjM8qrOLqs1D/fXqcP/tzxE7lM5OMhbTI0Aq
+d7OvPAEsbO2ZLIvZTmmYsvePQbAyeGHWDV/D+qJAkh1cF+ZwPjXnorfCYuKrpDhM
+tTk1b+oDafo6VGiFbdbyL0NVHpENDtjVaqSW0RM8LHhQ6DqS0hdW5TUaQBw+jSzt
+Od9C4INBdN+jzcKGYEho42kLVACL5HZpIQ15TjQIXhTCzLG3rdd8cIrHhQIDAQAB
+o0IwQDAdBgNVHQ4EFgQU++8Nhp6w492pufEhF38+/PB3KxowDgYDVR0PAQH/BAQD
+AgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAFn/8oz1h31x
+PaOfG1vR2vjTnGs2vZupYeveFix0PZ7mddrXuqe8QhfnPZHr5X3dPpzxz5KsbEjM
+wiI/aTvFthUvozXGaCocV685743QNcMYDHsAVhzNixl03r4PEuDQqqE/AjSxcM6d
+GNYIAwlG7mDgfrbESQRRfXBgvKqy/3lyeqYdPV8q+Mri/Tm3R7nrft8EI6/6nAYH
+6ftjk4BAtcZsCjEozgyfz7MjNYBBjWzEN3uBL4ChQEKF6dk4jeihU80Bv2noWgby
+RQuQ+q7hv53yrlc8pa6yVvSLZUDp/TGBLPQ5Cdjua6e0ph0VpZj3AYHYhX3zUVxx
+iN66zB+Afko=
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            31:f5:e4:62:0c:6c:58:ed:d6:d8
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=IN, OU=emSign PKI, O=eMudhra Technologies Limited, CN=emSign Root CA - G1
+        Validity
+            Not Before: Feb 18 18:30:00 2018 GMT
+            Not After : Feb 18 18:30:00 2043 GMT
+        Subject: C=IN, OU=emSign PKI, O=eMudhra Technologies Limited, CN=emSign Root CA - G1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                RSA Public-Key: (2048 bit)
+                Modulus:
+                    00:93:4b:bb:e9:66:8a:ee:9d:5b:d5:34:93:d0:1b:
+                    1e:c3:e7:9e:b8:64:33:7f:63:78:68:b4:cd:2e:71:
+                    75:d7:9b:20:c6:4d:29:bc:b6:68:60:8a:f7:21:9a:
+                    56:35:5a:f3:76:bd:d8:cd:9a:ff:93:56:4b:a5:59:
+                    06:a1:93:34:29:dd:16:34:75:4e:f2:81:b4:c7:96:
+                    4e:ad:19:15:52:4a:fe:3c:70:75:70:cd:af:2b:ab:
+                    15:9a:33:3c:aa:b3:8b:aa:cd:43:fd:f5:ea:70:ff:
+                    ed:cf:11:3b:94:ce:4e:32:16:d3:23:40:2a:77:b3:
+                    af:3c:01:2c:6c:ed:99:2c:8b:d9:4e:69:98:b2:f7:
+                    8f:41:b0:32:78:61:d6:0d:5f:c3:fa:a2:40:92:1d:
+                    5c:17:e6:70:3e:35:e7:a2:b7:c2:62:e2:ab:a4:38:
+                    4c:b5:39:35:6f:ea:03:69:fa:3a:54:68:85:6d:d6:
+                    f2:2f:43:55:1e:91:0d:0e:d8:d5:6a:a4:96:d1:13:
+                    3c:2c:78:50:e8:3a:92:d2:17:56:e5:35:1a:40:1c:
+                    3e:8d:2c:ed:39:df:42:e0:83:41:74:df:a3:cd:c2:
+                    86:60:48:68:e3:69:0b:54:00:8b:e4:76:69:21:0d:
+                    79:4e:34:08:5e:14:c2:cc:b1:b7:ad:d7:7c:70:8a:
+                    c7:85
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                FB:EF:0D:86:9E:B0:E3:DD:A9:B9:F1:21:17:7F:3E:FC:F0:77:2B:1A
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         59:ff:f2:8c:f5:87:7d:71:3d:a3:9f:1b:5b:d1:da:f8:d3:9c:
+         6b:36:bd:9b:a9:61:eb:de:16:2c:74:3d:9e:e6:75:da:d7:ba:
+         a7:bc:42:17:e7:3d:91:eb:e5:7d:dd:3e:9c:f1:cf:92:ac:6c:
+         48:cc:c2:22:3f:69:3b:c5:b6:15:2f:a3:35:c6:68:2a:1c:57:
+         af:39:ef:8d:d0:35:c3:18:0c:7b:00:56:1c:cd:8b:19:74:de:
+         be:0f:12:e0:d0:aa:a1:3f:02:34:b1:70:ce:9d:18:d6:08:03:
+         09:46:ee:60:e0:7e:b6:c4:49:04:51:7d:70:60:bc:aa:b2:ff:
+         79:72:7a:a6:1d:3d:5f:2a:f8:ca:e2:fd:39:b7:47:b9:eb:7e:
+         df:04:23:af:fa:9c:06:07:e9:fb:63:93:80:40:b5:c6:6c:0a:
+         31:28:ce:0c:9f:cf:b3:23:35:80:41:8d:6c:c4:37:7b:81:2f:
+         80:a1:40:42:85:e9:d9:38:8d:e8:a1:53:cd:01:bf:69:e8:5a:
+         06:f2:45:0b:90:fa:ae:e1:bf:9d:f2:ae:57:3c:a5:ae:b2:56:
+         f4:8b:65:40:e9:fd:31:81:2c:f4:39:09:d8:ee:6b:a7:b4:a6:
+         1d:15:a5:98:f7:01:81:d8:85:7d:f3:51:5c:71:88:de:ba:cc:
+         1f:80:7e:4a
+SHA1 Fingerprint=8A:C7:AD:8F:73:AC:4E:C1:B5:75:4D:A5:40:F4:FC:CF:7C:B5:8E:8C
diff --git a/files/facacbc6.0 b/files/facacbc6.0
index 0b2120a..611f1e0 100644
--- a/files/facacbc6.0
+++ b/files/facacbc6.0
@@ -31,7 +31,7 @@
         Version: 3 (0x2)
         Serial Number:
             18:da:d1:9e:26:7d:e8:bb:4a:21:58:cd:cc:6b:3b:4a
-    Signature Algorithm: sha1WithRSAEncryption
+        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
@@ -39,7 +39,7 @@
         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)
+                RSA 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:
diff --git a/files/fb5fa911.0 b/files/fb5fa911.0
index 8758d19..bb8f8cb 100644
--- a/files/fb5fa911.0
+++ b/files/fb5fa911.0
@@ -34,7 +34,7 @@
         Version: 3 (0x2)
         Serial Number:
             06:6c:9f:d2:96:35:86:9f:0a:0f:e5:86:78:f8:5b:26:bb:8a:37
-    Signature Algorithm: sha384WithRSAEncryption
+        Signature Algorithm: sha384WithRSAEncryption
         Issuer: C=US, O=Amazon, CN=Amazon Root CA 2
         Validity
             Not Before: May 26 00:00:00 2015 GMT
@@ -42,7 +42,7 @@
         Subject: C=US, O=Amazon, CN=Amazon Root CA 2
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (4096 bit)
+                RSA Public-Key: (4096 bit)
                 Modulus:
                     00:ad:96:9f:2d:9c:4a:4c:4a:81:79:51:99:ec:8a:
                     cb:6b:60:51:13:bc:4d:6d:06:fc:b0:08:8d:dd:19:
diff --git a/files/fd08c599.0 b/files/fd08c599.0
index 3468f7f..ea15047 100644
--- a/files/fd08c599.0
+++ b/files/fd08c599.0
@@ -23,7 +23,7 @@
         Version: 3 (0x2)
         Serial Number:
             06:6c:9f:cf:99:bf:8c:0a:39:e2:f0:78:8a:43:e6:96:36:5b:ca
-    Signature Algorithm: sha256WithRSAEncryption
+        Signature Algorithm: sha256WithRSAEncryption
         Issuer: C=US, O=Amazon, CN=Amazon Root CA 1
         Validity
             Not Before: May 26 00:00:00 2015 GMT
@@ -31,7 +31,7 @@
         Subject: C=US, O=Amazon, CN=Amazon Root CA 1
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:b2:78:80:71:ca:78:d5:e3:71:af:47:80:50:74:
                     7d:6e:d8:d7:88:76:f4:99:68:f7:58:21:60:f9:74:
diff --git a/files/fde84897.0 b/files/fde84897.0
index c22a646..46cebbd 100644
--- a/files/fde84897.0
+++ b/files/fde84897.0
@@ -25,7 +25,7 @@
         Version: 3 (0x2)
         Serial Number:
             fe:dc:e3:01:0f:c9:48:ff
-    Signature Algorithm: sha1WithRSAEncryption
+        Signature Algorithm: sha1WithRSAEncryption
         Issuer: C=FR, O=Dhimyotis, CN=Certigna
         Validity
             Not Before: Jun 29 15:13:05 2007 GMT
@@ -33,7 +33,7 @@
         Subject: C=FR, O=Dhimyotis, CN=Certigna
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (2048 bit)
+                RSA Public-Key: (2048 bit)
                 Modulus:
                     00:c8:68:f1:c9:d6:d6:b3:34:75:26:82:1e:ec:b4:
                     be:ea:5c:e1:26:ed:11:47:61:e1:a2:7c:16:78:40: