diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/test/src/main/java/test/IceSSL/configuration/AllTests.java | 60 |
1 files changed, 32 insertions, 28 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 a7a637d85e2..dd9b342ec41 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java @@ -771,34 +771,38 @@ public class AllTests comm.destroy(); // - // SSLv3 is disabled by default in the IBM JDK. - // - if(System.getProperty("java.vendor").toLowerCase().indexOf("ibm") == -1) - { - // - // This should succeed. - // - comm = Ice.Util.initialize(args, initData); - fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost); - d.put("IceSSL.Keystore", "s_rsa_ca1.jks"); - d.put("IceSSL.Password", "password"); - d.put("IceSSL.Truststore", "cacert1.jks"); - d.put("IceSSL.VerifyPeer", "2"); - d.put("IceSSL.Protocols", "tls1, ssl3"); - server = fact.createServer(d); - try - { - server.ice_ping(); - } - catch(Ice.LocalException ex) - { - test(false); - } - fact.destroyServer(server); - comm.destroy(); - } + // SSLv3 has been disabled by default in latests JDK updates. + // +// // +// // SSLv3 is disabled by default in the IBM JDK. +// // +// if(System.getProperty("java.vendor").toLowerCase().indexOf("ibm") == -1) +// { +// // +// // This should succeed. +// // +// comm = Ice.Util.initialize(args, initData); +// fact = ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); +// test(fact != null); +// d = createServerProps(defaultProperties, defaultDir, defaultHost); +// d.put("IceSSL.Keystore", "s_rsa_ca1.jks"); +// d.put("IceSSL.Password", "password"); +// d.put("IceSSL.Truststore", "cacert1.jks"); +// d.put("IceSSL.VerifyPeer", "2"); +// d.put("IceSSL.Protocols", "tls1, ssl3"); +// server = fact.createServer(d); +// try +// { +// server.ice_ping(); +// } +// catch(Ice.LocalException ex) +// { +// ex.printStackTrace(); +// test(false); +// } +// fact.destroyServer(server); +// comm.destroy(); +// } } { |