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

3 files changed, 65 insertions, 0 deletions

diff --git a/java/src/Ice/src/main/java/IceInternal/WSEndpointDelegate.java b/java/src/Ice/src/main/java/IceInternal/WSEndpointDelegate.java
new file mode 100644
index 00000000000..123c4708655
--- /dev/null
+++ b/java/src/Ice/src/main/java/IceInternal/WSEndpointDelegate.java
@@ -0,0 +1,19 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+//
+// Delegate interface implemented by TcpEndpoint or IceSSL.EndpointI or any endpoint that WS can
+// delegate to.
+//
+public interface WSEndpointDelegate
+{
+    Ice.EndpointInfo getWSInfo(String resource);
+};
diff --git a/java/src/Ice/src/main/java/IceInternal/WSTransceiverDelegate.java b/java/src/Ice/src/main/java/IceInternal/WSTransceiverDelegate.java
new file mode 100644
index 00000000000..1e01765ffed
--- /dev/null
+++ b/java/src/Ice/src/main/java/IceInternal/WSTransceiverDelegate.java
@@ -0,0 +1,19 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceInternal;
+
+//
+// Delegate interface implemented by TcpTransceiver or IceSSL.TransceiverI or any endpoint that WS can
+// delegate to.
+//
+public interface WSTransceiverDelegate
+{
+    Ice.ConnectionInfo getWSInfo(java.util.Map<String, String> headers);
+};
diff --git a/java/src/Ice/src/main/java/IceSSL/WSSNativeConnectionInfo.java b/java/src/Ice/src/main/java/IceSSL/WSSNativeConnectionInfo.java
new file mode 100644
index 00000000000..341d087a640
--- /dev/null
+++ b/java/src/Ice/src/main/java/IceSSL/WSSNativeConnectionInfo.java
@@ -0,0 +1,27 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+package IceSSL;
+
+/**
+ *
+ * This class is a native extension of the Slice local class
+ * IceSSL::WSSConnectionInfo. It provides access to the native
+ * Java certificates.
+ *
+ **/
+public class WSSNativeConnectionInfo extends WSSConnectionInfo
+{
+    /**
+     * The certificate chain. This may be null if the peer did not
+     * supply a certificate. The peer's certificate (if any) is the
+     * first one in the chain.
+     **/
+    public java.security.cert.Certificate[] nativeCerts;
+}