diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/SSLEngine.java b/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/SSLEngine.java index c5458f48be9..0fd98163079 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/SSLEngine.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/SSLEngine.java @@ -18,13 +18,13 @@ public SSLEngine(com.zeroc.Ice.Communicator communicator) { _communicator = communicator; _logger = _communicator.getLogger(); _securityTraceLevel = - _communicator.getProperties().getPropertyAsIntWithDefault("Ice.SSL.Trace.Security", 0); + _communicator.getProperties().getPropertyAsIntWithDefault("IceSSL.Trace.Security", 0); _securityTraceCategory = "Security"; _trustManager = new TrustManager(_communicator); } public void initialize() { - final String prefix = "Ice.SSL."; + final String prefix = "IceSSL."; com.zeroc.Ice.Properties properties = communicator().getProperties(); // @@ -45,7 +45,7 @@ public void initialize() { // VerifyPeer determines whether certificate validation failures abort a // connection. // - _verifyPeer = properties.getPropertyAsIntWithDefault("Ice.SSL.VerifyPeer", 2); + _verifyPeer = properties.getPropertyAsIntWithDefault("IceSSL.VerifyPeer", 2); // // If the user doesn't supply an SSLContext, we need to create one based @@ -121,7 +121,8 @@ public void initialize() { } else { keystoreStream = openResource(keystorePath); if (keystoreStream == null) { - throw new InitializationException("Ice.SSL: keystore not found:\n" + keystorePath); + throw new InitializationException( + "SSL transport: keystore not found:\n" + keystorePath); } } @@ -142,7 +143,7 @@ public void initialize() { keystorePassword = null; } catch (java.io.IOException ex) { throw new InitializationException( - "Ice.SSL: unable to load keystore:\n" + keystorePath, ex); + "SSL transport: unable to load keystore:\n" + keystorePath, ex); } finally { if (keystoreStream != null) { try { @@ -192,7 +193,7 @@ public void initialize() { // if (!keys.isKeyEntry(alias)) { throw new InitializationException( - "Ice.SSL: keystore does not contain an entry with alias `" + alias + "'"); + "SSL trasnsport: keystore does not contain an entry with alias `" + alias + "'"); } for (int i = 0; i < keyManagers.length; ++i) { @@ -225,7 +226,7 @@ public void initialize() { truststoreStream = openResource(truststorePath); if (truststoreStream == null) { throw new InitializationException( - "Ice.SSL: truststore not found:\n" + truststorePath); + "SSL transport: truststore not found:\n" + truststorePath); } } @@ -247,7 +248,7 @@ public void initialize() { truststorePassword = null; } catch (java.io.IOException ex) { throw new InitializationException( - "Ice.SSL: unable to load truststore:\n" + truststorePath, ex); + "SSL transport: unable to load truststore:\n" + truststorePath, ex); } finally { if (truststoreStream != null) { try { @@ -261,7 +262,7 @@ public void initialize() { } // - // Collect the trust managers. Use Ice.SSL.Truststore if + // Collect the trust managers. Use IceSSL.Truststore if // specified, otherwise use the Java root CAs if // Ice.Use.PlatformCAs is enabled. If none of these are enabled, // use the keystore or a dummy trust manager which rejects any @@ -275,7 +276,7 @@ public void initialize() { java.security.KeyStore trustStore = null; if (ts != null) { trustStore = ts; - } else if (properties.getPropertyAsInt("Ice.SSL.UsePlatformCAs") <= 0) { + } else if (properties.getPropertyAsInt("IceSSL.UsePlatformCAs") <= 0) { if (keys != null) { trustStore = keys; } else { @@ -313,7 +314,7 @@ public X509Certificate[] getAcceptedIssuers() { // must be non-empty // if (trustStore != null && trustStore.size() == 0) { - throw new InitializationException("Ice.SSL: truststore is empty"); + throw new InitializationException("SSL transport: truststore is empty"); } if (trustManagers == null) { @@ -329,7 +330,7 @@ public X509Certificate[] getAcceptedIssuers() { _context = javax.net.ssl.SSLContext.getInstance("TLS"); _context.init(keyManagers, trustManagers, null); } catch (java.security.GeneralSecurityException ex) { - throw new InitializationException("Ice.SSL: unable to initialize context", ex); + throw new InitializationException("SSL transport: unable to initialize context", ex); } } @@ -358,7 +359,7 @@ javax.net.ssl.SSLEngine createSSLEngine(boolean incoming, String host, int port) } engine.setUseClientMode(!incoming); } catch (Exception ex) { - throw new com.zeroc.Ice.SecurityException("Ice.SSL: couldn't create SSL engine", ex); + throw new com.zeroc.Ice.SecurityException("SSL transport: couldn't create SSL engine", ex); } if (incoming) { @@ -421,12 +422,13 @@ com.zeroc.Ice.Communicator communicator() { void verifyPeer(String address, ConnectionInfo info, String desc) { // - // Ice.SSL.VerifyPeer is translated into the proper SSLEngine configuration + // IceSSL.VerifyPeer is translated into the proper SSLEngine configuration // for a server, but we have to do it ourselves for a client. // if (!info.incoming) { if (_verifyPeer > 0 && !info.verified) { - throw new com.zeroc.Ice.SecurityException("Ice.SSL: server did not supply a certificate"); + throw new com.zeroc.Ice.SecurityException( + "SSL trasnsport: server did not supply a certificate"); } } @@ -476,7 +478,7 @@ private java.io.InputStream openResource(String path) throws java.io.IOException com.zeroc.IceInternal.Util.openResource(getClass().getClassLoader(), path); // - // If the first attempt fails and Ice.SSL.DefaultDir is defined and the original + // If the first attempt fails and IceSSL.DefaultDir is defined and the original // path is // relative, // we prepend the default directory and try again. diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TransceiverI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TransceiverI.java index b5f13d5bbf8..1250f4d4deb 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TransceiverI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TransceiverI.java @@ -46,7 +46,7 @@ public int initialize( _engine.beginHandshake(); } catch (javax.net.ssl.SSLException ex) { _engine = null; - throw new com.zeroc.Ice.SecurityException("Ice.SSL: handshake error", ex); + throw new com.zeroc.Ice.SecurityException("SSL transport: handshake error", ex); } _appInput = ByteBuffer.allocate(_engine.getSession().getApplicationBufferSize() * 2); @@ -121,12 +121,7 @@ public void close() { } } } catch (SSLException ex) { - // // We can't throw in close. - // - // Ice.SecurityException se = new Ice.SecurityException( - // "Ice.SSL: SSL failure while shutting down socket", ex); - // } try { @@ -140,7 +135,7 @@ public void close() { // We would probably need to wait for a response in shutdown() to avoid this. // For now, we'll ignore this exception. // - // _instance.logger().error("Ice.SSL: error during close\n" + ex.getMessage()); + // _instance.logger().error("SSL transport: error during close\n" + ex.getMessage()); } } @@ -219,7 +214,7 @@ else if (status == Status.BUFFER_UNDERFLOW // the buffer with a complete request which must be processed. } } catch (SSLException ex) { - throw new com.zeroc.Ice.SecurityException("Ice.SSL: error during read", ex); + throw new com.zeroc.Ice.SecurityException("SSL transport: error during read", ex); } // @@ -399,7 +394,7 @@ private int handshakeNonBlocking() { } } } catch (SSLException ex) { - throw new com.zeroc.Ice.SecurityException("Ice.SSL: handshake error", ex); + throw new com.zeroc.Ice.SecurityException("SSL transport: handshake error", ex); } return SocketOperation.None; } @@ -446,7 +441,7 @@ private int writeNonBlocking(ByteBuffer buf) { } } } catch (SSLException ex) { - throw new com.zeroc.Ice.SecurityException("Ice.SSL: error while encoding message", ex); + throw new com.zeroc.Ice.SecurityException("SSL transport: error while encoding message", ex); } assert (_netOutput.b.position() == 0); diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TrustManager.java b/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TrustManager.java index 260bdc53814..d8a70f38182 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TrustManager.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/SSL/TrustManager.java @@ -9,20 +9,20 @@ class TrustManager { assert communicator != null; _communicator = communicator; com.zeroc.Ice.Properties properties = communicator.getProperties(); - _traceLevel = properties.getPropertyAsInt("Ice.SSL.Trace.Security"); + _traceLevel = properties.getPropertyAsInt("IceSSL.Trace.Security"); String key = null; try { - key = "Ice.SSL.TrustOnly"; + key = "IceSSL.TrustOnly"; parse(properties.getProperty(key), _rejectAll, _acceptAll); - key = "Ice.SSL.TrustOnly.Client"; + key = "IceSSL.TrustOnly.Client"; parse(properties.getProperty(key), _rejectClient, _acceptClient); - key = "Ice.SSL.TrustOnly.Server"; + key = "IceSSL.TrustOnly.Server"; parse(properties.getProperty(key), _rejectAllServer, _acceptAllServer); java.util.Map dict = - properties.getPropertiesForPrefix("Ice.SSL.TrustOnly.Server."); + properties.getPropertiesForPrefix("IceSSL.TrustOnly.Server."); for (java.util.Map.Entry p : dict.entrySet()) { key = p.getKey(); - String name = key.substring("Ice.SSL.TrustOnly.Server.".length()); + String name = key.substring("IceSSL.TrustOnly.Server.".length()); java.util.List> reject = new java.util.LinkedList>(); java.util.List> accept = diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java index 51092dcd3a9..9cad632ea2f 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java @@ -352,8 +352,7 @@ private static com.zeroc.Ice.Communicator createSendLogCommunicator( com.zeroc.Ice.Properties mainProps = communicator.getProperties(); copyProperties("Ice.Default.Locator", mainProps, initData.properties); - copyProperties("Ice.Plugin.Ice.SSL", mainProps, initData.properties); - copyProperties("Ice.SSL.", mainProps, initData.properties); + copyProperties("IceSSL.", mainProps, initData.properties); String[] extraProps = mainProps.getPropertyAsList("Ice.Admin.Logger.Properties"); diff --git a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java index 58f7c302798..dce9adcde05 100644 --- a/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java +++ b/java/test/android/controller/src/main/java/com/zeroc/testcontroller/ControllerApp.java @@ -275,11 +275,11 @@ public ControllerHelperI(TestSuiteBundle bundle, String[] args) { public void communicatorInitialized(Communicator communicator) { com.zeroc.Ice.Properties properties = communicator.getProperties(); - if (properties.getProperty("Ice.Plugin.Ice.SSL").equals("com.zeroc.Ice.SSL.PluginFactory")) { + if (properties.getProperty("Ice.Plugin.IceSSL").equals("com.zeroc.IceSSL.PluginFactory")) { com.zeroc.Ice.SSL.Plugin plugin = - (com.zeroc.Ice.SSL.Plugin) communicator.getPluginManager().getPlugin("Ice.SSL"); - String keystore = communicator.getProperties().getProperty("Ice.SSL.Keystore"); - properties.setProperty("Ice.SSL.Keystore", ""); + (com.zeroc.Ice.SSL.Plugin) communicator.getPluginManager().getPlugin("IceSSL"); + String keystore = communicator.getProperties().getProperty("IceSSL.Keystore"); + properties.setProperty("IceSSL.Keystore", ""); int resource = keystore.equals("client.bks") ? R.raw.client : R.raw.server; java.io.InputStream certs = getResources().openRawResource(resource); plugin.setKeystoreStream(certs); diff --git a/java/test/src/main/java/test/Ice/properties/Client.java b/java/test/src/main/java/test/Ice/properties/Client.java index bd677626def..8c2e305b5fb 100644 --- a/java/test/src/main/java/test/Ice/properties/Client.java +++ b/java/test/src/main/java/test/Ice/properties/Client.java @@ -114,13 +114,13 @@ public void run(String[] args) { System.out.print("testing ice properties with unset default values..."); Properties properties = Util.createProperties(); - String stringValue = properties.getIceProperty("Ice.SSL.CAs"); + String stringValue = properties.getIceProperty("IceSSL.CAs"); test(stringValue.isEmpty()); - int intValue = properties.getIcePropertyAsInt("Ice.SSL.CAs"); + int intValue = properties.getIcePropertyAsInt("IceSSL.CAs"); test(intValue == 0); - String[] listValue = properties.getIcePropertyAsList("Ice.SSL.CAs"); + String[] listValue = properties.getIcePropertyAsList("IceSSL.CAs"); test(listValue.length == 0); System.out.println("ok"); 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 a3ca26f5f42..364b92effb4 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/AllTests.java +++ b/java/test/src/main/java/test/IceSSL/configuration/AllTests.java @@ -37,7 +37,7 @@ private static InitializationData createClientProps(com.zeroc.Ice.Properties def InitializationData initData = new com.zeroc.Ice.InitializationData(); initData.properties = Util.createProperties(); initData.properties.setProperty( - "Ice.SSL.DefaultDir", defaultProperties.getProperty("Ice.SSL.DefaultDir")); + "IceSSL.DefaultDir", defaultProperties.getProperty("IceSSL.DefaultDir")); initData.properties.setProperty( "Ice.Default.Host", defaultProperties.getProperty("Ice.Default.Host")); if (defaultProperties.getProperty("Ice.IPv6").length() > 0) { @@ -51,19 +51,19 @@ private static InitializationData createClientProps( com.zeroc.Ice.Properties defaultProperties, String ks, String ts) { InitializationData initData = createClientProps(defaultProperties); if (!ks.isEmpty()) { - initData.properties.setProperty("Ice.SSL.Keystore", ks + ".jks"); + initData.properties.setProperty("IceSSL.Keystore", ks + ".jks"); } if (!ts.isEmpty()) { - initData.properties.setProperty("Ice.SSL.Truststore", ts + ".jks"); + initData.properties.setProperty("IceSSL.Truststore", ts + ".jks"); } - initData.properties.setProperty("Ice.SSL.Password", "password"); + initData.properties.setProperty("IceSSL.Password", "password"); return initData; } private static java.util.Map createServerProps( com.zeroc.Ice.Properties defaultProperties) { java.util.Map result = new java.util.HashMap<>(); - result.put("Ice.SSL.DefaultDir", defaultProperties.getProperty("Ice.SSL.DefaultDir")); + result.put("IceSSL.DefaultDir", defaultProperties.getProperty("IceSSL.DefaultDir")); result.put("Ice.Default.Host", defaultProperties.getProperty("Ice.Default.Host")); if (defaultProperties.getProperty("Ice.IPv6").length() > 0) { result.put("Ice.IPv6", defaultProperties.getProperty("Ice.IPv6")); @@ -75,12 +75,12 @@ private static java.util.Map createServerProps( com.zeroc.Ice.Properties defaultProperties, String ks, String ts) { java.util.Map d = createServerProps(defaultProperties); if (!ks.isEmpty()) { - d.put("Ice.SSL.Keystore", ks + ".jks"); + d.put("IceSSL.Keystore", ks + ".jks"); } if (!ts.isEmpty()) { - d.put("Ice.SSL.Truststore", ts + ".jks"); + d.put("IceSSL.Truststore", ts + ".jks"); } - d.put("Ice.SSL.Password", "password"); + d.put("IceSSL.Password", "password"); return d; } @@ -97,7 +97,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) final String defaultDir = testDir + "/../certs"; final com.zeroc.Ice.Properties defaultProperties = communicator.getProperties()._clone(); final String[] args = new String[0]; - defaultProperties.setProperty("Ice.SSL.DefaultDir", defaultDir); + defaultProperties.setProperty("IceSSL.DefaultDir", defaultDir); defaultProperties.setProperty("Ice.Default.Host", defaultHost); out.print("testing certificate verification... "); @@ -115,7 +115,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1", ""); - d.put("Ice.SSL.VerifyPeer", "0"); + d.put("IceSSL.VerifyPeer", "0"); ServerPrx server = fact.createServer(d); try { server.noCert(); @@ -135,7 +135,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1", ""); - d.put("Ice.SSL.VerifyPeer", "1"); + d.put("IceSSL.VerifyPeer", "1"); server = fact.createServer(d); try { server.noCert(); @@ -150,7 +150,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // does not supply a certificate. // d = createServerProps(defaultProperties, "s_rsa_ca1", ""); - d.put("Ice.SSL.VerifyPeer", "2"); + d.put("IceSSL.VerifyPeer", "2"); server = fact.createServer(d); try { server.ice_ping(); @@ -179,7 +179,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); - d.put("Ice.SSL.VerifyPeer", "1"); + d.put("IceSSL.VerifyPeer", "1"); server = fact.createServer(d); try { java.security.cert.X509Certificate clientCert = @@ -208,7 +208,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // Test Ice.SSL.VerifyPeer=2. Client has a certificate. // d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); - d.put("Ice.SSL.VerifyPeer", "2"); + d.put("IceSSL.VerifyPeer", "2"); server = fact.createServer(d); try { java.security.cert.X509Certificate clientCert = @@ -229,12 +229,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // client doesn't trust the server's CA. // initData = createClientProps(defaultProperties, "", ""); - initData.properties.setProperty("Ice.SSL.VerifyPeer", "1"); + initData.properties.setProperty("IceSSL.VerifyPeer", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); - d.put("Ice.SSL.VerifyPeer", "0"); + d.put("IceSSL.VerifyPeer", "0"); server = fact.createServer(d); try { server.ice_ping(); @@ -254,12 +254,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // server doesn't trust the client's CA. // initData = createClientProps(defaultProperties, "c_rsa_ca2", ""); - initData.properties.setProperty("Ice.SSL.VerifyPeer", "0"); + initData.properties.setProperty("IceSSL.VerifyPeer", "0"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1", ""); - d.put("Ice.SSL.VerifyPeer", "1"); + d.put("IceSSL.VerifyPeer", "1"); server = fact.createServer(d); try { server.ice_ping(); @@ -280,12 +280,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // trusted. // initData = createClientProps(defaultProperties, "", "cacert2"); - initData.properties.setProperty("Ice.SSL.VerifyPeer", "1"); + initData.properties.setProperty("IceSSL.VerifyPeer", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_cacert2", ""); - d.put("Ice.SSL.VerifyPeer", "0"); + d.put("IceSSL.VerifyPeer", "0"); server = fact.createServer(d); try { server.ice_ping(); @@ -302,12 +302,12 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // trusted. // initData = createClientProps(defaultProperties); - initData.properties.setProperty("Ice.SSL.VerifyPeer", "1"); + initData.properties.setProperty("IceSSL.VerifyPeer", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_cacert2", ""); - d.put("Ice.SSL.VerifyPeer", "0"); + d.put("IceSSL.VerifyPeer", "0"); server = fact.createServer(d); try { server.ice_ping(); @@ -330,7 +330,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); - d.put("Ice.SSL.CheckCertName", "1"); + d.put("IceSSL.CheckCertName", "1"); server = fact.createServer(d); try { server.ice_ping(); @@ -356,7 +356,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -378,7 +378,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -401,7 +401,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -425,7 +425,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -448,7 +448,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -474,7 +474,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -496,7 +496,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -519,7 +519,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "1"); + initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -543,7 +543,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.CheckCertName", "0"); + initData.properties.setProperty("IceSSL.CheckCertName", "0"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -576,7 +576,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1_exp", "cacert1"); - d.put("Ice.SSL.VerifyPeer", "2"); + d.put("IceSSL.VerifyPeer", "2"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -593,13 +593,13 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // // This should fail because the client's certificate is expired. // - initData.properties.setProperty("Ice.SSL.Keystore", "c_rsa_ca1_exp.jks"); - initData.properties.setProperty("Ice.SSL.Truststore", "cacert1.jks"); + initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1_exp.jks"); + initData.properties.setProperty("IceSSL.Truststore", "cacert1.jks"); comm = Util.initialize(args, initData); fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); - d.put("Ice.SSL.VerifyPeer", "2"); + d.put("IceSSL.VerifyPeer", "2"); server = fact.createServer(d); try { server.ice_ping(); @@ -625,7 +625,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_ca2", "cacerts"); - d.put("Ice.SSL.VerifyPeer", "2"); + d.put("IceSSL.VerifyPeer", "2"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -645,7 +645,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // Test password failure. // initData = createClientProps(defaultProperties); - initData.properties.setProperty("Ice.SSL.Keystore", "c_rsa_ca1.jks"); + initData.properties.setProperty("IceSSL.Keystore", "c_rsa_ca1.jks"); // Don't specify the password. try { Util.initialize(args, initData); @@ -664,7 +664,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty( - "Ice.SSL.TrustOnly", + "IceSSL.TrustOnly", "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Communicator comm = Util.initialize(args, initData); @@ -684,7 +684,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty( - "Ice.SSL.TrustOnly", + "IceSSL.TrustOnly", "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Communicator comm = Util.initialize(args, initData); @@ -703,7 +703,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty( - "Ice.SSL.TrustOnly", + "IceSSL.TrustOnly", "C=US, ST=Florida, O=\"ZeroC, Inc.\", OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Communicator comm = Util.initialize(args, initData); @@ -728,7 +728,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); d.put( - "Ice.SSL.TrustOnly", + "IceSSL.TrustOnly", "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client"); ServerPrx server = fact.createServer(d); try { @@ -748,7 +748,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); d.put( - "Ice.SSL.TrustOnly", + "IceSSL.TrustOnly", "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client"); ServerPrx server = fact.createServer(d); try { @@ -761,7 +761,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "CN=Server"); + initData.properties.setProperty("IceSSL.TrustOnly", "CN=Server"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -779,7 +779,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "!CN=Server"); + initData.properties.setProperty("IceSSL.TrustOnly", "!CN=Server"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -801,7 +801,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly", "CN=Client"); + d.put("IceSSL.TrustOnly", "CN=Client"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -819,7 +819,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly", "!CN=Client"); + d.put("IceSSL.TrustOnly", "!CN=Client"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -831,7 +831,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "CN=Client"); + initData.properties.setProperty("IceSSL.TrustOnly", "CN=Client"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -853,7 +853,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly", "CN=Server"); + d.put("IceSSL.TrustOnly", "CN=Server"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -865,7 +865,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "C=Canada,CN=Server"); + initData.properties.setProperty("IceSSL.TrustOnly", "C=Canada,CN=Server"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -882,7 +882,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "!C=Canada,CN=Server"); + initData.properties.setProperty("IceSSL.TrustOnly", "!C=Canada,CN=Server"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -900,7 +900,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "C=Canada;CN=Server"); + initData.properties.setProperty("IceSSL.TrustOnly", "C=Canada;CN=Server"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -918,7 +918,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "!C=Canada;!CN=Server"); + initData.properties.setProperty("IceSSL.TrustOnly", "!C=Canada;!CN=Server"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -936,7 +936,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty( - "Ice.SSL.TrustOnly", "!CN=Server1"); // Should not match "Server" + "IceSSL.TrustOnly", "!CN=Server1"); // Should not match "Server" Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -959,7 +959,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly", "!CN=Client1"); // Should not match "Client" + d.put("IceSSL.TrustOnly", "!CN=Client1"); // Should not match "Client" ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -975,7 +975,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) // Rejection takes precedence (client). // initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly", "ST=Florida;!CN=Server;C=US"); + initData.properties.setProperty("IceSSL.TrustOnly", "ST=Florida;!CN=Server;C=US"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -1000,7 +1000,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly", "ST=Florida;!CN=Client;C=US"); + d.put("IceSSL.TrustOnly", "ST=Florida;!CN=Client;C=US"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -1017,7 +1017,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty( - "Ice.SSL.TrustOnly.Client", + "IceSSL.TrustOnly.Client", "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Communicator comm = Util.initialize(args, initData); @@ -1026,7 +1026,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); // Should have no effect. d.put( - "Ice.SSL.TrustOnly.Client", + "IceSSL.TrustOnly.Client", "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server"); ServerPrx server = fact.createServer(d); try { @@ -1041,7 +1041,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty( - "Ice.SSL.TrustOnly.Client", + "IceSSL.TrustOnly.Client", "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Communicator comm = Util.initialize(args, initData); @@ -1065,7 +1065,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); // Should have no effect. - d.put("Ice.SSL.TrustOnly.Client", "CN=Client"); + d.put("IceSSL.TrustOnly.Client", "CN=Client"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -1078,7 +1078,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly.Client", "CN=Client"); + initData.properties.setProperty("IceSSL.TrustOnly.Client", "CN=Client"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -1095,7 +1095,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) } { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); - initData.properties.setProperty("Ice.SSL.TrustOnly.Client", "!CN=Client"); + initData.properties.setProperty("IceSSL.TrustOnly.Client", "!CN=Client"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -1119,7 +1119,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); // Should have no effect. initData.properties.setProperty( - "Ice.SSL.TrustOnly.Server", + "IceSSL.TrustOnly.Server", "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client"); Communicator comm = Util.initialize(args, initData); @@ -1127,7 +1127,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); d.put( - "Ice.SSL.TrustOnly.Server", + "IceSSL.TrustOnly.Server", "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client"); ServerPrx server = fact.createServer(d); try { @@ -1147,7 +1147,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); d.put( - "Ice.SSL.TrustOnly.Server", + "IceSSL.TrustOnly.Server", "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client"); ServerPrx server = fact.createServer(d); try { @@ -1161,7 +1161,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) { initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); // Should have no effect. - initData.properties.setProperty("Ice.SSL.TrustOnly.Server", "!CN=Server"); + initData.properties.setProperty("IceSSL.TrustOnly.Server", "!CN=Server"); Communicator comm = Util.initialize(args, initData); ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); @@ -1184,7 +1184,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly.Server", "CN=Server"); + d.put("IceSSL.TrustOnly.Server", "CN=Server"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -1201,7 +1201,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly.Server", "!CN=Client"); + d.put("IceSSL.TrustOnly.Server", "!CN=Client"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -1222,9 +1222,9 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly.Server", "CN=bogus"); + d.put("IceSSL.TrustOnly.Server", "CN=bogus"); d.put( - "Ice.SSL.TrustOnly.Server.ServerAdapter", + "IceSSL.TrustOnly.Server.ServerAdapter", "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client"); ServerPrx server = fact.createServer(d); try { @@ -1244,7 +1244,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); d.put( - "Ice.SSL.TrustOnly.Server.ServerAdapter", + "IceSSL.TrustOnly.Server.ServerAdapter", "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client"); ServerPrx server = fact.createServer(d); try { @@ -1262,7 +1262,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly.Server.ServerAdapter", "CN=bogus"); + d.put("IceSSL.TrustOnly.Server.ServerAdapter", "CN=bogus"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -1278,7 +1278,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) ServerFactoryPrx fact = ServerFactoryPrx.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); d = createServerProps(defaultProperties, "s_rsa_dsa_ca1", "cacert1"); - d.put("Ice.SSL.TrustOnly.Server.ServerAdapter", "!CN=bogus"); + d.put("IceSSL.TrustOnly.Server.ServerAdapter", "!CN=bogus"); ServerPrx server = fact.createServer(d); try { server.ice_ping(); @@ -1340,7 +1340,7 @@ public static ServerFactoryPrx allTests(test.TestHelper helper, String testDir) retryCount = 0; initData = createClientProps(defaultProperties); initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout - initData.properties.setProperty("Ice.SSL.UsePlatformCAs", "1"); + initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); comm = Util.initialize(initData); p = comm.stringToProxy("dummy:wss -p 443 -h zeroc.com -r /demo-proxy/chat/glacier2"); while (true) { diff --git a/java/test/src/main/java/test/IceSSL/configuration/Client.java b/java/test/src/main/java/test/IceSSL/configuration/Client.java index 777efe1a75e..1af08299cc9 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/Client.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Client.java @@ -13,7 +13,7 @@ public void run(String[] args) { if (rargs.size() < 1) { throw new RuntimeException("Usage: client testdir"); } - properties.setProperty("Ice.Package.Test", "test.Ice.SSL.configuration"); + properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration"); try (com.zeroc.Ice.Communicator communicator = initialize(properties)) { ServerFactoryPrx factory = AllTests.allTests(this, rargs.get(0)); factory.shutdown(); diff --git a/java/test/src/main/java/test/IceSSL/configuration/Server.java b/java/test/src/main/java/test/IceSSL/configuration/Server.java index 51297789242..f2344ef49d0 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/Server.java +++ b/java/test/src/main/java/test/IceSSL/configuration/Server.java @@ -12,7 +12,7 @@ public void run(String[] args) { throw new RuntimeException("Usage: server testdir"); } - properties.setProperty("Ice.Package.Test", "test.Ice.SSL.configuration"); + properties.setProperty("Ice.Package.Test", "test.IceSSL.configuration"); try (com.zeroc.Ice.Communicator communicator = initialize(properties)) { communicator.getProperties().setProperty("TestAdapter.Endpoints", getTestEndpoint(0, "tcp")); com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter"); diff --git a/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java index d17b5abc7b0..16e67e65397 100644 --- a/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java +++ b/java/test/src/main/java/test/IceSSL/configuration/ServerFactoryI.java @@ -26,7 +26,7 @@ public ServerPrx createServer( for (java.util.Map.Entry i : props.entrySet()) { initData.properties.setProperty(i.getKey(), i.getValue()); } - initData.properties.setProperty("Ice.SSL.DefaultDir", _defaultDir); + initData.properties.setProperty("IceSSL.DefaultDir", _defaultDir); com.zeroc.Ice.Communicator communicator = com.zeroc.Ice.Util.initialize(initData); com.zeroc.Ice.ObjectAdapter adapter = communicator.createObjectAdapterWithEndpoints("ServerAdapter", "ssl");