Merge "Skip tests if it includes unsupported locale/charset" into gingerbread
diff --git a/luni/src/main/files/cacerts.bks b/luni/src/main/files/cacerts.bks
index 3dbbe49..0022b41 100644
--- a/luni/src/main/files/cacerts.bks
+++ b/luni/src/main/files/cacerts.bks
Binary files differ
diff --git a/luni/src/main/files/cacerts/0d188d89.0 b/luni/src/main/files/cacerts/0d188d89.0
new file mode 100644
index 0000000..1f150e4
--- /dev/null
+++ b/luni/src/main/files/cacerts/0d188d89.0
@@ -0,0 +1,80 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            44:99:8d:3c:c0:03:27:bd:9c:76:95:b9:ea:db:ac:b5
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=TR, O=Elektronik Bilgi Guvenligi A.S., CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
+        Validity
+            Not Before: Jan  4 11:32:48 2007 GMT
+            Not After : Jan  4 11:32:48 2017 GMT
+        Subject: C=TR, O=Elektronik Bilgi Guvenligi A.S., CN=e-Guven Kok Elektronik Sertifika Hizmet Saglayicisi
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:c3:12:20:9e:b0:5e:00:65:8d:4e:46:bb:80:5c:
+                    e9:2c:06:97:d5:f3:72:c9:70:b9:e7:4b:65:80:c1:
+                    4b:be:7e:3c:d7:54:31:94:de:d5:12:ba:53:16:02:
+                    ea:58:63:ef:5b:d8:f3:ed:2a:1a:aa:71:48:a3:dc:
+                    10:2d:5f:5f:eb:5c:4b:9c:96:08:42:25:28:11:cc:
+                    8a:5a:62:01:50:d5:eb:09:53:2f:f8:c3:8f:fe:b3:
+                    fc:fd:9d:a2:e3:5f:7d:be:ed:0b:e0:60:eb:69:ec:
+                    33:ed:d8:8d:fb:12:49:83:00:c9:8b:97:8c:3b:73:
+                    2a:32:b3:12:f7:b9:4d:f2:f4:4d:6d:c7:e6:d6:26:
+                    37:08:f2:d9:fd:6b:5c:a3:e5:48:5c:58:bc:42:be:
+                    03:5a:81:ba:1c:35:0c:00:d3:f5:23:7e:71:30:08:
+                    26:38:dc:25:11:47:2d:f3:ba:23:10:a5:bf:bc:02:
+                    f7:43:5e:c7:fe:b0:37:50:99:7b:0f:93:ce:e6:43:
+                    2c:c3:7e:0d:f2:1c:43:66:60:cb:61:31:47:87:a3:
+                    4f:ae:bd:56:6c:4c:bc:bc:f8:05:ca:64:f4:e9:34:
+                    a1:2c:b5:73:e1:c2:3e:e8:c8:c9:34:25:08:5c:f3:
+                    ed:a6:c7:94:9f:ad:88:43:25:d7:e1:39:60:fe:ac:
+                    39:59
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                9F:EE:44:B3:94:D5:FA:91:4F:2E:D9:55:9A:04:56:DB:2D:C4:DB:A5
+    Signature Algorithm: sha1WithRSAEncryption
+        7f:5f:b9:53:5b:63:3d:75:32:e7:fa:c4:74:1a:cb:46:df:46:
+        69:1c:52:cf:aa:4f:c2:68:eb:ff:80:a9:51:e8:3d:62:77:89:
+        3d:0a:75:39:f1:6e:5d:17:87:6f:68:05:c1:94:6c:d9:5d:df:
+        da:b2:59:cb:a5:10:8a:ca:cc:39:cd:9f:eb:4e:de:52:ff:0c:
+        f0:f4:92:a9:f2:6c:53:ab:9b:d2:47:a0:1f:74:f7:9b:9a:f1:
+        2f:15:9f:7a:64:30:18:07:3c:2a:0f:67:ca:fc:0f:89:61:9d:
+        65:a5:3c:e5:bc:13:5b:08:db:e3:ff:ed:bb:06:bb:6a:06:b1:
+        7a:4f:65:c6:82:fd:1e:9c:8b:b5:0d:ee:48:bb:b8:bd:aa:08:
+        b4:fb:a3:7c:cb:9f:cd:90:76:5c:86:96:78:57:0a:66:f9:58:
+        1a:9d:fd:97:29:60:de:11:a6:90:1c:19:1c:ee:01:96:22:34:
+        34:2e:91:f9:b7:c4:27:d1:7b:e6:bf:fb:80:44:5a:16:e5:eb:
+        e0:d4:0a:38:bc:e4:91:e3:d5:eb:5c:c1:ac:df:1b:6a:7c:9e:
+        e5:75:d2:b6:97:87:db:cc:87:2b:43:3a:84:08:af:ab:3c:db:
+        f7:3c:66:31:86:b0:9d:53:79:ed:f8:23:de:42:e3:2d:82:f1:
+        0f:e5:fa:97
+SHA1 Fingerprint=DD:E1:D2:A9:01:80:2E:1D:87:5E:84:B3:80:7E:4B:B1:FD:99:41:34
+-----BEGIN CERTIFICATE-----
+MIIDtjCCAp6gAwIBAgIQRJmNPMADJ72cdpW56tustTANBgkqhkiG9w0BAQUFADB1
+MQswCQYDVQQGEwJUUjEoMCYGA1UEChMfRWxla3Ryb25payBCaWxnaSBHdXZlbmxp
+Z2kgQS5TLjE8MDoGA1UEAxMzZS1HdXZlbiBLb2sgRWxla3Ryb25payBTZXJ0aWZp
+a2EgSGl6bWV0IFNhZ2xheWljaXNpMB4XDTA3MDEwNDExMzI0OFoXDTE3MDEwNDEx
+MzI0OFowdTELMAkGA1UEBhMCVFIxKDAmBgNVBAoTH0VsZWt0cm9uaWsgQmlsZ2kg
+R3V2ZW5saWdpIEEuUy4xPDA6BgNVBAMTM2UtR3V2ZW4gS29rIEVsZWt0cm9uaWsg
+U2VydGlmaWthIEhpem1ldCBTYWdsYXlpY2lzaTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAMMSIJ6wXgBljU5Gu4Bc6SwGl9XzcslwuedLZYDBS75+PNdU
+MZTe1RK6UxYC6lhj71vY8+0qGqpxSKPcEC1fX+tcS5yWCEIlKBHMilpiAVDV6wlT
+L/jDj/6z/P2douNffb7tC+Bg62nsM+3YjfsSSYMAyYuXjDtzKjKzEve5TfL0TW3H
+5tYmNwjy2f1rXKPlSFxYvEK+A1qBuhw1DADT9SN+cTAIJjjcJRFHLfO6IxClv7wC
+90Nex/6wN1CZew+TzuZDLMN+DfIcQ2Zgy2ExR4ejT669VmxMvLz4Bcpk9Ok0oSy1
+c+HCPujIyTQlCFzz7abHlJ+tiEMl1+E5YP6sOVkCAwEAAaNCMEAwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFJ/uRLOU1fqRTy7ZVZoE
+VtstxNulMA0GCSqGSIb3DQEBBQUAA4IBAQB/X7lTW2M9dTLn+sR0GstG30ZpHFLP
+qk/CaOv/gKlR6D1id4k9CnU58W5dF4dvaAXBlGzZXd/aslnLpRCKysw5zZ/rTt5S
+/wzw9JKp8mxTq5vSR6AfdPebmvEvFZ96ZDAYBzwqD2fK/A+JYZ1lpTzlvBNbCNvj
+/+27BrtqBrF6T2XGgv0enIu1De5Iu7i9qgi0+6N8y5/NkHZchpZ4Vwpm+Vganf2X
+KWDeEaaQHBkc7gGWIjQ0LpH5t8Qn0Xvmv/uARFoW5evg1Ao4vOSR49XrXMGs3xtq
+fJ7lddK2l4fbzIcrQzqECK+rPNv3PGYxhrCdU3nt+CPeQuMtgvEP5fqX
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/119afc2e.0 b/luni/src/main/files/cacerts/119afc2e.0
new file mode 100644
index 0000000..46f51b8
--- /dev/null
+++ b/luni/src/main/files/cacerts/119afc2e.0
@@ -0,0 +1,98 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 999181308 (0x3b8e4bfc)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: emailAddress=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, CN=Juur-SK
+        Validity
+            Not Before: Aug 30 14:23:01 2001 GMT
+            Not After : Aug 26 14:23:01 2016 GMT
+        Subject: emailAddress=pki@sk.ee, C=EE, O=AS Sertifitseerimiskeskus, CN=Juur-SK
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:81:71:36:3e:33:07:d6:e3:30:8d:13:7e:77:32:
+                    46:cb:cf:19:b2:60:31:46:97:86:f4:98:46:a4:c2:
+                    65:45:cf:d3:40:7c:e3:5a:22:a8:10:78:33:cc:88:
+                    b1:d3:81:4a:f6:62:17:7b:5f:4d:0a:2e:d0:cf:8b:
+                    23:ee:4f:02:4e:bb:eb:0e:ca:bd:18:63:e8:80:1c:
+                    8d:e1:1c:8d:3d:e0:ff:5b:5f:ea:64:e5:97:e8:3f:
+                    99:7f:0c:0a:09:33:00:1a:53:a7:21:e1:38:4b:d6:
+                    83:1b:ad:af:64:c2:f9:1c:7a:8c:66:48:4d:66:1f:
+                    18:0a:e2:3e:bb:1f:07:65:93:85:b9:1a:b0:b9:c4:
+                    fb:0d:11:f6:f5:d6:f9:1b:c7:2c:2b:b7:18:51:fe:
+                    e0:7b:f6:a8:48:af:6c:3b:4f:2f:ef:f8:d1:47:1e:
+                    26:57:f0:51:1d:33:96:ff:ef:59:3d:da:4d:d1:15:
+                    34:c7:ea:3f:16:48:7b:91:1c:80:43:0f:3d:b8:05:
+                    3e:d1:b3:95:cd:d8:ca:0f:c2:43:67:db:b7:93:e0:
+                    22:82:2e:be:f5:68:28:83:b9:c1:3b:69:7b:20:da:
+                    4e:9c:6d:e1:ba:cd:8f:7a:6c:b0:09:22:d7:8b:0b:
+                    db:1c:d5:5a:26:5b:0d:c0:ea:e5:60:d0:9f:fe:35:
+                    df:3f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Certificate Policies: 
+                Policy: 1.3.6.1.4.1.10015.1.1.1
+                  User Notice:
+                    Explicit Text: 
+                  CPS: http://www.sk.ee/cps/
+
+            X509v3 CRL Distribution Points: 
+                URI:http://www.sk.ee/juur/crl/
+
+            X509v3 Subject Key Identifier: 
+                04:AA:7A:47:A3:E4:89:AF:1A:CF:0A:40:A7:18:3F:6F:EF:E9:7D:BE
+            X509v3 Authority Key Identifier: 
+                keyid:04:AA:7A:47:A3:E4:89:AF:1A:CF:0A:40:A7:18:3F:6F:EF:E9:7D:BE
+
+            X509v3 Key Usage: critical
+                Digital Signature, Non Repudiation, Key Encipherment, Certificate Sign, CRL Sign
+    Signature Algorithm: sha1WithRSAEncryption
+        7b:c1:18:94:53:a2:09:f3:fe:26:67:9a:50:e4:c3:05:2f:2b:
+        35:78:91:4c:7c:a8:11:11:79:4c:49:59:ac:c8:f7:85:65:5c:
+        46:bb:3b:10:a0:02:af:cd:4f:b5:cc:36:2a:ec:5d:fe:ef:a0:
+        91:c9:b6:93:6f:7c:80:54:ec:c7:08:70:0d:8e:fb:82:ec:2a:
+        60:78:69:36:36:d1:c5:9c:8b:69:b5:40:c8:94:65:77:f2:57:
+        21:66:3b:ce:85:40:b6:33:63:1a:bf:79:1e:fc:5c:1d:d3:1d:
+        93:1b:8b:0c:5d:85:bd:99:30:32:18:09:91:52:e9:7c:a1:ba:
+        ff:64:92:9a:ec:fe:35:ee:8c:2f:ae:fc:20:86:ec:4a:de:1b:
+        78:32:37:a6:81:d2:9d:af:5a:12:16:ca:99:5b:fc:6f:6d:0e:
+        c5:a0:1e:86:c9:91:d0:5c:98:82:5f:63:0c:8a:5a:ab:d8:95:
+        a6:cc:cb:8a:d6:bf:64:4b:8e:ca:8a:b2:b0:e9:21:32:9e:aa:
+        a8:85:98:34:81:39:21:3b:a8:3a:52:32:3d:f6:6b:37:86:06:
+        5a:15:98:dc:f0:11:66:fe:34:20:b7:03:f4:41:10:7d:39:84:
+        79:96:72:63:b6:96:02:e5:6b:b9:ad:19:4d:bb:c6:44:db:36:
+        cb:2a:9c:8e
+SHA1 Fingerprint=40:9D:4B:D9:17:B5:5C:27:B6:9B:64:CB:98:22:44:0D:CD:09:B8:89
+-----BEGIN CERTIFICATE-----
+MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcN
+AQkBFglwa2lAc2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZp
+dHNlZXJpbWlza2Vza3VzMRAwDgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMw
+MVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqGSIb3DQEJARYJcGtpQHNrLmVlMQsw
+CQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVyaW1pc2tlc2t1czEQ
+MA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOB
+SvZiF3tfTQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkz
+ABpTpyHhOEvWgxutr2TC+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvH
+LCu3GFH+4Hv2qEivbDtPL+/40UceJlfwUR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMP
+PbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDaTpxt4brNj3pssAki14sL
+2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQFMAMBAf8w
+ggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwIC
+MIHDHoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDk
+AGwAagBhAHMAdABhAHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0
+AHMAZQBlAHIAaQBtAGkAcwBrAGUAcwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABz
+AGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABrAGkAbgBuAGkAdABhAG0AaQBz
+AGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nwcy8wKwYDVR0f
+BCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE
+FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcY
+P2/v6X2+MA4GA1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOi
+CfP+JmeaUOTDBS8rNXiRTHyoERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+g
+kcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyLabVAyJRld/JXIWY7zoVAtjNjGr95
+HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678IIbsSt4beDI3poHS
+na9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkhMp6q
+qIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0Z
+TbvGRNs2yyqcjg==
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/1eb37bdf.0 b/luni/src/main/files/cacerts/1eb37bdf.0
new file mode 100644
index 0000000..3f3287b
--- /dev/null
+++ b/luni/src/main/files/cacerts/1eb37bdf.0
@@ -0,0 +1,140 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            a3:da:42:7e:a4:b1:ae:da
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Chambers of Commerce Root - 2008
+        Validity
+            Not Before: Aug  1 12:29:50 2008 GMT
+            Not After : Jul 31 12:29:50 2038 GMT
+        Subject: C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Chambers of Commerce Root - 2008
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:af:00:cb:70:37:2b:80:5a:4a:3a:6c:78:94:7d:
+                    a3:7f:1a:1f:f6:35:d5:bd:db:cb:0d:44:72:3e:26:
+                    b2:90:52:ba:63:3b:28:58:6f:a5:b3:6d:94:a6:f3:
+                    dd:64:0c:55:f6:f6:e7:f2:22:22:80:5e:e1:62:c6:
+                    b6:29:e1:81:6c:f2:bf:e5:7d:32:6a:54:a0:32:19:
+                    59:fe:1f:8b:d7:3d:60:86:85:24:6f:e3:11:b3:77:
+                    3e:20:96:35:21:6b:b3:08:d9:70:2e:64:f7:84:92:
+                    53:d6:0e:b0:90:8a:8a:e3:87:8d:06:d3:bd:90:0e:
+                    e2:99:a1:1b:86:0e:da:9a:0a:bb:0b:61:50:06:52:
+                    f1:9e:7f:76:ec:cb:0f:d0:1e:0d:cf:99:30:3d:1c:
+                    c4:45:10:58:ac:d6:d3:e8:d7:e5:ea:c5:01:07:77:
+                    d6:51:e6:03:7f:8a:48:a5:4d:68:75:b9:e9:bc:9e:
+                    4e:19:71:f5:32:4b:9c:6d:60:19:0b:fb:cc:9d:75:
+                    dc:bf:26:cd:8f:93:78:39:79:73:5e:25:0e:ca:5c:
+                    eb:77:12:07:cb:64:41:47:72:93:ab:50:c3:eb:09:
+                    76:64:34:d2:39:b7:76:11:09:0d:76:45:c4:a9:ae:
+                    3d:6a:af:b5:7d:65:2f:94:58:10:ec:5c:7c:af:7e:
+                    e2:b6:18:d9:d0:9b:4e:5a:49:df:a9:66:0b:cc:3c:
+                    c6:78:7c:a7:9c:1d:e3:ce:8e:53:be:05:de:60:0f:
+                    6b:e5:1a:db:3f:e3:e1:21:c9:29:c1:f1:eb:07:9c:
+                    52:1b:01:44:51:3c:7b:25:d7:c4:e5:52:54:5d:25:
+                    07:ca:16:20:b8:ad:e4:41:ee:7a:08:fe:99:6f:83:
+                    a6:91:02:b0:6c:36:55:6a:e7:7d:f5:96:e6:ca:81:
+                    d6:97:f1:94:83:e9:ed:b0:b1:6b:12:69:1e:ac:fb:
+                    5d:a9:c5:98:e9:b4:5b:58:7a:be:3d:a2:44:3a:63:
+                    59:d4:0b:25:de:1b:4f:bd:e5:01:9e:cd:d2:29:d5:
+                    9f:17:19:0a:6f:bf:0c:90:d3:09:5f:d9:e3:8a:35:
+                    cc:79:5a:4d:19:37:92:b7:c4:c1:ad:af:f4:79:24:
+                    9a:b2:01:0b:b1:af:5c:96:f3:80:32:fb:5c:3d:98:
+                    f1:a0:3f:4a:de:be:af:94:2e:d9:55:9a:17:6e:60:
+                    9d:63:6c:b8:63:c9:ae:81:5c:18:35:e0:90:bb:be:
+                    3c:4f:37:22:b9:7e:eb:cf:9e:77:21:a6:3d:38:81:
+                    fb:48:da:31:3d:2b:e3:89:f5:d0:b5:bd:7e:e0:50:
+                    c4:12:89:b3:23:9a:10:31:85:db:ae:6f:ef:38:33:
+                    18:76:11
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:12
+            X509v3 Subject Key Identifier: 
+                F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19
+            X509v3 Authority Key Identifier: 
+                keyid:F9:24:AC:0F:B2:B5:F8:79:C0:FA:60:88:1B:C4:D9:4D:02:9E:17:19
+                DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Chambers of Commerce Root - 2008
+                serial:A3:DA:42:7E:A4:B1:AE:DA
+
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Certificate Policies: 
+                Policy: X509v3 Any Policy
+                  CPS: http://policy.camerfirma.com
+
+    Signature Algorithm: sha1WithRSAEncryption
+        90:12:af:22:35:c2:a3:39:f0:2e:de:e9:b5:e9:78:7c:48:be:
+        3f:7d:45:92:5e:e9:da:b1:19:fc:16:3c:9f:b4:5b:66:9e:6a:
+        e7:c3:b9:5d:88:e8:0f:ad:cf:23:0f:de:25:3a:5e:cc:4f:a5:
+        c1:b5:2d:ac:24:d2:58:07:de:a2:cf:69:84:60:33:e8:10:0d:
+        13:a9:23:d0:85:e5:8e:7b:a6:9e:3d:72:13:72:33:f5:aa:7d:
+        c6:63:1f:08:f4:fe:01:7f:24:cf:2b:2c:54:09:de:e2:2b:6d:
+        92:c6:39:4f:16:ea:3c:7e:7a:46:d4:45:6a:46:a8:eb:75:82:
+        56:a7:ab:a0:7c:68:13:33:f6:9d:30:f0:6f:27:39:24:23:2a:
+        90:fd:90:29:35:f2:93:df:34:a5:c6:f7:f8:ef:8c:0f:62:4a:
+        7c:ae:d3:f5:54:f8:8d:b6:9a:56:87:16:82:3a:33:ab:5a:22:
+        08:f7:82:ba:ea:2e:e0:47:9a:b4:b5:45:a3:05:3b:d9:dc:2e:
+        45:40:3b:ea:dc:7f:e8:3b:eb:d1:ec:26:d8:35:a4:30:c5:3a:
+        ac:57:9e:b3:76:a5:20:7b:f9:1e:4a:05:62:01:a6:28:75:60:
+        97:92:0d:6e:3e:4d:37:43:0d:92:15:9c:18:22:cd:51:99:a0:
+        29:1a:3c:5f:8a:32:33:5b:30:c7:89:2f:47:98:0f:a3:03:c6:
+        f6:f1:ac:df:32:f0:d9:81:1a:e4:9c:bd:f6:80:14:f0:d1:2c:
+        b9:85:f5:d8:a3:b1:c8:a5:21:e5:1c:13:97:ee:0e:bd:df:29:
+        a9:ef:34:53:5b:d3:e4:6a:13:84:06:b6:32:02:c4:52:ae:22:
+        d2:dc:b2:21:42:1a:da:40:f0:29:c9:ec:0a:0c:5c:e2:d0:ba:
+        cc:48:d3:37:0a:cc:12:0a:8a:79:b0:3d:03:7f:69:4b:f4:34:
+        20:7d:b3:34:ea:8e:4b:64:f5:3e:fd:b3:23:67:15:0d:04:b8:
+        f0:2d:c1:09:51:3c:b2:6c:15:f0:a5:23:d7:83:74:e4:e5:2e:
+        c9:fe:98:27:42:c6:ab:c6:9e:b0:d0:5b:38:a5:9b:50:de:7e:
+        18:98:b5:45:3b:f6:79:b4:e8:f7:1a:7b:06:83:fb:d0:8b:da:
+        bb:c7:bd:18:ab:08:6f:3c:80:6b:40:3f:19:19:ba:65:8a:e6:
+        be:d5:5c:d3:36:d7:ef:40:52:24:60:38:67:04:31:ec:8f:f3:
+        82:c6:de:b9:55:f3:3b:31:91:5a:dc:b5:08:15:ad:76:25:0a:
+        0d:7b:2e:87:e2:0c:a6:06:bc:26:10:6d:37:9d:ec:dd:78:8c:
+        7c:80:c5:f0:d9:77:48:d0
+SHA1 Fingerprint=78:6A:74:AC:76:AB:14:7F:9C:6A:30:50:BA:9E:A8:7E:FE:9A:CE:3C
+-----BEGIN CERTIFICATE-----
+MIIHTzCCBTegAwIBAgIJAKPaQn6ksa7aMA0GCSqGSIb3DQEBBQUAMIGuMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xKTAnBgNVBAMTIENoYW1iZXJz
+IG9mIENvbW1lcmNlIFJvb3QgLSAyMDA4MB4XDTA4MDgwMTEyMjk1MFoXDTM4MDcz
+MTEyMjk1MFowga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpNYWRyaWQgKHNlZSBj
+dXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29tL2FkZHJlc3MpMRIw
+EAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVyZmlybWEgUy5BLjEp
+MCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAtIDIwMDgwggIiMA0G
+CSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCvAMtwNyuAWko6bHiUfaN/Gh/2NdW9
+28sNRHI+JrKQUrpjOyhYb6WzbZSm891kDFX29ufyIiKAXuFixrYp4YFs8r/lfTJq
+VKAyGVn+H4vXPWCGhSRv4xGzdz4gljUha7MI2XAuZPeEklPWDrCQiorjh40G072Q
+DuKZoRuGDtqaCrsLYVAGUvGef3bsyw/QHg3PmTA9HMRFEFis1tPo1+XqxQEHd9ZR
+5gN/ikilTWh1uem8nk4ZcfUyS5xtYBkL+8ydddy/Js2Pk3g5eXNeJQ7KXOt3EgfL
+ZEFHcpOrUMPrCXZkNNI5t3YRCQ12RcSprj1qr7V9ZS+UWBDsXHyvfuK2GNnQm05a
+Sd+pZgvMPMZ4fKecHePOjlO+Bd5gD2vlGts/4+EhySnB8esHnFIbAURRPHsl18Tl
+UlRdJQfKFiC4reRB7noI/plvg6aRArBsNlVq5331lubKgdaX8ZSD6e2wsWsSaR6s
++12pxZjptFtYer49okQ6Y1nUCyXeG0+95QGezdIp1Z8XGQpvvwyQ0wlf2eOKNcx5
+Wk0ZN5K3xMGtr/R5JJqyAQuxr1yW84Ay+1w9mPGgP0revq+ULtlVmhduYJ1jbLhj
+ya6BXBg14JC7vjxPNyK5fuvPnnchpj04gftI2jE9K+OJ9dC1vX7gUMQSibMjmhAx
+hduub+84Mxh2EQIDAQABo4IBbDCCAWgwEgYDVR0TAQH/BAgwBgEB/wIBDDAdBgNV
+HQ4EFgQU+SSsD7K1+HnA+mCIG8TZTQKeFxkwgeMGA1UdIwSB2zCB2IAU+SSsD7K1
++HnA+mCIG8TZTQKeFxmhgbSkgbEwga4xCzAJBgNVBAYTAkVVMUMwQQYDVQQHEzpN
+YWRyaWQgKHNlZSBjdXJyZW50IGFkZHJlc3MgYXQgd3d3LmNhbWVyZmlybWEuY29t
+L2FkZHJlc3MpMRIwEAYDVQQFEwlBODI3NDMyODcxGzAZBgNVBAoTEkFDIENhbWVy
+ZmlybWEgUy5BLjEpMCcGA1UEAxMgQ2hhbWJlcnMgb2YgQ29tbWVyY2UgUm9vdCAt
+IDIwMDiCCQCj2kJ+pLGu2jAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRV
+HSAAMCowKAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20w
+DQYJKoZIhvcNAQEFBQADggIBAJASryI1wqM58C7e6bXpeHxIvj99RZJe6dqxGfwW
+PJ+0W2aeaufDuV2I6A+tzyMP3iU6XsxPpcG1Lawk0lgH3qLPaYRgM+gQDROpI9CF
+5Y57pp49chNyM/WqfcZjHwj0/gF/JM8rLFQJ3uIrbZLGOU8W6jx+ekbURWpGqOt1
+glanq6B8aBMz9p0w8G8nOSQjKpD9kCk18pPfNKXG9/jvjA9iSnyu0/VU+I22mlaH
+FoI6M6taIgj3grrqLuBHmrS1RaMFO9ncLkVAO+rcf+g769HsJtg1pDDFOqxXnrN2
+pSB7+R5KBWIBpih1YJeSDW4+TTdDDZIVnBgizVGZoCkaPF+KMjNbMMeJL0eYD6MD
+xvbxrN8y8NmBGuScvfaAFPDRLLmF9dijscilIeUcE5fuDr3fKanvNFNb0+RqE4QG
+tjICxFKuItLcsiFCGtpA8CnJ7AoMXOLQusxI0zcKzBIKinmwPQN/aUv0NCB9szTq
+jktk9T79syNnFQ0EuPAtwQlRPLJsFfClI9eDdOTlLsn+mCdCxqvGnrDQWzilm1De
+fhiYtUU79nm06PcaewaD+9CL2rvHvRirCG88gGtAPxkZumWK5r7VXNM21+9AUiRg
+OGcEMeyP84LG3rlV8zsxkVrctQgVrXYlCg17LofiDKYGvCYQbTed7N14jHyAxfDZ
+d0jQ
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/256fd83b.0 b/luni/src/main/files/cacerts/256fd83b.0
deleted file mode 100644
index 39ef065..0000000
--- a/luni/src/main/files/cacerts/256fd83b.0
+++ /dev/null
@@ -1,63 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1002 (0x3ea)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 2 CA/emailAddress=certificate@trustcenter.de
-        Validity
-            Not Before: Mar  9 11:59:59 1998 GMT
-            Not After : Jan  1 11:59:59 2011 GMT
-        Subject: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 2 CA/emailAddress=certificate@trustcenter.de
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:da:38:e8:ed:32:00:29:71:83:01:0d:bf:8c:01:
-                    dc:da:c6:ad:39:a4:a9:8a:2f:d5:8b:5c:68:5f:50:
-                    c6:62:f5:66:bd:ca:91:22:ec:aa:1d:51:d7:3d:b3:
-                    51:b2:83:4e:5d:cb:49:b0:f0:4c:55:e5:6b:2d:c7:
-                    85:0b:30:1c:92:4e:82:d4:ca:02:ed:f7:6f:be:dc:
-                    e0:e3:14:b8:05:53:f2:9a:f4:56:8b:5a:9e:85:93:
-                    d1:b4:82:56:ae:4d:bb:a8:4b:57:16:bc:fe:f8:58:
-                    9e:f8:29:8d:b0:7b:cd:78:c9:4f:ac:8b:67:0c:f1:
-                    9c:fb:fc:57:9b:57:5c:4f:0d
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Digital Signature, Certificate Sign, CRL Sign
-            Netscape CA Policy Url: 
-                http://www.trustcenter.de/guidelines
-            Netscape Cert Type: 
-                SSL CA, S/MIME CA, Object Signing CA
-    Signature Algorithm: md5WithRSAEncryption
-        84:52:fb:28:df:ff:1f:75:01:bc:01:be:04:56:97:6a:74:42:
-        24:31:83:f9:46:b1:06:8a:89:cf:96:2c:33:bf:8c:b5:5f:7a:
-        72:a1:85:06:ce:86:f8:05:8e:e8:f9:25:ca:da:83:8c:06:ac:
-        eb:36:6d:85:91:34:04:36:f4:42:f0:f8:79:2e:0a:48:5c:ab:
-        cc:51:4f:78:76:a0:d9:ac:19:bd:2a:d1:69:04:28:91:ca:36:
-        10:27:80:57:5b:d2:5c:f5:c2:5b:ab:64:81:63:74:51:f4:97:
-        bf:cd:12:28:f7:4d:66:7f:a7:f0:1c:01:26:78:b2:66:47:70:
-        51:64
-SHA1 Fingerprint=83:8E:30:F7:7F:DD:14:AA:38:5E:D1:45:00:9C:0E:22:36:49:4F:AA
------BEGIN CERTIFICATE-----
-MIIDXDCCAsWgAwIBAgICA+owDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF
-MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU
-QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI
-MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAyIENBMSkwJwYJKoZIhvcN
-AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla
-Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy
-ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y
-IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1
-c3RDZW50ZXIgQ2xhc3MgMiBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA
-dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANo46O0y
-AClxgwENv4wB3NrGrTmkqYov1YtcaF9QxmL1Zr3KkSLsqh1R1z2zUbKDTl3LSbDw
-TFXlay3HhQswHJJOgtTKAu33b77c4OMUuAVT8pr0VotanoWT0bSCVq5Nu6hLVxa8
-/vhYnvgpjbB7zXjJT6yLZwzxnPv8V5tXXE8NAgMBAAGjazBpMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3
-LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G
-CSqGSIb3DQEBBAUAA4GBAIRS+yjf/x91AbwBvgRWl2p0QiQxg/lGsQaKic+WLDO/
-jLVfenKhhQbOhvgFjuj5Jcrag4wGrOs2bYWRNAQ29ELw+HkuCkhcq8xRT3h2oNms
-Gb0q0WkEKJHKNhAngFdb0lz1wlurZIFjdFH0l7/NEij3TWZ/p/AcASZ4smZHcFFk
------END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/3d441de8.0 b/luni/src/main/files/cacerts/3d441de8.0
new file mode 100644
index 0000000..3d68ea4
--- /dev/null
+++ b/luni/src/main/files/cacerts/3d441de8.0
@@ -0,0 +1,125 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 10000012 (0x98968c)
+        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
+            Not After : Mar 25 11:03:10 2020 GMT
+        Subject: C=NL, O=Staat der Nederlanden, CN=Staat der Nederlanden Root CA - G2
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    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:
+                    3b:e1:00:48:6a:cf:da:e1:06:43:11:99:aa:14:25:
+                    12:ad:22:e8:00:6d:43:c4:a9:b8:e5:1f:89:4b:67:
+                    bd:61:48:ef:fd:d2:e0:60:88:e5:b9:18:60:28:c3:
+                    77:2b:ad:b0:37:aa:37:de:64:59:2a:46:57:e4:4b:
+                    b9:f8:37:7c:d5:36:e7:80:c1:b6:f3:d4:67:9b:96:
+                    e8:ce:d7:c6:0a:53:d0:6b:49:96:f3:a3:0b:05:77:
+                    48:f7:25:e5:70:ac:30:14:20:25:e3:7f:75:5a:e5:
+                    48:f8:4e:7b:03:07:04:fa:82:61:87:6e:f0:3b:c4:
+                    a4:c7:d0:f5:74:3e:a5:5d:1a:08:f2:9b:25:d2:f6:
+                    ac:04:26:3e:55:3a:62:28:a5:7b:b2:30:af:f8:37:
+                    c2:d1:ba:d6:38:fd:f4:ef:49:30:37:99:26:21:48:
+                    85:01:a9:e5:16:e7:dc:90:55:df:0f:e8:38:cd:99:
+                    37:21:4f:5d:f5:22:6f:6a:c5:12:16:60:17:55:f2:
+                    65:66:a6:a7:30:91:38:c1:38:1d:86:04:84:ba:1a:
+                    25:78:5e:9d:af:cc:50:60:d6:13:87:52:ed:63:1f:
+                    6d:65:7d:c2:15:18:74:ca:e1:7e:64:29:8c:72:d8:
+                    16:13:7d:0b:49:4a:f1:28:1b:20:74:6b:c5:3d:dd:
+                    b0:aa:48:09:3d:2e:82:94:cd:1a:65:d9:2b:88:9a:
+                    99:bc:18:7e:9f:ee:7d:66:7c:3e:bd:94:b8:81:ce:
+                    cd:98:30:78:c1:6f:67:d0:be:5f:e0:68:ed:de:e2:
+                    b1:c9:2c:59:78:92:aa:df:2b:60:63:f2:e5:5e:b9:
+                    e3:ca:fa:7f:50:86:3e:a2:34:18:0c:09:68:28:11:
+                    1c:e4:e1:b9:5c:3e:47:ba:32:3f:18:cc:5b:84:f5:
+                    f3:6b:74:c4:72:74:e1:e3:8b:a0:4a:bd:8d:66:2f:
+                    ea:ad:35:da:20:d3:88:82:61:f0:12:22:b6:bc:d0:
+                    d5:a4:ec:af:54:88:25:24:3c:a7:6d:b1:72:29:3f:
+                    3e:57:a6:7f:55:af:6e:26:c6:fe:e7:cc:40:5c:51:
+                    44:81:0a:78:de:4a:ce:55:bf:1d:d5:d9:b7:56:ef:
+                    f0:76:ff:0b:79:b5:af:bd:fb:a9:69:91:46:97:68:
+                    80:14:36:1d:b3:7f:bb:29:98:36:a5:20:fa:82:60:
+                    62:33:a4:ec:d6:ba:07:a7:6e:c5:cf:14:a6:e7:d6:
+                    92:34:d8:81:f5:fc:1d:5d:aa:5c:1e:f6:a3:4d:3b:
+                    b8:f7:39
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Certificate Policies: 
+                Policy: X509v3 Any Policy
+                  CPS: http://www.pkioverheid.nl/policies/root-policy-G2
+
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                91:68:32:87:15:1D:89:E2:B5:F1:AC:36:28:34:8D:0B:7C:62:88:EB
+    Signature Algorithm: sha256WithRSAEncryption
+        a8:41:4a:67:2a:92:81:82:50:6e:e1:d7:d8:b3:39:3b:f3:02:
+        15:09:50:51:ef:2d:bd:24:7b:88:86:3b:f9:b4:bc:92:09:96:
+        b9:f6:c0:ab:23:60:06:79:8c:11:4e:51:d2:79:80:33:fb:9d:
+        48:be:ec:41:43:81:1f:7e:47:40:1c:e5:7a:08:ca:aa:8b:75:
+        ad:14:c4:c2:e8:66:3c:82:07:a7:e6:27:82:5b:18:e6:0f:6e:
+        d9:50:3e:8a:42:18:29:c6:b4:56:fc:56:10:a0:05:17:bd:0c:
+        23:7f:f4:93:ed:9c:1a:51:be:dd:45:41:bf:91:24:b4:1f:8c:
+        e9:5f:cf:7b:21:99:9f:95:9f:39:3a:46:1c:6c:f9:cd:7b:9c:
+        90:cd:28:a9:c7:a9:55:bb:ac:62:34:62:35:13:4b:14:3a:55:
+        83:b9:86:8d:92:a6:c6:f4:07:25:54:cc:16:57:12:4a:82:78:
+        c8:14:d9:17:82:26:2d:5d:20:1f:79:ae:fe:d4:70:16:16:95:
+        83:d8:35:39:ff:52:5d:75:1c:16:c5:13:55:cf:47:cc:75:65:
+        52:4a:de:f0:b0:a7:e4:0a:96:0b:fb:ad:c2:e2:25:84:b2:dd:
+        e4:bd:7e:59:6c:9b:f0:f0:d8:e7:ca:f2:e9:97:38:7e:89:be:
+        cc:fb:39:17:61:3f:72:db:3a:91:d8:65:01:19:1d:ad:50:a4:
+        57:0a:7c:4b:bc:9c:71:73:2a:45:51:19:85:cc:8e:fd:47:a7:
+        74:95:1d:a8:d1:af:4e:17:b1:69:26:c2:aa:78:57:5b:c5:4d:
+        a7:e5:9e:05:17:94:ca:b2:5f:a0:49:18:8d:34:e9:26:6c:48:
+        1e:aa:68:92:05:e1:82:73:5a:9b:dc:07:5b:08:6d:7d:9d:d7:
+        8d:21:d9:fc:14:20:aa:c2:45:df:3f:e7:00:b2:51:e4:c2:f8:
+        05:b9:79:1a:8c:34:f3:9e:5b:e4:37:5b:6b:4a:df:2c:57:8a:
+        40:5a:36:ba:dd:75:44:08:37:42:70:0c:fe:dc:5e:21:a0:a3:
+        8a:c0:90:9c:68:da:50:e6:45:10:47:78:b6:4e:d2:65:c9:c3:
+        37:df:e1:42:63:b0:57:37:45:2d:7b:8a:9c:bf:05:ea:65:55:
+        33:f7:39:10:c5:28:2a:21:7a:1b:8a:c4:24:f9:3f:15:c8:9a:
+        15:20:f5:55:62:96:ed:6d:93:50:bc:e4:aa:78:ad:d9:cb:0a:
+        65:87:a6:66:c1:c4:81:a3:77:3a:58:1e:0b:ee:83:8b:9d:1e:
+        d2:52:a4:cc:1d:6f:b0:98:6d:94:31:b5:f8:71:0a:dc:b9:fc:
+        7d:32:60:e6:eb:af:8a:01
+SHA1 Fingerprint=59:AF:82:79:91:86:C7:B4:75:07:CB:CF:03:57:46:EB:04:DD:B7:16
+-----BEGIN CERTIFICATE-----
+MIIFyjCCA7KgAwIBAgIEAJiWjDANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJO
+TDEeMBwGA1UECgwVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSswKQYDVQQDDCJTdGFh
+dCBkZXIgTmVkZXJsYW5kZW4gUm9vdCBDQSAtIEcyMB4XDTA4MDMyNjExMTgxN1oX
+DTIwMDMyNTExMDMxMFowWjELMAkGA1UEBhMCTkwxHjAcBgNVBAoMFVN0YWF0IGRl
+ciBOZWRlcmxhbmRlbjErMCkGA1UEAwwiU3RhYXQgZGVyIE5lZGVybGFuZGVuIFJv
+b3QgQ0EgLSBHMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMVZ5291
+qj5LnLW4rJ4L5PnZyqtdj7U5EILXr1HgO+EASGrP2uEGQxGZqhQlEq0i6ABtQ8Sp
+uOUfiUtnvWFI7/3S4GCI5bkYYCjDdyutsDeqN95kWSpGV+RLufg3fNU254DBtvPU
+Z5uW6M7XxgpT0GtJlvOjCwV3SPcl5XCsMBQgJeN/dVrlSPhOewMHBPqCYYdu8DvE
+pMfQ9XQ+pV0aCPKbJdL2rAQmPlU6Yiile7Iwr/g3wtG61jj99O9JMDeZJiFIhQGp
+5Rbn3JBV3w/oOM2ZNyFPXfUib2rFEhZgF1XyZWampzCROME4HYYEhLoaJXhena/M
+UGDWE4dS7WMfbWV9whUYdMrhfmQpjHLYFhN9C0lK8SgbIHRrxT3dsKpICT0ugpTN
+GmXZK4iambwYfp/ufWZ8Pr2UuIHOzZgweMFvZ9C+X+Bo7d7iscksWXiSqt8rYGPy
+5V6548r6f1CGPqI0GAwJaCgRHOThuVw+R7oyPxjMW4T182t0xHJ04eOLoEq9jWYv
+6q012iDTiIJh8BIitrzQ1aTsr1SIJSQ8p22xcik/Plemf1WvbibG/ufMQFxRRIEK
+eN5KzlW/HdXZt1bv8Hb/C3m1r737qWmRRpdogBQ2HbN/uymYNqUg+oJgYjOk7Na6
+B6duxc8UpufWkjTYgfX8HV2qXB72o007uPc5AgMBAAGjgZcwgZQwDwYDVR0TAQH/
+BAUwAwEB/zBSBgNVHSAESzBJMEcGBFUdIAAwPzA9BggrBgEFBQcCARYxaHR0cDov
+L3d3dy5wa2lvdmVyaGVpZC5ubC9wb2xpY2llcy9yb290LXBvbGljeS1HMjAOBgNV
+HQ8BAf8EBAMCAQYwHQYDVR0OBBYEFJFoMocVHYnitfGsNig0jQt8YojrMA0GCSqG
+SIb3DQEBCwUAA4ICAQCoQUpnKpKBglBu4dfYszk78wIVCVBR7y29JHuIhjv5tLyS
+CZa59sCrI2AGeYwRTlHSeYAz+51IvuxBQ4EffkdAHOV6CMqqi3WtFMTC6GY8ggen
+5ieCWxjmD27ZUD6KQhgpxrRW/FYQoAUXvQwjf/ST7ZwaUb7dRUG/kSS0H4zpX897
+IZmflZ85OkYcbPnNe5yQzSipx6lVu6xiNGI1E0sUOlWDuYaNkqbG9AclVMwWVxJK
+gnjIFNkXgiYtXSAfea7+1HAWFpWD2DU5/1JddRwWxRNVz0fMdWVSSt7wsKfkCpYL
++63C4iWEst3kvX5ZbJvw8NjnyvLplzh+ib7M+zkXYT9y2zqR2GUBGR2tUKRXCnxL
+vJxxcypFURmFzI79R6d0lR2o0a9OF7FpJsKqeFdbxU2n5Z4FF5TKsl+gSRiNNOkm
+bEgeqmiSBeGCc1qb3AdbCG19ndeNIdn8FCCqwkXfP+cAslHkwvgFuXkajDTznlvk
+N1trSt8sV4pAWja63XVECDdCcAz+3F4hoKOKwJCcaNpQ5kUQR3i2TtJlycM33+FC
+Y7BXN0Ute4qcvwXqZVUz9zkQxSgqIXobisQk+T8VyJoVIPVVYpbtbZNQvOSqeK3Z
+ywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm66+KAQ==
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/418595b9.0 b/luni/src/main/files/cacerts/418595b9.0
new file mode 100644
index 0000000..a55863e
--- /dev/null
+++ b/luni/src/main/files/cacerts/418595b9.0
@@ -0,0 +1,87 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 17 (0x11)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=TR, L=Gebze - Kocaeli, O=T\xC3\xBCrkiye Bilimsel ve Teknolojik Ara\xC5\x9Ft\xC4\xB1rma Kurumu - T\xC3\x9CB\xC4\xB0TAK, OU=Ulusal Elektronik ve Kriptoloji Ara\xC5\x9Ft\xC4\xB1rma Enstit\xC3\xBCs\xC3\xBC - UEKAE, OU=Kamu Sertifikasyon Merkezi, CN=T\xC3\x9CB\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1 - S\xC3\xBCr\xC3\xBCm 3
+        Validity
+            Not Before: Aug 24 11:37:07 2007 GMT
+            Not After : Aug 21 11:37:07 2017 GMT
+        Subject: C=TR, L=Gebze - Kocaeli, O=T\xC3\xBCrkiye Bilimsel ve Teknolojik Ara\xC5\x9Ft\xC4\xB1rma Kurumu - T\xC3\x9CB\xC4\xB0TAK, OU=Ulusal Elektronik ve Kriptoloji Ara\xC5\x9Ft\xC4\xB1rma Enstit\xC3\xBCs\xC3\xBC - UEKAE, OU=Kamu Sertifikasyon Merkezi, CN=T\xC3\x9CB\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1 - S\xC3\xBCr\xC3\xBCm 3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:8a:6d:4b:ff:10:88:3a:c3:f6:7e:94:e8:ea:20:
+                    64:70:ae:21:81:be:3a:7b:3c:db:f1:1d:52:7f:59:
+                    fa:f3:22:4c:95:a0:90:bc:48:4e:11:ab:fb:b7:b5:
+                    8d:7a:83:28:8c:26:46:d8:4e:95:40:87:61:9f:c5:
+                    9e:6d:81:87:57:6c:8a:3b:b4:66:ea:cc:40:fc:e3:
+                    aa:6c:b2:cb:01:db:32:bf:d2:eb:85:cf:a1:0d:55:
+                    c3:5b:38:57:70:b8:75:c6:79:d1:14:30:ed:1b:58:
+                    5b:6b:ef:35:f2:a1:21:4e:c5:ce:7c:99:5f:6c:b9:
+                    b8:22:93:50:a7:cd:4c:70:6a:be:6a:05:7f:13:9c:
+                    2b:1e:ea:fe:47:ce:04:a5:6f:ac:93:2e:7c:2b:9f:
+                    9e:79:13:91:e8:ea:9e:ca:38:75:8e:62:b0:95:93:
+                    2a:e5:df:e9:5e:97:6e:20:5f:5f:84:7a:44:39:19:
+                    40:1c:ba:55:2b:fb:30:b2:81:ef:84:e3:dc:ec:98:
+                    38:39:03:85:08:a9:54:03:05:29:f0:c9:8f:8b:ea:
+                    0b:86:65:19:11:d3:e9:09:23:de:68:93:03:c9:36:
+                    1c:21:6e:ce:8c:66:f1:99:30:d8:d7:b3:c3:1d:f8:
+                    81:2e:a8:bd:82:0b:66:fe:82:cb:e1:e0:1a:82:c3:
+                    40:81
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                BD:88:87:C9:8F:F6:A4:0A:0B:AA:EB:C5:FE:91:23:9D:AB:4A:8A:32
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        1d:7c:fa:49:8f:34:e9:b7:26:92:16:9a:05:74:e7:4b:d0:6d:
+        39:6c:c3:26:f6:ce:b8:31:bc:c4:df:bc:2a:f8:37:91:18:dc:
+        04:c8:64:99:2b:18:6d:80:03:59:c9:ae:f8:58:d0:3e:ed:c3:
+        23:9f:69:3c:86:38:1c:9e:ef:da:27:78:d1:84:37:71:8a:3c:
+        4b:39:cf:7e:45:06:d6:2d:d8:8a:4d:78:12:d6:ad:c2:d3:cb:
+        d2:d0:41:f3:26:36:4a:9b:95:6c:0c:ee:e5:d1:43:27:66:c1:
+        88:f7:7a:b3:20:6c:ea:b0:69:2b:c7:20:e8:0c:03:c4:41:05:
+        99:e2:3f:e4:6b:f8:a0:86:81:c7:84:c6:1f:d5:4b:81:12:b2:
+        16:21:2c:13:a1:80:b2:5e:0c:4a:13:9e:20:d8:62:40:ab:90:
+        ea:64:4a:2f:ac:0d:01:12:79:45:a8:2f:87:19:68:c8:e2:85:
+        c7:30:b2:75:f9:38:3f:b2:c0:93:b4:6b:e2:03:44:ce:67:a0:
+        df:89:d6:ad:8c:76:a3:13:c3:94:61:2b:6b:d9:6c:c1:07:0a:
+        22:07:85:6c:85:24:46:a9:be:3f:8b:78:84:82:7e:24:0c:9d:
+        fd:81:37:e3:25:a8:ed:36:4e:95:2c:c9:9c:90:da:ec:a9:42:
+        3c:ad:b6:02
+SHA1 Fingerprint=1B:4B:39:61:26:27:6B:64:91:A2:68:6D:D7:02:43:21:2D:1F:1D:96
+-----BEGIN CERTIFICATE-----
+MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRS
+MRgwFgYDVQQHDA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJp
+bGltc2VsIHZlIFRla25vbG9qaWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSw
+VEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ryb25payB2ZSBLcmlwdG9sb2ppIEFy
+YcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNVBAsMGkthbXUgU2Vy
+dGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUgS8O2
+ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAe
+Fw0wNzA4MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIx
+GDAWBgNVBAcMD0dlYnplIC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmls
+aW1zZWwgdmUgVGVrbm9sb2ppayBBcmHFn3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBU
+QUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZlIEtyaXB0b2xvamkgQXJh
+xZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2FtdSBTZXJ0
+aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7Zr
+IFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4h
+gb46ezzb8R1Sf1n68yJMlaCQvEhOEav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yK
+O7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1xnnRFDDtG1hba+818qEhTsXO
+fJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR6Oqeyjh1jmKw
+lZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
+hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQID
+AQABo0IwQDAdBgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/
+BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmP
+NOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4N5EY3ATIZJkrGG2AA1nJrvhY0D7t
+wyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLTy9LQQfMmNkqblWwM
+7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYhLBOh
+gLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5n
+oN+J1q2MdqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUs
+yZyQ2uypQjyttgI=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/524d9b43.0 b/luni/src/main/files/cacerts/524d9b43.0
new file mode 100644
index 0000000..07bbf11
--- /dev/null
+++ b/luni/src/main/files/cacerts/524d9b43.0
@@ -0,0 +1,88 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            40:1a:c4:64:21:b3:13:21:03:0e:bb:e4:12:1a:c5:1d
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2008 VeriSign, Inc. - For authorized use only, CN=VeriSign Universal Root Certification Authority
+        Validity
+            Not Before: Apr  2 00:00:00 2008 GMT
+            Not After : Dec  1 23:59:59 2037 GMT
+        Subject: C=US, O=VeriSign, Inc., OU=VeriSign Trust Network, OU=(c) 2008 VeriSign, Inc. - For authorized use only, CN=VeriSign Universal Root Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:c7:61:37:5e:b1:01:34:db:62:d7:15:9b:ff:58:
+                    5a:8c:23:23:d6:60:8e:91:d7:90:98:83:7a:e6:58:
+                    19:38:8c:c5:f6:e5:64:85:b4:a2:71:fb:ed:bd:b9:
+                    da:cd:4d:00:b4:c8:2d:73:a5:c7:69:71:95:1f:39:
+                    3c:b2:44:07:9c:e8:0e:fa:4d:4a:c4:21:df:29:61:
+                    8f:32:22:61:82:c5:87:1f:6e:8c:7c:5f:16:20:51:
+                    44:d1:70:4f:57:ea:e3:1c:e3:cc:79:ee:58:d8:0e:
+                    c2:b3:45:93:c0:2c:e7:9a:17:2b:7b:00:37:7a:41:
+                    33:78:e1:33:e2:f3:10:1a:7f:87:2c:be:f6:f5:f7:
+                    42:e2:e5:bf:87:62:89:5f:00:4b:df:c5:dd:e4:75:
+                    44:32:41:3a:1e:71:6e:69:cb:0b:75:46:08:d1:ca:
+                    d2:2b:95:d0:cf:fb:b9:40:6b:64:8c:57:4d:fc:13:
+                    11:79:84:ed:5e:54:f6:34:9f:08:01:f3:10:25:06:
+                    17:4a:da:f1:1d:7a:66:6b:98:60:66:a4:d9:ef:d2:
+                    2e:82:f1:f0:ef:09:ea:44:c9:15:6a:e2:03:6e:33:
+                    d3:ac:9f:55:00:c7:f6:08:6a:94:b9:5f:dc:e0:33:
+                    f1:84:60:f9:5b:27:11:b4:fc:16:f2:bb:56:6a:80:
+                    25:8d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            1.3.6.1.5.5.7.1.12: 
+                0_.].[0Y0W0U..image/gif0!0.0...+..............k...j.H.,{..0%.#http://logo.verisign.com/vslogo.gif
+            X509v3 Subject Key Identifier: 
+                B6:77:FA:69:48:47:9F:53:12:D5:C2:EA:07:32:76:07:D1:97:07:19
+    Signature Algorithm: sha256WithRSAEncryption
+        4a:f8:f8:b0:03:e6:2c:67:7b:e4:94:77:63:cc:6e:4c:f9:7d:
+        0e:0d:dc:c8:b9:35:b9:70:4f:63:fa:24:fa:6c:83:8c:47:9d:
+        3b:63:f3:9a:f9:76:32:95:91:b1:77:bc:ac:9a:be:b1:e4:31:
+        21:c6:81:95:56:5a:0e:b1:c2:d4:b1:a6:59:ac:f1:63:cb:b8:
+        4c:1d:59:90:4a:ef:90:16:28:1f:5a:ae:10:fb:81:50:38:0c:
+        6c:cc:f1:3d:c3:f5:63:e3:b3:e3:21:c9:24:39:e9:fd:15:66:
+        46:f4:1b:11:d0:4d:73:a3:7d:46:f9:3d:ed:a8:5f:62:d4:f1:
+        3f:f8:e0:74:57:2b:18:9d:81:b4:c4:28:da:94:97:a5:70:eb:
+        ac:1d:be:07:11:f0:d5:db:dd:e5:8c:f0:d5:32:b0:83:e6:57:
+        e2:8f:bf:be:a1:aa:bf:3d:1d:b5:d4:38:ea:d7:b0:5c:3a:4f:
+        6a:3f:8f:c0:66:6c:63:aa:e9:d9:a4:16:f4:81:d1:95:14:0e:
+        7d:cd:95:34:d9:d2:8f:70:73:81:7b:9c:7e:bd:98:61:d8:45:
+        87:98:90:c5:eb:86:30:c6:35:bf:f0:ff:c3:55:88:83:4b:ef:
+        05:92:06:71:f2:b8:98:93:b7:ec:cd:82:61:f1:38:e6:4f:97:
+        98:2a:5a:8d
+SHA1 Fingerprint=36:79:CA:35:66:87:72:30:4D:30:A5:FB:87:3B:0F:A7:7B:B7:0D:54
+-----BEGIN CERTIFICATE-----
+MIIEuTCCA6GgAwIBAgIQQBrEZCGzEyEDDrvkEhrFHTANBgkqhkiG9w0BAQsFADCB
+vTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTowOAYDVQQLEzEoYykgMjAwOCBWZXJp
+U2lnbiwgSW5jLiAtIEZvciBhdXRob3JpemVkIHVzZSBvbmx5MTgwNgYDVQQDEy9W
+ZXJpU2lnbiBVbml2ZXJzYWwgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wODA0MDIwMDAwMDBaFw0zNzEyMDEyMzU5NTlaMIG9MQswCQYDVQQGEwJVUzEX
+MBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0
+IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAyMDA4IFZlcmlTaWduLCBJbmMuIC0gRm9y
+IGF1dGhvcml6ZWQgdXNlIG9ubHkxODA2BgNVBAMTL1ZlcmlTaWduIFVuaXZlcnNh
+bCBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAx2E3XrEBNNti1xWb/1hajCMj1mCOkdeQmIN65lgZOIzF
+9uVkhbSicfvtvbnazU0AtMgtc6XHaXGVHzk8skQHnOgO+k1KxCHfKWGPMiJhgsWH
+H26MfF8WIFFE0XBPV+rjHOPMee5Y2A7Cs0WTwCznmhcrewA3ekEzeOEz4vMQGn+H
+LL729fdC4uW/h2KJXwBL38Xd5HVEMkE6HnFuacsLdUYI0crSK5XQz/u5QGtkjFdN
+/BMReYTtXlT2NJ8IAfMQJQYXStrxHXpma5hgZqTZ79IugvHw7wnqRMkVauIDbjPT
+rJ9VAMf2CGqUuV/c4DPxhGD5WycRtPwW8rtWaoAljQIDAQABo4GyMIGvMA8GA1Ud
+EwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMG0GCCsGAQUFBwEMBGEwX6FdoFsw
+WTBXMFUWCWltYWdlL2dpZjAhMB8wBwYFKw4DAhoEFI/l0xqGrI2Oa8PPgGrUSBgs
+exkuMCUWI2h0dHA6Ly9sb2dvLnZlcmlzaWduLmNvbS92c2xvZ28uZ2lmMB0GA1Ud
+DgQWBBS2d/ppSEefUxLVwuoHMnYH0ZcHGTANBgkqhkiG9w0BAQsFAAOCAQEASvj4
+sAPmLGd75JR3Y8xuTPl9Dg3cyLk1uXBPY/ok+myDjEedO2Pzmvl2MpWRsXe8rJq+
+seQxIcaBlVZaDrHC1LGmWazxY8u4TB1ZkErvkBYoH1quEPuBUDgMbMzxPcP1Y+Oz
+4yHJJDnp/RVmRvQbEdBNc6N9Rvk97ahfYtTxP/jgdFcrGJ2BtMQo2pSXpXDrrB2+
+BxHw1dvd5Yzw1TKwg+ZX4o+/vqGqvz0dtdQ46tewXDpPaj+PwGZsY6rp2aQW9IHR
+lRQOfc2VNNnSj3BzgXucfr2YYdhFh5iQxeuGMMY1v/D/w1WIg0vvBZIGcfK4mJO3
+7M2CYfE45k+XmCpajQ==
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/54edfa5d.0 b/luni/src/main/files/cacerts/54edfa5d.0
deleted file mode 100644
index e2530a4..0000000
--- a/luni/src/main/files/cacerts/54edfa5d.0
+++ /dev/null
@@ -1,63 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 1003 (0x3eb)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 3 CA/emailAddress=certificate@trustcenter.de
-        Validity
-            Not Before: Mar  9 11:59:59 1998 GMT
-            Not After : Jan  1 11:59:59 2011 GMT
-        Subject: C=DE, ST=Hamburg, L=Hamburg, O=TC TrustCenter for Security in Data Networks GmbH, OU=TC TrustCenter Class 3 CA/emailAddress=certificate@trustcenter.de
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-            RSA Public Key: (1024 bit)
-                Modulus (1024 bit):
-                    00:b6:b4:c1:35:05:2e:0d:8d:ec:a0:40:6a:1c:0e:
-                    27:a6:50:92:6b:50:1b:07:de:2e:e7:76:cc:e0:da:
-                    fc:84:a8:5e:8c:63:6a:2b:4d:d9:4e:02:76:11:c1:
-                    0b:f2:8d:79:ca:00:b6:f1:b0:0e:d7:fb:a4:17:3d:
-                    af:ab:69:7a:96:27:bf:af:33:a1:9a:2a:59:aa:c4:
-                    b5:37:08:f2:12:a5:31:b6:43:f5:32:96:71:28:28:
-                    ab:8d:28:86:df:bb:ee:e3:0c:7d:30:d6:c3:52:ab:
-                    8f:5d:27:9c:6b:c0:a3:e7:05:6b:57:49:44:b3:6e:
-                    ea:64:cf:d2:8e:7a:50:77:77
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: critical
-                CA:TRUE
-            X509v3 Key Usage: critical
-                Digital Signature, Certificate Sign, CRL Sign
-            Netscape CA Policy Url: 
-                http://www.trustcenter.de/guidelines
-            Netscape Cert Type: 
-                SSL CA, S/MIME CA, Object Signing CA
-    Signature Algorithm: md5WithRSAEncryption
-        16:3d:c6:cd:c1:bb:85:71:85:46:9f:3e:20:8f:51:28:99:ec:
-        2d:45:21:63:23:5b:04:bb:4c:90:b8:88:92:04:4d:bd:7d:01:
-        a3:3f:f6:ec:ce:f1:de:fe:7d:e5:e1:3e:bb:c6:ab:5e:0b:dd:
-        3d:96:c4:cb:a9:d4:f9:26:e6:06:4e:9e:0c:a5:7a:ba:6e:c3:
-        7c:82:19:d1:c7:b1:b1:c3:db:0d:8e:9b:40:7c:37:0b:f1:5d:
-        e8:fd:1f:90:88:a5:0e:4e:37:64:21:a8:4e:8d:b4:9f:f1:de:
-        48:ad:d5:56:18:52:29:8b:47:34:12:09:d4:bb:92:35:ef:0f:
-        db:34
-SHA1 Fingerprint=9F:C7:96:E8:F8:52:4F:86:3A:E1:49:6D:38:12:42:10:5F:1B:78:F5
------BEGIN CERTIFICATE-----
-MIIDXDCCAsWgAwIBAgICA+swDQYJKoZIhvcNAQEEBQAwgbwxCzAJBgNVBAYTAkRF
-MRAwDgYDVQQIEwdIYW1idXJnMRAwDgYDVQQHEwdIYW1idXJnMTowOAYDVQQKEzFU
-QyBUcnVzdENlbnRlciBmb3IgU2VjdXJpdHkgaW4gRGF0YSBOZXR3b3JrcyBHbWJI
-MSIwIAYDVQQLExlUQyBUcnVzdENlbnRlciBDbGFzcyAzIENBMSkwJwYJKoZIhvcN
-AQkBFhpjZXJ0aWZpY2F0ZUB0cnVzdGNlbnRlci5kZTAeFw05ODAzMDkxMTU5NTla
-Fw0xMTAxMDExMTU5NTlaMIG8MQswCQYDVQQGEwJERTEQMA4GA1UECBMHSGFtYnVy
-ZzEQMA4GA1UEBxMHSGFtYnVyZzE6MDgGA1UEChMxVEMgVHJ1c3RDZW50ZXIgZm9y
-IFNlY3VyaXR5IGluIERhdGEgTmV0d29ya3MgR21iSDEiMCAGA1UECxMZVEMgVHJ1
-c3RDZW50ZXIgQ2xhc3MgMyBDQTEpMCcGCSqGSIb3DQEJARYaY2VydGlmaWNhdGVA
-dHJ1c3RjZW50ZXIuZGUwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALa0wTUF
-Lg2N7KBAahwOJ6ZQkmtQGwfeLud2zODa/ISoXoxjaitN2U4CdhHBC/KNecoAtvGw
-Dtf7pBc9r6tpepYnv68zoZoqWarEtTcI8hKlMbZD9TKWcSgoq40oht+77uMMfTDW
-w1Krj10nnGvAo+cFa1dJRLNu6mTP0o56UHd3AgMBAAGjazBpMA8GA1UdEwEB/wQF
-MAMBAf8wDgYDVR0PAQH/BAQDAgGGMDMGCWCGSAGG+EIBCAQmFiRodHRwOi8vd3d3
-LnRydXN0Y2VudGVyLmRlL2d1aWRlbGluZXMwEQYJYIZIAYb4QgEBBAQDAgAHMA0G
-CSqGSIb3DQEBBAUAA4GBABY9xs3Bu4VxhUafPiCPUSiZ7C1FIWMjWwS7TJC4iJIE
-Tb19AaM/9uzO8d7+feXhPrvGq14L3T2WxMup1Pkm5gZOngylerpuw3yCGdHHsbHD
-2w2Om0B8NwvxXej9H5CIpQ5ON2QhqE6NtJ/x3kit1VYYUimLRzQSCdS7kjXvD9s0
------END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/60afe812.0 b/luni/src/main/files/cacerts/60afe812.0
new file mode 100644
index 0000000..78ad01c
--- /dev/null
+++ b/luni/src/main/files/cacerts/60afe812.0
@@ -0,0 +1,82 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            49:41:2c:e4:00:10
+        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
+            Not After : Dec  6 15:08:21 2028 GMT
+        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
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    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:
+                    30:ca:83:e3:20:c1:e3:f4:3a:d3:94:5f:1a:7c:5b:
+                    6d:bf:30:4f:84:27:f6:9f:1f:49:bc:c6:99:0a:90:
+                    f2:0f:f5:7f:43:84:37:63:51:8b:7a:a5:70:fc:7a:
+                    58:cd:8e:9b:ed:c3:46:6c:84:70:5d:da:f3:01:90:
+                    23:fc:4e:30:a9:7e:e1:27:63:e7:ed:64:3c:a0:b8:
+                    c9:33:63:fe:16:90:ff:b0:b8:fd:d7:a8:c0:c0:94:
+                    43:0b:b6:d5:59:a6:9e:56:d0:24:1f:70:79:af:db:
+                    39:54:0d:65:75:d9:15:41:94:01:af:5e:ec:f6:8d:
+                    f1:ff:ad:64:fe:20:9a:d7:5c:eb:fe:a6:1f:08:64:
+                    a3:8b:76:55:ad:1e:3b:28:60:2e:87:25:e8:aa:af:
+                    1f:c6:64:46:20:b7:70:7f:3c:de:48:db:96:53:b7:
+                    39:77:e4:1a:e2:c7:16:84:76:97:5b:2f:bb:19:15:
+                    85:f8:69:85:f5:99:a7:a9:f2:34:a7:a9:b6:a6:03:
+                    fc:6f:86:3d:54:7c:76:04:9b:6b:f9:40:5d:00:34:
+                    c7:2e:99:75:9d:e5:88:03:aa:4d:f8:03:d2:42:76:
+                    c0:1b
+                Exponent: 43147 (0xa88b)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:4
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                CC:FA:67:93:F0:B6:B8:D0:A5:C0:1E:F3:53:FD:8C:53:DF:83:D7:96
+    Signature Algorithm: sha256WithRSAEncryption
+        ab:7f:ee:1c:16:a9:9c:3c:51:00:a0:c0:11:08:05:a7:99:e6:
+        6f:01:88:54:61:6e:f1:b9:18:ad:4a:ad:fe:81:40:23:94:2f:
+        fb:75:7c:2f:28:4b:62:24:81:82:0b:f5:61:f1:1c:6e:b8:61:
+        38:eb:81:fa:62:a1:3b:5a:62:d3:94:65:c4:e1:e6:6d:82:f8:
+        2f:25:70:b2:21:26:c1:72:51:1f:8c:2c:c3:84:90:c3:5a:8f:
+        ba:cf:f4:a7:65:a5:eb:98:d1:fb:05:b2:46:75:15:23:6a:6f:
+        85:63:30:80:f0:d5:9e:1f:29:1c:c2:6c:b0:50:59:5d:90:5b:
+        3b:a8:0d:30:cf:bf:7d:7f:ce:f1:9d:83:bd:c9:46:6e:20:a6:
+        f9:61:51:ba:21:2f:7b:be:a5:15:63:a1:d4:95:87:f1:9e:b9:
+        f3:89:f3:3d:85:b8:b8:db:be:b5:b9:29:f9:da:37:05:00:49:
+        94:03:84:44:e7:bf:43:31:cf:75:8b:25:d1:f4:a6:64:f5:92:
+        f6:ab:05:eb:3d:e9:a5:0b:36:62:da:cc:06:5f:36:8b:b6:5e:
+        31:b8:2a:fb:5e:f6:71:df:44:26:9e:c4:e6:0d:91:b4:2e:75:
+        95:80:51:6a:4b:30:a6:b0:62:a1:93:f1:9b:d8:ce:c4:63:75:
+        3f:59:47:b1
+SHA1 Fingerprint=06:08:3F:59:3F:15:A1:04:A0:69:A4:6B:A9:03:D0:06:B7:97:09:91
+-----BEGIN CERTIFICATE-----
+MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQG
+EwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3
+MDUGA1UECwwuVGFuw7pzw610dsOhbnlraWFkw7NrIChDZXJ0aWZpY2F0aW9uIFNl
+cnZpY2VzKTE1MDMGA1UEAwwsTmV0TG9jayBBcmFueSAoQ2xhc3MgR29sZCkgRsWR
+dGFuw7pzw610dsOhbnkwHhcNMDgxMjExMTUwODIxWhcNMjgxMjA2MTUwODIxWjCB
+pzELMAkGA1UEBhMCSFUxETAPBgNVBAcMCEJ1ZGFwZXN0MRUwEwYDVQQKDAxOZXRM
+b2NrIEtmdC4xNzA1BgNVBAsMLlRhbsO6c8OtdHbDoW55a2lhZMOzayAoQ2VydGlm
+aWNhdGlvbiBTZXJ2aWNlcykxNTAzBgNVBAMMLE5ldExvY2sgQXJhbnkgKENsYXNz
+IEdvbGQpIEbFkXRhbsO6c8OtdHbDoW55MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAxCRec75LbRTDofTjl5Bu0jBFHjzuZ9lk4BqKf8owyoPjIMHj9DrT
+lF8afFttvzBPhCf2nx9JvMaZCpDyD/V/Q4Q3Y1GLeqVw/HpYzY6b7cNGbIRwXdrz
+AZAj/E4wqX7hJ2Pn7WQ8oLjJM2P+FpD/sLj916jAwJRDC7bVWaaeVtAkH3B5r9s5
+VA1lddkVQZQBr17s9o3x/61k/iCa11zr/qYfCGSji3ZVrR47KGAuhyXoqq8fxmRG
+ILdwfzzeSNuWU7c5d+Qa4scWhHaXWy+7GRWF+GmF9ZmnqfI0p6m2pgP8b4Y9VHx2
+BJtr+UBdADTHLpl1neWIA6pN+APSQnbAGwIDAKiLo0UwQzASBgNVHRMBAf8ECDAG
+AQH/AgEEMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUzPpnk/C2uNClwB7zU/2M
+U9+D15YwDQYJKoZIhvcNAQELBQADggEBAKt/7hwWqZw8UQCgwBEIBaeZ5m8BiFRh
+bvG5GK1Krf6BQCOUL/t1fC8oS2IkgYIL9WHxHG64YTjrgfpioTtaYtOUZcTh5m2C
++C8lcLIhJsFyUR+MLMOEkMNaj7rP9KdlpeuY0fsFskZ1FSNqb4VjMIDw1Z4fKRzC
+bLBQWV2QWzuoDTDPv31/zvGdg73JRm4gpvlhUbohL3u+pRVjodSVh/GeufOJ8z2F
+uLjbvrW5KfnaNwUASZQDhETnv0Mxz3WLJdH0pmT1kvarBes96aULNmLazAZfNou2
+XjG4Kvte9nHfRCaexOYNkbQudZWAUWpLMKawYqGT8ZvYzsRjdT9ZR7E=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/67495436.0 b/luni/src/main/files/cacerts/67495436.0
new file mode 100644
index 0000000..35df1f8
--- /dev/null
+++ b/luni/src/main/files/cacerts/67495436.0
@@ -0,0 +1,83 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            60:01:97:b7:46:a7:ea:b4:b4:9a:d6:4b:2f:f7:90:fb
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=thawte, Inc., OU=Certification Services Division, OU=(c) 2008 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA - G3
+        Validity
+            Not Before: Apr  2 00:00:00 2008 GMT
+            Not After : Dec  1 23:59:59 2037 GMT
+        Subject: C=US, O=thawte, Inc., OU=Certification Services Division, OU=(c) 2008 thawte, Inc. - For authorized use only, CN=thawte Primary Root CA - G3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:b2:bf:27:2c:fb:db:d8:5b:dd:78:7b:1b:9e:77:
+                    66:81:cb:3e:bc:7c:ae:f3:a6:27:9a:34:a3:68:31:
+                    71:38:33:62:e4:f3:71:66:79:b1:a9:65:a3:a5:8b:
+                    d5:8f:60:2d:3f:42:cc:aa:6b:32:c0:23:cb:2c:41:
+                    dd:e4:df:fc:61:9c:e2:73:b2:22:95:11:43:18:5f:
+                    c4:b6:1f:57:6c:0a:05:58:22:c8:36:4c:3a:7c:a5:
+                    d1:cf:86:af:88:a7:44:02:13:74:71:73:0a:42:59:
+                    02:f8:1b:14:6b:42:df:6f:5f:ba:6b:82:a2:9d:5b:
+                    e7:4a:bd:1e:01:72:db:4b:74:e8:3b:7f:7f:7d:1f:
+                    04:b4:26:9b:e0:b4:5a:ac:47:3d:55:b8:d7:b0:26:
+                    52:28:01:31:40:66:d8:d9:24:bd:f6:2a:d8:ec:21:
+                    49:5c:9b:f6:7a:e9:7f:55:35:7e:96:6b:8d:93:93:
+                    27:cb:92:bb:ea:ac:40:c0:9f:c2:f8:80:cf:5d:f4:
+                    5a:dc:ce:74:86:a6:3e:6c:0b:53:ca:bd:92:ce:19:
+                    06:72:e6:0c:5c:38:69:c7:04:d6:bc:6c:ce:5b:f6:
+                    f7:68:9c:dc:25:15:48:88:a1:e9:a9:f8:98:9c:e0:
+                    f3:d5:31:28:61:11:6c:67:96:8d:39:99:cb:c2:45:
+                    24:39
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                AD:6C:AA:94:60:9C:ED:E4:FF:FA:3E:0A:74:2B:63:03:F7:B6:59:BF
+    Signature Algorithm: sha256WithRSAEncryption
+        1a:40:d8:95:65:ac:09:92:89:c6:39:f4:10:e5:a9:0e:66:53:
+        5d:78:de:fa:24:91:bb:e7:44:51:df:c6:16:34:0a:ef:6a:44:
+        51:ea:2b:07:8a:03:7a:c3:eb:3f:0a:2c:52:16:a0:2b:43:b9:
+        25:90:3f:70:a9:33:25:6d:45:1a:28:3b:27:cf:aa:c3:29:42:
+        1b:df:3b:4c:c0:33:34:5b:41:88:bf:6b:2b:65:af:28:ef:b2:
+        f5:c3:aa:66:ce:7b:56:ee:b7:c8:cb:67:c1:c9:9c:1a:18:b8:
+        c4:c3:49:03:f1:60:0e:50:cd:46:c5:f3:77:79:f7:b6:15:e0:
+        38:db:c7:2f:28:a0:0c:3f:77:26:74:d9:25:12:da:31:da:1a:
+        1e:dc:29:41:91:22:3c:69:a7:bb:02:f2:b6:5c:27:03:89:f4:
+        06:ea:9b:e4:72:82:e3:a1:09:c1:e9:00:19:d3:3e:d4:70:6b:
+        ba:71:a6:aa:58:ae:f4:bb:e9:6c:b6:ef:87:cc:9b:bb:ff:39:
+        e6:56:61:d3:0a:a7:c4:5c:4c:60:7b:05:77:26:7a:bf:d8:07:
+        52:2c:62:f7:70:63:d9:39:bc:6f:1c:c2:79:dc:76:29:af:ce:
+        c5:2c:64:04:5e:88:36:6e:31:d4:40:1a:62:34:36:3f:35:01:
+        ae:ac:63:a0
+SHA1 Fingerprint=F1:8B:53:8D:1B:E9:03:B6:A6:F0:56:43:5B:17:15:89:CA:F3:6B:F2
+-----BEGIN CERTIFICATE-----
+MIIEKjCCAxKgAwIBAgIQYAGXt0an6rS0mtZLL/eQ+zANBgkqhkiG9w0BAQsFADCB
+rjELMAkGA1UEBhMCVVMxFTATBgNVBAoTDHRoYXd0ZSwgSW5jLjEoMCYGA1UECxMf
+Q2VydGlmaWNhdGlvbiBTZXJ2aWNlcyBEaXZpc2lvbjE4MDYGA1UECxMvKGMpIDIw
+MDggdGhhd3RlLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxJDAiBgNV
+BAMTG3RoYXd0ZSBQcmltYXJ5IFJvb3QgQ0EgLSBHMzAeFw0wODA0MDIwMDAwMDBa
+Fw0zNzEyMDEyMzU5NTlaMIGuMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMdGhhd3Rl
+LCBJbmMuMSgwJgYDVQQLEx9DZXJ0aWZpY2F0aW9uIFNlcnZpY2VzIERpdmlzaW9u
+MTgwNgYDVQQLEy8oYykgMjAwOCB0aGF3dGUsIEluYy4gLSBGb3IgYXV0aG9yaXpl
+ZCB1c2Ugb25seTEkMCIGA1UEAxMbdGhhd3RlIFByaW1hcnkgUm9vdCBDQSAtIEcz
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsr8nLPvb2FvdeHsbnndm
+gcs+vHyu86YnmjSjaDFxODNi5PNxZnmxqWWjpYvVj2AtP0LMqmsywCPLLEHd5N/8
+YZzic7IilRFDGF/Eth9XbAoFWCLINkw6fKXRz4aviKdEAhN0cXMKQlkC+BsUa0Lf
+b1+6a4KinVvnSr0eAXLbS3ToO39/fR8EtCab4LRarEc9VbjXsCZSKAExQGbY2SS9
+9irY7CFJXJv2eul/VTV+lmuNk5Mny5K76qxAwJ/C+IDPXfRa3M50hqY+bAtTyr2S
+zhkGcuYMXDhpxwTWvGzOW/b3aJzcJRVIiKHpqfiYnODz1TEoYRFsZ5aNOZnLwkUk
+OQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNV
+HQ4EFgQUrWyqlGCc7eT/+j4KdCtjA/e2Wb8wDQYJKoZIhvcNAQELBQADggEBABpA
+2JVlrAmSicY59BDlqQ5mU1143vokkbvnRFHfxhY0Cu9qRFHqKweKA3rD6z8KLFIW
+oCtDuSWQP3CpMyVtRRooOyfPqsMpQhvfO0zAMzRbQYi/aytlryjvsvXDqmbOe1bu
+t8jLZ8HJnBoYuMTDSQPxYA5QzUbF83d597YV4Djbxy8ooAw/dyZ02SUS2jHaGh7c
+KUGRIjxpp7sC8rZcJwOJ9Abqm+RyguOhCcHpABnTPtRwa7pxpqpYrvS76Wy274fM
+m7v/OeZWYdMKp8RcTGB7BXcmer/YB1IsYvdwY9k5vG8cwnncdimvzsUsZAReiDZu
+MdRAGmI0Nj81Aa6sY6A=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/72f369af.0 b/luni/src/main/files/cacerts/72f369af.0
new file mode 100644
index 0000000..969e680
--- /dev/null
+++ b/luni/src/main/files/cacerts/72f369af.0
@@ -0,0 +1,77 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=NO, O=Buypass AS-983163327, CN=Buypass Class 2 CA 1
+        Validity
+            Not Before: Oct 13 10:25:09 2006 GMT
+            Not After : Oct 13 10:25:09 2016 GMT
+        Subject: C=NO, O=Buypass AS-983163327, CN=Buypass Class 2 CA 1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:8b:3c:07:45:d8:f6:df:e6:c7:ca:ba:8d:43:c5:
+                    47:8d:b0:5a:c1:38:db:92:84:1c:af:13:d4:0f:6f:
+                    36:46:20:c4:2e:cc:71:70:34:a2:34:d3:37:2e:d8:
+                    dd:3a:77:2f:c0:eb:29:e8:5c:d2:b5:a9:91:34:87:
+                    22:59:fe:cc:db:e7:99:af:96:c1:a8:c7:40:dd:a5:
+                    15:8c:6e:c8:7c:97:03:cb:e6:20:f2:d7:97:5f:31:
+                    a1:2f:37:d2:be:ee:be:a9:ad:a8:4c:9e:21:66:43:
+                    3b:a8:bc:f3:09:a3:38:d5:59:24:c1:c2:47:76:b1:
+                    88:5c:82:3b:bb:2b:a6:04:d7:8c:07:8f:cd:d5:41:
+                    1d:f0:ae:b8:29:2c:94:52:60:34:94:3b:da:e0:38:
+                    d1:9d:33:3e:15:f4:93:32:c5:00:da:b5:29:66:0e:
+                    3a:78:0f:21:52:5f:02:e5:92:7b:25:d3:92:1e:2f:
+                    15:9d:81:e4:9d:8e:e8:ef:89:ce:14:4c:54:1d:1c:
+                    81:12:4d:70:a8:be:10:05:17:7e:1f:d1:b8:57:55:
+                    ed:cd:bb:52:c2:b0:1e:78:c2:4d:36:68:cb:56:26:
+                    c1:52:c1:bd:76:f7:58:d5:72:7e:1f:44:76:bb:00:
+                    89:1d:16:9d:51:35:ef:4d:c2:56:ef:6b:e0:8c:3b:
+                    0d:e9
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                3F:8D:9A:59:8B:FC:7B:7B:9C:A3:AF:38:B0:39:ED:90:71:80:D6:C8
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha1WithRSAEncryption
+        15:1a:7e:13:8a:b9:e8:07:a3:4b:27:32:b2:40:91:f2:21:d1:
+        64:85:be:63:6a:d2:cf:81:c2:15:d5:7a:7e:0c:29:ac:37:1e:
+        1c:7c:76:52:95:da:b5:7f:23:a1:29:77:65:c9:32:9d:a8:2e:
+        56:ab:60:76:ce:16:b4:8d:7f:78:c0:d5:99:51:83:7f:5e:d9:
+        be:0c:a8:50:ed:22:c7:ad:05:4c:76:fb:ed:ee:1e:47:64:f6:
+        f7:27:7d:5c:28:0f:45:c5:5c:62:5e:a6:9a:91:91:b7:53:17:
+        2e:dc:ad:60:9d:96:64:39:bd:67:68:b2:ae:05:cb:4d:e7:5f:
+        1f:57:86:d5:20:9c:28:fb:6f:13:38:f5:f6:11:92:f6:7d:99:
+        5e:1f:0c:e8:ab:44:24:29:72:40:3d:36:52:af:8c:58:90:73:
+        c1:ec:61:2c:79:a1:ec:87:b5:3f:da:4d:d9:21:00:30:de:90:
+        da:0e:d3:1a:48:a9:3e:85:0b:14:8b:8c:bc:41:9e:6a:f7:0e:
+        70:c0:35:f7:39:a2:5d:66:d0:7b:59:9f:a8:47:12:9a:27:23:
+        a4:2d:8e:27:83:92:20:a1:d7:15:7f:f1:2e:18:ee:f4:48:7f:
+        2f:7f:f1:a1:18:b5:a1:0b:94:a0:62:20:32:9c:1d:f6:d4:ef:
+        bf:4c:88:68
+SHA1 Fingerprint=A0:A1:AB:90:C9:FC:84:7B:3B:12:61:E8:97:7D:5F:D3:22:61:D3:CC
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMiBDQSAxMB4XDTA2MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7McXA0
+ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLX
+l18xoS830r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVB
+HfCuuCkslFJgNJQ72uA40Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B
+5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/RuFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3
+WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLP
+gcIV1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+
+DKhQ7SLHrQVMdvvt7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKu
+BctN518fV4bVIJwo+28TOPX2EZL2fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHs
+h7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5wwDX3OaJdZtB7WZ+oRxKaJyOk
+LY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/86212b19.0 b/luni/src/main/files/cacerts/86212b19.0
new file mode 100644
index 0000000..6e70276
--- /dev/null
+++ b/luni/src/main/files/cacerts/86212b19.0
@@ -0,0 +1,78 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            7c:4f:04:39:1c:d4:99:2d
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Networking
+        Validity
+            Not Before: Jan 29 14:08:24 2010 GMT
+            Not After : Dec 31 14:08:24 2030 GMT
+        Subject: C=US, O=AffirmTrust, CN=AffirmTrust Networking
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:b4:84:cc:33:17:2e:6b:94:6c:6b:61:52:a0:eb:
+                    a3:cf:79:94:4c:e5:94:80:99:cb:55:64:44:65:8f:
+                    67:64:e2:06:e3:5c:37:49:f6:2f:9b:84:84:1e:2d:
+                    f2:60:9d:30:4e:cc:84:85:e2:2c:cf:1e:9e:fe:36:
+                    ab:33:77:35:44:d8:35:96:1a:3d:36:e8:7a:0e:d8:
+                    d5:47:a1:6a:69:8b:d9:fc:bb:3a:ae:79:5a:d5:f4:
+                    d6:71:bb:9a:90:23:6b:9a:b7:88:74:87:0c:1e:5f:
+                    b9:9e:2d:fa:ab:53:2b:dc:bb:76:3e:93:4c:08:08:
+                    8c:1e:a2:23:1c:d4:6a:ad:22:ba:99:01:2e:6d:65:
+                    cb:be:24:66:55:24:4b:40:44:b1:1b:d7:e1:c2:85:
+                    c0:de:10:3f:3d:ed:b8:fc:f1:f1:23:53:dc:bf:65:
+                    97:6f:d9:f9:40:71:8d:7d:bd:95:d4:ce:be:a0:5e:
+                    27:23:de:fd:a6:d0:26:0e:00:29:eb:3c:46:f0:3d:
+                    60:bf:3f:50:d2:dc:26:41:51:9e:14:37:42:04:a3:
+                    70:57:a8:1b:87:ed:2d:fa:7b:ee:8c:0a:e3:a9:66:
+                    89:19:cb:41:f9:dd:44:36:61:cf:e2:77:46:c8:7d:
+                    f6:f4:92:81:36:fd:db:34:f1:72:7e:f3:0c:16:bd:
+                    b4:15
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                07:1F:D2:E7:9C:DA:C2:6E:A2:40:B4:B0:7A:50:10:50:74:C4:C8:BD
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha1WithRSAEncryption
+        89:57:b2:16:7a:a8:c2:fd:d6:d9:9b:9b:34:c2:9c:b4:32:14:
+        4d:a7:a4:df:ec:be:a7:be:f8:43:db:91:37:ce:b4:32:2e:50:
+        55:1a:35:4e:76:43:71:20:ef:93:77:4e:15:70:2e:87:c3:c1:
+        1d:6d:dc:cb:b5:27:d4:2c:56:d1:52:53:3a:44:d2:73:c8:c4:
+        1b:05:65:5a:62:92:9c:ee:41:8d:31:db:e7:34:ea:59:21:d5:
+        01:7a:d7:64:b8:64:39:cd:c9:ed:af:ed:4b:03:48:a7:a0:99:
+        01:80:dc:65:a3:36:ae:65:59:48:4f:82:4b:c8:65:f1:57:1d:
+        e5:59:2e:0a:3f:6c:d8:d1:f5:e5:09:b4:6c:54:00:0a:e0:15:
+        4d:87:75:6d:b7:58:96:5a:dd:6d:d2:00:a0:f4:9b:48:be:c3:
+        37:a4:ba:36:e0:7c:87:85:97:1a:15:a2:de:2e:a2:5b:bd:af:
+        18:f9:90:50:cd:70:59:f8:27:67:47:cb:c7:a0:07:3a:7d:d1:
+        2c:5d:6c:19:3a:66:b5:7d:fd:91:6f:82:b1:be:08:93:db:14:
+        47:f1:a2:37:c7:45:9e:3c:c7:77:af:64:a8:93:df:f6:69:83:
+        82:60:f2:49:42:34:ed:5a:00:54:85:1c:16:36:92:0c:5c:fa:
+        a6:ad:bf:db
+SHA1 Fingerprint=29:36:21:02:8B:20:ED:02:F5:66:C5:32:D1:D6:ED:90:9F:45:00:2F
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIIfE8EORzUmS0wDQYJKoZIhvcNAQEFBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBOZXR3b3JraW5nMB4XDTEwMDEyOTE0MDgyNFoXDTMwMTIzMTE0MDgyNFowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBOZXR3b3JraW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEAtITMMxcua5Rsa2FSoOujz3mUTOWUgJnLVWREZY9nZOIG41w3SfYvm4SEHi3y
+YJ0wTsyEheIszx6e/jarM3c1RNg1lho9Nuh6DtjVR6FqaYvZ/Ls6rnla1fTWcbua
+kCNrmreIdIcMHl+5ni36q1Mr3Lt2PpNMCAiMHqIjHNRqrSK6mQEubWXLviRmVSRL
+QESxG9fhwoXA3hA/Pe24/PHxI1Pcv2WXb9n5QHGNfb2V1M6+oF4nI979ptAmDgAp
+6zxG8D1gvz9Q0twmQVGeFDdCBKNwV6gbh+0t+nvujArjqWaJGctB+d1ENmHP4ndG
+yH329JKBNv3bNPFyfvMMFr20FQIDAQABo0IwQDAdBgNVHQ4EFgQUBx/S55zawm6i
+QLSwelAQUHTEyL0wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQEFBQADggEBAIlXshZ6qML91tmbmzTCnLQyFE2npN/svqe++EPbkTfO
+tDIuUFUaNU52Q3Eg75N3ThVwLofDwR1t3Mu1J9QsVtFSUzpE0nPIxBsFZVpikpzu
+QY0x2+c06lkh1QF612S4ZDnNye2v7UsDSKegmQGA3GWjNq5lWUhPgkvIZfFXHeVZ
+Lgo/bNjR9eUJtGxUAArgFU2HdW23WJZa3W3SAKD0m0i+wzekujbgfIeFlxoVot4u
+olu9rxj5kFDNcFn4J2dHy8egBzp90SxdbBk6ZrV9/ZFvgrG+CJPbFEfxojfHRZ48
+x3evZKiT3/Zpg4Jg8klCNO1aAFSFHBY2kgxc+qatv9s=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/882de061.0 b/luni/src/main/files/cacerts/882de061.0
new file mode 100644
index 0000000..959b9ea
--- /dev/null
+++ b/luni/src/main/files/cacerts/882de061.0
@@ -0,0 +1,78 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            20:06:05:16:70:02
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=RO, O=certSIGN, OU=certSIGN ROOT CA
+        Validity
+            Not Before: Jul  4 17:20:04 2006 GMT
+            Not After : Jul  4 17:20:04 2031 GMT
+        Subject: C=RO, O=certSIGN, OU=certSIGN ROOT CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:b7:33:b9:7e:c8:25:4a:8e:b5:db:b4:28:1b:aa:
+                    57:90:e8:d1:22:d3:64:ba:d3:93:e8:d4:ac:86:61:
+                    40:6a:60:57:68:54:84:4d:bc:6a:54:02:05:ff:df:
+                    9b:9a:2a:ae:5d:07:8f:4a:c3:28:7f:ef:fb:2b:fa:
+                    79:f1:c7:ad:f0:10:53:24:90:8b:66:c9:a8:88:ab:
+                    af:5a:a3:00:e9:be:ba:46:ee:5b:73:7b:2c:17:82:
+                    81:5e:62:2c:a1:02:65:b3:bd:c5:2b:00:7e:c4:fc:
+                    03:33:57:0d:ed:e2:fa:ce:5d:45:d6:38:cd:35:b6:
+                    b2:c1:d0:9c:81:4a:aa:e4:b2:01:5c:1d:8f:5f:99:
+                    c4:b1:ad:db:88:21:eb:90:08:82:80:f3:30:a3:43:
+                    e6:90:82:ae:55:28:49:ed:5b:d7:a9:10:38:0e:fe:
+                    8f:4c:5b:9b:46:ea:41:f5:b0:08:74:c3:d0:88:33:
+                    b6:7c:d7:74:df:dc:84:d1:43:0e:75:39:a1:25:40:
+                    28:ea:78:cb:0e:2c:2e:39:9d:8c:8b:6e:16:1c:2f:
+                    26:82:10:e2:e3:65:94:0a:04:c0:5e:f7:5d:5b:f8:
+                    10:e2:d0:ba:7a:4b:fb:de:37:00:00:1a:5b:28:e3:
+                    d2:9c:73:3e:32:87:98:a1:c9:51:2f:d7:de:ac:33:
+                    b3:4f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Digital Signature, Non Repudiation, Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                E0:8C:9B:DB:25:49:B3:F1:7C:86:D6:B2:42:87:0B:D0:6B:A0:D9:E4
+    Signature Algorithm: sha1WithRSAEncryption
+        3e:d2:1c:89:2e:35:fc:f8:75:dd:e6:7f:65:88:f4:72:4c:c9:
+        2c:d7:32:4e:f3:dd:19:79:47:bd:8e:3b:5b:93:0f:50:49:24:
+        13:6b:14:06:72:ef:09:d3:a1:a1:e3:40:84:c9:e7:18:32:74:
+        3c:48:6e:0f:9f:4b:d4:f7:1e:d3:93:86:64:54:97:63:72:50:
+        d5:55:cf:fa:20:93:02:a2:9b:c3:23:93:4e:16:55:76:a0:70:
+        79:6d:cd:21:1f:cf:2f:2d:bc:19:e3:88:31:f8:59:1a:81:09:
+        c8:97:a6:74:c7:60:c4:5b:cc:57:8e:b2:75:fd:1b:02:09:db:
+        59:6f:72:93:69:f7:31:41:d6:88:38:bf:87:b2:bd:16:79:f9:
+        aa:e4:be:88:25:dd:61:27:23:1c:b5:31:07:04:36:b4:1a:90:
+        bd:a0:74:71:50:89:6d:bc:14:e3:0f:86:ae:f1:ab:3e:c7:a0:
+        09:cc:a3:48:d1:e0:db:64:e7:92:b5:cf:af:72:43:70:8b:f9:
+        c3:84:3c:13:aa:7e:92:9b:57:53:93:fa:70:c2:91:0e:31:f9:
+        9b:67:5d:e9:96:38:5e:5f:b3:73:4e:88:15:67:de:9e:76:10:
+        62:20:be:55:69:95:43:00:39:4d:f6:ee:b0:5a:4e:49:44:54:
+        58:5f:42:83
+SHA1 Fingerprint=FA:B7:EE:36:97:26:62:FB:2D:B0:2A:F6:BF:03:FD:E8:7C:4B:2F:9B
+-----BEGIN CERTIFICATE-----
+MIIDODCCAiCgAwIBAgIGIAYFFnACMA0GCSqGSIb3DQEBBQUAMDsxCzAJBgNVBAYT
+AlJPMREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBD
+QTAeFw0wNjA3MDQxNzIwMDRaFw0zMTA3MDQxNzIwMDRaMDsxCzAJBgNVBAYTAlJP
+MREwDwYDVQQKEwhjZXJ0U0lHTjEZMBcGA1UECxMQY2VydFNJR04gUk9PVCBDQTCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALczuX7IJUqOtdu0KBuqV5Do
+0SLTZLrTk+jUrIZhQGpgV2hUhE28alQCBf/fm5oqrl0Hj0rDKH/v+yv6efHHrfAQ
+UySQi2bJqIirr1qjAOm+ukbuW3N7LBeCgV5iLKECZbO9xSsAfsT8AzNXDe3i+s5d
+RdY4zTW2ssHQnIFKquSyAVwdj1+ZxLGt24gh65AIgoDzMKND5pCCrlUoSe1b16kQ
+OA7+j0xbm0bqQfWwCHTD0IgztnzXdN/chNFDDnU5oSVAKOp4yw4sLjmdjItuFhwv
+JoIQ4uNllAoEwF73XVv4EOLQunpL+943AAAaWyjj0pxzPjKHmKHJUS/X3qwzs08C
+AwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAcYwHQYDVR0O
+BBYEFOCMm9slSbPxfIbWskKHC9BroNnkMA0GCSqGSIb3DQEBBQUAA4IBAQA+0hyJ
+LjX8+HXd5n9liPRyTMks1zJO890ZeUe9jjtbkw9QSSQTaxQGcu8J06Gh40CEyecY
+MnQ8SG4Pn0vU9x7Tk4ZkVJdjclDVVc/6IJMCopvDI5NOFlV2oHB5bc0hH88vLbwZ
+44gx+FkagQnIl6Z0x2DEW8xXjrJ1/RsCCdtZb3KTafcxQdaIOL+Hsr0Wefmq5L6I
+Jd1hJyMctTEHBDa0GpC9oHRxUIltvBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNw
+i/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7NzTogVZ96edhBiIL5VaZVDADlN
+9u6wWk5JRFRYX0KD
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/895cad1a.0 b/luni/src/main/files/cacerts/895cad1a.0
new file mode 100644
index 0000000..d620e48
--- /dev/null
+++ b/luni/src/main/files/cacerts/895cad1a.0
@@ -0,0 +1,82 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1228079105 (0x49330001)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=CN, O=CNNIC, CN=CNNIC ROOT
+        Validity
+            Not Before: Apr 16 07:09:14 2007 GMT
+            Not After : Apr 16 07:09:14 2027 GMT
+        Subject: C=CN, O=CNNIC, CN=CNNIC ROOT
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:d3:35:f7:3f:73:77:ad:e8:5b:73:17:c2:d1:6f:
+                    ed:55:bc:6e:ea:e8:a4:79:b2:6c:c3:a3:ef:e1:9f:
+                    b1:3b:48:85:f5:9a:5c:21:22:10:2c:c5:82:ce:da:
+                    e3:9a:6e:37:e1:87:2c:dc:b9:0c:5a:ba:88:55:df:
+                    fd:aa:db:1f:31:ea:01:f1:df:39:01:c1:13:fd:48:
+                    52:21:c4:55:df:da:d8:b3:54:76:ba:74:b1:b7:7d:
+                    d7:c0:e8:f6:59:c5:4d:c8:bd:ad:1f:14:da:df:58:
+                    44:25:32:19:2a:c7:7e:7e:8e:ae:38:b0:30:7b:47:
+                    72:09:31:f0:30:db:c3:1b:76:29:bb:69:76:4e:57:
+                    f9:1b:64:a2:93:56:b7:6f:99:6e:db:0a:04:9c:11:
+                    e3:80:1f:cb:63:94:10:0a:a9:e1:64:82:31:f9:8c:
+                    27:ed:a6:99:00:f6:70:93:18:f8:a1:34:86:a3:dd:
+                    7a:c2:18:79:f6:7a:65:35:cf:90:eb:bd:33:93:9f:
+                    53:ab:73:3b:e6:9b:34:20:2f:1d:ef:a9:1d:63:1a:
+                    a0:80:db:03:2f:f9:26:1a:86:d2:8d:bb:a9:be:52:
+                    3a:87:67:48:0d:bf:b4:a0:d8:26:be:23:5f:73:37:
+                    7f:26:e6:92:04:a3:7f:cf:20:a7:b7:f3:3a:ca:cb:
+                    99:cb
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            Netscape Cert Type: 
+                SSL CA, S/MIME CA, Object Signing CA
+            X509v3 Authority Key Identifier: 
+                keyid:65:F2:31:AD:2A:F7:F7:DD:52:96:0A:C7:02:C1:0E:EF:A6:D5:3B:11
+
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: 
+                Digital Signature, Non Repudiation, Key Encipherment, Data Encipherment, Key Agreement, Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                65:F2:31:AD:2A:F7:F7:DD:52:96:0A:C7:02:C1:0E:EF:A6:D5:3B:11
+    Signature Algorithm: sha1WithRSAEncryption
+        4b:35:ee:cc:e4:ae:bf:c3:6e:ad:9f:95:3b:4b:3f:5b:1e:df:
+        57:29:a2:59:ca:38:e2:b9:1a:ff:9e:e6:6e:32:dd:1e:ae:ea:
+        35:b7:f5:93:91:4e:da:42:e1:c3:17:60:50:f2:d1:5c:26:b9:
+        82:b7:ea:6d:e4:9c:84:e7:03:79:17:af:98:3d:94:db:c7:ba:
+        00:e7:b8:bf:01:57:c1:77:45:32:0c:3b:f1:b4:1c:08:b0:fd:
+        51:a0:a1:dd:9a:1d:13:36:9a:6d:b7:c7:3c:b9:e1:c5:d9:17:
+        fa:83:d5:3d:15:a0:3c:bb:1e:0b:e2:c8:90:3f:a8:86:0c:fc:
+        f9:8b:5e:85:cb:4f:5b:4b:62:11:47:c5:45:7c:05:2f:41:b1:
+        9e:10:69:1b:99:96:e0:55:79:fb:4e:86:99:b8:94:da:86:38:
+        6a:93:a3:e7:cb:6e:e5:df:ea:21:55:89:9c:7d:7d:7f:98:f5:
+        00:89:ee:e3:84:c0:5c:96:b5:c5:46:ea:46:e0:85:55:b6:1b:
+        c9:12:d6:c1:cd:cd:80:f3:02:01:3c:c8:69:cb:45:48:63:d8:
+        94:d0:ec:85:0e:3b:4e:11:65:f4:82:8c:a6:3d:ae:2e:22:94:
+        09:c8:5c:ea:3c:81:5d:16:2a:03:97:16:55:09:db:8a:41:82:
+        9e:66:9b:11
+SHA1 Fingerprint=8B:AF:4C:9B:1D:F0:2A:92:F7:DA:12:8E:B9:1B:AC:F4:98:60:4B:6F
+-----BEGIN CERTIFICATE-----
+MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJD
+TjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2
+MDcwOTE0WhcNMjcwNDE2MDcwOTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMF
+Q05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzDo+/hn7E7SIX1mlwh
+IhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tizVHa6
+dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZO
+V/kbZKKTVrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrC
+GHn2emU1z5DrvTOTn1OrczvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gN
+v7Sg2Ca+I19zN38m5pIEo3/PIKe38zrKy5nLAgMBAAGjczBxMBEGCWCGSAGG+EIB
+AQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscCwQ7vptU7ETAPBgNVHRMB
+Af8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991SlgrHAsEO
+76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnK
+OOK5Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvH
+ugDnuL8BV8F3RTIMO/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7Hgvi
+yJA/qIYM/PmLXoXLT1tLYhFHxUV8BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fL
+buXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2G8kS1sHNzYDzAgE8yGnLRUhj
+2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5mmxE=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/9685a493.0 b/luni/src/main/files/cacerts/9685a493.0
new file mode 100644
index 0000000..5d1f7ed
--- /dev/null
+++ b/luni/src/main/files/cacerts/9685a493.0
@@ -0,0 +1,75 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1000 (0x3e8)
+        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
+            Not After : May 15 04:52:29 2023 GMT
+        Subject: C=HK, O=Hongkong Post, CN=Hongkong Post Root CA 1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    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:
+                    f6:da:85:72:69:fe:d7:3f:09:d4:dd:91:b5:02:9c:
+                    d0:8d:5a:e1:55:c3:50:86:b9:29:26:c2:e3:d9:a0:
+                    f1:69:03:28:20:80:45:22:2d:56:a7:3b:54:95:56:
+                    22:59:1f:28:df:1f:20:3d:6d:a2:36:be:23:a0:b1:
+                    6e:b5:b1:27:3f:39:53:09:ea:ab:6a:e8:74:b2:c2:
+                    65:5c:8e:bf:7c:c3:78:84:cd:9e:16:fc:f5:2e:4f:
+                    20:2a:08:9f:77:f3:c5:1e:c4:9a:52:66:1e:48:5e:
+                    e3:10:06:8f:22:98:e1:65:8e:1b:5d:23:66:3b:b8:
+                    a5:32:51:c8:86:aa:a1:a9:9e:7f:76:94:c2:a6:6c:
+                    b7:41:f0:d5:c8:06:38:e6:d4:0c:e2:f3:3b:4c:6d:
+                    50:8c:c4:83:27:c1:13:84:59:3d:9e:75:74:b6:d8:
+                    02:5e:3a:90:7a:c0:42:36:72:ec:6a:4d:dc:ef:c4:
+                    00:df:13:18:57:5f:26:78:c8:d6:0a:79:77:bf:f7:
+                    af:b7:76:b9:a5:0b:84:17:5d:10:ea:6f:e1:ab:95:
+                    11:5f:6d:3c:a3:5c:4d:83:5b:f2:b3:19:8a:80:8b:
+                    0b:87
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:3
+            X509v3 Key Usage: critical
+                Digital Signature, Non Repudiation, Certificate Sign, CRL Sign
+    Signature Algorithm: sha1WithRSAEncryption
+        0e:46:d5:3c:ae:e2:87:d9:5e:81:8b:02:98:41:08:8c:4c:bc:
+        da:db:ee:27:1b:82:e7:6a:45:ec:16:8b:4f:85:a0:f3:b2:70:
+        bd:5a:96:ba:ca:6e:6d:ee:46:8b:6e:e7:2a:2e:96:b3:19:33:
+        eb:b4:9f:a8:b2:37:ee:98:a8:97:b6:2e:b6:67:27:d4:a6:49:
+        fd:1c:93:65:76:9e:42:2f:dc:22:6c:9a:4f:f2:5a:15:39:b1:
+        71:d7:2b:51:e8:6d:1c:98:c0:d9:2a:f4:a1:82:7b:d5:c9:41:
+        a2:23:01:74:38:55:8b:0f:b9:2e:67:a2:20:04:37:da:9c:0b:
+        d3:17:21:e0:8f:97:79:34:6f:84:48:02:20:33:1b:e6:34:44:
+        9f:91:70:f4:80:5e:84:43:c2:29:d2:6c:12:14:e4:61:8d:ac:
+        10:90:9e:84:50:bb:f0:96:6f:45:9f:8a:f3:ca:6c:4f:fa:11:
+        3a:15:15:46:c3:cd:1f:83:5b:2d:41:12:ed:50:67:41:13:3d:
+        21:ab:94:8a:aa:4e:7c:c1:b1:fb:a7:d6:b5:27:2f:97:ab:6e:
+        e0:1d:e2:d1:1c:2c:1f:44:e2:fc:be:91:a1:9c:fb:d6:29:53:
+        73:86:9f:53:d8:43:0e:5d:d6:63:82:71:1d:80:74:ca:f6:e2:
+        02:6b:d9:5a
+SHA1 Fingerprint=D6:DA:A8:20:8D:09:D2:15:4D:24:B5:2F:CB:34:6E:B2:58:B2:8A:58
+-----BEGIN CERTIFICATE-----
+MIIDMDCCAhigAwIBAgICA+gwDQYJKoZIhvcNAQEFBQAwRzELMAkGA1UEBhMCSEsx
+FjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdrb25nIFBvc3Qg
+Um9vdCBDQSAxMB4XDTAzMDUxNTA1MTMxNFoXDTIzMDUxNTA0NTIyOVowRzELMAkG
+A1UEBhMCSEsxFjAUBgNVBAoTDUhvbmdrb25nIFBvc3QxIDAeBgNVBAMTF0hvbmdr
+b25nIFBvc3QgUm9vdCBDQSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEArP84tulmAknjorThkPlAj3n54r15/gK97iSSHSL22oVyaf7XPwnU3ZG1ApzQ
+jVrhVcNQhrkpJsLj2aDxaQMoIIBFIi1WpztUlVYiWR8o3x8gPW2iNr4joLFutbEn
+PzlTCeqrauh0ssJlXI6/fMN4hM2eFvz1Lk8gKgifd/PFHsSaUmYeSF7jEAaPIpjh
+ZY4bXSNmO7ilMlHIhqqhqZ5/dpTCpmy3QfDVyAY45tQM4vM7TG1QjMSDJ8EThFk9
+nnV0ttgCXjqQesBCNnLsak3c78QA3xMYV18meMjWCnl3v/evt3a5pQuEF10Q6m/h
+q5URX208o1xNg1vysxmKgIsLhwIDAQABoyYwJDASBgNVHRMBAf8ECDAGAQH/AgED
+MA4GA1UdDwEB/wQEAwIBxjANBgkqhkiG9w0BAQUFAAOCAQEADkbVPK7ih9legYsC
+mEEIjEy82tvuJxuC52pF7BaLT4Wg87JwvVqWuspube5Gi27nKi6Wsxkz67SfqLI3
+7piol7Yutmcn1KZJ/RyTZXaeQi/cImyaT/JaFTmxcdcrUehtHJjA2Sr0oYJ71clB
+oiMBdDhViw+5LmeiIAQ32pwL0xch4I+XeTRvhEgCIDMb5jREn5Fw9IBehEPCKdJs
+EhTkYY2sEJCehFC78JZvRZ+K88psT/oROhUVRsPNH4NbLUES7VBnQRM9IauUiqpO
+fMGx+6fWtScvl6tu4B3i0RwsH0Ti/L6RoZz71ilTc4afU9hDDl3WY4JxHYB0yvbi
+AmvZWg==
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/9d6523ce.0 b/luni/src/main/files/cacerts/9d6523ce.0
new file mode 100644
index 0000000..94078c4
--- /dev/null
+++ b/luni/src/main/files/cacerts/9d6523ce.0
@@ -0,0 +1,123 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            15:c8:bd:65:47:5c:af:b8:97:00:5e:e4:06:d2:bc:9d
+        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
+            Not After : Dec 20 02:31:27 2034 GMT
+        Subject: C=TW, O=Chunghwa Telecom Co., Ltd., OU=ePKI Root Certification Authority
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    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:
+                    ea:84:50:07:4b:26:5b:09:43:6c:21:9e:6a:c8:d5:
+                    03:f5:60:69:8f:cc:f0:22:e4:1f:e7:f7:6a:22:31:
+                    b7:2c:15:f2:e0:fe:00:6a:43:ff:87:65:c6:b5:1a:
+                    c1:a7:4c:6d:22:70:21:8a:31:f2:97:74:89:09:12:
+                    26:1c:9e:ca:d9:12:a2:95:3c:da:e9:67:bf:08:a0:
+                    64:e3:d6:42:b7:45:ef:97:f4:f6:f5:d7:b5:4a:15:
+                    02:58:7d:98:58:4b:60:bc:cd:d7:0d:9a:13:33:53:
+                    d1:61:f9:7a:d5:d7:78:b3:9a:33:f7:00:86:ce:1d:
+                    4d:94:38:af:a8:ec:78:51:70:8a:5c:10:83:51:21:
+                    f7:11:3d:34:86:5e:e5:48:cd:97:81:82:35:4c:19:
+                    ec:65:f6:6b:c5:05:a1:ee:47:13:d6:b3:21:27:94:
+                    10:0a:d9:24:3b:ba:be:44:13:46:30:3f:97:3c:d8:
+                    d7:d7:6a:ee:3b:38:e3:2b:d4:97:0e:b9:1b:e7:07:
+                    49:7f:37:2a:f9:77:78:cf:54:ed:5b:46:9d:a3:80:
+                    0e:91:43:c1:d6:5b:5f:14:ba:9f:a6:8d:24:47:40:
+                    59:bf:72:38:b2:36:6c:37:ff:99:d1:5d:0e:59:0a:
+                    ab:69:f7:c0:b2:04:45:7a:54:00:ae:be:53:f6:b5:
+                    e7:e1:f8:3c:a3:31:d2:a9:fe:21:52:64:c5:a6:67:
+                    f0:75:07:06:94:14:81:55:c6:27:e4:01:8f:17:c1:
+                    6a:71:d7:be:4b:fb:94:58:7d:7e:11:33:b1:42:f7:
+                    62:6c:18:d6:cf:09:68:3e:7f:6c:f6:1e:8f:62:ad:
+                    a5:63:db:09:a7:1f:22:42:41:1e:6f:99:8a:3e:d7:
+                    f9:3f:40:7a:79:b0:a5:01:92:d2:9d:3d:08:15:a5:
+                    10:01:2d:b3:32:76:a8:95:0d:b3:7a:9a:fb:07:10:
+                    78:11:6f:e1:8f:c7:ba:0f:25:1a:74:2a:e5:1c:98:
+                    41:99:df:21:87:e8:95:06:6a:0a:b3:6a:47:76:65:
+                    f6:3a:cf:8f:62:17:19:7b:0a:28:cd:1a:d2:83:1e:
+                    21:c7:2c:bf:be:ff:61:68:b7:67:1b:bb:78:4d:8d:
+                    ce:67:e5:e4:c1:8e:b7:23:66:e2:9d:90:75:34:98:
+                    a9:36:2b:8a:9a:94:b9:9d:ec:cc:8a:b1:f8:25:89:
+                    5c:5a:b6:2f:8c:1f:6d:79:24:a7:52:68:c3:84:35:
+                    e2:66:8d:63:0e:25:4d:d5:19:b2:e6:79:37:a7:22:
+                    9d:54:31
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                1E:0C:F7:B6:67:F2:E1:92:26:09:45:C0:55:39:2E:77:3F:42:4A:A2
+            X509v3 Basic Constraints: 
+                CA:TRUE
+            setCext-hashedRoot: 
+                0/0-...0...+......0...g*.....E...
+V|.[x....S.....
+    Signature Algorithm: sha1WithRSAEncryption
+        09:b3:83:53:59:01:3e:95:49:b9:f1:81:ba:f9:76:20:23:b5:
+        27:60:74:d4:6a:99:34:5e:6c:00:53:d9:9f:f2:a6:b1:24:07:
+        44:6a:2a:c6:a5:8e:78:12:e8:47:d9:58:1b:13:2a:5e:79:9b:
+        9f:0a:2a:67:a6:25:3f:06:69:56:73:c3:8a:66:48:fb:29:81:
+        57:74:06:ca:9c:ea:28:e8:38:67:26:2b:f1:d5:b5:3f:65:93:
+        f8:36:5d:8e:8d:8d:40:20:87:19:ea:ef:27:c0:3d:b4:39:0f:
+        25:7b:68:50:74:55:9c:0c:59:7d:5a:3d:41:94:25:52:08:e0:
+        47:2c:15:31:19:d5:bf:07:55:c6:bb:12:b5:97:f4:5f:83:85:
+        ba:71:c1:d9:6c:81:11:76:0a:0a:b0:bf:82:97:f7:ea:3d:fa:
+        fa:ec:2d:a9:28:94:3b:56:dd:d2:51:2e:ae:c0:bd:08:15:8c:
+        77:52:34:96:d6:9b:ac:d3:1d:8e:61:0f:35:7b:9b:ae:39:69:
+        0b:62:60:40:20:36:8f:af:fb:36:ee:2d:08:4a:1d:b8:bf:9b:
+        5c:f8:ea:a5:1b:a0:73:a6:d8:f8:6e:e0:33:04:5f:68:aa:27:
+        87:ed:d9:c1:90:9c:ed:bd:e3:6a:35:af:63:df:ab:18:d9:ba:
+        e6:e9:4a:ea:50:8a:0f:61:93:1e:e2:2d:19:e2:30:94:35:92:
+        5d:0e:b6:07:af:19:80:8f:47:90:51:4b:2e:4d:dd:85:e2:d2:
+        0a:52:0a:17:9a:fc:1a:b0:50:02:e5:01:a3:63:37:21:4c:44:
+        c4:9b:51:99:11:0e:73:9c:06:8f:54:2e:a7:28:5e:44:39:87:
+        56:2d:37:bd:85:44:94:e1:0c:4b:2c:9c:c3:92:85:34:61:cb:
+        0f:b8:9b:4a:43:52:fe:34:3a:7d:b8:e9:29:dc:76:a9:c8:30:
+        f8:14:71:80:c6:1e:36:48:74:22:41:5c:87:82:e8:18:71:8b:
+        41:89:44:e7:7e:58:5b:a8:b8:8d:13:e9:a7:6c:c3:47:ed:b3:
+        1a:9d:62:ae:8d:82:ea:94:9e:dd:59:10:c3:ad:dd:e2:4d:e3:
+        31:d5:c7:ec:e8:f2:b0:fe:92:1e:16:0a:1a:fc:d9:f3:f8:27:
+        b6:c9:be:1d:b4:6c:64:90:7f:f4:e4:c4:5b:d7:37:ae:42:0e:
+        dd:a4:1a:6f:7c:88:54:c5:16:6e:e1:7a:68:2e:f8:3a:bf:0d:
+        a4:3c:89:3b:78:a7:4e:63:83:04:21:08:67:8d:f2:82:49:d0:
+        5b:fd:b1:cd:0f:83:84:d4:3e:20:85:f7:4a:3d:2b:9c:fd:2a:
+        0a:09:4d:ea:81:f8:11:9c
+SHA1 Fingerprint=67:65:0D:F1:7E:8E:7E:5B:82:40:A4:F4:56:4B:CF:E2:3D:69:C6:F0
+-----BEGIN CERTIFICATE-----
+MIIFsDCCA5igAwIBAgIQFci9ZUdcr7iXAF7kBtK8nTANBgkqhkiG9w0BAQUFADBe
+MQswCQYDVQQGEwJUVzEjMCEGA1UECgwaQ2h1bmdod2EgVGVsZWNvbSBDby4sIEx0
+ZC4xKjAoBgNVBAsMIWVQS0kgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAe
+Fw0wNDEyMjAwMjMxMjdaFw0zNDEyMjAwMjMxMjdaMF4xCzAJBgNVBAYTAlRXMSMw
+IQYDVQQKDBpDaHVuZ2h3YSBUZWxlY29tIENvLiwgTHRkLjEqMCgGA1UECwwhZVBL
+SSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIICIjANBgkqhkiG9w0BAQEF
+AAOCAg8AMIICCgKCAgEA4SUP7o3biDN1Z82tH306Tm2d0y8U82N0ywEhajfqhFAH
+SyZbCUNsIZ5qyNUD9WBpj8zwIuQf5/dqIjG3LBXy4P4AakP/h2XGtRrBp0xtInAh
+ijHyl3SJCRImHJ7K2RKilTza6We/CKBk49ZCt0Xvl/T29de1ShUCWH2YWEtgvM3X
+DZoTM1PRYfl61dd4s5oz9wCGzh1NlDivqOx4UXCKXBCDUSH3ET00hl7lSM2XgYI1
+TBnsZfZrxQWh7kcT1rMhJ5QQCtkkO7q+RBNGMD+XPNjX12ruOzjjK9SXDrkb5wdJ
+fzcq+Xd4z1TtW0ado4AOkUPB1ltfFLqfpo0kR0BZv3I4sjZsN/+Z0V0OWQqraffA
+sgRFelQArr5T9rXn4fg8ozHSqf4hUmTFpmfwdQcGlBSBVcYn5AGPF8Fqcde+S/uU
+WH1+ETOxQvdibBjWzwloPn9s9h6PYq2lY9sJpx8iQkEeb5mKPtf5P0B6ebClAZLS
+nT0IFaUQAS2zMnaolQ2zepr7BxB4EW/hj8e6DyUadCrlHJhBmd8hh+iVBmoKs2pH
+dmX2Os+PYhcZewoozRrSgx4hxyy/vv9haLdnG7t4TY3OZ+XkwY63I2binZB1NJip
+NiuKmpS5nezMirH4JYlcWrYvjB9teSSnUmjDhDXiZo1jDiVN1Rmy5nk3pyKdVDEC
+AwEAAaNqMGgwHQYDVR0OBBYEFB4M97Zn8uGSJglFwFU5Lnc/QkqiMAwGA1UdEwQF
+MAMBAf8wOQYEZyoHAAQxMC8wLQIBADAJBgUrDgMCGgUAMAcGBWcqAwAABBRFsMLH
+ClZ87lt4DJX5GFPBphzYEDANBgkqhkiG9w0BAQUFAAOCAgEACbODU1kBPpVJufGB
+uvl2ICO1J2B01GqZNF5sAFPZn/KmsSQHRGoqxqWOeBLoR9lYGxMqXnmbnwoqZ6Yl
+PwZpVnPDimZI+ymBV3QGypzqKOg4ZyYr8dW1P2WT+DZdjo2NQCCHGervJ8A9tDkP
+JXtoUHRVnAxZfVo9QZQlUgjgRywVMRnVvwdVxrsStZf0X4OFunHB2WyBEXYKCrC/
+gpf36j36+uwtqSiUO1bd0lEursC9CBWMd1I0ltabrNMdjmEPNXubrjlpC2JgQCA2
+j6/7Nu4tCEoduL+bXPjqpRugc6bY+G7gMwRfaKonh+3ZwZCc7b3jajWvY9+rGNm6
+5ulK6lCKD2GTHuItGeIwlDWSXQ62B68ZgI9HkFFLLk3dheLSClIKF5r8GrBQAuUB
+o2M3IUxExJtRmREOc5wGj1QupyheRDmHVi03vYVElOEMSyycw5KFNGHLD7ibSkNS
+/jQ6fbjpKdx2qcgw+BRxgMYeNkh0IkFch4LoGHGLQYlE535YW6i4jRPpp2zDR+2z
+Gp1iro2C6pSe3VkQw63d4k3jMdXH7OjysP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTE
+W9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmODBCEIZ43ygknQW/2xzQ+D
+hNQ+IIX3Sj0rnP0qCglN6oH4EZw=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/9f533518.0 b/luni/src/main/files/cacerts/9f533518.0
new file mode 100644
index 0000000..c05a115
--- /dev/null
+++ b/luni/src/main/files/cacerts/9f533518.0
@@ -0,0 +1,139 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            c9:cd:d3:e9:d5:7d:23:ce
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Global Chambersign Root - 2008
+        Validity
+            Not Before: Aug  1 12:31:40 2008 GMT
+            Not After : Jul 31 12:31:40 2038 GMT
+        Subject: C=EU, L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287, O=AC Camerfirma S.A., CN=Global Chambersign Root - 2008
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:c0:df:56:d3:e4:3a:9b:76:45:b4:13:db:ff:c1:
+                    b6:19:8b:37:41:18:95:52:47:eb:17:9d:29:88:8e:
+                    35:6c:06:32:2e:47:62:f3:49:04:bf:7d:44:36:b1:
+                    71:cc:bd:5a:09:73:d5:d9:85:44:ff:91:57:25:df:
+                    5e:36:8e:70:d1:5c:71:43:1d:d9:da:ef:5c:d2:fb:
+                    1b:bd:3a:b5:cb:ad:a3:cc:44:a7:0d:ae:21:15:3f:
+                    b9:7a:5b:92:75:d8:a4:12:38:89:19:8a:b7:80:d2:
+                    e2:32:6f:56:9c:91:d6:88:10:0b:b3:74:64:92:74:
+                    60:f3:f6:cf:18:4f:60:b2:23:d0:c7:3b:ce:61:4b:
+                    99:8f:c2:0c:d0:40:b2:98:dc:0d:a8:4e:a3:b9:0a:
+                    ae:60:a0:ad:45:52:63:ba:66:bd:68:e0:f9:be:1a:
+                    a8:81:bb:1e:41:78:75:d3:c1:fe:00:55:b0:87:54:
+                    e8:27:90:35:1d:4c:33:ad:97:fc:97:2e:98:84:bf:
+                    2c:c9:a3:bf:d1:98:11:14:ed:63:f8:ca:98:88:58:
+                    17:99:ed:45:03:97:7e:3c:86:1e:88:8c:be:f2:91:
+                    84:8f:65:34:d8:00:4c:7d:b7:31:17:5a:29:7a:0a:
+                    18:24:30:a3:37:b5:7a:a9:01:7d:26:d6:f9:0e:8e:
+                    59:f1:fd:1b:33:b5:29:3b:17:3b:41:b6:21:dd:d4:
+                    c0:3d:a5:9f:9f:1f:43:50:c9:bb:bc:6c:7a:97:98:
+                    ee:cd:8c:1f:fb:9c:51:ae:8b:70:bd:27:9f:71:c0:
+                    6b:ac:7d:90:66:e8:d7:5d:3a:0d:b0:d5:c2:8d:d5:
+                    c8:9d:9d:c1:6d:d0:d0:bf:51:e4:e3:f8:c3:38:36:
+                    ae:d6:a7:75:e6:af:84:43:5d:93:92:0c:6a:07:de:
+                    3b:1d:98:22:d6:ac:c1:35:db:a3:a0:25:ff:72:b5:
+                    76:1d:de:6d:e9:2c:66:2c:52:84:d0:45:92:ce:1c:
+                    e5:e5:33:1d:dc:07:53:54:a3:aa:82:3b:9a:37:2f:
+                    dc:dd:a0:64:e9:e6:dd:bd:ae:fc:64:85:1d:3c:a7:
+                    c9:06:de:84:ff:6b:e8:6b:1a:3c:c5:a2:b3:42:fb:
+                    8b:09:3e:5f:08:52:c7:62:c4:d4:05:71:bf:c4:64:
+                    e4:f8:a1:83:e8:3e:12:9b:a8:1e:d4:36:4d:2f:71:
+                    f6:8d:28:f6:83:a9:13:d2:61:c1:91:bb:48:c0:34:
+                    8f:41:8c:4b:4c:db:69:12:ff:50:94:9c:20:83:59:
+                    73:ed:7c:a1:f2:f1:fd:dd:f7:49:d3:43:58:a0:56:
+                    63:ca:3d:3d:e5:35:56:59:e9:0e:ca:20:cc:2b:4b:
+                    93:29:0f
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:12
+            X509v3 Subject Key Identifier: 
+                B9:09:CA:9C:1E:DB:D3:6C:3A:6B:AE:ED:54:F1:5B:93:06:35:2E:5E
+            X509v3 Authority Key Identifier: 
+                keyid:B9:09:CA:9C:1E:DB:D3:6C:3A:6B:AE:ED:54:F1:5B:93:06:35:2E:5E
+                DirName:/C=EU/L=Madrid (see current address at www.camerfirma.com/address)/serialNumber=A82743287/O=AC Camerfirma S.A./CN=Global Chambersign Root - 2008
+                serial:C9:CD:D3:E9:D5:7D:23:CE
+
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Certificate Policies: 
+                Policy: X509v3 Any Policy
+                  CPS: http://policy.camerfirma.com
+
+    Signature Algorithm: sha1WithRSAEncryption
+        80:88:7f:70:de:92:28:d9:05:94:46:ff:90:57:a9:f1:2f:df:
+        1a:0d:6b:fa:7c:0e:1c:49:24:79:27:d8:46:aa:6f:29:59:52:
+        88:70:12:ea:dd:3d:f5:9b:53:54:6f:e1:60:a2:a8:09:b9:ec:
+        eb:59:7c:c6:35:f1:dc:18:e9:f1:67:e5:af:ba:45:e0:09:de:
+        ca:44:0f:c2:17:0e:77:91:45:7a:33:5f:5f:96:2c:68:8b:c1:
+        47:8f:98:9b:3d:c0:ec:cb:f5:d5:82:92:84:35:d1:be:36:38:
+        56:72:31:5b:47:2d:aa:17:a4:63:51:eb:0a:01:ad:7f:ec:75:
+        9e:cb:a1:1f:f1:7f:12:b1:b9:e4:64:7f:67:d6:23:2a:f4:b8:
+        39:5d:98:e8:21:a7:e1:bd:3d:42:1a:74:9a:70:af:68:6c:50:
+        5d:49:cf:ff:fb:0e:5d:e6:2c:47:d7:81:3a:59:00:b5:73:6b:
+        63:20:f6:31:45:08:39:0e:f4:70:7e:40:70:5a:3f:d0:6b:42:
+        a9:74:3d:28:2f:02:6d:75:72:95:09:8d:48:63:c6:c6:23:57:
+        92:93:5e:35:c1:8d:f9:0a:f7:2c:9d:62:1c:f6:ad:7c:dd:a6:
+        31:1e:b6:b1:c7:7e:85:26:fa:a4:6a:b5:da:63:30:d1:ef:93:
+        37:b2:66:2f:7d:05:f7:e7:b7:4b:98:94:35:c0:d9:3a:29:c1:
+        9d:b2:50:33:1d:4a:a9:5a:a6:c9:03:ef:ed:f4:e7:a8:6e:8a:
+        b4:57:84:eb:a4:3f:d0:ee:aa:aa:87:5b:63:e8:93:e2:6b:a8:
+        d4:b8:72:78:6b:1b:ed:39:e4:5d:cb:9b:aa:87:d5:4f:4e:00:
+        fe:d9:6a:9f:3c:31:0f:28:02:01:7d:98:e8:a7:b0:a2:64:9e:
+        79:f8:48:f2:15:a9:cc:e6:c8:44:eb:3f:78:99:f2:7b:71:3e:
+        3c:f1:98:a7:c5:18:12:3f:e6:bb:28:33:42:e9:45:0a:7c:6d:
+        f2:86:79:2f:c5:82:19:7d:09:89:7c:b2:54:76:88:ae:de:c1:
+        f3:cc:e1:6e:db:31:d6:93:ae:99:a0:ef:25:6a:73:98:89:5b:
+        3a:2e:13:88:1e:bf:c0:92:94:34:1b:e3:27:b7:8b:1e:6f:42:
+        ff:e7:e9:37:9b:50:1d:2d:a2:f9:02:ee:cb:58:58:3a:71:bc:
+        68:e3:aa:c1:af:1c:28:1f:a2:dc:23:65:3f:81:ea:ae:99:d3:
+        d8:30:cf:13:0d:4f:15:c9:84:bc:a7:48:2d:f8:30:23:77:d8:
+        46:4b:79:6d:f6:8c:ed:3a:7f:60:11:78:f4:e9:9b:ae:d5:54:
+        c0:74:80:d1:0b:42:9f:c1
+SHA1 Fingerprint=4A:BD:EE:EC:95:0D:35:9C:89:AE:C7:52:A1:2C:5B:29:F6:D6:AA:0C
+-----BEGIN CERTIFICATE-----
+MIIHSTCCBTGgAwIBAgIJAMnN0+nVfSPOMA0GCSqGSIb3DQEBBQUAMIGsMQswCQYD
+VQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3VycmVudCBhZGRyZXNzIGF0
+IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAGA1UEBRMJQTgyNzQzMjg3
+MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAlBgNVBAMTHkdsb2JhbCBD
+aGFtYmVyc2lnbiBSb290IC0gMjAwODAeFw0wODA4MDExMjMxNDBaFw0zODA3MzEx
+MjMxNDBaMIGsMQswCQYDVQQGEwJFVTFDMEEGA1UEBxM6TWFkcmlkIChzZWUgY3Vy
+cmVudCBhZGRyZXNzIGF0IHd3dy5jYW1lcmZpcm1hLmNvbS9hZGRyZXNzKTESMBAG
+A1UEBRMJQTgyNzQzMjg3MRswGQYDVQQKExJBQyBDYW1lcmZpcm1hIFMuQS4xJzAl
+BgNVBAMTHkdsb2JhbCBDaGFtYmVyc2lnbiBSb290IC0gMjAwODCCAiIwDQYJKoZI
+hvcNAQEBBQADggIPADCCAgoCggIBAMDfVtPkOpt2RbQT2//BthmLN0EYlVJH6xed
+KYiONWwGMi5HYvNJBL99RDaxccy9Wglz1dmFRP+RVyXfXjaOcNFccUMd2drvXNL7
+G706tcuto8xEpw2uIRU/uXpbknXYpBI4iRmKt4DS4jJvVpyR1ogQC7N0ZJJ0YPP2
+zxhPYLIj0Mc7zmFLmY/CDNBAspjcDahOo7kKrmCgrUVSY7pmvWjg+b4aqIG7HkF4
+ddPB/gBVsIdU6CeQNR1MM62X/JcumIS/LMmjv9GYERTtY/jKmIhYF5ntRQOXfjyG
+HoiMvvKRhI9lNNgATH23MRdaKXoKGCQwoze1eqkBfSbW+Q6OWfH9GzO1KTsXO0G2
+Id3UwD2ln58fQ1DJu7xsepeY7s2MH/ucUa6LcL0nn3HAa6x9kGbo1106DbDVwo3V
+yJ2dwW3Q0L9R5OP4wzg2rtandeavhENdk5IMagfeOx2YItaswTXbo6Al/3K1dh3e
+beksZixShNBFks4c5eUzHdwHU1SjqoI7mjcv3N2gZOnm3b2u/GSFHTynyQbehP9r
+6GsaPMWis0L7iwk+XwhSx2LE1AVxv8Rk5Pihg+g+EpuoHtQ2TS9x9o0o9oOpE9Jh
+wZG7SMA0j0GMS0zbaRL/UJScIINZc+18ofLx/d33SdNDWKBWY8o9PeU1VlnpDsog
+zCtLkykPAgMBAAGjggFqMIIBZjASBgNVHRMBAf8ECDAGAQH/AgEMMB0GA1UdDgQW
+BBS5CcqcHtvTbDprru1U8VuTBjUuXjCB4QYDVR0jBIHZMIHWgBS5CcqcHtvTbDpr
+ru1U8VuTBjUuXqGBsqSBrzCBrDELMAkGA1UEBhMCRVUxQzBBBgNVBAcTOk1hZHJp
+ZCAoc2VlIGN1cnJlbnQgYWRkcmVzcyBhdCB3d3cuY2FtZXJmaXJtYS5jb20vYWRk
+cmVzcykxEjAQBgNVBAUTCUE4Mjc0MzI4NzEbMBkGA1UEChMSQUMgQ2FtZXJmaXJt
+YSBTLkEuMScwJQYDVQQDEx5HbG9iYWwgQ2hhbWJlcnNpZ24gUm9vdCAtIDIwMDiC
+CQDJzdPp1X0jzjAOBgNVHQ8BAf8EBAMCAQYwPQYDVR0gBDYwNDAyBgRVHSAAMCow
+KAYIKwYBBQUHAgEWHGh0dHA6Ly9wb2xpY3kuY2FtZXJmaXJtYS5jb20wDQYJKoZI
+hvcNAQEFBQADggIBAICIf3DekijZBZRG/5BXqfEv3xoNa/p8DhxJJHkn2EaqbylZ
+UohwEurdPfWbU1Rv4WCiqAm57OtZfMY18dwY6fFn5a+6ReAJ3spED8IXDneRRXoz
+X1+WLGiLwUePmJs9wOzL9dWCkoQ10b42OFZyMVtHLaoXpGNR6woBrX/sdZ7LoR/x
+fxKxueRkf2fWIyr0uDldmOghp+G9PUIadJpwr2hsUF1Jz//7Dl3mLEfXgTpZALVz
+a2Mg9jFFCDkO9HB+QHBaP9BrQql0PSgvAm11cpUJjUhjxsYjV5KTXjXBjfkK9yyd
+Yhz2rXzdpjEetrHHfoUm+qRqtdpjMNHvkzeyZi99Bffnt0uYlDXA2TopwZ2yUDMd
+SqlapskD7+3056huirRXhOukP9DuqqqHW2Pok+JrqNS4cnhrG+055F3Lm6qH1U9O
+AP7Zap88MQ8oAgF9mOinsKJknnn4SPIVqczmyETrP3iZ8ntxPjzxmKfFGBI/5rso
+M0LpRQp8bfKGeS/Fghl9CYl8slR2iK7ewfPM4W7bMdaTrpmg7yVqc5iJWzouE4ge
+v8CSlDQb4ye3ix5vQv/n6TebUB0tovkC7stYWDpxvGjjqsGvHCgfotwjZT+B6q6Z
+09gwzxMNTxXJhLynSC34MCN32EZLeW32jO06f2ARePTpm67VVMB0gNELQp/B
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/ab5346f4.0 b/luni/src/main/files/cacerts/ab5346f4.0
new file mode 100644
index 0000000..1dbed66
--- /dev/null
+++ b/luni/src/main/files/cacerts/ab5346f4.0
@@ -0,0 +1,78 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=JP, O=Japan Certification Services, Inc., CN=SecureSign RootCA11
+        Validity
+            Not Before: Apr  8 04:56:47 2009 GMT
+            Not After : Apr  8 04:56:47 2029 GMT
+        Subject: C=JP, O=Japan Certification Services, Inc., CN=SecureSign RootCA11
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:fd:77:aa:a5:1c:90:05:3b:cb:4c:9b:33:8b:5a:
+                    14:45:a4:e7:90:16:d1:df:57:d2:21:10:a4:17:fd:
+                    df:ac:d6:1f:a7:e4:db:7c:f7:ec:df:b8:03:da:94:
+                    58:fd:5d:72:7c:8c:3f:5f:01:67:74:15:96:e3:02:
+                    3c:87:db:ae:cb:01:8e:c2:f3:66:c6:85:45:f4:02:
+                    c6:3a:b5:62:b2:af:fa:9c:bf:a4:e6:d4:80:30:98:
+                    f3:0d:b6:93:8f:a9:d4:d8:36:f2:b0:fc:8a:ca:2c:
+                    a1:15:33:95:31:da:c0:1b:f2:ee:62:99:86:63:3f:
+                    bf:dd:93:2a:83:a8:76:b9:13:1f:b7:ce:4e:42:85:
+                    8f:22:e7:2e:1a:f2:95:09:b2:05:b5:44:4e:77:a1:
+                    20:bd:a9:f2:4e:0a:7d:50:ad:f5:05:0d:45:4f:46:
+                    71:fd:28:3e:53:fb:04:d8:2d:d7:65:1d:4a:1b:fa:
+                    cf:3b:b0:31:9a:35:6e:c8:8b:06:d3:00:91:f2:94:
+                    08:65:4c:b1:34:06:00:7a:89:e2:f0:c7:03:59:cf:
+                    d5:d6:e8:a7:32:b3:e6:98:40:86:c5:cd:27:12:8b:
+                    cc:7b:ce:b7:11:3c:62:60:07:23:3e:2b:40:6e:94:
+                    80:09:6d:b6:b3:6f:77:6f:35:08:50:fb:02:87:c5:
+                    3e:89
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                5B:F8:4D:4F:B2:A5:86:D4:3A:D2:F1:63:9A:A0:BE:09:F6:57:B7:DE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        a0:a1:38:16:66:2e:a7:56:1f:21:9c:06:fa:1d:ed:b9:22:c5:
+        38:26:d8:4e:4f:ec:a3:7f:79:de:46:21:a1:87:77:8f:07:08:
+        9a:b2:a4:c5:af:0f:32:98:0b:7c:66:29:b6:9b:7d:25:52:49:
+        43:ab:4c:2e:2b:6e:7a:70:af:16:0e:e3:02:6c:fb:42:e6:18:
+        9d:45:d8:55:c8:e8:3b:dd:e7:e1:f4:2e:0b:1c:34:5c:6c:58:
+        4a:fb:8c:88:50:5f:95:1c:bf:ed:ab:22:b5:65:b3:85:ba:9e:
+        0f:b8:ad:e5:7a:1b:8a:50:3a:1d:bd:0d:bc:7b:54:50:0b:b9:
+        42:af:55:a0:18:81:ad:65:99:ef:be:e4:9c:bf:c4:85:ab:41:
+        b2:54:6f:dc:25:cd:ed:78:e2:8e:0c:8d:09:49:dd:63:7b:5a:
+        69:96:02:21:a8:bd:52:59:e9:7d:35:cb:c8:52:ca:7f:81:fe:
+        d9:6b:d3:f7:11:ed:25:df:f8:e7:f9:a4:fa:72:97:84:53:0d:
+        a5:d0:32:18:51:76:59:14:6c:0f:eb:ec:5f:80:8c:75:43:83:
+        c3:85:98:ff:4c:9e:2d:0d:e4:77:83:93:4e:b5:96:07:8b:28:
+        13:9b:8c:19:8d:41:27:49:40:ee:de:e6:23:44:39:dc:a1:22:
+        d6:ba:03:f2
+SHA1 Fingerprint=3B:C4:9F:48:F8:F3:73:A0:9C:1E:BD:F8:5B:B1:C3:65:C7:D8:11:B3
+-----BEGIN CERTIFICATE-----
+MIIDbTCCAlWgAwIBAgIBATANBgkqhkiG9w0BAQUFADBYMQswCQYDVQQGEwJKUDEr
+MCkGA1UEChMiSmFwYW4gQ2VydGlmaWNhdGlvbiBTZXJ2aWNlcywgSW5jLjEcMBoG
+A1UEAxMTU2VjdXJlU2lnbiBSb290Q0ExMTAeFw0wOTA0MDgwNDU2NDdaFw0yOTA0
+MDgwNDU2NDdaMFgxCzAJBgNVBAYTAkpQMSswKQYDVQQKEyJKYXBhbiBDZXJ0aWZp
+Y2F0aW9uIFNlcnZpY2VzLCBJbmMuMRwwGgYDVQQDExNTZWN1cmVTaWduIFJvb3RD
+QTExMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA/XeqpRyQBTvLTJsz
+i1oURaTnkBbR31fSIRCkF/3frNYfp+TbfPfs37gD2pRY/V1yfIw/XwFndBWW4wI8
+h9uuywGOwvNmxoVF9ALGOrVisq/6nL+k5tSAMJjzDbaTj6nU2DbysPyKyiyhFTOV
+MdrAG/LuYpmGYz+/3ZMqg6h2uRMft85OQoWPIucuGvKVCbIFtUROd6EgvanyTgp9
+UK31BQ1FT0Zx/Sg+U/sE2C3XZR1KG/rPO7AxmjVuyIsG0wCR8pQIZUyxNAYAeoni
+8McDWc/V1uinMrPmmECGxc0nEovMe863ETxiYAcjPitAbpSACW22s293bzUIUPsC
+h8U+iQIDAQABo0IwQDAdBgNVHQ4EFgQUW/hNT7KlhtQ60vFjmqC+CfZXt94wDgYD
+VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB
+AKChOBZmLqdWHyGcBvod7bkixTgm2E5P7KN/ed5GIaGHd48HCJqypMWvDzKYC3xm
+KbabfSVSSUOrTC4rbnpwrxYO4wJs+0LmGJ1F2FXI6Dvd5+H0LgscNFxsWEr7jIhQ
+X5Ucv+2rIrVls4W6ng+4reV6G4pQOh29Dbx7VFALuUKvVaAYga1lme++5Jy/xIWr
+QbJUb9wlze144o4MjQlJ3WN7WmmWAiGovVJZ6X01y8hSyn+B/tlr0/cR7SXf+Of5
+pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061lgeLKBObjBmN
+QSdJQO7e5iNEOdyhIta6A/I=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/c7e2a638.0 b/luni/src/main/files/cacerts/c7e2a638.0
new file mode 100644
index 0000000..e1f961b
--- /dev/null
+++ b/luni/src/main/files/cacerts/c7e2a638.0
@@ -0,0 +1,82 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            15:ac:6e:94:19:b2:79:4b:41:f6:27:a9:c3:18:0f:1f
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=GeoTrust Inc., OU=(c) 2008 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G3
+        Validity
+            Not Before: Apr  2 00:00:00 2008 GMT
+            Not After : Dec  1 23:59:59 2037 GMT
+        Subject: C=US, O=GeoTrust Inc., OU=(c) 2008 GeoTrust Inc. - For authorized use only, CN=GeoTrust Primary Certification Authority - G3
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:dc:e2:5e:62:58:1d:33:57:39:32:33:fa:eb:cb:
+                    87:8c:a7:d4:4a:dd:06:88:ea:64:8e:31:98:a5:38:
+                    90:1e:98:cf:2e:63:2b:f0:46:bc:44:b2:89:a1:c0:
+                    28:0c:49:70:21:95:9f:64:c0:a6:93:12:02:65:26:
+                    86:c6:a5:89:f0:fa:d7:84:a0:70:af:4f:1a:97:3f:
+                    06:44:d5:c9:eb:72:10:7d:e4:31:28:fb:1c:61:e6:
+                    28:07:44:73:92:22:69:a7:03:88:6c:9d:63:c8:52:
+                    da:98:27:e7:08:4c:70:3e:b4:c9:12:c1:c5:67:83:
+                    5d:33:f3:03:11:ec:6a:d0:53:e2:d1:ba:36:60:94:
+                    80:bb:61:63:6c:5b:17:7e:df:40:94:1e:ab:0d:c2:
+                    21:28:70:88:ff:d6:26:6c:6c:60:04:25:4e:55:7e:
+                    7d:ef:bf:94:48:de:b7:1d:dd:70:8d:05:5f:88:a5:
+                    9b:f2:c2:ee:ea:d1:40:41:6d:62:38:1d:56:06:c5:
+                    03:47:51:20:19:fc:7b:10:0b:0e:62:ae:76:55:bf:
+                    5f:77:be:3e:49:01:53:3d:98:25:03:76:24:5a:1d:
+                    b4:db:89:ea:79:e5:b6:b3:3b:3f:ba:4c:28:41:7f:
+                    06:ac:6a:8e:c1:d0:f6:05:1d:7d:e6:42:86:e3:a5:
+                    d5:47
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                C4:79:CA:8E:A1:4E:03:1D:1C:DC:6B:DB:31:5B:94:3E:3F:30:7F:2D
+    Signature Algorithm: sha256WithRSAEncryption
+        2d:c5:13:cf:56:80:7b:7a:78:bd:9f:ae:2c:99:e7:ef:da:df:
+        94:5e:09:69:a7:e7:6e:68:8c:bd:72:be:47:a9:0e:97:12:b8:
+        4a:f1:64:d3:39:df:25:34:d4:c1:cd:4e:81:f0:0f:04:c4:24:
+        b3:34:96:c6:a6:aa:30:df:68:61:73:d7:f9:8e:85:89:ef:0e:
+        5e:95:28:4a:2a:27:8f:10:8e:2e:7c:86:c4:02:9e:da:0c:77:
+        65:0e:44:0d:92:fd:fd:b3:16:36:fa:11:0d:1d:8c:0e:07:89:
+        6a:29:56:f7:72:f4:dd:15:9c:77:35:66:57:ab:13:53:d8:8e:
+        c1:40:c5:d7:13:16:5a:72:c7:b7:69:01:c4:7a:b1:83:01:68:
+        7d:8d:41:a1:94:18:c1:25:5c:fc:f0:fe:83:02:87:7c:0d:0d:
+        cf:2e:08:5c:4a:40:0d:3e:ec:81:61:e6:24:db:ca:e0:0e:2d:
+        07:b2:3e:56:dc:8d:f5:41:85:07:48:9b:0c:0b:cb:49:3f:7d:
+        ec:b7:fd:cb:8d:67:89:1a:ab:ed:bb:1e:a3:00:08:08:17:2a:
+        82:5c:31:5d:46:8a:2d:0f:86:9b:74:d9:45:fb:d4:40:b1:7a:
+        aa:68:2d:86:b2:99:22:e1:c1:2b:c7:9c:f8:f3:5f:a8:82:12:
+        eb:19:11:2d
+SHA1 Fingerprint=03:9E:ED:B8:0B:E7:A0:3C:69:53:89:3B:20:D2:D9:32:3A:4C:2A:FD
+-----BEGIN CERTIFICATE-----
+MIID/jCCAuagAwIBAgIQFaxulBmyeUtB9iepwxgPHzANBgkqhkiG9w0BAQsFADCB
+mDELMAkGA1UEBhMCVVMxFjAUBgNVBAoTDUdlb1RydXN0IEluYy4xOTA3BgNVBAsT
+MChjKSAyMDA4IEdlb1RydXN0IEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ugb25s
+eTE2MDQGA1UEAxMtR2VvVHJ1c3QgUHJpbWFyeSBDZXJ0aWZpY2F0aW9uIEF1dGhv
+cml0eSAtIEczMB4XDTA4MDQwMjAwMDAwMFoXDTM3MTIwMTIzNTk1OVowgZgxCzAJ
+BgNVBAYTAlVTMRYwFAYDVQQKEw1HZW9UcnVzdCBJbmMuMTkwNwYDVQQLEzAoYykg
+MjAwOCBHZW9UcnVzdCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNlIG9ubHkxNjA0
+BgNVBAMTLUdlb1RydXN0IFByaW1hcnkgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
+LSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANziXmJYHTNXOTIz
++uvLh4yn1ErdBojqZI4xmKU4kB6Yzy5jK/BGvESyiaHAKAxJcCGVn2TAppMSAmUm
+hsalifD614SgcK9PGpc/BkTVyetyEH3kMSj7HGHmKAdEc5IiaacDiGydY8hS2pgn
+5whMcD60yRLBxWeDXTPzAxHsatBT4tG6NmCUgLthY2xbF37fQJQeqw3CIShwiP/W
+JmxsYAQlTlV+fe+/lEjetx3dcI0FX4ilm/LC7urRQEFtYjgdVgbFA0dRIBn8exAL
+DmKudlW/X3e+PkkBUz2YJQN2JFodtNuJ6nnltrM7P7pMKEF/BqxqjsHQ9gUdfeZC
+huOl1UcCAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw
+HQYDVR0OBBYEFMR5yo6hTgMdHNxr2zFblD4/MH8tMA0GCSqGSIb3DQEBCwUAA4IB
+AQAtxRPPVoB7eni9n64smefv2t+UXglpp+duaIy9cr5HqQ6XErhK8WTTOd8lNNTB
+zU6B8A8ExCSzNJbGpqow32hhc9f5joWJ7w5elShKKiePEI4ufIbEAp7aDHdlDkQN
+kv39sxY2+hENHYwOB4lqKVb3cvTdFZx3NWZXqxNT2I7BQMXXExZacse3aQHEerGD
+AWh9jUGhlBjBJVz88P6DAod8DQ3PLghcSkANPuyBYeYk28rgDi0Hsj5W3I31QYUH
+SJsMC8tJP33st/3LjWeJGqvtux6jAAgIFyqCXDFdRootD4abdNlF+9RAsXqqaC2G
+spki4cErx5z481+oghLrGREt
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/d16a5865.0 b/luni/src/main/files/cacerts/d16a5865.0
new file mode 100644
index 0000000..8811ddf
--- /dev/null
+++ b/luni/src/main/files/cacerts/d16a5865.0
@@ -0,0 +1,130 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            53:ec:3b:ee:fb:b2:48:5f
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=ES, CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+        Validity
+            Not Before: May 20 08:38:15 2009 GMT
+            Not After : Dec 31 08:38:15 2030 GMT
+        Subject: C=ES, CN=Autoridad de Certificacion Firmaprofesional CIF A62634068
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    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:
+                    6a:b2:ca:1c:5d:28:9a:78:11:1a:69:59:57:af:b5:
+                    20:42:e4:8b:0f:e6:df:5b:a6:03:92:2f:f5:11:e4:
+                    62:d7:32:71:38:d9:04:0c:71:ab:3d:51:7e:0f:07:
+                    df:63:05:5c:e9:bf:94:6f:c1:29:82:c0:b4:da:51:
+                    b0:c1:3c:bb:ad:37:4a:5c:ca:f1:4b:36:0e:24:ab:
+                    bf:c3:84:77:fd:a8:50:f4:b1:e7:c6:2f:d2:2d:59:
+                    8d:7a:0a:4e:96:69:52:02:aa:36:98:ec:fc:fa:14:
+                    83:0c:37:1f:c9:92:37:7f:d7:81:2d:e5:c4:b9:e0:
+                    3e:34:fe:67:f4:3e:66:d1:d3:f4:40:cf:5e:62:34:
+                    0f:70:06:3e:20:18:5a:ce:f7:72:1b:25:6c:93:74:
+                    14:93:a3:73:b1:0e:aa:87:10:23:59:5f:20:05:19:
+                    47:ed:68:8e:92:12:ca:5d:fc:d6:2b:b2:92:3c:20:
+                    cf:e1:5f:af:20:be:a0:76:7f:76:e5:ec:1a:86:61:
+                    33:3e:e7:7b:b4:3f:a0:0f:8e:a2:b9:6a:6f:b9:87:
+                    26:6f:41:6c:88:a6:50:fd:6a:63:0b:f5:93:16:1b:
+                    19:8f:b2:ed:9b:9b:c9:90:f5:01:0c:df:19:3d:0f:
+                    3e:38:23:c9:2f:8f:0c:d1:02:fe:1b:55:d6:4e:d0:
+                    8d:3c:af:4f:a4:f3:fe:af:2a:d3:05:9d:79:08:a1:
+                    cb:57:31:b4:9c:c8:90:b2:67:f4:18:16:93:3a:fc:
+                    47:d8:d1:78:96:31:1f:ba:2b:0c:5f:5d:99:ad:63:
+                    89:5a:24:20:76:d8:df:fd:ab:4e:a6:22:aa:9d:5e:
+                    e6:27:8a:7d:68:29:a3:e7:8a:b8:da:11:bb:17:2d:
+                    99:9d:13:24:46:f7:c5:e2:d8:9f:8e:7f:c7:8f:74:
+                    6d:5a:b2:e8:72:f5:ac:ee:24:10:ad:2f:14:da:ff:
+                    2d:9a:46:71:47:be:42:df:bb:01:db:f4:7f:d3:28:
+                    8f:31:59:5b:d3:c9:02:a6:b4:52:ca:6e:97:fb:43:
+                    c5:08:26:6f:8a:f4:bb:fd:9f:28:aa:0d:d5:45:f3:
+                    13:3a:1d:d8:c0:78:8f:41:67:3c:1e:94:64:ae:7b:
+                    0b:c5:e8:d9:01:88:39:1a:97:86:64:41:d5:3b:87:
+                    0c:6e:fa:0f:c6:bd:48:14:bf:39:4d:d4:9e:41:b6:
+                    8f:96:1d:63:96:93:d9:95:06:78:31:68:9e:37:06:
+                    3b:80:89:45:61:39:23:c7:1b:44:a3:15:e5:1c:f8:
+                    92:30:bb
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE, pathlen:1
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                65:CD:EB:AB:35:1E:00:3E:7E:D5:74:C0:1C:B4:73:47:0E:1A:64:2F
+            X509v3 Certificate Policies: 
+                Policy: X509v3 Any Policy
+                  CPS: http://www.firmaprofesional.com/cps
+                  User Notice:
+                    Explicit Text: 
+
+    Signature Algorithm: sha1WithRSAEncryption
+        17:7d:a0:f9:b4:dd:c5:c5:eb:ad:4b:24:b5:a1:02:ab:dd:a5:
+        88:4a:b2:0f:55:4b:2b:57:8c:3b:e5:31:dd:fe:c4:32:f1:e7:
+        5b:64:96:36:32:18:ec:a5:32:77:d7:e3:44:b6:c0:11:2a:80:
+        b9:3d:6a:6e:7c:9b:d3:ad:fc:c3:d6:a3:e6:64:29:7c:d1:e1:
+        38:1e:82:2b:ff:27:65:af:fb:16:15:c4:2e:71:84:e5:b5:ff:
+        fa:a4:47:bd:64:32:bb:f6:25:84:a2:27:42:f5:20:b0:c2:13:
+        10:11:cd:10:15:ba:42:90:2a:d2:44:e1:96:26:eb:31:48:12:
+        fd:2a:da:c9:06:cf:74:1e:a9:4b:d5:87:28:f9:79:34:92:3e:
+        2e:44:e8:f6:8f:4f:8f:35:3f:25:b3:39:dc:63:2a:90:6b:20:
+        5f:c4:52:12:4e:97:2c:2a:ac:9d:97:de:48:f2:a3:66:db:c2:
+        d2:83:95:a6:66:a7:9e:25:0f:e9:0b:33:91:65:0a:5a:c3:d9:
+        54:12:dd:af:c3:4e:0e:1f:26:5e:0d:dc:b3:8d:ec:d5:81:70:
+        de:d2:4f:24:05:f3:6c:4e:f5:4c:49:66:8d:d1:ff:d2:0b:25:
+        41:48:fe:51:84:c6:42:af:80:04:cf:d0:7e:64:49:e4:f2:df:
+        a2:ec:b1:4c:c0:2a:1d:e7:b4:b1:65:a2:c4:bc:f1:98:f4:aa:
+        70:07:63:b4:b8:da:3b:4c:fa:40:22:30:5b:11:a6:f0:05:0e:
+        c6:02:03:48:ab:86:9b:85:dd:db:dd:ea:a2:76:80:73:7d:f5:
+        9c:04:c4:45:8d:e7:b9:1c:8b:9e:ea:d7:75:d1:72:b1:de:75:
+        44:e7:42:7d:e2:57:6b:7d:dc:99:bc:3d:83:28:ea:80:93:8d:
+        c5:4c:65:c1:70:81:b8:38:fc:43:31:b2:f6:03:34:47:b2:ac:
+        fb:22:06:cb:1e:dd:17:47:1c:5f:66:b9:d3:1a:a2:da:11:b1:
+        a4:bc:23:c9:e4:be:87:ff:b9:94:b6:f8:5d:20:4a:d4:5f:e7:
+        bd:68:7b:65:f2:15:1e:d2:3a:a9:2d:e9:d8:6b:24:ac:97:58:
+        44:47:ad:59:18:f1:21:65:70:de:ce:34:60:a8:40:f1:f3:3c:
+        a4:c3:28:23:8c:fe:27:33:43:40:a0:17:3c:eb:ea:3b:b0:72:
+        a6:a3:b9:4a:4b:5e:16:48:f4:b2:bc:c8:8c:92:c5:9d:9f:ac:
+        72:36:bc:34:80:34:6b:a9:8b:92:c0:b8:17:ed:ec:76:53:f5:
+        24:01:8c:b3:22:e8:4b:7c:55:c6:9d:fa:a3:14:bb:65:85:6e:
+        6e:4f:12:7e:0a:3c:9d:95
+SHA1 Fingerprint=AE:C5:FB:3F:C8:E1:BF:C4:E5:4F:03:07:5A:9A:E8:00:B7:F7:B6:FA
+-----BEGIN CERTIFICATE-----
+MIIGFDCCA/ygAwIBAgIIU+w77vuySF8wDQYJKoZIhvcNAQEFBQAwUTELMAkGA1UE
+BhMCRVMxQjBABgNVBAMMOUF1dG9yaWRhZCBkZSBDZXJ0aWZpY2FjaW9uIEZpcm1h
+cHJvZmVzaW9uYWwgQ0lGIEE2MjYzNDA2ODAeFw0wOTA1MjAwODM4MTVaFw0zMDEy
+MzEwODM4MTVaMFExCzAJBgNVBAYTAkVTMUIwQAYDVQQDDDlBdXRvcmlkYWQgZGUg
+Q2VydGlmaWNhY2lvbiBGaXJtYXByb2Zlc2lvbmFsIENJRiBBNjI2MzQwNjgwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDKlmuO6vj78aI14H9M2uDDUtd9
+thDIAl6zQyrET2qyyhxdKJp4ERppWVevtSBC5IsP5t9bpgOSL/UR5GLXMnE42QQM
+cas9UX4PB99jBVzpv5RvwSmCwLTaUbDBPLutN0pcyvFLNg4kq7/DhHf9qFD0sefG
+L9ItWY16Ck6WaVICqjaY7Pz6FIMMNx/Jkjd/14Et5cS54D40/mf0PmbR0/RAz15i
+NA9wBj4gGFrO93IbJWyTdBSTo3OxDqqHECNZXyAFGUftaI6SEspd/NYrspI8IM/h
+X68gvqB2f3bl7BqGYTM+53u0P6APjqK5am+5hyZvQWyIplD9amML9ZMWGxmPsu2b
+m8mQ9QEM3xk9Dz44I8kvjwzRAv4bVdZO0I08r0+k8/6vKtMFnXkIoctXMbScyJCy
+Z/QYFpM6/EfY0XiWMR+6KwxfXZmtY4laJCB22N/9q06mIqqdXuYnin1oKaPnirja
+EbsXLZmdEyRG98Xi2J+Of8ePdG1asuhy9azuJBCtLxTa/y2aRnFHvkLfuwHb9H/T
+KI8xWVvTyQKmtFLKbpf7Q8UIJm+K9Lv9nyiqDdVF8xM6HdjAeI9BZzwelGSuewvF
+6NkBiDkal4ZkQdU7hwxu+g/GvUgUvzlN1J5Bto+WHWOWk9mVBngxaJ43BjuAiUVh
+OSPHG0SjFeUc+JIwuwIDAQABo4HvMIHsMBIGA1UdEwEB/wQIMAYBAf8CAQEwDgYD
+VR0PAQH/BAQDAgEGMB0GA1UdDgQWBBRlzeurNR4APn7VdMActHNHDhpkLzCBpgYD
+VR0gBIGeMIGbMIGYBgRVHSAAMIGPMC8GCCsGAQUFBwIBFiNodHRwOi8vd3d3LmZp
+cm1hcHJvZmVzaW9uYWwuY29tL2NwczBcBggrBgEFBQcCAjBQHk4AUABhAHMAZQBv
+ACAAZABlACAAbABhACAAQgBvAG4AYQBuAG8AdgBhACAANAA3ACAAQgBhAHIAYwBl
+AGwAbwBuAGEAIAAwADgAMAAxADcwDQYJKoZIhvcNAQEFBQADggIBABd9oPm03cXF
+661LJLWhAqvdpYhKsg9VSytXjDvlMd3+xDLx51tkljYyGOylMnfX40S2wBEqgLk9
+am58m9Ot/MPWo+ZkKXzR4Tgegiv/J2Wv+xYVxC5xhOW1//qkR71kMrv2JYSiJ0L1
+ILDCExARzRAVukKQKtJE4ZYm6zFIEv0q2skGz3QeqUvVhyj5eTSSPi5E6PaPT481
+PyWzOdxjKpBrIF/EUhJOlywqrJ2X3kjyo2bbwtKDlaZmp54lD+kLM5FlClrD2VQS
+3a/DTg4fJl4N3LON7NWBcN7STyQF82xO9UxJZo3R/9ILJUFI/lGExkKvgATP0H5k
+SeTy36LssUzAKh3ntLFlosS88Zj0qnAHY7S42jtM+kAiMFsRpvAFDsYCA0irhpuF
+3dvd6qJ2gHN99ZwExEWN57kci57q13XRcrHedUTnQn3iV2t93Jm8PYMo6oCTjcVM
+ZcFwgbg4/EMxsvYDNEeyrPsiBsse3RdHHF9mudMaotoRsaS8I8nkvof/uZS2+F0g
+StRf571oe2XyFR7SOqkt6dhrJKyXWERHrVkY8SFlcN7ONGCoQPHzPKTDKCOM/icz
+Q0CgFzzr6juwcqajuUpLXhZI9LK8yIySxZ2frHI2vDSANGupi5LAuBft7HZT9SQB
+jLMi6Et8Vcad+qMUu2WFbm5PEn4KPJ2V
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/d64f06f3.0 b/luni/src/main/files/cacerts/d64f06f3.0
new file mode 100644
index 0000000..ba28a2c
--- /dev/null
+++ b/luni/src/main/files/cacerts/d64f06f3.0
@@ -0,0 +1,90 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=SK, L=Bratislava, O=Disig a.s., CN=CA Disig
+        Validity
+            Not Before: Mar 22 01:39:34 2006 GMT
+            Not After : Mar 22 01:39:34 2016 GMT
+        Subject: C=SK, L=Bratislava, O=Disig a.s., CN=CA Disig
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:92:f6:31:c1:7d:88:fd:99:01:a9:d8:7b:f2:71:
+                    75:f1:31:c6:f3:75:66:fa:51:28:46:84:97:78:34:
+                    bc:6c:fc:bc:45:59:88:26:18:4a:c4:37:1f:a1:4a:
+                    44:bd:e3:71:04:f5:44:17:e2:3f:fc:48:58:6f:5c:
+                    9e:7a:09:ba:51:37:22:23:66:43:21:b0:3c:64:a2:
+                    f8:6a:15:0e:3f:eb:51:e1:54:a9:dd:06:99:d7:9a:
+                    3c:54:8b:39:03:3f:0f:c5:ce:c6:eb:83:72:02:a8:
+                    1f:71:f3:2d:f8:75:08:db:62:4c:e8:fa:ce:f9:e7:
+                    6a:1f:b6:6b:35:82:ba:e2:8f:16:92:7d:05:0c:6c:
+                    46:03:5d:c0:ed:69:bf:3a:c1:8a:a0:e8:8e:d9:b9:
+                    45:28:87:08:ec:b4:ca:15:be:82:dd:b5:44:8b:2d:
+                    ad:86:0c:68:62:6d:85:56:f2:ac:14:63:3a:c6:d1:
+                    99:ac:34:78:56:4b:cf:b6:ad:3f:8c:8a:d7:04:e5:
+                    e3:78:4c:f5:86:aa:f5:8f:fa:3d:6c:71:a3:2d:ca:
+                    67:eb:68:7b:6e:33:a9:0c:82:28:a8:4c:6a:21:40:
+                    15:20:0c:26:5b:83:c2:a9:16:15:c0:24:82:5d:2b:
+                    16:ad:ca:63:f6:74:00:b0:df:43:c4:10:60:56:67:
+                    63:45
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                8D:B2:49:68:9D:72:08:25:B9:C0:27:F5:50:93:56:48:46:71:F9:8F
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Alternative Name: 
+                email:caoperator@disig.sk, URI:http://www.disig.sk/ca
+            X509v3 CRL Distribution Points: 
+                URI:http://www.disig.sk/ca/crl/ca_disig.crl
+                URI:http://ca.disig.sk/ca/crl/ca_disig.crl
+
+            X509v3 Certificate Policies: 
+                Policy: 1.3.158.35975946.0.0.0.1.1.1
+
+    Signature Algorithm: sha1WithRSAEncryption
+        5d:34:74:61:4c:af:3b:d8:ff:9f:6d:58:36:1c:3d:0b:81:0d:
+        12:2b:46:10:80:fd:e7:3c:27:d0:7a:c8:a9:b6:7e:74:30:33:
+        a3:3a:8a:7b:74:c0:79:79:42:93:6d:ff:b1:29:14:82:ab:21:
+        8c:2f:17:f9:3f:26:2f:f5:59:c6:ef:80:06:b7:9a:49:29:ec:
+        ce:7e:71:3c:6a:10:41:c0:f6:d3:9a:b2:7c:5a:91:9c:c0:ac:
+        5b:c8:4d:5e:f7:e1:53:ff:43:77:fc:9e:4b:67:6c:d7:f3:83:
+        d1:a0:e0:7f:25:df:b8:98:0b:9a:32:38:6c:30:a0:f3:ff:08:
+        15:33:f7:50:4a:7b:3e:a3:3e:20:a9:dc:2f:56:80:0a:ed:41:
+        50:b0:c9:f4:ec:b2:e3:26:44:00:0e:6f:9e:06:bc:22:96:53:
+        70:65:c4:50:0a:46:6b:a4:2f:27:81:12:27:13:5f:10:a1:76:
+        ce:8a:7b:37:ea:c3:39:61:03:95:98:3a:e7:6c:88:25:08:fc:
+        79:68:0d:87:7d:62:f8:b4:5f:fb:c5:d8:4c:bd:58:bc:3f:43:
+        5b:d4:1e:01:4d:3c:63:be:23:ef:8c:cd:5a:50:b8:68:54:f9:
+        0a:99:33:11:00:e1:9e:c2:46:77:82:f5:59:06:8c:21:4c:87:
+        09:cd:e5:a8
+SHA1 Fingerprint=2A:C8:D5:8B:57:CE:BF:2F:49:AF:F2:FC:76:8F:51:14:62:90:7A:41
+-----BEGIN CERTIFICATE-----
+MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzET
+MBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UE
+AxMIQ0EgRGlzaWcwHhcNMDYwMzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQsw
+CQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcg
+YS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
+ggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgmGErE
+Nx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnX
+mjxUizkDPw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYD
+XcDtab86wYqg6I7ZuUUohwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhW
+S8+2rT+MitcE5eN4TPWGqvWP+j1scaMtymfraHtuM6kMgiioTGohQBUgDCZbg8Kp
+FhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8wgfwwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0PAQH/BAQD
+AgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cu
+ZGlzaWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5z
+ay9jYS9jcmwvY2FfZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2sv
+Y2EvY3JsL2NhX2Rpc2lnLmNybDAaBgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEw
+DQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59tWDYcPQuBDRIrRhCA/ec8J9B6
+yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3mkkp7M5+cTxq
+EEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/
+CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeB
+EicTXxChds6KezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFN
+PGO+I++MzVpQuGhU+QqZMxEA4Z7CRneC9VkGjCFMhwnN5ag=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/dbc54cab.0 b/luni/src/main/files/cacerts/dbc54cab.0
new file mode 100644
index 0000000..1da3108
--- /dev/null
+++ b/luni/src/main/files/cacerts/dbc54cab.0
@@ -0,0 +1,120 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            6d:8c:14:46:b1:a6:0a:ee
+        Signature Algorithm: sha384WithRSAEncryption
+        Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Premium
+        Validity
+            Not Before: Jan 29 14:10:36 2010 GMT
+            Not After : Dec 31 14:10:36 2040 GMT
+        Subject: C=US, O=AffirmTrust, CN=AffirmTrust Premium
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:c4:12:df:a9:5f:fe:41:dd:dd:f5:9f:8a:e3:f6:
+                    ac:e1:3c:78:9a:bc:d8:f0:7f:7a:a0:33:2a:dc:8d:
+                    20:5b:ae:2d:6f:e7:93:d9:36:70:6a:68:cf:8e:51:
+                    a3:85:5b:67:04:a0:10:24:6f:5d:28:82:c1:97:57:
+                    d8:48:29:13:b6:e1:be:91:4d:df:85:0c:53:18:9a:
+                    1e:24:a2:4f:8f:f0:a2:85:0b:cb:f4:29:7f:d2:a4:
+                    58:ee:26:4d:c9:aa:a8:7b:9a:d9:fa:38:de:44:57:
+                    15:e5:f8:8c:c8:d9:48:e2:0d:16:27:1d:1e:c8:83:
+                    85:25:b7:ba:aa:55:41:cc:03:22:4b:2d:91:8d:8b:
+                    e6:89:af:66:c7:e9:ff:2b:e9:3c:ac:da:d2:b3:c3:
+                    e1:68:9c:89:f8:7a:00:56:de:f4:55:95:6c:fb:ba:
+                    64:dd:62:8b:df:0b:77:32:eb:62:cc:26:9a:9b:bb:
+                    aa:62:83:4c:b4:06:7a:30:c8:29:bf:ed:06:4d:97:
+                    b9:1c:c4:31:2b:d5:5f:bc:53:12:17:9c:99:57:29:
+                    66:77:61:21:31:07:2e:25:49:9d:18:f2:ee:f3:2b:
+                    71:8c:b5:ba:39:07:49:77:fc:ef:2e:92:90:05:8d:
+                    2d:2f:77:7b:ef:43:bf:35:bb:9a:d8:f9:73:a7:2c:
+                    f2:d0:57:ee:28:4e:26:5f:8f:90:68:09:2f:b8:f8:
+                    dc:06:e9:2e:9a:3e:51:a7:d1:22:c4:0a:a7:38:48:
+                    6c:b3:f9:ff:7d:ab:86:57:e3:ba:d6:85:78:77:ba:
+                    43:ea:48:7f:f6:d8:be:23:6d:1e:bf:d1:36:6c:58:
+                    5c:f1:ee:a4:19:54:1a:f5:03:d2:76:e6:e1:8c:bd:
+                    3c:b3:d3:48:4b:e2:c8:f8:7f:92:a8:76:46:9c:42:
+                    65:3e:a4:1e:c1:07:03:5a:46:2d:b8:97:f3:b7:d5:
+                    b2:55:21:ef:ba:dc:4c:00:97:fb:14:95:27:33:bf:
+                    e8:43:47:46:d2:08:99:16:60:3b:9a:7e:d2:e6:ed:
+                    38:ea:ec:01:1e:3c:48:56:49:09:c7:4c:37:00:9e:
+                    88:0e:c0:73:e1:6f:66:e9:72:47:30:3e:10:e5:0b:
+                    03:c9:9a:42:00:6c:c5:94:7e:61:c4:8a:df:7f:82:
+                    1a:0b:59:c4:59:32:77:b3:bc:60:69:56:39:fd:b4:
+                    06:7b:2c:d6:64:36:d9:bd:48:ed:84:1f:7e:a5:22:
+                    8f:2a:b8:42:f4:82:b7:d4:53:90:78:4e:2d:1a:fd:
+                    81:6f:44:d7:3b:01:74:96:42:e0:00:e2:2e:6b:ea:
+                    c5:ee:72:ac:bb:bf:fe:ea:aa:a8:f8:dc:f6:b2:79:
+                    8a:b6:67
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                9D:C0:67:A6:0C:22:D9:26:F5:45:AB:A6:65:52:11:27:D8:45:AC:63
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha384WithRSAEncryption
+        b3:57:4d:10:62:4e:3a:e4:ac:ea:b8:1c:af:32:23:c8:b3:49:
+        5a:51:9c:76:28:8d:79:aa:57:46:17:d5:f5:52:f6:b7:44:e8:
+        08:44:bf:18:84:d2:0b:80:cd:c5:12:fd:00:55:05:61:87:41:
+        dc:b5:24:9e:3c:c4:d8:c8:fb:70:9e:2f:78:96:83:20:36:de:
+        7c:0f:69:13:88:a5:75:36:98:08:a6:c6:df:ac:ce:e3:58:d6:
+        b7:3e:de:ba:f3:eb:34:40:d8:a2:81:f5:78:3f:2f:d5:a5:fc:
+        d9:a2:d4:5e:04:0e:17:ad:fe:41:f0:e5:b2:72:fa:44:82:33:
+        42:e8:2d:58:f7:56:8c:62:3f:ba:42:b0:9c:0c:5c:7e:2e:65:
+        26:5c:53:4f:00:b2:78:7e:a1:0d:99:2d:8d:b8:1d:8e:a2:c4:
+        b0:fd:60:d0:30:a4:8e:c8:04:62:a9:c4:ed:35:de:7a:97:ed:
+        0e:38:5e:92:2f:93:70:a5:a9:9c:6f:a7:7d:13:1d:7e:c6:08:
+        48:b1:5e:67:eb:51:08:25:e9:e6:25:6b:52:29:91:9c:d2:39:
+        73:08:57:de:99:06:b4:5b:9d:10:06:e1:c2:00:a8:b8:1c:4a:
+        02:0a:14:d0:c1:41:ca:fb:8c:35:21:7d:82:38:f2:a9:54:91:
+        19:35:93:94:6d:6a:3a:c5:b2:d0:bb:89:86:93:e8:9b:c9:0f:
+        3a:a7:7a:b8:a1:f0:78:46:fa:fc:37:2f:e5:8a:84:f3:df:fe:
+        04:d9:a1:68:a0:2f:24:e2:09:95:06:d5:95:ca:e1:24:96:eb:
+        7c:f6:93:05:bb:ed:73:e9:2d:d1:75:39:d7:e7:24:db:d8:4e:
+        5f:43:8f:9e:d0:14:39:bf:55:70:48:99:57:31:b4:9c:ee:4a:
+        98:03:96:30:1f:60:06:ee:1b:23:fe:81:60:23:1a:47:62:85:
+        a5:cc:19:34:80:6f:b3:ac:1a:e3:9f:f0:7b:48:ad:d5:01:d9:
+        67:b6:a9:72:93:ea:2d:66:b5:b2:b8:e4:3d:3c:b2:ef:4c:8c:
+        ea:eb:07:bf:ab:35:9a:55:86:bc:18:a6:b5:a8:5e:b4:83:6c:
+        6b:69:40:d3:9f:dc:f1:c3:69:6b:b9:e1:6d:09:f4:f1:aa:50:
+        76:0a:7a:7d:7a:17:a1:55:96:42:99:31:09:dd:60:11:8d:05:
+        30:7e:e6:8e:46:d1:9d:14:da:c7:17:e4:05:96:8c:c4:24:b5:
+        1b:cf:14:07:b2:40:f8:a3:9e:41:86:bc:04:d0:6b:96:c8:2a:
+        80:34:fd:bf:ef:06:a3:dd:58:c5:85:3d:3e:8f:fe:9e:29:e0:
+        b6:b8:09:68:19:1c:18:43
+SHA1 Fingerprint=D8:A6:33:2C:E0:03:6F:B1:85:F6:63:4F:7D:6A:06:65:26:32:28:27
+-----BEGIN CERTIFICATE-----
+MIIFRjCCAy6gAwIBAgIIbYwURrGmCu4wDQYJKoZIhvcNAQEMBQAwQTELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1UcnVz
+dCBQcmVtaXVtMB4XDTEwMDEyOTE0MTAzNloXDTQwMTIzMTE0MTAzNlowQTELMAkG
+A1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MRwwGgYDVQQDDBNBZmZpcm1U
+cnVzdCBQcmVtaXVtMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAxBLf
+qV/+Qd3d9Z+K4/as4Tx4mrzY8H96oDMq3I0gW64tb+eT2TZwamjPjlGjhVtnBKAQ
+JG9dKILBl1fYSCkTtuG+kU3fhQxTGJoeJKJPj/CihQvL9Cl/0qRY7iZNyaqoe5rZ
++jjeRFcV5fiMyNlI4g0WJx0eyIOFJbe6qlVBzAMiSy2RjYvmia9mx+n/K+k8rNrS
+s8PhaJyJ+HoAVt70VZVs+7pk3WKL3wt3MutizCaam7uqYoNMtAZ6MMgpv+0GTZe5
+HMQxK9VfvFMSF5yZVylmd2EhMQcuJUmdGPLu8ytxjLW6OQdJd/zvLpKQBY0tL3d7
+70O/Nbua2Plzpyzy0FfuKE4mX4+QaAkvuPjcBukumj5Rp9EixAqnOEhss/n/fauG
+V+O61oV4d7pD6kh/9ti+I20ev9E2bFhc8e6kGVQa9QPSdubhjL08s9NIS+LI+H+S
+qHZGnEJlPqQewQcDWkYtuJfzt9WyVSHvutxMAJf7FJUnM7/oQ0dG0giZFmA7mn7S
+5u046uwBHjxIVkkJx0w3AJ6IDsBz4W9m6XJHMD4Q5QsDyZpCAGzFlH5hxIrff4Ia
+C1nEWTJ3s7xgaVY5/bQGeyzWZDbZvUjthB9+pSKPKrhC9IK31FOQeE4tGv2Bb0TX
+OwF0lkLgAOIua+rF7nKsu7/+6qqo+Nz2snmKtmcCAwEAAaNCMEAwHQYDVR0OBBYE
+FJ3AZ6YMItkm9UWrpmVSESfYRaxjMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/
+BAQDAgEGMA0GCSqGSIb3DQEBDAUAA4ICAQCzV00QYk465KzquByvMiPIs0laUZx2
+KI15qldGF9X1Uva3ROgIRL8YhNILgM3FEv0AVQVhh0HctSSePMTYyPtwni94loMg
+Nt58D2kTiKV1NpgIpsbfrM7jWNa3Pt668+s0QNiigfV4Py/VpfzZotReBA4Xrf5B
+8OWycvpEgjNC6C1Y91aMYj+6QrCcDFx+LmUmXFNPALJ4fqENmS2NuB2OosSw/WDQ
+MKSOyARiqcTtNd56l+0OOF6SL5Nwpamcb6d9Ex1+xghIsV5n61EIJenmJWtSKZGc
+0jlzCFfemQa0W50QBuHCAKi4HEoCChTQwUHK+4w1IX2COPKpVJEZNZOUbWo6xbLQ
+u4mGk+ibyQ86p3q4ofB4Rvr8Ny/lioTz3/4E2aFooC8k4gmVBtWVyuEklut89pMF
+u+1z6S3RdTnX5yTb2E5fQ4+e0BQ5v1VwSJlXMbSc7kqYA5YwH2AG7hsj/oFgIxpH
+YoWlzBk0gG+zrBrjn/B7SK3VAdlntqlyk+otZrWyuOQ9PLLvTIzq6we/qzWaVYa8
+GKa1qF60g2xraUDTn9zxw2lrueFtCfTxqlB2Cnp9ehehVZZCmTEJ3WARjQUwfuaO
+RtGdFNrHF+QFlozEJLUbzxQHskD4o55BhrwE0GuWyCqANP2/7waj3VjFhT0+j/6e
+KeC2uAloGRwYQw==
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/e48193cf.0 b/luni/src/main/files/cacerts/e48193cf.0
new file mode 100644
index 0000000..a35f76a
--- /dev/null
+++ b/luni/src/main/files/cacerts/e48193cf.0
@@ -0,0 +1,78 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            77:77:06:27:26:a9:b1:7c
+        Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=US, O=AffirmTrust, CN=AffirmTrust Commercial
+        Validity
+            Not Before: Jan 29 14:06:06 2010 GMT
+            Not After : Dec 31 14:06:06 2030 GMT
+        Subject: C=US, O=AffirmTrust, CN=AffirmTrust Commercial
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:f6:1b:4f:67:07:2b:a1:15:f5:06:22:cb:1f:01:
+                    b2:e3:73:45:06:44:49:2c:bb:49:25:14:d6:ce:c3:
+                    b7:ab:2c:4f:c6:41:32:94:57:fa:12:a7:5b:0e:e2:
+                    8f:1f:1e:86:19:a7:aa:b5:2d:b9:5f:0d:8a:c2:af:
+                    85:35:79:32:2d:bb:1c:62:37:f2:b1:5b:4a:3d:ca:
+                    cd:71:5f:e9:42:be:94:e8:c8:de:f9:22:48:64:c6:
+                    e5:ab:c6:2b:6d:ad:05:f0:fa:d5:0b:cf:9a:e5:f0:
+                    50:a4:8b:3b:47:a5:23:5b:7a:7a:f8:33:3f:b8:ef:
+                    99:97:e3:20:c1:d6:28:89:cf:94:fb:b9:45:ed:e3:
+                    40:17:11:d4:74:f0:0b:31:e2:2b:26:6a:9b:4c:57:
+                    ae:ac:20:3e:ba:45:7a:05:f3:bd:9b:69:15:ae:7d:
+                    4e:20:63:c4:35:76:3a:07:02:c9:37:fd:c7:47:ee:
+                    e8:f1:76:1d:73:15:f2:97:a4:b5:c8:7a:79:d9:42:
+                    aa:2b:7f:5c:fe:ce:26:4f:a3:66:81:35:af:44:ba:
+                    54:1e:1c:30:32:65:9d:e6:3c:93:5e:50:4e:7a:e3:
+                    3a:d4:6e:cc:1a:fb:f9:d2:37:ae:24:2a:ab:57:03:
+                    22:28:0d:49:75:7f:b7:28:da:75:bf:8e:e3:dc:0e:
+                    79:31
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                9D:93:C6:53:8B:5E:CA:AF:3F:9F:1E:0F:E5:99:95:BC:24:F6:94:8F
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha256WithRSAEncryption
+        58:ac:f4:04:0e:cd:c0:0d:ff:0a:fd:d4:ba:16:5f:29:bd:7b:
+        68:99:58:49:d2:b4:1d:37:4d:7f:27:7d:46:06:5d:43:c6:86:
+        2e:3e:73:b2:26:7d:4f:93:a9:b6:c4:2a:9a:ab:21:97:14:b1:
+        de:8c:d3:ab:89:15:d8:6b:24:d4:f1:16:ae:d8:a4:5c:d4:7f:
+        51:8e:ed:18:01:b1:93:63:bd:bc:f8:61:80:9a:9e:b1:ce:42:
+        70:e2:a9:7d:06:25:7d:27:a1:fe:6f:ec:b3:1e:24:da:e3:4b:
+        55:1a:00:3b:35:b4:3b:d9:d7:5d:30:fd:81:13:89:f2:c2:06:
+        2b:ed:67:c4:8e:c9:43:b2:5c:6b:15:89:02:bc:62:fc:4e:f2:
+        b5:33:aa:b2:6f:d3:0a:a2:50:e3:f6:3b:e8:2e:44:c2:db:66:
+        38:a9:33:56:48:f1:6d:1b:33:8d:0d:8c:3f:60:37:9d:d3:ca:
+        6d:7e:34:7e:0d:9f:72:76:8b:1b:9f:72:fd:52:35:41:45:02:
+        96:2f:1c:b2:9a:73:49:21:b1:49:47:45:47:b4:ef:6a:34:11:
+        c9:4d:9a:cc:59:b7:d6:02:9e:5a:4e:65:b5:94:ae:1b:df:29:
+        b0:16:f1:bf:00:9e:07:3a:17:64:b5:04:b5:23:21:99:0a:95:
+        3b:97:7c:ef
+SHA1 Fingerprint=F9:B5:B6:32:45:5F:9C:BE:EC:57:5F:80:DC:E9:6E:2C:C7:B2:78:B7
+-----BEGIN CERTIFICATE-----
+MIIDTDCCAjSgAwIBAgIId3cGJyapsXwwDQYJKoZIhvcNAQELBQAwRDELMAkGA1UE
+BhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZpcm1UcnVz
+dCBDb21tZXJjaWFsMB4XDTEwMDEyOTE0MDYwNloXDTMwMTIzMTE0MDYwNlowRDEL
+MAkGA1UEBhMCVVMxFDASBgNVBAoMC0FmZmlybVRydXN0MR8wHQYDVQQDDBZBZmZp
+cm1UcnVzdCBDb21tZXJjaWFsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA9htPZwcroRX1BiLLHwGy43NFBkRJLLtJJRTWzsO3qyxPxkEylFf6EqdbDuKP
+Hx6GGaeqtS25Xw2Kwq+FNXkyLbscYjfysVtKPcrNcV/pQr6U6Mje+SJIZMblq8Yr
+ba0F8PrVC8+a5fBQpIs7R6UjW3p6+DM/uO+Zl+MgwdYoic+U+7lF7eNAFxHUdPAL
+MeIrJmqbTFeurCA+ukV6BfO9m2kVrn1OIGPENXY6BwLJN/3HR+7o8XYdcxXyl6S1
+yHp52UKqK39c/s4mT6NmgTWvRLpUHhwwMmWd5jyTXlBOeuM61G7MGvv50jeuJCqr
+VwMiKA1JdX+3KNp1v47j3A55MQIDAQABo0IwQDAdBgNVHQ4EFgQUnZPGU4teyq8/
+nx4P5ZmVvCT2lI8wDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwDQYJ
+KoZIhvcNAQELBQADggEBAFis9AQOzcAN/wr91LoWXym9e2iZWEnStB03TX8nfUYG
+XUPGhi4+c7ImfU+TqbbEKpqrIZcUsd6M06uJFdhrJNTxFq7YpFzUf1GO7RgBsZNj
+vbz4YYCanrHOQnDiqX0GJX0nof5v7LMeJNrjS1UaADs1tDvZ110w/YETifLCBivt
+Z8SOyUOyXGsViQK8YvxO8rUzqrJv0wqiUOP2O+guRMLbZjipM1ZI8W0bM40NjD9g
+N53Tym1+NH4Nn3J2ixufcv1SNUFFApYvHLKac0khsUlHRUe072o0EclNmsxZt9YC
+nlpOZbWUrhvfKbAW8b8Angc6F2S1BLUjIZkKlTuXfO8=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/e8651083.0 b/luni/src/main/files/cacerts/e8651083.0
new file mode 100644
index 0000000..98d6b34
--- /dev/null
+++ b/luni/src/main/files/cacerts/e8651083.0
@@ -0,0 +1,87 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            c2:7e:43:04:4e:47:3f:19
+        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
+            Not After : Dec 30 11:30:18 2029 GMT
+        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
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    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:
+                    7d:6d:96:6e:a1:0e:44:ee:e1:13:9d:94:42:52:9a:
+                    bd:75:85:74:2c:a8:0e:1d:93:b6:18:b7:8c:2c:a8:
+                    cf:fb:5c:71:b9:da:ec:fe:e8:7e:8f:e4:2f:1d:b2:
+                    a8:75:87:d8:b7:a1:e5:3b:cf:99:4a:46:d0:83:19:
+                    7d:c0:a1:12:1c:95:6d:4a:f4:d8:c7:a5:4d:33:2e:
+                    85:39:40:75:7e:14:7c:80:12:98:50:c7:41:67:b8:
+                    a0:80:61:54:a6:6c:4e:1f:e0:9d:0e:07:e9:c9:ba:
+                    33:e7:fe:c0:55:28:2c:02:80:a7:19:f5:9e:dc:55:
+                    53:03:97:7b:07:48:ff:99:fb:37:8a:24:c4:59:cc:
+                    50:10:63:8e:aa:a9:1a:b0:84:1a:86:f9:5f:bb:b1:
+                    50:6e:a4:d1:0a:cc:d5:71:7e:1f:a7:1b:7c:f5:53:
+                    6e:22:5f:cb:2b:e6:d4:7c:5d:ae:d6:c2:c6:4c:e5:
+                    05:01:d9:ed:57:fc:c1:23:79:fc:fa:c8:24:83:95:
+                    f3:b5:6a:51:01:d0:77:d6:e9:12:a1:f9:1a:83:fb:
+                    82:1b:b9:b0:97:f4:76:06:33:43:49:a0:ff:0b:b5:
+                    fa:b5
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                CB:0F:C6:DF:42:43:CC:3D:CB:B5:48:23:A1:1A:7A:A6:2A:BB:34:68
+            X509v3 Authority Key Identifier: 
+                keyid:CB:0F:C6:DF:42:43:CC:3D:CB:B5:48:23:A1:1A:7A:A6:2A:BB:34:68
+
+            X509v3 Subject Alternative Name: 
+                email:info@e-szigno.hu
+    Signature Algorithm: sha256WithRSAEncryption
+        c9:d1:0e:5e:2e:d5:cc:b3:7c:3e:cb:fc:3d:ff:0d:28:95:93:
+        04:c8:bf:da:cd:79:b8:43:90:f0:a4:be:ef:f2:ef:21:98:bc:
+        d4:d4:5d:06:f6:ee:42:ec:30:6c:a0:aa:a9:ca:f1:af:8a:fa:
+        3f:0b:73:6a:3e:ea:2e:40:7e:1f:ae:54:61:79:eb:2e:08:37:
+        d7:23:f3:8c:9f:be:1d:b1:e1:a4:75:db:a0:e2:54:14:b1:ba:
+        1c:29:a4:18:f6:12:ba:a2:14:14:e3:31:35:c8:40:ff:b7:e0:
+        05:76:57:c1:1c:59:f2:f8:bf:e4:ed:25:62:5c:84:f0:7e:7e:
+        1f:b3:be:f9:b7:21:11:cc:03:01:56:70:a7:10:92:1e:1b:34:
+        81:1e:ad:9c:1a:c3:04:3c:ed:02:61:d6:1e:06:f3:5f:3a:87:
+        f2:2b:f1:45:87:e5:3d:ac:d1:c7:57:84:bd:6b:ae:dc:d8:f9:
+        b6:1b:62:70:0b:3d:36:c9:42:f2:32:d7:7a:61:e6:d2:db:3d:
+        cf:c8:a9:c9:9b:dc:db:58:44:d7:6f:38:af:7f:78:d3:a3:ad:
+        1a:75:ba:1c:c1:36:7c:8f:1e:6d:1c:c3:75:46:ae:35:05:a6:
+        f6:5c:3d:21:ee:56:f0:c9:82:22:2d:7a:54:ab:70:c3:7d:22:
+        65:82:70:96
+SHA1 Fingerprint=89:DF:74:FE:5C:F4:0F:4A:80:F9:E3:37:7D:54:DA:91:E1:01:31:8E
+-----BEGIN CERTIFICATE-----
+MIIECjCCAvKgAwIBAgIJAMJ+QwRORz8ZMA0GCSqGSIb3DQEBCwUAMIGCMQswCQYD
+VQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3QxFjAUBgNVBAoMDU1pY3Jvc2VjIEx0
+ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EgMjAwOTEfMB0G
+CSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5odTAeFw0wOTA2MTYxMTMwMThaFw0y
+OTEyMzAxMTMwMThaMIGCMQswCQYDVQQGEwJIVTERMA8GA1UEBwwIQnVkYXBlc3Qx
+FjAUBgNVBAoMDU1pY3Jvc2VjIEx0ZC4xJzAlBgNVBAMMHk1pY3Jvc2VjIGUtU3pp
+Z25vIFJvb3QgQ0EgMjAwOTEfMB0GCSqGSIb3DQEJARYQaW5mb0BlLXN6aWduby5o
+dTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOn4j/NjrdqG2KfgQvvP
+kd6mJviZpWNwrZuuyjNAfW2WbqEORO7hE52UQlKavXWFdCyoDh2Tthi3jCyoz/tc
+cbna7P7ofo/kLx2yqHWH2Leh5TvPmUpG0IMZfcChEhyVbUr02MelTTMuhTlAdX4U
+fIASmFDHQWe4oIBhVKZsTh/gnQ4H6cm6M+f+wFUoLAKApxn1ntxVUwOXewdI/5n7
+N4okxFnMUBBjjqqpGrCEGob5X7uxUG6k0QrM1XF+H6cbfPVTbiJfyyvm1HxdrtbC
+xkzlBQHZ7Vf8wSN5/PrIJIOV87VqUQHQd9bpEqH5GoP7ghu5sJf0dgYzQ0mg/wu1
++rUCAwEAAaOBgDB+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
+A1UdDgQWBBTLD8bfQkPMPcu1SCOhGnqmKrs0aDAfBgNVHSMEGDAWgBTLD8bfQkPM
+Pcu1SCOhGnqmKrs0aDAbBgNVHREEFDASgRBpbmZvQGUtc3ppZ25vLmh1MA0GCSqG
+SIb3DQEBCwUAA4IBAQDJ0Q5eLtXMs3w+y/w9/w0olZMEyL/azXm4Q5DwpL7v8u8h
+mLzU1F0G9u5C7DBsoKqpyvGvivo/C3NqPuouQH4frlRheesuCDfXI/OMn74dseGk
+ddug4lQUsbocKaQY9hK6ohQU4zE1yED/t+AFdlfBHFny+L/k7SViXITwfn4fs775
+tyERzAMBVnCnEJIeGzSBHq2cGsMEPO0CYdYeBvNfOofyK/FFh+U9rNHHV4S9a67c
+2Pm2G2JwCz02yULyMtd6YebS2z3PyKnJm9zbWETXbzivf3jTo60adbocwTZ8jx5t
+HMN1Rq41Bab2XD0h7lbwyYIiLXpUq3DDfSJlgnCW
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/ea169617.0 b/luni/src/main/files/cacerts/ea169617.0
new file mode 100644
index 0000000..2586ed4
--- /dev/null
+++ b/luni/src/main/files/cacerts/ea169617.0
@@ -0,0 +1,129 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            61:8d:c7:86:3b:01:82:05
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: CN=ACEDICOM Root, OU=PKI, O=EDICOM, C=ES
+        Validity
+            Not Before: Apr 18 16:24:22 2008 GMT
+            Not After : Apr 13 16:24:22 2028 GMT
+        Subject: CN=ACEDICOM Root, OU=PKI, O=EDICOM, C=ES
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:ff:92:95:e1:68:06:76:b4:2c:c8:58:48:ca:fd:
+                    80:54:29:55:63:24:ff:90:65:9b:10:75:7b:c3:6a:
+                    db:62:02:01:f2:18:86:b5:7c:5a:38:b1:e4:58:b9:
+                    fb:d3:d8:2d:9f:bd:32:37:bf:2c:15:6d:be:b5:f4:
+                    21:d2:13:91:d9:07:ad:01:05:d6:f3:bd:77:ce:5f:
+                    42:81:0a:f9:6a:e3:83:00:a8:2b:2e:55:13:63:81:
+                    ca:47:1c:7b:5c:16:57:7a:1b:83:60:04:3a:3e:65:
+                    c3:cd:01:de:de:a4:d6:0c:ba:8e:de:d9:04:ee:17:
+                    56:22:9b:8f:63:fd:4d:16:0b:b7:7b:77:8c:f9:25:
+                    b5:d1:6d:99:12:2e:4f:1a:b8:e6:ea:04:92:ae:3d:
+                    11:b9:51:42:3d:87:b0:31:85:af:79:5a:9c:fe:e7:
+                    4e:5e:92:4f:43:fc:ab:3a:ad:a5:12:26:66:b9:e2:
+                    0c:d7:98:ce:d4:58:a5:95:40:0a:b7:44:9d:13:74:
+                    2b:c2:a5:eb:22:15:98:10:d8:8b:c5:04:9f:1d:8f:
+                    60:e5:06:1b:9b:cf:b9:79:a0:3d:a2:23:3f:42:3f:
+                    6b:fa:1c:03:7b:30:8d:ce:6c:c0:bf:e6:1b:5f:bf:
+                    67:b8:84:19:d5:15:ef:7b:cb:90:36:31:62:c9:bc:
+                    02:ab:46:5f:9b:fe:1a:68:94:34:3d:90:8e:ad:f6:
+                    e4:1d:09:7f:4a:88:38:3f:be:67:fd:34:96:f5:1d:
+                    bc:30:74:cb:38:ee:d5:6c:ab:d4:fc:f4:00:b7:00:
+                    5b:85:32:16:76:33:e9:d8:a3:99:9d:05:00:aa:16:
+                    e6:f3:81:7d:6f:7d:aa:86:6d:ad:15:74:d3:c4:a2:
+                    71:aa:f4:14:7d:e7:32:b8:1f:bc:d5:f1:4e:bd:6f:
+                    17:02:39:d7:0e:95:42:3a:c7:00:3e:e9:26:63:11:
+                    ea:0b:d1:4a:ff:18:9d:b2:d7:7b:2f:3a:d9:96:fb:
+                    e8:1e:92:ae:13:55:c8:d9:27:f6:dc:48:1b:b0:24:
+                    c1:85:e3:77:9d:9a:a4:f3:0c:11:1d:0d:c8:b4:14:
+                    ee:b5:82:57:09:bf:20:58:7f:2f:22:23:d8:70:cb:
+                    79:6c:c9:4b:f2:a9:2a:c8:fc:87:2b:d7:1a:50:f8:
+                    27:e8:2f:43:e3:3a:bd:d8:57:71:fd:ce:a6:52:5b:
+                    f9:dd:4d:ed:e5:f6:6f:89:ed:bb:93:9c:76:21:75:
+                    f0:92:4c:29:f7:2f:9c:01:2e:fe:50:46:9e:64:0c:
+                    14:b3:07:5b:c5:c2:73:6c:f1:07:5c:45:24:14:35:
+                    ae:83:f1:6a:4d:89:7a:fa:b3:d8:2d:66:f0:36:87:
+                    f5:2b:53
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Authority Key Identifier: 
+                keyid:A6:B3:E1:2B:2B:49:B6:D7:73:A1:AA:94:F5:01:E7:73:65:4C:AC:50
+
+            X509v3 Key Usage: critical
+                Digital Signature, Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                A6:B3:E1:2B:2B:49:B6:D7:73:A1:AA:94:F5:01:E7:73:65:4C:AC:50
+            X509v3 Certificate Policies: 
+                Policy: X509v3 Any Policy
+                  CPS: http://acedicom.edicomgroup.com/doc
+
+    Signature Algorithm: sha1WithRSAEncryption
+        ce:2c:0b:52:51:62:26:7d:0c:27:83:8f:c5:f6:da:a0:68:7b:
+        4f:92:5e:ea:a4:73:32:11:53:44:b2:44:cb:9d:ec:0f:79:42:
+        b3:10:a6:c7:0d:9d:cb:b6:fa:3f:3a:7c:ea:bf:88:53:1b:3c:
+        f7:82:fa:05:35:33:e1:35:a8:57:c0:e7:fd:8d:4f:3f:93:32:
+        4f:78:66:03:77:07:58:e9:95:c8:7e:3e:d0:79:00:8c:f2:1b:
+        51:33:9b:bc:94:e9:3a:7b:6e:52:2d:32:9e:23:a4:45:fb:b6:
+        2e:13:b0:8b:18:b1:dd:ce:d5:1d:a7:42:7f:55:be:fb:5b:bb:
+        47:d4:fc:24:cd:04:ae:96:05:15:d6:ac:ce:30:f3:ca:0b:c5:
+        ba:e2:22:e0:a6:ad:22:e4:02:ee:74:11:7f:4c:ff:78:1d:35:
+        da:e6:02:34:eb:18:12:61:77:06:09:16:63:ea:18:ad:a2:87:
+        1f:f2:c7:80:09:09:75:4e:10:a8:8f:3d:86:b8:75:11:c0:24:
+        62:8a:96:7b:4a:45:e9:ec:59:c5:be:6b:83:e6:e1:e8:ac:b5:
+        30:1e:fe:05:07:80:f9:e1:23:0d:50:8f:05:98:ff:2c:5f:e8:
+        3b:b6:ad:cf:81:b5:21:87:ca:08:2a:23:27:30:20:2b:cf:ed:
+        94:5b:ac:b2:7a:d2:c7:28:a1:8a:0b:9b:4d:4a:2c:6d:85:3f:
+        09:72:3c:67:e2:d9:dc:07:ba:eb:65:7b:5a:01:63:d6:90:5b:
+        4f:17:66:3d:7f:0b:19:a3:93:63:10:52:2a:9f:14:16:58:e2:
+        dc:a5:f4:a1:16:8b:0e:91:8b:81:ca:9b:59:fa:d8:6b:91:07:
+        65:55:5f:52:1f:af:3a:fb:90:dd:69:a5:5b:9c:6d:0e:2c:b6:
+        fa:ce:ac:a5:7c:32:4a:67:40:dc:30:34:23:dd:d7:04:23:66:
+        f0:fc:55:80:a7:fb:66:19:82:35:67:62:70:39:5e:6f:c7:ea:
+        90:40:44:08:1e:b8:b2:d6:db:ee:59:a7:0d:18:79:34:bc:54:
+        18:5e:53:ca:34:51:ed:45:0a:e6:8e:c7:82:36:3e:a7:38:63:
+        a9:30:2c:17:10:60:92:9f:55:87:12:59:10:c2:0f:67:69:11:
+        cc:4e:1e:7e:4a:9a:ad:af:40:a8:75:ac:56:90:74:b8:a0:9c:
+        a5:79:6f:dc:e9:1a:c8:69:05:e9:ba:fa:03:b3:7c:e4:e0:4e:
+        c2:ce:9d:e8:b6:46:0d:6e:7e:57:3a:67:94:c2:cb:1f:9c:77:
+        4a:67:4e:69:86:43:93:38:fb:b6:db:4f:83:91:d4:60:7e:4b:
+        3e:2b:38:07:55:98:5e:a4
+SHA1 Fingerprint=E0:B4:32:2E:B2:F6:A5:68:B6:54:53:84:48:18:4A:50:36:87:43:84
+-----BEGIN CERTIFICATE-----
+MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UE
+AwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00x
+CzAJBgNVBAYTAkVTMB4XDTA4MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEW
+MBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZF
+RElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKC
+AgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHkWLn7
+09gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7
+XBZXehuDYAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5P
+Grjm6gSSrj0RuVFCPYewMYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAK
+t0SdE3QrwqXrIhWYENiLxQSfHY9g5QYbm8+5eaA9oiM/Qj9r+hwDezCNzmzAv+Yb
+X79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbkHQl/Sog4P75n/TSW9R28
+MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTTxKJxqvQU
+fecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI
+2Sf23EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyH
+K9caUPgn6C9D4zq92Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEae
+ZAwUswdbxcJzbPEHXEUkFDWug/FqTYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAP
+BgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz4SsrSbbXc6GqlPUB53NlTKxQ
+MA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU9QHnc2VMrFAw
+RAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
+bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWIm
+fQwng4/F9tqgaHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3
+gvoFNTPhNahXwOf9jU8/kzJPeGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKe
+I6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1PwkzQSulgUV1qzOMPPKC8W64iLgpq0i
+5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1ThCojz2GuHURwCRi
+ipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oIKiMn
+MCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZ
+o5NjEFIqnxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6
+zqylfDJKZ0DcMDQj3dcEI2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacN
+GHk0vFQYXlPKNFHtRQrmjseCNj6nOGOpMCwXEGCSn1WHElkQwg9naRHMTh5+Spqt
+r0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3otkYNbn5XOmeUwssfnHdK
+Z05phkOTOPu220+DkdRgfks+KzgHVZhepA==
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/eb375c3e.0 b/luni/src/main/files/cacerts/eb375c3e.0
new file mode 100644
index 0000000..d4c69d3
--- /dev/null
+++ b/luni/src/main/files/cacerts/eb375c3e.0
@@ -0,0 +1,77 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=NO, O=Buypass AS-983163327, CN=Buypass Class 3 CA 1
+        Validity
+            Not Before: May  9 14:13:03 2005 GMT
+            Not After : May  9 14:13:03 2015 GMT
+        Subject: C=NO, O=Buypass AS-983163327, CN=Buypass Class 3 CA 1
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:a4:8e:d7:74:d9:29:64:de:5f:1f:87:80:91:ea:
+                    4e:39:e6:19:c6:44:0b:80:d5:0b:af:53:07:8b:12:
+                    bd:e6:67:f0:02:b1:89:f6:60:8a:c4:5b:b0:42:d1:
+                    c0:21:a8:cb:e1:9b:ef:64:51:b6:a7:cf:15:f5:74:
+                    80:68:04:90:a0:58:a2:e6:74:a6:53:53:55:48:63:
+                    3f:92:56:dd:24:4e:8e:f8:ba:2b:ff:f3:34:8a:9e:
+                    28:d7:34:9f:ac:2f:d6:0f:f1:a4:2f:bd:52:b2:49:
+                    85:6d:39:35:f0:44:30:93:46:24:f3:b6:e7:53:fb:
+                    bc:61:af:a9:a3:14:fb:c2:17:17:84:6c:e0:7c:88:
+                    f8:c9:1c:57:2c:f0:3d:7e:94:bc:25:93:84:e8:9a:
+                    00:9a:45:05:42:57:80:f4:4e:ce:d9:ae:39:f6:c8:
+                    53:10:0c:65:3a:47:7b:60:c2:d6:fa:91:c9:c6:71:
+                    6c:bd:91:87:3c:91:86:49:ab:f3:0f:a0:6c:26:76:
+                    5e:1c:ac:9b:71:e5:8d:bc:9b:21:1e:9c:d6:38:7e:
+                    24:80:15:31:82:96:b1:49:d3:62:37:5b:88:0c:0a:
+                    62:34:fe:a7:48:7e:99:b1:30:8b:90:37:95:1c:a8:
+                    1f:a5:2c:8d:f4:55:c8:db:dd:59:0a:c2:ad:78:a0:
+                    f4:8b
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Subject Key Identifier: 
+                38:14:E6:C8:F0:A9:A4:03:F4:4E:3E:22:A3:5B:F2:D6:E0:AD:40:74
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+    Signature Algorithm: sha1WithRSAEncryption
+        01:67:a3:8c:c9:25:3d:13:63:5d:16:6f:ec:a1:3e:09:5c:91:
+        15:2a:2a:d9:80:21:4f:05:dc:bb:a5:89:ab:13:33:2a:9e:38:
+        b7:8c:6f:02:72:63:c7:73:77:1e:09:06:ba:3b:28:7b:a4:47:
+        c9:61:6b:08:08:20:fc:8a:05:8a:1f:bc:ba:c6:c2:fe:cf:6e:
+        ec:13:33:71:67:2e:69:fa:a9:2c:3f:66:c0:12:59:4d:0b:54:
+        02:92:84:bb:db:12:ef:83:70:70:78:c8:53:fa:df:c6:c6:ff:
+        dc:88:2f:07:c0:49:9d:32:57:60:d3:f2:f6:99:29:5f:e7:aa:
+        01:cc:ac:33:a8:1c:0a:bb:91:c4:03:a0:6f:b6:34:f9:86:d3:
+        b3:76:54:98:f4:4a:81:b3:53:9d:4d:40:ec:e5:77:13:45:af:
+        5b:aa:1f:d8:2f:4c:82:7b:fe:2a:c4:58:bb:4f:fc:9e:fd:03:
+        65:1a:2a:0e:c3:a5:20:16:94:6b:79:a6:a2:12:b4:bb:1a:a4:
+        23:7a:5f:f0:ae:84:24:e4:f3:2b:fb:8a:24:a3:27:98:65:da:
+        30:75:76:fc:19:91:e8:db:eb:9b:3f:32:bf:40:97:07:26:ba:
+        cc:f3:94:85:4a:7a:27:93:cf:90:42:d4:b8:5b:16:a6:e7:cb:
+        40:03:dd:79
+SHA1 Fingerprint=61:57:3A:11:DF:0E:D8:7E:D5:92:65:22:EA:D0:56:D7:44:B3:23:71
+-----BEGIN CERTIFICATE-----
+MIIDUzCCAjugAwIBAgIBAjANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEd
+MBsGA1UECgwUQnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3Mg
+Q2xhc3MgMyBDQSAxMB4XDTA1MDUwOTE0MTMwM1oXDTE1MDUwOTE0MTMwM1owSzEL
+MAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBhc3MgQVMtOTgzMTYzMzI3MR0wGwYD
+VQQDDBRCdXlwYXNzIENsYXNzIDMgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKSO13TZKWTeXx+HgJHqTjnmGcZEC4DVC69TB4sSveZn8AKxifZg
+isRbsELRwCGoy+Gb72RRtqfPFfV0gGgEkKBYouZ0plNTVUhjP5JW3SROjvi6K//z
+NIqeKNc0n6wv1g/xpC+9UrJJhW05NfBEMJNGJPO251P7vGGvqaMU+8IXF4Rs4HyI
++MkcVyzwPX6UvCWThOiaAJpFBUJXgPROztmuOfbIUxAMZTpHe2DC1vqRycZxbL2R
+hzyRhkmr8w+gbCZ2Xhysm3HljbybIR6c1jh+JIAVMYKWsUnTYjdbiAwKYjT+p0h+
+mbEwi5A3lRyoH6UsjfRVyNvdWQrCrXig9IsCAwEAAaNCMEAwDwYDVR0TAQH/BAUw
+AwEB/zAdBgNVHQ4EFgQUOBTmyPCppAP0Tj4io1vy1uCtQHQwDgYDVR0PAQH/BAQD
+AgEGMA0GCSqGSIb3DQEBBQUAA4IBAQABZ6OMySU9E2NdFm/soT4JXJEVKirZgCFP
+Bdy7pYmrEzMqnji3jG8CcmPHc3ceCQa6Oyh7pEfJYWsICCD8igWKH7y6xsL+z27s
+EzNxZy5p+qksP2bAEllNC1QCkoS72xLvg3BweMhT+t/Gxv/ciC8HwEmdMldg0/L2
+mSlf56oBzKwzqBwKu5HEA6BvtjT5htOzdlSY9EqBs1OdTUDs5XcTRa9bqh/YL0yC
+e/4qxFi7T/ye/QNlGioOw6UgFpRreaaiErS7GqQjel/wroQk5PMr+4okoyeYZdow
+dXb8GZHo2+ubPzK/QJcHJrrM85SFSnonk8+QQtS4Wxam58tAA915
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/f80cc7f6.0 b/luni/src/main/files/cacerts/f80cc7f6.0
new file mode 100644
index 0000000..5f1b777
--- /dev/null
+++ b/luni/src/main/files/cacerts/f80cc7f6.0
@@ -0,0 +1,126 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            4c:af:73:42:1c:8e:74:02
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: CN=EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1, O=EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E., C=TR
+        Validity
+            Not Before: Aug 17 00:21:09 2006 GMT
+            Not After : Aug 14 00:31:09 2016 GMT
+        Subject: CN=EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xC4\xB1c\xC4\xB1s\xC4\xB1, O=EBG Bili\xC5\x9Fim Teknolojileri ve Hizmetleri A.\xC5\x9E., C=TR
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (4096 bit)
+                Modulus (4096 bit):
+                    00:ee:a0:84:61:d0:3a:6a:66:10:32:d8:31:38:7f:
+                    a7:a7:e5:fd:a1:e1:fb:97:77:b8:71:96:e8:13:96:
+                    46:83:4f:b6:f2:5f:72:56:6e:13:60:a5:01:91:e2:
+                    5b:c5:cd:57:1f:77:63:51:ff:2f:3d:db:b9:3f:aa:
+                    a9:35:e7:79:d0:f5:d0:24:b6:21:ea:eb:23:94:fe:
+                    29:bf:fb:89:91:0c:64:9a:05:4a:2b:cc:0c:ee:f1:
+                    3d:9b:82:69:a4:4c:f8:9a:6f:e7:22:da:10:ba:5f:
+                    92:fc:18:27:0a:a8:aa:44:fa:2e:2c:b4:fb:46:9a:
+                    08:03:83:72:ab:88:e4:6a:72:c9:e5:65:1f:6e:2a:
+                    0f:9d:b3:e8:3b:e4:0c:6e:7a:da:57:fd:d7:eb:79:
+                    8b:5e:20:06:d3:76:0b:6c:02:95:a3:96:e4:cb:76:
+                    51:d1:28:9d:a1:1a:fc:44:a2:4d:cc:7a:76:a8:0d:
+                    3d:bf:17:4f:22:88:50:fd:ae:b6:ec:90:50:4a:5b:
+                    9f:95:41:aa:ca:0f:b2:4a:fe:80:99:4e:a3:46:15:
+                    ab:f8:73:42:6a:c2:66:76:b1:0a:26:15:dd:93:92:
+                    ec:db:a9:5f:54:22:52:91:70:5d:13:ea:48:ec:6e:
+                    03:6c:d9:dd:6c:fc:eb:0d:03:ff:a6:83:12:9b:f1:
+                    a9:93:0f:c5:26:4c:31:b2:63:99:61:72:e7:2a:64:
+                    99:d2:b8:e9:75:e2:7c:a9:a9:9a:1a:aa:c3:56:db:
+                    10:9a:3c:83:52:b6:7b:96:b7:ac:87:77:a8:b9:f2:
+                    67:0b:94:43:b3:af:3e:73:fa:42:36:b1:25:c5:0a:
+                    31:26:37:56:67:ba:a3:0b:7d:d6:f7:89:cd:67:a1:
+                    b7:3a:1e:66:4f:f6:a0:55:14:25:4c:2c:33:0d:a6:
+                    41:8c:bd:04:31:6a:10:72:0a:9d:0e:2e:76:bd:5e:
+                    f3:51:89:8b:a8:3f:55:73:bf:db:3a:c6:24:05:96:
+                    92:48:aa:4b:8d:2a:03:e5:57:91:10:f4:6a:28:15:
+                    6e:47:77:84:5c:51:74:9f:19:e9:e6:1e:63:16:39:
+                    e3:11:15:e3:58:1a:44:bd:cb:c4:6c:66:d7:84:06:
+                    df:30:f4:37:a2:43:22:79:d2:10:6c:df:bb:e6:13:
+                    11:fc:9d:84:0a:13:7b:f0:3b:d0:fc:a3:0a:d7:89:
+                    ea:96:7e:8d:48:85:1e:64:5f:db:54:a2:ac:d5:7a:
+                    02:79:6b:d2:8a:f0:67:da:65:72:0d:14:70:e4:e9:
+                    8e:78:8f:32:74:7c:57:f2:d6:d6:f4:36:89:1b:f8:
+                    29:6c:8b:b9:f6:97:d1:a4:2e:aa:be:0b:19:c2:45:
+                    e9:70:5d
+                Exponent: 40409 (0x9dd9)
+        X509v3 extensions:
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Key Identifier: 
+                E7:CE:C6:4F:FC:16:67:96:FA:4A:A3:07:C1:04:A7:CB:6A:DE:DA:47
+            X509v3 Authority Key Identifier: 
+                keyid:E7:CE:C6:4F:FC:16:67:96:FA:4A:A3:07:C1:04:A7:CB:6A:DE:DA:47
+
+    Signature Algorithm: sha1WithRSAEncryption
+        9b:98:9a:5d:be:f3:28:23:76:c6:6c:f7:7f:e6:40:9e:c0:36:
+        dc:95:0d:1d:ad:15:c5:36:d8:d5:39:ef:f2:1e:22:5e:b3:82:
+        b4:5d:bb:4c:1a:ca:92:0d:df:47:24:1e:b3:24:da:91:88:e9:
+        83:70:dd:93:d7:e9:ba:b3:df:16:5a:3e:de:e0:c8:fb:d3:fd:
+        6c:29:f8:15:46:a0:68:26:cc:93:52:ae:82:01:93:90:ca:77:
+        ca:4d:49:ef:e2:5a:d9:2a:bd:30:ce:4c:b2:81:b6:30:ce:59:
+        4f:da:59:1d:6a:7a:a4:45:b0:82:26:81:86:76:f5:f5:10:00:
+        b8:ee:b3:09:e8:4f:87:02:07:ae:24:5c:f0:5f:ac:0a:30:cc:
+        8a:40:a0:73:04:c1:fb:89:24:f6:9a:1c:5c:b7:3c:0a:67:36:
+        05:08:31:b3:af:d8:01:68:2a:e0:78:8f:74:de:b8:51:a4:8c:
+        6c:20:3d:a2:fb:b3:d4:09:fd:7b:c2:80:aa:93:6c:29:98:21:
+        a8:bb:16:f3:a9:12:5f:74:b5:87:98:f2:95:26:df:34:ef:8a:
+        53:91:88:5d:1a:94:a3:3f:7c:22:f8:d7:88:ba:a6:8c:96:a8:
+        3d:52:34:62:9f:00:1e:54:55:42:67:c6:4d:46:8f:bb:14:45:
+        3d:0a:96:16:8e:10:a1:97:99:d5:d3:30:85:cc:de:b4:72:b7:
+        bc:8a:3c:18:29:68:fd:dc:71:07:ee:24:39:6a:fa:ed:a5:ac:
+        38:2f:f9:1e:10:0e:06:71:1a:10:4c:fe:75:7e:ff:1e:57:39:
+        42:ca:d7:e1:15:a1:56:55:59:1b:d1:a3:af:11:d8:4e:c3:a5:
+        2b:ef:90:bf:c0:ec:82:13:5b:8d:d6:72:2c:93:4e:8f:6a:29:
+        df:85:3c:d3:0d:e0:a2:18:12:cc:55:2f:47:b7:a7:9b:02:fe:
+        41:f6:88:4c:6d:da:a9:01:47:83:64:27:62:10:82:d6:12:7b:
+        5e:03:1f:34:a9:c9:91:fe:af:5d:6d:86:27:b7:23:aa:75:18:
+        ca:20:e7:b0:0f:d7:89:0e:a6:67:22:63:f4:83:41:2b:06:4b:
+        bb:58:d5:d1:d7:b7:b9:10:63:d8:89:4a:b4:aa:dd:16:63:f5:
+        6e:be:60:a1:f8:ed:e8:d6:90:4f:1a:c6:c5:a0:29:d3:a7:21:
+        a8:f5:5a:3c:f7:c7:49:a2:21:9a:4a:95:52:20:96:72:9a:66:
+        cb:f7:d2:86:43:7c:22:be:96:f9:bd:01:a8:47:dd:e5:3b:40:
+        f9:75:2b:9b:2b:46:64:86:8d:1e:f4:8f:fb:07:77:d0:ea:49:
+        a2:1c:8d:52:14:a6:0a:93
+SHA1 Fingerprint=8C:96:BA:EB:DD:2B:07:07:48:EE:30:32:66:A0:F3:98:6E:7C:AE:58
+-----BEGIN CERTIFICATE-----
+MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNV
+BAMML0VCRyBFbGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sx
+c8SxMTcwNQYDVQQKDC5FQkcgQmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXpt
+ZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAeFw0wNjA4MTcwMDIxMDlaFw0xNjA4
+MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25payBTZXJ0aWZpa2Eg
+SGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2ltIFRl
+a25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIi
+MA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h
+4fuXd7hxlugTlkaDT7byX3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAk
+tiHq6yOU/im/+4mRDGSaBUorzAzu8T2bgmmkTPiab+ci2hC6X5L8GCcKqKpE+i4s
+tPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfreYteIAbTdgtsApWjluTL
+dlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZTqNGFav4
+c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8Um
+TDGyY5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z
++kI2sSXFCjEmN1ZnuqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0O
+Lna9XvNRiYuoP1Vzv9s6xiQFlpJIqkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMW
+OeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vmExH8nYQKE3vwO9D8owrXieqW
+fo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0Nokb+Clsi7n2
+l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB
+/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgw
+FoAU587GT/wWZ5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+
+8ygjdsZs93/mQJ7ANtyVDR2tFcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI
+6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgmzJNSroIBk5DKd8pNSe/iWtkqvTDO
+TLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64kXPBfrAowzIpAoHME
+wfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqTbCmY
+Iai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJn
+xk1Gj7sURT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4Q
+DgZxGhBM/nV+/x5XOULK1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9q
+Kd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11t
+hie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQY9iJSrSq3RZj9W6+YKH4
+7ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9AahH3eU7
+QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT
+-----END CERTIFICATE-----
diff --git a/luni/src/main/files/cacerts/fac084d7.0 b/luni/src/main/files/cacerts/fac084d7.0
new file mode 100644
index 0000000..282ce58
--- /dev/null
+++ b/luni/src/main/files/cacerts/fac084d7.0
@@ -0,0 +1,81 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 49 (0x31)
+        Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=JP, O=Japanese Government, OU=ApplicationCA
+        Validity
+            Not Before: Dec 12 15:00:00 2007 GMT
+            Not After : Dec 12 15:00:00 2017 GMT
+        Subject: C=JP, O=Japanese Government, OU=ApplicationCA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+            RSA Public Key: (2048 bit)
+                Modulus (2048 bit):
+                    00:a7:6d:e0:74:4e:87:8f:a5:06:de:68:a2:db:86:
+                    99:4b:64:0d:71:f0:0a:05:9b:8e:aa:e1:cc:2e:d2:
+                    6a:3b:c1:7a:b4:97:61:8d:8a:be:c6:9a:9c:06:b4:
+                    86:51:e4:37:0e:74:78:7e:5f:8a:7f:94:a4:d7:47:
+                    08:fd:50:5a:56:e4:68:ac:28:73:a0:7b:e9:7f:18:
+                    92:40:4f:2d:9d:f5:ae:44:48:73:36:06:9e:64:2c:
+                    3b:34:23:db:5c:26:e4:71:79:8f:d4:6e:79:22:b9:
+                    93:c1:ca:cd:c1:56:ed:88:6a:d7:a0:39:21:04:57:
+                    2c:a2:f5:bc:47:41:4f:5e:34:22:95:b5:1f:29:6d:
+                    5e:4a:f3:4d:72:be:41:56:20:87:fc:e9:50:47:d7:
+                    30:14:ee:5c:8c:55:ba:59:8d:87:fc:23:de:93:d0:
+                    04:8c:fd:ef:6d:bd:d0:7a:c9:a5:3a:6a:72:33:c6:
+                    4a:0d:05:17:2a:2d:7b:b1:a7:d8:d6:f0:be:f4:3f:
+                    ea:0e:28:6d:41:61:23:76:78:c3:b8:65:a4:f3:5a:
+                    ae:cc:c2:aa:d9:e7:58:de:b6:7e:9d:85:6e:9f:2a:
+                    0a:6f:9f:03:29:30:97:28:1d:bc:b7:cf:54:29:4e:
+                    51:31:f9:27:b6:28:26:fe:a2:63:e6:41:16:f0:33:
+                    98:47
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                54:5A:CB:26:3F:71:CC:94:46:0D:96:53:EA:6B:48:D0:93:FE:42:75
+            X509v3 Key Usage: critical
+                Certificate Sign, CRL Sign
+            X509v3 Subject Alternative Name: 
+                DirName:/C=JP/O=\xE6\x97\xA5\xE6\x9C\xAC\xE5\x9B\xBD\xE6\x94\xBF\xE5\xBA\x9C/OU=\xE3\x82\xA2\xE3\x83\x97\xE3\x83\xAA\xE3\x82\xB1\xE3\x83\xBC\xE3\x82\xB7\xE3\x83\xA7\xE3\x83\xB3CA
+            X509v3 Basic Constraints: critical
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+        39:6a:44:76:77:38:3a:ec:a3:67:46:0f:f9:8b:06:a8:fb:6a:
+        90:31:ce:7e:ec:da:d1:89:7c:7a:eb:2e:0c:bd:99:32:e7:b0:
+        24:d6:c3:ff:f5:b2:88:09:87:2c:e3:54:e1:a3:a6:b2:08:0b:
+        c0:85:a8:c8:d2:9c:71:f6:1d:9f:60:fc:38:33:13:e1:9e:dc:
+        0b:5f:da:16:50:29:7b:2f:70:91:0f:99:ba:34:34:8d:95:74:
+        c5:7e:78:a9:66:5d:bd:ca:21:77:42:10:ac:66:26:3d:de:91:
+        ab:fd:15:f0:6f:ed:6c:5f:10:f8:f3:16:f6:03:8a:8f:a7:12:
+        11:0c:cb:fd:3f:79:c1:9c:fd:62:ee:a3:cf:54:0c:d1:2b:5f:
+        17:3e:e3:3e:bf:c0:2b:3e:09:9b:fe:88:a6:7e:b4:92:17:fc:
+        23:94:81:bd:6e:a7:c5:8c:c2:eb:11:45:db:f8:41:c9:96:76:
+        ea:70:5f:79:12:6b:e4:a3:07:5a:05:ef:27:49:cf:21:9f:8a:
+        4c:09:70:66:a9:26:c1:2b:11:4e:33:d2:0e:fc:d6:6c:d2:0e:
+        32:64:68:ff:ad:05:78:5f:03:1d:a8:e3:90:ac:24:e0:0f:40:
+        a7:4b:ae:8b:28:b7:82:ca:18:07:e6:b7:5b:74:e9:20:19:7f:
+        b2:1b:89:54
+SHA1 Fingerprint=7F:8A:B0:CF:D0:51:87:6A:66:F3:36:0F:47:C8:8D:8C:D3:35:FC:74
+-----BEGIN CERTIFICATE-----
+MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEc
+MBoGA1UEChMTSmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRp
+b25DQTAeFw0wNzEyMTIxNTAwMDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYT
+AkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zlcm5tZW50MRYwFAYDVQQLEw1BcHBs
+aWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp23gdE6H
+j6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4fl+K
+f5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55
+IrmTwcrNwVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cw
+FO5cjFW6WY2H/CPek9AEjP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDiht
+QWEjdnjDuGWk81quzMKq2edY3rZ+nYVunyoKb58DKTCXKB28t89UKU5RMfkntigm
+/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRUWssmP3HMlEYNllPqa0jQ
+k/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNVBAYTAkpQ
+MRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOC
+seODvOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQAD
+ggEBADlqRHZ3ODrso2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJ
+hyzjVOGjprIIC8CFqMjSnHH2HZ9g/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+
+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYDio+nEhEMy/0/ecGc/WLuo89U
+DNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmWdupwX3kSa+Sj
+B1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL
+rosot4LKGAfmt1t06SAZf7IbiVQ=
+-----END CERTIFICATE-----
diff --git a/luni/src/main/java/java/util/zip/DeflaterOutputStream.java b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
index 7cb47db..e49633f 100644
--- a/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
+++ b/luni/src/main/java/java/util/zip/DeflaterOutputStream.java
@@ -132,11 +132,10 @@
      *             If an error occurs during deflation.
      */
     protected void deflate() throws IOException {
-        int x = 0;
-        do {
-            x = def.deflate(buf);
-            out.write(buf, 0, x);
-        } while (!def.needsInput());
+        int byteCount;
+        while ((byteCount = def.deflate(buf)) != 0) {
+            out.write(buf, 0, byteCount);
+        }
     }
 
     /**
@@ -169,13 +168,12 @@
             return;
         }
         def.finish();
-        int x = 0;
         while (!def.finished()) {
             if (def.needsInput()) {
                 def.setInput(buf, 0, 0);
             }
-            x = def.deflate(buf);
-            out.write(buf, 0, x);
+            int byteCount = def.deflate(buf);
+            out.write(buf, 0, byteCount);
         }
         done = true;
     }
@@ -229,8 +227,10 @@
      */
     @Override public void flush() throws IOException {
         if (syncFlush) {
-            int count = def.deflate(buf, 0, buf.length, Deflater.SYNC_FLUSH);
-            out.write(buf, 0, count);
+            int byteCount;
+            while ((byteCount = def.deflate(buf, 0, buf.length, Deflater.SYNC_FLUSH)) != 0) {
+                out.write(buf, 0, byteCount);
+            }
         }
         out.flush();
     }
diff --git a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/UnknownLengthHttpInputStream.java b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/UnknownLengthHttpInputStream.java
index 7bb4abb..574f509 100644
--- a/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/UnknownLengthHttpInputStream.java
+++ b/luni/src/main/java/org/apache/harmony/luni/internal/net/www/protocol/http/UnknownLengthHttpInputStream.java
@@ -34,7 +34,7 @@
     @Override public int read(byte[] buffer, int offset, int count) throws IOException {
         checkBounds(buffer, offset, count);
         checkNotClosed();
-        if (in == null) {
+        if (in == null || inputExhausted) {
             return -1;
         }
         int read = in.read(buffer, offset, count);
diff --git a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
index 5870f60..d8f79bc 100644
--- a/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
+++ b/luni/src/main/java/org/apache/harmony/security/provider/cert/X509CertImpl.java
@@ -71,27 +71,26 @@
     private final Certificate certificate;
 
     // to speed up access to the info, the following fields
-    // cache values retrieved from the certificate object
+    // cache values retrieved from the certificate object,
+    // initialized using the "single-check idiom".
     private final TBSCertificate tbsCert;
     private final Extensions extensions;
-    private long notBefore = -1;
-    private long notAfter;
-    private BigInteger serialNumber;
-    private X500Principal issuer;
-    private X500Principal subject;
-    private byte[] tbsCertificate;
-    private byte[] signature;
-    private String sigAlgName;
-    private String sigAlgOID;
-    private byte[] sigAlgParams;
+    private volatile long notBefore = -1;
+    private volatile long notAfter = -1;
+    private volatile BigInteger serialNumber;
+    private volatile X500Principal issuer;
+    private volatile X500Principal subject;
+    private volatile byte[] tbsCertificate;
+    private volatile byte[] signature;
+    private volatile String sigAlgName;
+    private volatile String sigAlgOID;
+    private volatile byte[] sigAlgParams;
     // indicates whether the signature algorithm parameters are null
-    private boolean nullSigAlgParams;
-    private PublicKey publicKey;
+    private volatile boolean nullSigAlgParams;
+    private volatile PublicKey publicKey;
 
     // encoding of the certificate
-// BEGIN android-changed
     private volatile byte[] encoding;
-// END android-changed
 
     //
     // ---------------------- Constructors -------------------------------
@@ -144,20 +143,9 @@
      * @see java.security.cert.X509Certificate#checkValidity()
      * method documentation for more information.
      */
-    public void checkValidity() throws CertificateExpiredException,
-                                       CertificateNotYetValidException {
-        if (notBefore == -1) {
-            // retrieve and cache the value of validity period
-            notBefore = tbsCert.getValidity().getNotBefore().getTime();
-            notAfter = tbsCert.getValidity().getNotAfter().getTime();
-        }
-        long time = System.currentTimeMillis();
-        if (time < notBefore) {
-            throw new CertificateNotYetValidException();
-        }
-        if (time > notAfter) {
-            throw new CertificateExpiredException();
-        }
+    public void checkValidity()
+            throws CertificateExpiredException, CertificateNotYetValidException {
+        checkValidity(System.currentTimeMillis());
     }
 
     /**
@@ -165,25 +153,19 @@
      * method documentation for more information.
      */
     public void checkValidity(Date date)
-                                throws CertificateExpiredException,
-                                       CertificateNotYetValidException {
-        if (notBefore == -1) {
-            // retrieve and cache the value of validity period
-            notBefore = tbsCert.getValidity().getNotBefore().getTime();
-            notAfter = tbsCert.getValidity().getNotAfter().getTime();
+            throws CertificateExpiredException, CertificateNotYetValidException {
+        checkValidity(date.getTime());
+    }
+
+    private void checkValidity(long time)
+            throws CertificateExpiredException, CertificateNotYetValidException {
+        if (time < getNotBeforeInternal()) {
+            throw new CertificateNotYetValidException("current time: " + new Date(time)
+                + ", validation time: " + new Date(getNotBeforeInternal()));
         }
-        long time = date.getTime();
-        if (time < notBefore) {
-            // BEGIN android-changed
-            throw new CertificateNotYetValidException("current time: " + date
-                + ", validation time: " + new Date(notBefore));
-            // END android-changed
-        }
-        if (time > notAfter) {
-            // BEGIN android-changed
-            throw new CertificateExpiredException("current time: " + date
-                + ", expiration time: " + new Date(notAfter));
-            // END android-changed
+        if (time > getNotAfterInternal()) {
+            throw new CertificateExpiredException("current time: " + new Date(time)
+                + ", expiration time: " + new Date(getNotAfterInternal()));
         }
     }
 
@@ -200,10 +182,11 @@
      * method documentation for more information.
      */
     public BigInteger getSerialNumber() {
-        if (serialNumber == null) {
-            serialNumber = tbsCert.getSerialNumber();
+        BigInteger result = serialNumber;
+        if (result == null) {
+            serialNumber = result = tbsCert.getSerialNumber();
         }
-        return serialNumber;
+        return result;
     }
 
     /**
@@ -211,11 +194,7 @@
      * method documentation for more information.
      */
     public Principal getIssuerDN() {
-        if (issuer == null) {
-            // retrieve the issuer's principal
-            issuer = tbsCert.getIssuer().getX500Principal();
-        }
-        return issuer;
+        return getIssuerX500Principal();
     }
 
     /**
@@ -223,11 +202,12 @@
      * method documentation for more information.
      */
     public X500Principal getIssuerX500Principal() {
-        if (issuer == null) {
+        X500Principal result = issuer;
+        if (result == null) {
             // retrieve the issuer's principal
-            issuer = tbsCert.getIssuer().getX500Principal();
+            issuer = result = tbsCert.getIssuer().getX500Principal();
         }
-        return issuer;
+        return result;
     }
 
     /**
@@ -235,11 +215,7 @@
      * method documentation for more information.
      */
     public Principal getSubjectDN() {
-        if (subject == null) {
-            // retrieve the subject's principal
-            subject = tbsCert.getSubject().getX500Principal();
-        }
-        return subject;
+        return getSubjectX500Principal();
     }
 
     /**
@@ -247,11 +223,12 @@
      * method documentation for more information.
      */
     public X500Principal getSubjectX500Principal() {
-        if (subject == null) {
+        X500Principal result = subject;
+        if (result == null) {
             // retrieve the subject's principal
-            subject = tbsCert.getSubject().getX500Principal();
+            subject = result = tbsCert.getSubject().getX500Principal();
         }
-        return subject;
+        return result;
     }
 
     /**
@@ -259,12 +236,14 @@
      * method documentation for more information.
      */
     public Date getNotBefore() {
-        if (notBefore == -1) {
-            // the value was not retrieved from the certificate, do it:
-            notBefore = tbsCert.getValidity().getNotBefore().getTime();
-            notAfter = tbsCert.getValidity().getNotAfter().getTime();
+        return new Date(getNotBeforeInternal());
+    }
+    private long getNotBeforeInternal() {
+        long result = notBefore;
+        if (result == -1) {
+            notBefore = result = tbsCert.getValidity().getNotBefore().getTime();
         }
-        return new Date(notBefore);
+        return result;
     }
 
     /**
@@ -272,26 +251,28 @@
      * method documentation for more information.
      */
     public Date getNotAfter() {
-        if (notBefore == -1) {
-            // the value was not retrieved from the certificate, do it:
-            notBefore = tbsCert.getValidity().getNotBefore().getTime();
-            notAfter = tbsCert.getValidity().getNotAfter().getTime();
+        return new Date(getNotAfterInternal());
+    }
+    private long getNotAfterInternal() {
+        long result = notAfter;
+        if (result == -1) {
+            notAfter = result = tbsCert.getValidity().getNotAfter().getTime();
         }
-        return new Date(notAfter);
+        return result;
     }
 
     /**
      * @see java.security.cert.X509Certificate#getTBSCertificate()
      * method documentation for more information.
      */
-    public byte[] getTBSCertificate()
-                        throws CertificateEncodingException {
-        if (tbsCertificate == null) {
-            // retrieve the encoded form of the TBSCertificate structure
-            tbsCertificate = tbsCert.getEncoded();
+    public byte[] getTBSCertificate() throws CertificateEncodingException {
+        return getTbsCertificateInternal().clone();
+    }
+    private byte[] getTbsCertificateInternal() {
+        byte[] result = tbsCertificate;
+        if (result == null) {
+            tbsCertificate = result = tbsCert.getEncoded();
         }
-        byte[] result = new byte[tbsCertificate.length];
-        System.arraycopy(tbsCertificate, 0, result, 0, tbsCertificate.length);
         return result;
     }
 
@@ -300,12 +281,13 @@
      * method documentation for more information.
      */
     public byte[] getSignature() {
-        if (signature == null) {
-            // retrieve the value of the signature
-            signature = certificate.getSignatureValue();
+        return getSignatureInternal().clone();
+    }
+    private byte[] getSignatureInternal() {
+        byte[] result = signature;
+        if (result == null) {
+            signature = result = certificate.getSignatureValue();
         }
-        byte[] result = new byte[signature.length];
-        System.arraycopy(signature, 0, result, 0, signature.length);
         return result;
     }
 
@@ -314,17 +296,18 @@
      * method documentation for more information.
      */
     public String getSigAlgName() {
-        if (sigAlgOID == null) {
-            // if info was not retrieved (and cached), do it:
-            sigAlgOID = tbsCert.getSignature().getAlgorithm();
+        String result = sigAlgName;
+        if (result == null) {
+            String sigAlgOIDLocal = getSigAlgOID();
             // retrieve the name of the signing algorithm
-            sigAlgName = AlgNameMapper.map2AlgName(sigAlgOID);
-            if (sigAlgName == null) {
+            result = AlgNameMapper.map2AlgName(sigAlgOIDLocal);
+            if (result == null) {
                 // if could not be found, use OID as a name
-                sigAlgName = sigAlgOID;
+                result = sigAlgOIDLocal;
             }
+            sigAlgName = result;
         }
-        return sigAlgName;
+        return result;
     }
 
     /**
@@ -332,17 +315,12 @@
      * method documentation for more information.
      */
     public String getSigAlgOID() {
-        if (sigAlgOID == null) {
+        String result = sigAlgOID;
+        if (result == null) {
             // if info was not retrieved (and cached), do it:
-            sigAlgOID = tbsCert.getSignature().getAlgorithm();
-            // retrieve the name of the signing algorithm
-            sigAlgName = AlgNameMapper.map2AlgName(sigAlgOID);
-            if (sigAlgName == null) {
-                // if could not be found, use OID as a name
-                sigAlgName = sigAlgOID;
-            }
+            sigAlgOID = result = tbsCert.getSignature().getAlgorithm();
         }
-        return sigAlgOID;
+        return result;
     }
 
     /**
@@ -353,14 +331,16 @@
         if (nullSigAlgParams) {
             return null;
         }
-        if (sigAlgParams == null) {
-            sigAlgParams = tbsCert.getSignature().getParameters();
-            if (sigAlgParams == null) {
+        byte[] result = sigAlgParams;
+        if (result == null) {
+            result = tbsCert.getSignature().getParameters();
+            if (result == null) {
                 nullSigAlgParams = true;
                 return null;
             }
+            sigAlgParams = result;
         }
-        return sigAlgParams;
+        return result;
     }
 
     /**
@@ -464,11 +444,13 @@
      * method documentation for more information.
      */
     public byte[] getEncoded() throws CertificateEncodingException {
+        return getEncodedInternal().clone();
+    }
+    private byte[] getEncodedInternal() throws CertificateEncodingException {
+        byte[] result = encoding;
         if (encoding == null) {
-            encoding = certificate.getEncoded();
+            encoding = result = certificate.getEncoded();
         }
-        byte[] result = new byte[encoding.length];
-        System.arraycopy(encoding, 0, result, 0, encoding.length);
         return result;
     }
 
@@ -477,12 +459,11 @@
      * method documentation for more information.
      */
     public PublicKey getPublicKey() {
-        if (publicKey == null) {
-            // retrieve the public key from SubjectPublicKeyInfo
-            // substructure of X.509 certificate
-            publicKey = tbsCert.getSubjectPublicKeyInfo().getPublicKey();
+        PublicKey result = publicKey;
+        if (result == null) {
+            publicKey = result = tbsCert.getSubjectPublicKeyInfo().getPublicKey();
         }
-        return publicKey;
+        return result;
     }
 
     /**
@@ -502,22 +483,17 @@
                          throws CertificateException, NoSuchAlgorithmException,
                                 InvalidKeyException, NoSuchProviderException,
                                 SignatureException {
-
-        // BEGIN android-added
         if (getSigAlgName().endsWith("withRSA")) {
             fastVerify(key);
             return;
         }
-        // END android-added
 
         Signature signature = Signature.getInstance(getSigAlgName());
         signature.initVerify(key);
         // retrieve the encoding of the TBSCertificate structure
-        if (tbsCertificate == null) {
-            tbsCertificate = tbsCert.getEncoded();
-        }
+        byte[] tbsCertificateLocal = getTbsCertificateInternal();
         // compute and verify the signature
-        signature.update(tbsCertificate, 0, tbsCertificate.length);
+        signature.update(tbsCertificateLocal, 0, tbsCertificateLocal.length);
         if (!signature.verify(certificate.getSignatureValue())) {
             throw new SignatureException("Signature was not verified");
         }
@@ -532,29 +508,23 @@
                          throws CertificateException, NoSuchAlgorithmException,
                                 InvalidKeyException, NoSuchProviderException,
                                 SignatureException {
-
-        // BEGIN android-added
         if (getSigAlgName().endsWith("withRSA")) {
             fastVerify(key);
             return;
         }
-        // END android-added
 
         Signature signature =
             Signature.getInstance(getSigAlgName(), sigProvider);
         signature.initVerify(key);
         // retrieve the encoding of the TBSCertificate structure
-        if (tbsCertificate == null) {
-            tbsCertificate = tbsCert.getEncoded();
-        }
+        byte[] tbsCertificateLocal = getTbsCertificateInternal();
         // compute and verify the signature
-        signature.update(tbsCertificate, 0, tbsCertificate.length);
+        signature.update(tbsCertificateLocal, 0, tbsCertificateLocal.length);
         if (!signature.verify(certificate.getSignatureValue())) {
             throw new SignatureException("Signature was not verified");
         }
     }
 
-    // BEGIN android-added
     /**
      * Implements a faster RSA verification method that delegates to OpenSSL
      * native code. In all other aspects it behaves just like the ordinary
@@ -586,16 +556,12 @@
         int i = algorithm.indexOf("with");
         algorithm = algorithm.substring(i + 4) + "-" + algorithm.substring(0, i);
 
-        if (tbsCertificate == null) {
-            tbsCertificate = tbsCert.getEncoded();
-        }
-
+        byte[] tbsCertificateLocal = getTbsCertificateInternal();
         byte[] sig = certificate.getSignatureValue();
-        if (!NativeCrypto.verifySignature(tbsCertificate, sig, algorithm, rsaKey)) {
+        if (!NativeCrypto.verifySignature(tbsCertificateLocal, sig, algorithm, rsaKey)) {
             throw new SignatureException("Signature was not verified");
         }
     }
-    // END android-added
 
     //
     // ----- java.security.cert.X509Extension methods implementations ----
diff --git a/luni/src/main/native/NativeCrypto.cpp b/luni/src/main/native/NativeCrypto.cpp
index f94b7e7..047a1f5 100644
--- a/luni/src/main/native/NativeCrypto.cpp
+++ b/luni/src/main/native/NativeCrypto.cpp
@@ -1285,6 +1285,9 @@
         if (pipe(appData.get()->fdsEmergency) == -1) {
             return NULL;
         }
+        if (!setBlocking(appData.get()->fdsEmergency[0], false)) {
+            return NULL;
+        }
         if (MUTEX_SETUP(appData.get()->mutex) == -1) {
             return NULL;
         }
@@ -1345,7 +1348,7 @@
 /**
  * Dark magic helper function that checks, for a given SSL session, whether it
  * can SSL_read() or SSL_write() without blocking. Takes into account any
- * concurrent attempts to close the SSL session from the Java side. This is
+ * concurrent attempts to close the SSLSocket from the Java side. This is
  * needed to get rid of the hangs that occur when thread #1 closes the SSLSocket
  * while thread #2 is sitting in a blocking read or write. The type argument
  * specifies whether we are waiting for readability or writability. It expects
@@ -1393,7 +1396,7 @@
 
         FD_SET(appData->fdsEmergency[0], &rfds);
 
-        int max = intFd > appData->fdsEmergency[0] ? intFd : appData->fdsEmergency[0];
+        int maxFd = (intFd > appData->fdsEmergency[0]) ? intFd : appData->fdsEmergency[0];
 
         // Build a struct for the timeout data if we actually want a timeout.
         timeval tv;
@@ -1406,32 +1409,33 @@
             ptv = NULL;
         }
 
-        {
-            AsynchronousSocketCloseMonitor monitor(intFd);
-            result = select(max + 1, &rfds, &wfds, NULL, ptv);
-            JNI_TRACE("sslSelect %s fd=%d appData=%p timeout=%d => %d",
-                      (type == SSL_ERROR_WANT_READ) ? "READ" : "WRITE",
-                      fd.get(), appData, timeout, result);
-            if (result == -1) {
-                if (fd.isClosed()) {
-                    result = THROWN_SOCKETEXCEPTION;
-                    break;
-                }
-                if (errno != EINTR) {
-                    break;
-                }
+        AsynchronousSocketCloseMonitor monitor(intFd);
+        result = select(maxFd + 1, &rfds, &wfds, NULL, ptv);
+        JNI_TRACE("sslSelect %s fd=%d appData=%p timeout=%d => %d",
+                  (type == SSL_ERROR_WANT_READ) ? "READ" : "WRITE",
+                  fd.get(), appData, timeout, result);
+        if (result == -1) {
+            if (fd.isClosed()) {
+                result = THROWN_SOCKETEXCEPTION;
+                break;
+            }
+            if (errno != EINTR) {
+                break;
             }
         }
     } while (result == -1);
 
-    // Lock
     if (MUTEX_LOCK(appData->mutex) == -1) {
         return -1;
     }
 
     if (result > 0) {
-        // If we have been woken up by the emergency pipe, there must be a token in
-        // it. Thus we can safely read it (even in a blocking way).
+        // If we have been woken up by the emergency pipe. We can't be
+        // sure there is a token in it because it could have been read
+        // by the thread that wrote it between when when we woke up
+        // from select and attempt to read it here. Thus we cannot
+        // safely read it in a blocking way (so we make it
+        // non-blocking at creation).
         if (FD_ISSET(appData->fdsEmergency[0], &rfds)) {
             char token;
             do {
@@ -1444,7 +1448,6 @@
     // underlying network.
     appData->waitingThreads--;
 
-    // Unlock
     MUTEX_UNLOCK(appData->mutex);
 
     return result;
@@ -2421,6 +2424,7 @@
     ret = 0;
     while (appData->aliveAndKicking) {
         errno = 0;
+
         if (!appData->setCallbackState(env, shc, fdObject)) {
             // SocketException thrown by NetFd.isClosed
             SSL_clear(ssl);
@@ -2653,7 +2657,6 @@
     while (appData->aliveAndKicking) {
         errno = 0;
 
-        // Lock
         if (MUTEX_LOCK(appData->mutex) == -1) {
             return -1;
         }
@@ -2688,7 +2691,6 @@
             appData->waitingThreads++;
         }
 
-        // Unlock
         MUTEX_UNLOCK(appData->mutex);
 
         switch (sslError) {
@@ -2901,6 +2903,7 @@
 
     while (appData->aliveAndKicking && len > 0) {
         errno = 0;
+
         if (MUTEX_LOCK(appData->mutex) == -1) {
             return -1;
         }
@@ -2938,7 +2941,7 @@
         MUTEX_UNLOCK(appData->mutex);
 
         switch (sslError) {
-            // Successfully write at least one byte.
+            // Successfully wrote at least one byte.
             case SSL_ERROR_NONE: {
                 buf += result;
                 len -= result;
@@ -2971,7 +2974,7 @@
                 break;
             }
 
-            // An problem occurred during a system call, but this is not
+            // A problem occurred during a system call, but this is not
             // necessarily an error.
             case SSL_ERROR_SYSCALL: {
                 // Connection closed without proper shutdown. Tell caller we
diff --git a/luni/src/test/java/libcore/java/net/URLConnectionTest.java b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
index e3394a5..5bffcfe 100644
--- a/luni/src/test/java/libcore/java/net/URLConnectionTest.java
+++ b/luni/src/test/java/libcore/java/net/URLConnectionTest.java
@@ -1501,6 +1501,24 @@
     }
 
     /**
+     * http://code.google.com/p/android/issues/detail?id=14562
+     */
+    public void testReadAfterLastByte() throws Exception {
+        server.enqueue(new MockResponse()
+                .setBody("ABC")
+                .clearHeaders()
+                .addHeader("Connection: close")
+                .setDisconnectAtEnd(true));
+        server.play();
+
+        HttpURLConnection connection = (HttpURLConnection) server.getUrl("/").openConnection();
+        InputStream in = connection.getInputStream();
+        assertEquals("ABC", readAscii(in, 3));
+        assertEquals(-1, in.read());
+        assertEquals(-1, in.read()); // throws IOException in Gingerbread
+    }
+
+    /**
      * Encodes the response body using GZIP and adds the corresponding header.
      */
     public byte[] gzip(byte[] bytes) throws IOException {
diff --git a/luni/src/test/java/libcore/java/util/zip/DeflaterOutputStreamTest.java b/luni/src/test/java/libcore/java/util/zip/DeflaterOutputStreamTest.java
index 55144ed..c8d6283 100644
--- a/luni/src/test/java/libcore/java/util/zip/DeflaterOutputStreamTest.java
+++ b/luni/src/test/java/libcore/java/util/zip/DeflaterOutputStreamTest.java
@@ -16,13 +16,18 @@
 
 package libcore.java.util.zip;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.EOFException;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PipedInputStream;
 import java.io.PipedOutputStream;
+import java.lang.reflect.Field;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import java.util.zip.Deflater;
 import java.util.zip.DeflaterOutputStream;
 import java.util.zip.InflaterInputStream;
 import junit.framework.TestCase;
@@ -34,6 +39,7 @@
         assertEquals(1, in.read());
         assertEquals(2, in.read());
         assertEquals(3, in.read());
+        in.close();
     }
 
     public void testSyncFlushDisabled() throws Exception {
@@ -43,6 +49,7 @@
             fail();
         } catch (IOException expected) {
         }
+        in.close();
     }
 
     /**
@@ -77,4 +84,56 @@
 
         return new InflaterInputStream(pin);
     }
+
+    /**
+     * Confirm that a DeflaterOutputStream constructed with Deflater
+     * with flushParm == SYNC_FLUSH does not need to to be flushed.
+     *
+     * http://4005091
+     */
+    public void testSyncFlushDeflater() throws Exception {
+        Deflater def = new Deflater();
+        Field f = def.getClass().getDeclaredField("flushParm");
+        f.setAccessible(true);
+        f.setInt(def, Deflater.SYNC_FLUSH);
+
+        final int deflaterBufferSize = 512;
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        DeflaterOutputStream dos = new DeflaterOutputStream(baos, def, deflaterBufferSize);
+
+        // make output buffer large enough that even if compressed it
+        // won't all fit within the deflaterBufferSize.
+        final int outputBufferSize = 128 * deflaterBufferSize;
+        byte[] output = new byte[outputBufferSize];
+        for (int i = 0; i < output.length; i++) {
+            output[i] = (byte) i;
+        }
+
+        dos.write(output);
+        byte[] compressed = baos.toByteArray();
+        assertTrue("compressed=" + compressed.length
+                   + " but deflaterBufferSize=" + deflaterBufferSize,
+                   compressed.length > deflaterBufferSize);
+
+        ByteArrayInputStream bais = new ByteArrayInputStream(compressed);
+        InflaterInputStream iis = new InflaterInputStream(bais);
+        byte[] input = new byte[output.length];
+        int total = 0;
+        while (true)  {
+            int n = iis.read(input, total, input.length - total);
+            if (n == -1) {
+                break;
+            }
+            total += n;
+            if (total == input.length) {
+                try {
+                    iis.read();
+                    fail();
+                } catch (EOFException expected) {
+                    break;
+                }
+            }
+        }
+        assertEquals(output.length, total);
+    }
 }
diff --git a/support/src/test/java/tests/http/MockWebServer.java b/support/src/test/java/tests/http/MockWebServer.java
index d790399..25d555c 100644
--- a/support/src/test/java/tests/http/MockWebServer.java
+++ b/support/src/test/java/tests/http/MockWebServer.java
@@ -32,12 +32,12 @@
 import java.net.UnknownHostException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingDeque;
@@ -59,7 +59,7 @@
     private final BlockingQueue<MockResponse> responseQueue
             = new LinkedBlockingDeque<MockResponse>();
     private final Set<Socket> openClientSockets
-            = Collections.synchronizedSet(new HashSet<Socket>());
+            = Collections.newSetFromMap(new ConcurrentHashMap<Socket, Boolean>());
     private boolean singleResponse;
     private final AtomicInteger requestCount = new AtomicInteger();
     private int bodyLimit = Integer.MAX_VALUE;