Fixed ICE-6443 and other SSL fixes

- Added IceSSL::WSSEndpointInfo and IceSSL::WSSEndpointInfo
- Deprecated IceSSL.KeyFile
- Added IceSSL.CAs and deprecated IceSSL.CertAuthFile and IceSSL.CertAuthDir
- Added support for IceSSL.UsePlatformCAs
- Fixed SSL implementations to support reading PEM files containing multiple PEM certificates
- Fixed Windows SSL implementation to support load DER certificates

2 files changed, 48 insertions, 0 deletions

diff --git a/cpp/test/IceSSL/certs/cacert1.der b/cpp/test/IceSSL/certs/cacert1.der
new file mode 100644
index 00000000000..5e57c94b34d
--- /dev/null
+++ b/cpp/test/IceSSL/certs/cacert1.der
diff --git a/cpp/test/IceSSL/certs/cacerts.pem b/cpp/test/IceSSL/certs/cacerts.pem
new file mode 100644
index 00000000000..29a3a849c04
--- /dev/null
+++ b/cpp/test/IceSSL/certs/cacerts.pem
@@ -0,0 +1,48 @@
+-----BEGIN CERTIFICATE-----
+MIID8jCCAtqgAwIBAgIIae4r8hQdO20wDQYJKoZIhvcNAQELBQAwgY4xGDAWBgNV
+BAMMD1plcm9DIFRlc3QgQ0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJv
+QywgSW5jLjEQMA4GA1UEBwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkG
+A1UEBhMCVVMxHTAbBgkqhkiG9w0BCQEWDmluZm9AemVyb2MuY29tMB4XDTE1MDQx
+NDE5MjAyN1oXDTIwMDQxMjE5MjAyN1owgY4xGDAWBgNVBAMMD1plcm9DIFRlc3Qg
+Q0EgMTEMMAoGA1UECwwDSWNlMRQwEgYDVQQKDAtaZXJvQywgSW5jLjEQMA4GA1UE
+BwwHSnVwaXRlcjEQMA4GA1UECAwHRmxvcmlkYTELMAkGA1UEBhMCVVMxHTAbBgkq
+hkiG9w0BCQEWDmluZm9AemVyb2MuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAwPJcYYlU0oS7jYwoQ2Vd8JRbVZgXjKsV/up6DJDxfwQHtdG0xh9w
+Ea2kz0SWVmVlw2bk1kF34MDZeW0TQ2B7Ae1z4UAbwdLRqQ1KDEcNIWP+lkvPal5k
+7VERPKCSIuq9rXtR1FEmKB//gUAp8HCh5fEvU2Atqg89Ij6ryf8gNYHMXSvlG77/
+5/m5y/pz21kV3JBf9C3dxaChgPrw10J3ki522XgLV7l5ita6EhJULHfKaYsCeVxF
+e2+WR8fJ/lvudUZkb+yZuYbtSsBWj9wiN45qCUa/5Ed7Akjc001ophR/Mvywm2S/
+/H09cxEb6AiFxM2NXGlRA/J48quR3nwTYQIDAQABo1IwUDAMBgNVHRMEBTADAQH/
+MB0GA1UdDgQWBBT+18YGVbtNwpbjJcDU4KEv6GJiGTAhBgNVHREEGjAYhwR/AAAB
+gRBpc3N1ZXJAemVyb2MuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCDDrEUz+OJOdvO
+p/wmLSdiuAbiEbauxOr/+JfcJi0S/wxF/Fvro5/byrTgKPFjXiHh2M7pLzGCqlyG
+XOPuJQFdBmVYuTt/68yJBSzh0PX9aq030oeW/nCyD4WxSKJ86K+VpPVyfcVb8uf1
+C1W4V1vNVYe7bWzEh05X3i8vPWhq8Zl57SP5KnCwXJCem+yPMu/wnpkhuTOvzXyX
+2n504kilXLRlhTt9g2uvsEb1ijVrr+tuk0wgHGjOsiZ4kqI1gQyBaxdzhT/IX/AZ
+7XxBlokeqvtBESbimUm/WswtMQGCvlkDSb/fUCJIXy/6h3/rj+hBi27WkqW9v/nG
+XI4tRAGQ
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIID8zCCAtugAwIBAgIJALMaPFxOvsKMMA0GCSqGSIb3DQEBCwUAMIGOMRgwFgYD
+VQQDDA9aZXJvQyBUZXN0IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVy
+b0MsIEluYy4xEDAOBgNVBAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJ
+BgNVBAYTAlVTMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTAeFw0xNTA0
+MTQxOTIwMjhaFw0yMDA0MTIxOTIwMjhaMIGOMRgwFgYDVQQDDA9aZXJvQyBUZXN0
+IENBIDIxDDAKBgNVBAsMA0ljZTEUMBIGA1UECgwLWmVyb0MsIEluYy4xEDAOBgNV
+BAcMB0p1cGl0ZXIxEDAOBgNVBAgMB0Zsb3JpZGExCzAJBgNVBAYTAlVTMR0wGwYJ
+KoZIhvcNAQkBFg5pbmZvQHplcm9jLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAKooFYG+g3WjSIspYC15cIS7d/6+tj2hx1vrQgZrJSrzhd4ER65o
+se2L4JsuRpVx2aTYVprwsJ2BF03e0xfIDHVZ40wTsfPXqs0L/r55eMBnW6RPclkF
+a3vFJz5URzTdlx0qzLYfNZ+saGn9dWq10b2zadTkaIGRTqI9b3O55WF5DnUz861n
+6mJCBzaeRVt4rIb+uVL9bWt1jUoURb4vkeiDnV+EghhLUCqKBtue29fABLx/NVoA
+zrXLIFI3bz5wSgnUZvv1JPUMpMizHv7/bvOdSS1iaHpo0S1lHqFL9Ytr0QOACYXT
+s9qxPR6UioyKZ7Rm8FVpnRdUxcJ2jcegAnUCAwEAAaNSMFAwDAYDVR0TBAUwAwEB
+/zAdBgNVHQ4EFgQUapTwhnmTEUdZs4iSemVHY960fnswIQYDVR0RBBowGIcEfwAA
+AYEQaXNzdWVyQHplcm9jLmNvbTANBgkqhkiG9w0BAQsFAAOCAQEAh3ypIObF3lF5
+qCs8MsHItqfa5BFBJVrnYY9cbipoQ7j8+KdrmT5g8CobsV0swSklC/Vufy495sTA
+LZ+F2ohA/CvlFsr8ylRINtrNVziqtRssizoWZpi0HTF3ar/bSLiaVdr3Nx1nSsMS
+UQqqRPvhUoJEGo4a6WXl8Av1Om/hX/1rBwhcAG9APbZ7jaBMDxohuoL/KPLwvHHX
+HuK4ZjY8v3fV9hfOc70AGy/HuPjHDHSdYwgTx43ZHP7nqJUuRE90qAwnE2e3UgGv
+x7Z48gKpn5zgAPKSQQ+vKCrr9ng5wZmEZPcWBgAHc+BXzfVh8YCsoEAaGmdnWyky
+x85pU3uAVw==
+-----END CERTIFICATE-----