diff options
Diffstat (limited to 'csharp/test/IceSSL/configuration/AllTests.cs')
| -rw-r--r-- | csharp/test/IceSSL/configuration/AllTests.cs | 438 |
1 files changed, 171 insertions, 267 deletions
diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs index 9dcea8a6a57..52c4d9f2bad 100644 --- a/csharp/test/IceSSL/configuration/AllTests.cs +++ b/csharp/test/IceSSL/configuration/AllTests.cs @@ -27,62 +27,42 @@ public class AllTests } private static Ice.InitializationData - createClientProps(Ice.Properties defaultProperties, string defaultDir, string defaultHost) + createClientProps(Ice.Properties defaultProperties) { Ice.InitializationData result = new Ice.InitializationData(); result.properties = Ice.Util.createProperties(); - // - // TODO: - // - // When an application loads IceSSL.dll directly, as this one does, we - // must ensure that it uses the same DLL as the one loaded dynamically - // by Ice. - // - // When Mono supports .NET 2.0, we'll need to fix this. - // + result.properties.setProperty("Ice.Plugin.IceSSL", "IceSSL:IceSSL.PluginFactory"); + result.properties.setProperty("IceSSL.DefaultDir", defaultProperties.getProperty("IceSSL.DefaultDir")); + result.properties.setProperty("Ice.Default.Host", defaultProperties.getProperty("Ice.Default.Host")); if(defaultProperties.getProperty("Ice.IPv6").Length > 0) { result.properties.setProperty("Ice.IPv6", defaultProperties.getProperty("Ice.IPv6")); } result.properties.setProperty("Ice.RetryIntervals", "-1"); - if(defaultHost.Length > 0) - { - result.properties.setProperty("Ice.Default.Host", defaultHost); - } - if(defaultDir.Length > 0) - { - result.properties.setProperty("IceSSL.DefaultDir", defaultDir); - } //result.properties.setProperty("IceSSL.Trace.Security", "1"); return result; } private static Dictionary<string, string> - createServerProps(Ice.Properties defaultProperties, string defaultDir, string defaultHost) + createServerProps(Ice.Properties defaultProperties) { Dictionary<string, string> result = new Dictionary<string, string>(); result["Ice.Plugin.IceSSL"] = "IceSSL:IceSSL.PluginFactory"; + result["IceSSL.DefaultDir"] = defaultProperties.getProperty("IceSSL.DefaultDir"); + result["Ice.Default.Host"] = defaultProperties.getProperty("Ice.Default.Host"); if(defaultProperties.getProperty("Ice.IPv6").Length > 0) { result["Ice.IPv6"] = defaultProperties.getProperty("Ice.IPv6"); } - if(defaultHost.Length > 0) - { - result["Ice.Default.Host"] = defaultHost; - } - if(defaultDir.Length > 0) - { - result["IceSSL.DefaultDir"] = defaultDir; - } //result["IceSSL.Trace.Security"] = "1"; return result; } private static Dictionary<string, string> - createServerProps(Ice.Properties defaultProperties, string defaultDir, string defaultHost, string cert, string ca) + createServerProps(Ice.Properties defaultProperties, string cert, string ca) { - Dictionary<string, string> d = createServerProps(defaultProperties, defaultDir, defaultHost); + Dictionary<string, string> d = createServerProps(defaultProperties); if(cert.Length > 0) { d["IceSSL.CertFile"] = cert + ".p12"; @@ -96,9 +76,9 @@ public class AllTests } private static Ice.InitializationData - createClientProps(Ice.Properties defaultProperties, string defaultDir, string defaultHost, string cert, string ca) + createClientProps(Ice.Properties defaultProperties, string cert, string ca) { - Ice.InitializationData initData = createClientProps(defaultProperties, defaultDir, defaultHost); + Ice.InitializationData initData = createClientProps(defaultProperties); if(cert.Length > 0) { initData.properties.setProperty("IceSSL.CertFile", cert + ".p12"); @@ -111,9 +91,11 @@ public class AllTests return initData; } - public static Test.ServerFactoryPrx allTests(Ice.Communicator communicator, string testDir) + public static Test.ServerFactoryPrx allTests(TestCommon.Application app, string testDir) { - string factoryRef = "factory:tcp -p 12010"; + Ice.Communicator communicator = app.communicator(); + string factoryRef = "factory:" + app.getTestEndpoint(0, "tcp"); + Ice.ObjectPrx b = communicator.stringToProxy(factoryRef); test(b != null); Test.ServerFactoryPrx factory = Test.ServerFactoryPrxHelper.checkedCast(b); @@ -121,6 +103,8 @@ public class AllTests string defaultHost = communicator.getProperties().getProperty("Ice.Default.Host"); string defaultDir = testDir + "/../certs"; Ice.Properties defaultProperties = communicator.getProperties(); + defaultProperties.setProperty("IceSSL.DefaultDir", defaultDir); + defaultProperties.setProperty("Ice.Default.Host", defaultHost); // // Load the CA certificates. We could use the IceSSL.ImportCert property, but @@ -158,7 +142,7 @@ public class AllTests Console.Out.Write("testing manual initialization... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost); + initData = createClientProps(defaultProperties); initData.properties.setProperty("Ice.InitPlugins", "0"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Ice.ObjectPrx p = comm.stringToProxy("dummy:ssl -p 9999"); @@ -178,7 +162,7 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("Ice.InitPlugins", "0"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Ice.PluginManager pm = comm.getPluginManager(); @@ -186,7 +170,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -206,7 +190,7 @@ public class AllTests X509Certificate2 cert = new X509Certificate2(defaultDir + "/c_rsa_ca1.p12", "password"); X509Certificate2Collection coll = new X509Certificate2Collection(); coll.Add(cert); - initData = createClientProps(defaultProperties, defaultDir, defaultHost); + initData = createClientProps(defaultProperties); initData.properties.setProperty("Ice.InitPlugins", "0"); initData.properties.setProperty("IceSSL.CAs", caCert1File); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); @@ -218,7 +202,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; Test.ServerPrx server = fact.createServer(d); try @@ -240,7 +224,7 @@ public class AllTests X509Certificate2 cert = new X509Certificate2(defaultDir + "/cacert1.pem"); X509Certificate2Collection coll = new X509Certificate2Collection(); coll.Add(cert); - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); initData.properties.setProperty("Ice.InitPlugins", "0"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Ice.PluginManager pm = comm.getPluginManager(); @@ -251,7 +235,7 @@ public class AllTests Ice.ObjectPrx obj = comm.stringToProxy(factoryRef); test(obj != null); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; Test.ServerPrx server = fact.createServer(d); try @@ -275,12 +259,12 @@ public class AllTests // Test IceSSL.VerifyPeer=0. Client does not have a certificate, // and it doesn't trust the server certificate. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", ""); + initData = createClientProps(defaultProperties, "", ""); initData.properties.setProperty("IceSSL.VerifyPeer", "0"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "0"; Test.ServerPrx server = fact.createServer(d); try @@ -300,12 +284,12 @@ public class AllTests // Test IceSSL.VerifyPeer=0. Client does not have a certificate, // but it still verifies the server's. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + initData = createClientProps(defaultProperties, "", "cacert1"); initData.properties.setProperty("IceSSL.VerifyPeer", "0"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "0"; server = fact.createServer(d); try @@ -324,11 +308,11 @@ public class AllTests // // Test IceSSL.VerifyPeer=1. Client does not have a certificate. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + initData = createClientProps(defaultProperties, "", "cacert1"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "1"; server = fact.createServer(d); try @@ -345,7 +329,7 @@ public class AllTests // Test IceSSL.VerifyPeer=2. This should fail because the client // does not supply a certificate. // - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "2"; server = fact.createServer(d); try @@ -373,11 +357,11 @@ public class AllTests // certificate (without this the client connection wouln't be // able to provide the certificate chain). // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "1"; server = fact.createServer(d); try @@ -407,7 +391,7 @@ public class AllTests // // Test IceSSL.VerifyPeer=2. Client has a certificate. // - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; server = fact.createServer(d); try @@ -428,11 +412,11 @@ public class AllTests // Test IceSSL.VerifyPeer=1. This should fail because the // client doesn't trust the server's CA. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", ""); + initData = createClientProps(defaultProperties, "", ""); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "0"; server = fact.createServer(d); try @@ -456,12 +440,12 @@ public class AllTests // Test IceSSL.VerifyPeer=1. This should fail because the // server doesn't trust the client's CA. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca2", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca2", ""); initData.properties.setProperty("IceSSL.VerifyPeer", "0"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "1"; server = fact.createServer(d); try @@ -488,11 +472,11 @@ public class AllTests // This should succeed because the self signed certificate used by the server is // trusted. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert2"); + initData = createClientProps(defaultProperties, "", "cacert2"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "cacert2", ""); + d = createServerProps(defaultProperties, "cacert2", ""); d["IceSSL.VerifyPeer"] = "0"; server = fact.createServer(d); try @@ -511,11 +495,11 @@ public class AllTests // This should l because the self signed certificate used by the server is not // trusted. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost); + initData = createClientProps(defaultProperties); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "cacert2", ""); + d = createServerProps(defaultProperties, "cacert2", ""); d["IceSSL.VerifyPeer"] = "0"; server = fact.createServer(d); try @@ -539,11 +523,11 @@ public class AllTests // // Verify that IceSSL.CheckCertName has no effect in a server. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.CheckCertName"] = "1"; server = fact.createServer(d); try @@ -575,13 +559,13 @@ public class AllTests // Test subject alternative name. // { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.CheckCertName"] = "1"; server = fact.createServer(d); try @@ -599,13 +583,13 @@ public class AllTests // Test common name. // { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1_cn1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1_cn1", "cacert1"); d["IceSSL.CheckCertName"] = "1"; server = fact.createServer(d); try @@ -624,13 +608,13 @@ public class AllTests // common name, therefore the address "127.0.0.1" must NOT match. // { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.CheckCertName", "1"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1_cn2", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1_cn2", "cacert1"); d["IceSSL.CheckCertName"] = "1"; server = fact.createServer(d); try @@ -664,7 +648,7 @@ public class AllTests { IceSSL.NativeConnectionInfo info; - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", ""); + initData = createClientProps(defaultProperties, "", ""); initData.properties.setProperty("IceSSL.VerifyPeer", "0"); Ice.Communicator comm = Ice.Util.initialize(initData); @@ -676,7 +660,7 @@ public class AllTests // still provide it. "s_rsa_ca1" doesn't include the root so the // cert size should be 1. // - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "0"; Test.ServerPrx server = fact.createServer(d); try @@ -695,7 +679,7 @@ public class AllTests // Setting the CA for the server shouldn't change anything, it // shouldn't modify the cert chain sent to the client. // - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "0"; server = fact.createServer(d); try @@ -715,7 +699,7 @@ public class AllTests // still provide it. "s_rsa_wroot_ca1" includes the root so // the cert size should be 2. // - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_wroot_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_wroot_ca1", ""); d["IceSSL.VerifyPeer"] = "0";; server = fact.createServer(d); try @@ -733,7 +717,7 @@ public class AllTests // // Now the client verifies the server certificate // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + initData = createClientProps(defaultProperties, "", "cacert1"); initData.properties.setProperty("IceSSL.VerifyPeer", "1"); comm = Ice.Util.initialize(initData); @@ -741,7 +725,7 @@ public class AllTests test(fact != null); { - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "0";; server = fact.createServer(d); try @@ -760,7 +744,7 @@ public class AllTests // // Try certificate with one intermediate and VerifyDepthMax=2 // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + initData = createClientProps(defaultProperties, "", "cacert1"); initData.properties.setProperty("IceSSL.VerifyPeer", "1"); initData.properties.setProperty("IceSSL.VerifyDepthMax", "2"); comm = Ice.Util.initialize(initData); @@ -769,7 +753,7 @@ public class AllTests test(fact != null); { - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_cai1", ""); + d = createServerProps(defaultProperties, "s_rsa_cai1", ""); d["IceSSL.VerifyPeer"] = "0";; server = fact.createServer(d); try @@ -792,7 +776,7 @@ public class AllTests // // Set VerifyDepthMax to 3 (the default) // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + initData = createClientProps(defaultProperties, "", "cacert1"); initData.properties.setProperty("IceSSL.VerifyPeer", "1"); //initData.properties.setProperty("IceSSL.VerifyDepthMax", "3"); comm = Ice.Util.initialize(initData); @@ -801,7 +785,7 @@ public class AllTests test(fact != null); { - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_cai1", ""); + d = createServerProps(defaultProperties, "s_rsa_cai1", ""); d["IceSSL.VerifyPeer"] = "0";; server = fact.createServer(d); try @@ -818,7 +802,7 @@ public class AllTests } { - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_cai2", ""); + d = createServerProps(defaultProperties, "s_rsa_cai2", ""); d["IceSSL.VerifyPeer"] = "0";; server = fact.createServer(d); try @@ -837,7 +821,7 @@ public class AllTests // // Increase VerifyDepthMax to 4 // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + initData = createClientProps(defaultProperties, "", "cacert1"); initData.properties.setProperty("IceSSL.VerifyPeer", "1"); initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); comm = Ice.Util.initialize(initData); @@ -846,7 +830,7 @@ public class AllTests test(fact != null); { - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_cai2", ""); + d = createServerProps(defaultProperties, "s_rsa_cai2", ""); d["IceSSL.VerifyPeer"] = "0";; server = fact.createServer(d); try @@ -867,7 +851,7 @@ public class AllTests // // Increase VerifyDepthMax to 4 // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_cai2", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_cai2", "cacert1"); initData.properties.setProperty("IceSSL.VerifyPeer", "1"); initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); comm = Ice.Util.initialize(initData); @@ -876,7 +860,7 @@ public class AllTests test(fact != null); { - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_cai2", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_cai2", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; server = fact.createServer(d); try @@ -900,7 +884,7 @@ public class AllTests } { - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_cai2", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_cai2", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; d["IceSSL.VerifyDepthMax"] = "4"; server = fact.createServer(d); @@ -933,7 +917,7 @@ public class AllTests // // Verify that a server certificate is present. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); IceSSL.Plugin plugin = (IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL"); test(plugin != null); @@ -942,7 +926,7 @@ public class AllTests Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; Test.ServerPrx server = fact.createServer(d); try @@ -964,7 +948,7 @@ public class AllTests // verifier.reset(); verifier.returnValue(false); - server.ice_getConnection().close(false); + server.ice_getConnection().close(Ice.ConnectionClose.GracefullyWithWait); try { server.ice_ping(); @@ -988,7 +972,7 @@ public class AllTests // // Verify that verifier is installed via property. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); initData.properties.setProperty("IceSSL.CertVerifier", "CertificateVerifierI"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); IceSSL.Plugin plugin = (IceSSL.Plugin)comm.getPluginManager().getPlugin("IceSSL"); @@ -1005,12 +989,12 @@ public class AllTests // This should fail because the client and server have no protocol // in common. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.Protocols", "ssl3"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; d["IceSSL.Protocols"] = "tls1"; Test.ServerPrx server = fact.createServer(d); @@ -1036,7 +1020,7 @@ public class AllTests comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; d["IceSSL.Protocols"] = "tls1, ssl3"; server = fact.createServer(d); @@ -1066,12 +1050,12 @@ public class AllTests try { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.Protocols", "tls1_2"); comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; d["IceSSL.Protocols"] = "tls1_2"; server = fact.createServer(d); @@ -1095,12 +1079,12 @@ public class AllTests // This should fail because the client ony enables SSLv3 and the server // uses the default protocol set that disables SSLv3 // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.Protocols", "ssl3"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; Test.ServerPrx server = fact.createServer(d); try @@ -1125,7 +1109,7 @@ public class AllTests comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; d["IceSSL.Protocols"] = "ssl3, tls1_0, tls1_1, tls1_2"; server = fact.createServer(d); @@ -1148,11 +1132,11 @@ public class AllTests // // This should fail because the server's certificate is expired. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1_exp", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1_exp", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; Test.ServerPrx server = fact.createServer(d); try @@ -1164,8 +1148,9 @@ public class AllTests { // Expected. } - catch(Ice.LocalException) + catch(Ice.LocalException ex) { + Console.Out.Write(ex.ToString()); test(false); } fact.destroyServer(server); @@ -1178,7 +1163,7 @@ public class AllTests comm = Ice.Util.initialize(ref args, initData); fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.VerifyPeer"] = "2"; server = fact.createServer(d); try @@ -1190,8 +1175,9 @@ public class AllTests { // Expected. } - catch(Ice.LocalException) + catch(Ice.LocalException ex) { + Console.Out.Write(ex.ToString()); test(false); } fact.destroyServer(server); @@ -1204,12 +1190,12 @@ public class AllTests Console.Out.Write("testing multiple CA certificates... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca2", ""); + d = createServerProps(defaultProperties, "s_rsa_ca2", ""); d["IceSSL.VerifyPeer"] = "2"; d["IceSSL.UsePlatformCAs"] = "1"; store.Add(caCert1); @@ -1234,11 +1220,11 @@ public class AllTests Console.Out.Write("testing multiple CA certificates... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacerts"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacerts"); Ice.Communicator comm = Ice.Util.initialize(initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca2", "cacerts"); + d = createServerProps(defaultProperties, "s_rsa_ca2", "cacerts"); d["IceSSL.VerifyPeer"] = "2"; Test.ServerPrx server = fact.createServer(d); try @@ -1257,12 +1243,12 @@ public class AllTests Console.Out.Write("testing DER CA certificate... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); initData.properties.setProperty("IceSSL.CAs", "cacert1.der"); Ice.Communicator comm = Ice.Util.initialize(initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); test(fact != null); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); + d = createServerProps(defaultProperties, "s_rsa_ca1", ""); d["IceSSL.VerifyPeer"] = "2"; d["IceSSL.CAs"] = "cacert1.der"; Test.ServerPrx server = fact.createServer(d); @@ -1285,7 +1271,7 @@ public class AllTests // // Test password failure. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); // Don't specify the password. initData.properties.setProperty("IceSSL.Password", ""); try @@ -1306,7 +1292,7 @@ public class AllTests // // Test password failure with callback. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); initData.properties.setProperty("Ice.InitPlugins", "0"); // Don't specify the password. initData.properties.setProperty("IceSSL.Password", ""); @@ -1335,7 +1321,7 @@ public class AllTests // // Test installation of password callback. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); initData.properties.setProperty("Ice.InitPlugins", "0"); // Don't specify the password. initData.properties.setProperty("IceSSL.Password", ""); @@ -1360,7 +1346,7 @@ public class AllTests // // Test password callback property. // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); + initData = createClientProps(defaultProperties, "c_rsa_ca1", ""); initData.properties.setProperty("IceSSL.PasswordCallback", "PasswordCallbackI"); // Don't specify the password. initData.properties.setProperty("IceSSL.Password", ""); @@ -1376,13 +1362,13 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1396,13 +1382,13 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1416,13 +1402,13 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "C=US, ST=Florida, O=\"ZeroC, Inc.\",OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1436,11 +1422,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly"] = "C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client"; Test.ServerPrx server = fact.createServer(d); @@ -1456,11 +1442,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly"] = "!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client"; Test.ServerPrx server = fact.createServer(d); @@ -1476,12 +1462,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1495,12 +1481,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "!CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1514,11 +1500,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly"] = "CN=Client"; Test.ServerPrx server = fact.createServer(d); try @@ -1533,11 +1519,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly"] = "!CN=Client"; Test.ServerPrx server = fact.createServer(d); try @@ -1552,12 +1538,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "CN=Client"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1571,11 +1557,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly"] = "CN=Server"; Test.ServerPrx server = fact.createServer(d); try @@ -1590,12 +1576,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "C=Canada,CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1609,12 +1595,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "!C=Canada,CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1628,12 +1614,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "C=Canada;CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1647,12 +1633,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "!C=Canada;!CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1666,12 +1652,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "!CN=Server1"); // Should not match "Server" Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1685,11 +1671,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly"] = "!CN=Client1"; // Should not match "Client" Test.ServerPrx server = fact.createServer(d); try @@ -1707,12 +1693,12 @@ public class AllTests // // Rejection takes precedence (client). // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly", "ST=Florida;!CN=Server;C=US"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1729,11 +1715,11 @@ public class AllTests // // Rejection takes precedence (server). // - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly"] = "C=US;!CN=Client;ST=Florida"; Test.ServerPrx server = fact.createServer(d); try @@ -1752,13 +1738,13 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly.Client... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly.Client", "C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); // Should have no effect. d["IceSSL.TrustOnly.Client"] = "C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server"; @@ -1775,13 +1761,13 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly.Client", "!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1795,11 +1781,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); // Should have no effect. d["IceSSL.TrustOnly.Client"] = "!CN=Client"; Test.ServerPrx server = fact.createServer(d); @@ -1815,12 +1801,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly.Client", "CN=Client"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1834,12 +1820,12 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); initData.properties.setProperty("IceSSL.TrustOnly.Client", "!CN=Client"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1857,14 +1843,14 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly.Server... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); // Should have no effect. initData.properties.setProperty("IceSSL.TrustOnly.Server", "C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server"] = "C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client"; Test.ServerPrx server = fact.createServer(d); @@ -1880,11 +1866,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server"] = "!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client"; Test.ServerPrx server = fact.createServer(d); @@ -1900,13 +1886,13 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); // Should have no effect. initData.properties.setProperty("IceSSL.TrustOnly.Server", "!CN=Server"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); Test.ServerPrx server = fact.createServer(d); try { @@ -1920,11 +1906,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server"] = "CN=Server"; Test.ServerPrx server = fact.createServer(d); try @@ -1939,11 +1925,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server"] = "!CN=Client"; Test.ServerPrx server = fact.createServer(d); try @@ -1962,11 +1948,11 @@ public class AllTests Console.Out.Write("testing IceSSL.TrustOnly.Server.<AdapterName>... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server"] = "CN=bogus"; d["IceSSL.TrustOnly.Server.ServerAdapter"] = "C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client"; @@ -1983,11 +1969,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server.ServerAdapter"] = "!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client"; Test.ServerPrx server = fact.createServer(d); @@ -2003,11 +1989,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server.ServerAdapter"] = "CN=bogus"; Test.ServerPrx server = fact.createServer(d); try @@ -2022,11 +2008,11 @@ public class AllTests comm.destroy(); } { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", "cacert1"); + initData = createClientProps(defaultProperties, "c_rsa_ca1", "cacert1"); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", "cacert1"); + d = createServerProps(defaultProperties, "s_rsa_ca1", "cacert1"); d["IceSSL.TrustOnly.Server.ServerAdapter"] = "!CN=bogus"; Test.ServerPrx server = fact.createServer(d); try @@ -2042,90 +2028,6 @@ public class AllTests } Console.Out.WriteLine("ok"); - if(isAdministrator) - { - Console.Out.Write("testing IceSSL.KeySet... "); - Console.Out.Flush(); - { - try - { - initData = createClientProps(defaultProperties, defaultDir, defaultHost); - initData.properties.setProperty("IceSSL.DefaultDir", defaultDir); - initData.properties.setProperty("IceSSL.ImportCert.LocalMachine.Root", "cacert1.pem"); - initData.properties.setProperty("IceSSL.CertFile", "c_rsa_ca1.p12"); - initData.properties.setProperty("IceSSL.KeySet", "MachineKeySet"); - initData.properties.setProperty("IceSSL.Password", "password"); - initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); - Ice.Communicator comm = Ice.Util.initialize(ref args, initData); - - Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost); - d["IceSSL.ImportCert.LocalMachine.Root"] = "cacert1.pem"; - d["IceSSL.KeySet"] = "MachineKeySet"; - d["IceSSL.CertFile"] = "s_rsa_ca1.p12"; - d["IceSSL.Password"] = "password"; - d["IceSSL.UsePlatformCAs"] = "1"; - - Test.ServerPrx server = fact.createServer(d); - try - { - server.ice_ping(); - } - catch(Ice.LocalException) - { - test(false); - } - fact.destroyServer(server); - - comm.destroy(); - } - finally - { - X509Store certStore = new X509Store("Root", StoreLocation.LocalMachine); - certStore.Open(OpenFlags.ReadWrite); - certStore.Remove(caCert1); - } - } - { - try - { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "c_rsa_ca1", ""); - initData.properties.setProperty("IceSSL.ImportCert.CurrentUser.Root", "cacert1.pem"); - initData.properties.setProperty("IceSSL.KeySet", "UserKeySet"); - initData.properties.setProperty("IceSSL.Password", "password"); - initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); - Ice.Communicator comm = Ice.Util.initialize(ref args, initData); - - Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "s_rsa_ca1", ""); - d["IceSSL.ImportCert.CurrentUser.Root"] = "cacert1.pem"; - d["IceSSL.KeySet"] = "UserKeySet"; - d["IceSSL.Password"] = "password"; - d["IceSSL.UsePlatformCAs"] = "1"; - - Test.ServerPrx server = fact.createServer(d); - try - { - server.ice_ping(); - } - catch(Ice.LocalException) - { - test(false); - } - fact.destroyServer(server); - - comm.destroy(); - } - finally - { - X509Store certStore = new X509Store("Root", StoreLocation.CurrentUser); - certStore.Open(OpenFlags.ReadWrite); - certStore.Remove(caCert1); - } - } - Console.Out.WriteLine("ok"); - } - Console.Out.Write("testing IceSSL.FindCerts properties... "); Console.Out.Flush(); { @@ -2172,7 +2074,7 @@ public class AllTests } for(int i = 0; i < clientFindCertProperties.Length; ++i) { - initData = createClientProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + initData = createClientProps(defaultProperties, "", "cacert1"); initData.properties.setProperty("IceSSL.CertStore", "My"); initData.properties.setProperty("IceSSL.CertStoreLocation", "CurrentUser"); initData.properties.setProperty("IceSSL.FindCert", clientFindCertProperties[i]); @@ -2183,7 +2085,7 @@ public class AllTests Ice.Communicator comm = Ice.Util.initialize(ref args, initData); Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef)); - d = createServerProps(defaultProperties, defaultDir, defaultHost, "", "cacert1"); + d = createServerProps(defaultProperties, "", "cacert1"); // Use deprecated property here to test it d["IceSSL.FindCert.CurrentUser.My"] = serverFindCertProperties[i]; // @@ -2211,7 +2113,7 @@ public class AllTests { try { - initData = createClientProps(defaultProperties, defaultDir, defaultHost); + initData = createClientProps(defaultProperties); initData.properties.setProperty("IceSSL.FindCert", s); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); test(false); @@ -2243,7 +2145,7 @@ public class AllTests { try { - initData = createClientProps(defaultProperties, defaultDir, defaultHost); + initData = createClientProps(defaultProperties); initData.properties.setProperty("IceSSL.FindCert.CurrentUser.My", s); Ice.Communicator comm = Ice.Util.initialize(ref args, initData); test(false); @@ -2263,7 +2165,8 @@ public class AllTests Console.Out.Write("testing system CAs... "); Console.Out.Flush(); { - initData = createClientProps(defaultProperties, defaultDir, defaultHost); + initData = createClientProps(defaultProperties); + initData.properties.setProperty("IceSSL.DefaultDir", ""); initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout Ice.Communicator comm = Ice.Util.initialize(initData); @@ -2282,16 +2185,17 @@ public class AllTests test(false); } - initData = createClientProps(defaultProperties, defaultDir, defaultHost); + initData = createClientProps(defaultProperties); + initData.properties.setProperty("IceSSL.DefaultDir", ""); initData.properties.setProperty("IceSSL.VerifyDepthMax", "4"); initData.properties.setProperty("Ice.Override.Timeout", "5000"); // 5s timeout initData.properties.setProperty("IceSSL.UsePlatformCAs", "1"); comm = Ice.Util.initialize(initData); p = comm.stringToProxy("dummy:wss -h demo.zeroc.com -p 5064"); - IceSSL.WSSConnectionInfo info; + IceSSL.ConnectionInfo info; try { - info = (IceSSL.WSSConnectionInfo)p.ice_getConnection().getInfo(); + info = (IceSSL.ConnectionInfo)p.ice_getConnection().getInfo().underlying; test(info.verified); } catch(Ice.LocalException) |