ICE-6744 - updating test to use better ciphers with anon-DH

1 files changed, 12 insertions, 25 deletions

diff --git a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
index 9bbb2a5f55b..2f145c1d563 100644
--- a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
+++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java
@@ -154,9 +154,8 @@ public class AllTests
         {
             Ice.InitializationData initData = createClientProps(defaultProperties, defaultDir, defaultHost);
             initData.properties.setProperty("Ice.InitPlugins", "0");
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            initData.properties.setProperty("IceSSL.Protocols", "tls1_1");
             Ice.Communicator comm = Ice.Util.initialize(args, initData);
             Ice.PluginManager pm = comm.getPluginManager();
             pm.initializePlugins();
@@ -164,9 +163,8 @@ public class AllTests
             test(obj != null);
             ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(obj);
             java.util.Map<String, String> d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             d.put("IceSSL.VerifyPeer", "0");
-            d.put("IceSSL.Protocols", "tls1_1");
             ServerPrx server = fact.createServer(d);
             try
             {
@@ -404,16 +402,14 @@ public class AllTests
             // does not supply a certificate.
             //
             initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             initData.properties.setProperty("IceSSL.VerifyPeer", "1");
-            initData.properties.setProperty("IceSSL.Protocols", "tls1_1");
             comm = Ice.Util.initialize(args, initData);
             fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
             d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             d.put("IceSSL.VerifyPeer", "0");
-            d.put("IceSSL.Protocols", "tls1_1");
             server = fact.createServer(d);
             try
             {
@@ -859,9 +855,8 @@ public class AllTests
             // ADH is allowed but will not have a certificate.
             //
             initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            initData.properties.setProperty("IceSSL.Protocols", "tls1_1");
             Ice.Communicator comm = Ice.Util.initialize(args, initData);
             IceSSL.Plugin plugin = (IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL");
             test(plugin != null);
@@ -871,9 +866,8 @@ public class AllTests
             ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
             d = createServerProps(defaultProperties, defaultDir, defaultHost);
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             d.put("IceSSL.VerifyPeer", "0");
-            d.put("IceSSL.Protocols", "tls1_1");
             ServerPrx server = fact.createServer(d);
             try
             {
@@ -1280,16 +1274,14 @@ public class AllTests
             // negotiate to use ADH since we explicitly enable it.
             //
             initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            initData.properties.setProperty("IceSSL.Protocols", "tls1_1");
             Ice.Communicator comm = Ice.Util.initialize(args, initData);
             ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
             d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1");
             d.put("IceSSL.Ciphers", "ALL");
             d.put("IceSSL.VerifyPeer", "1");
-            d.put("IceSSL.Protocols", "tls1_1");
             ServerPrx server = fact.createServer(d);
             try
             {
@@ -1351,8 +1343,7 @@ public class AllTests
             // Next try a client with ADH. This should fail.
             //
             initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
-            initData.properties.setProperty("IceSSL.Protocols", "tls1_1");
+            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             comm = Ice.Util.initialize(args, initData);
             fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
             test(fact != null);
@@ -1829,9 +1820,8 @@ public class AllTests
             // Test rejection when client does not supply a certificate.
             //
             initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            initData.properties.setProperty("IceSSL.Protocols", "tls1_1");
             Ice.Communicator comm = Ice.Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
@@ -1839,9 +1829,8 @@ public class AllTests
             d = createServerProps(defaultProperties, defaultDir, defaultHost);
             d.put("IceSSL.TrustOnly",
                   "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             d.put("IceSSL.VerifyPeer", "0");
-            d.put("IceSSL.Protocols", "tls1_1");
             ServerPrx server = fact.createServer(d);
             try
             {
@@ -1859,9 +1848,8 @@ public class AllTests
             // Test rejection when client does not supply a certificate.
             //
             initData = createClientProps(defaultProperties, defaultDir, defaultHost);
-            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            initData.properties.setProperty("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             initData.properties.setProperty("IceSSL.VerifyPeer", "0");
-            initData.properties.setProperty("IceSSL.Protocols", "tls1_1");
             Ice.Communicator comm = Ice.Util.initialize(args, initData);
 
             ServerFactoryPrx fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
@@ -1869,9 +1857,8 @@ public class AllTests
             d = createServerProps(defaultProperties, defaultDir, defaultHost);
             d.put("IceSSL.TrustOnly",
                   "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client");
-            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*)");
+            d.put("IceSSL.Ciphers", "NONE (.*DH_anon.*AES.*)");
             d.put("IceSSL.VerifyPeer", "0");
-            d.put("IceSSL.Protocols", "tls1_1");
             ServerPrx server = fact.createServer(d);
             try
             {