3 files changed, 25 insertions, 23 deletions
diff --git a/cs/demo/Glacier2/callback/config b/cs/demo/Glacier2/callback/config
index 9f13f00f8a6..9ae39cca590 100644
--- a/cs/demo/Glacier2/callback/config
+++ b/cs/demo/Glacier2/callback/config
@@ -56,12 +56,11 @@ Ice.Warn.Connections=1
 #
 # SSL Configuration
 #
-#Ice.Plugin.IceSSL=IceSSL.PluginFactory
-#Ice.ThreadPerConnection=1
-#IceSSL.Client.Keystore=../../../certs/client.jks
-#IceSSL.Client.Password=password
-#IceSSL.Client.Certs=../../../certs/certs.jks
-#IceSSL.Server.Keystore=../../../certs/server.jks
-#IceSSL.Server.Password=password
-#IceSSL.Server.ClientAuth=1
-#IceSSL.Server.Certs=../../../certs/certs.jks
+#Ice.Plugin.IceSSL=../../../bin/icesslcs.dll:IceSSL.PluginFactory
+IceSSL.ImportCert.LocalMachine.AuthRoot=../../../certs/cacert.pem
+IceSSL.Server.CertFile=../../../certs/s_rsa1024.pfx
+IceSSL.Server.Password=password
+IceSSL.Client.CertFile=../../../certs/c_rsa1024.pfx
+IceSSL.Client.Password=password
+IceSSL.Trace.Security=2
+Ice.ThreadPerConnection=1
diff --git a/vb/demo/Glacier2/callback/config b/vb/demo/Glacier2/callback/config
index 9f13f00f8a6..9ae39cca590 100644
--- a/vb/demo/Glacier2/callback/config
+++ b/vb/demo/Glacier2/callback/config
@@ -56,12 +56,11 @@ Ice.Warn.Connections=1
 #
 # SSL Configuration
 #
-#Ice.Plugin.IceSSL=IceSSL.PluginFactory
-#Ice.ThreadPerConnection=1
-#IceSSL.Client.Keystore=../../../certs/client.jks
-#IceSSL.Client.Password=password
-#IceSSL.Client.Certs=../../../certs/certs.jks
-#IceSSL.Server.Keystore=../../../certs/server.jks
-#IceSSL.Server.Password=password
-#IceSSL.Server.ClientAuth=1
-#IceSSL.Server.Certs=../../../certs/certs.jks
+#Ice.Plugin.IceSSL=../../../bin/icesslcs.dll:IceSSL.PluginFactory
+IceSSL.ImportCert.LocalMachine.AuthRoot=../../../certs/cacert.pem
+IceSSL.Server.CertFile=../../../certs/s_rsa1024.pfx
+IceSSL.Server.Password=password
+IceSSL.Client.CertFile=../../../certs/c_rsa1024.pfx
+IceSSL.Client.Password=password
+IceSSL.Trace.Security=2
+Ice.ThreadPerConnection=1
diff --git a/vb/demo/Glacier2/callback/config.glacier2 b/vb/demo/Glacier2/callback/config.glacier2
index 0ea4337eb51..e745f2b1ab7 100644
--- a/vb/demo/Glacier2/callback/config.glacier2
+++ b/vb/demo/Glacier2/callback/config.glacier2
@@ -109,10 +109,14 @@ Glacier2.Trace.RoutingTable=1
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
 Ice.Warn.Connections=1
-#IceSSL.Trace.Security=3
 
 #Ice.Plugin.IceSSL=IceSSL:create
-#IceSSL.Server.CertPath=../../../../ice/certs
-#IceSSL.Server.Config=sslconfig.xml
-#IceSSL.Client.CertPath=../../../../ice/certs
-#IceSSL.Client.Config=sslconfig.xml
+#IceSSL.Client.DefaultDir=../../../certs
+#IceSSL.Client.CertAuthFile=cacert.pem
+#IceSSL.Client.CertFile=c_rsa1024_pub.pem
+#IceSSL.Client.KeyFile=c_rsa1024_priv.pem
+#IceSSL.Server.DefaultDir=../../../certs
+#IceSSL.Server.CertAuthFile=cacert.pem
+#IceSSL.Server.CertFile=s_rsa1024_pub.pem
+#IceSSL.Server.KeyFile=s_rsa1024_priv.pem
+#IceSSL.Trace.Security=1