adding SSL support

4 files changed, 101 insertions, 10 deletions

diff --git a/java/demo/Ice/callback/CallbackClient.java b/java/demo/Ice/callback/CallbackClient.java
index d310e88a078..25301e98c6e 100644
--- a/java/demo/Ice/callback/CallbackClient.java
+++ b/java/demo/Ice/callback/CallbackClient.java
@@ -22,6 +22,7 @@ class CallbackClient extends Ice.Application
             "d: send callback as datagram\n" +
             "D: send callback as batch datagram\n" +
             "f: flush all batch requests\n" +
+	    "S: switch secure mode on/off\n" +
             "s: shutdown server\n" +
             "x: exit\n" +
             "?: help\n");
@@ -61,6 +62,9 @@ class CallbackClient extends Ice.Application
         CallbackReceiverPrx onewayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_oneway());
         CallbackReceiverPrx datagramR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_datagram());
 
+	boolean secure = false;
+	String secureStr = "";
+
         menu();
 
         java.io.BufferedReader in = new java.io.BufferedReader(new java.io.InputStreamReader(System.in));
@@ -91,12 +95,50 @@ class CallbackClient extends Ice.Application
                 }
                 else if(line.equals("d"))
                 {
-                    datagram.initiateCallback(datagramR);
+		    if(secure)
+		    {
+			System.out.println("secure datagrams are not supported");
+		    }
+		    else
+		    {
+			datagram.initiateCallback(datagramR);
+		    }
                 }
                 else if(line.equals("D"))
                 {
-		    batchDatagram.initiateCallback(datagramR);
+		    if(secure)
+		    {
+			System.out.println("secure datagrams are not supported");
+		    }
+		    else
+		    {
+			batchDatagram.initiateCallback(datagramR);
+		    }
                 }
+		else if(line.equals("S"))
+		{
+		    secure = !secure;
+		    secureStr = secure ? "s" : "";
+
+		    twoway = CallbackPrxHelper.uncheckedCast(twoway.ice_secure(secure));
+		    oneway = CallbackPrxHelper.uncheckedCast(oneway.ice_secure(secure));
+		    batchOneway = CallbackPrxHelper.uncheckedCast(batchOneway.ice_secure(secure));
+		    datagram = CallbackPrxHelper.uncheckedCast(datagram.ice_secure(secure));
+		    batchDatagram = CallbackPrxHelper.uncheckedCast(batchDatagram.ice_secure(secure));
+
+		    twowayR = CallbackReceiverPrxHelper.uncheckedCast(twowayR.ice_secure(secure));
+		    onewayR = CallbackReceiverPrxHelper.uncheckedCast(onewayR.ice_secure(secure));
+		    datagramR = CallbackReceiverPrxHelper.uncheckedCast(datagramR.ice_secure(secure));
+
+		    if(secure)
+		    {
+			System.out.println("secure mode is now on");
+		    }
+		    else
+		    {
+			System.out.println("secure mode is now off");
+		    }
+		}
                 else if(line.equals("f"))
                 {
 		    communicator().flushBatchRequests();
diff --git a/java/demo/Ice/callback/config b/java/demo/Ice/callback/config
index 81b2b22dd61..937eefde81c 100644
--- a/java/demo/Ice/callback/config
+++ b/java/demo/Ice/callback/config
@@ -1,7 +1,15 @@
-Callback.Client.Callback=callback:tcp -p 10000:udp -p 10000
-Callback.Client.Endpoints=tcp:udp
-Callback.Server.Endpoints=tcp -p 10000:udp -p 10000
+Callback.Client.Callback=callback:tcp -p 10000:udp -p 10000:ssl -p 10001
+Callback.Client.Endpoints=tcp:udp:ssl
+Callback.Server.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
 Ice.Warn.Connections=1
+
+Ice.Plugin.IceSSL=IceSSL.PluginFactory
+Ice.ThreadPerConnection=1
+#IceSSL.Client.CertPath=../../../certs
+#IceSSL.Client.Config=sslconfig.xml
+#IceSSL.Server.CertPath=../../../certs
+#IceSSL.Server.Config=sslconfig.xml
+#IceSSL.Trace.Security=1
diff --git a/java/demo/Ice/hello/Client.java b/java/demo/Ice/hello/Client.java
index 11a2ed73067..e9117409870 100644
--- a/java/demo/Ice/hello/Client.java
+++ b/java/demo/Ice/hello/Client.java
@@ -23,6 +23,7 @@ public class Client
             "D: send greeting as batch datagram\n" +
             "f: flush all batch requests\n" +
             "T: set a timeout\n" +
+            "S: switch secure mode on/off\n" +
             "s: shutdown server\n" +
             "x: exit\n" +
             "?: help\n");
@@ -52,6 +53,7 @@ public class Client
         HelloPrx datagram = HelloPrxHelper.uncheckedCast(twoway.ice_datagram());
         HelloPrx batchDatagram = HelloPrxHelper.uncheckedCast(twoway.ice_batchDatagram());
 
+	boolean secure = false;
         int timeout = -1;
 
         menu();
@@ -84,11 +86,25 @@ public class Client
                 }
                 else if(line.equals("d"))
                 {
-                    datagram.sayHello();
+		    if(secure)
+		    {
+			System.out.println("secure datagrams are not supported");
+		    }
+		    else
+		    {
+			datagram.sayHello();
+		    }
                 }
                 else if(line.equals("D"))
                 {
-                    batchDatagram.sayHello();
+		    if(secure)
+		    {
+			System.out.println("secure datagrams are not supported");
+		    }
+		    else
+		    {
+			batchDatagram.sayHello();
+		    }
                 }
                 else if(line.equals("f"))
                 {
@@ -118,6 +134,25 @@ public class Client
                         System.out.println("timeout is now set to 2000ms");
                     }
                 }
+                else if(line.equals("S"))
+                {
+		    secure = !secure;
+
+		    twoway = HelloPrxHelper.uncheckedCast(twoway.ice_secure(secure));
+		    oneway = HelloPrxHelper.uncheckedCast(oneway.ice_secure(secure));
+		    batchOneway = HelloPrxHelper.uncheckedCast(batchOneway.ice_secure(secure));
+		    datagram = HelloPrxHelper.uncheckedCast(datagram.ice_secure(secure));
+		    batchDatagram = HelloPrxHelper.uncheckedCast(batchDatagram.ice_secure(secure));
+
+                    if(secure)
+                    {
+                        System.out.println("secure mode is now on");
+                    }
+                    else
+                    {
+                        System.out.println("secure mode is now off");
+                    }
+                }
                 else if(line.equals("s"))
                 {
                     twoway.shutdown();
diff --git a/java/demo/Ice/hello/config b/java/demo/Ice/hello/config
index 6bfa60c3566..d95531a1888 100644
--- a/java/demo/Ice/hello/config
+++ b/java/demo/Ice/hello/config
@@ -2,14 +2,14 @@
 # The client reads this property to create the reference to the
 # "hello" object in the server.
 #
-Hello.Proxy=hello:tcp -p 10000:udp -p 10000
+Hello.Proxy=hello:tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # The server creates one single object adapter with the name
 # "helloadapater". The following line sets the endpoints for this
 # adapter
 #
-Hello.Endpoints=tcp -p 10000:udp -p 10000
+Hello.Endpoints=tcp -p 10000:udp -p 10000:ssl -p 10001
 
 #
 # Warn about connection exceptions
@@ -46,4 +46,10 @@ Ice.Trace.Protocol=0
 # 1 = trace warning messages
 # 2 = config file parsing warnings
 #
-#Ice.Trace.Security=2
+IceSSL.Trace.Security=0
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL.PluginFactory
+Ice.ThreadPerConnection=1