summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/test/Ice/metrics/AllTests.cpp4
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp403
-rw-r--r--cpp/test/IceSSL/configuration/Server.cpp14
-rw-r--r--cpp/test/IceSSL/configuration/TestI.cpp6
-rw-r--r--cpp/test/IceSSL/configuration/TestI.h3
5 files changed, 218 insertions, 212 deletions
diff --git a/cpp/test/Ice/metrics/AllTests.cpp b/cpp/test/Ice/metrics/AllTests.cpp
index 30839b24a20..6bc8626a611 100644
--- a/cpp/test/Ice/metrics/AllTests.cpp
+++ b/cpp/test/Ice/metrics/AllTests.cpp
@@ -1288,11 +1288,11 @@ allTests(const Ice::CommunicatorPtr& communicator, const CommunicatorObserverIPt
size_t size = !collocated ? im1->remotes.size() : im1->collocated.size();
if(size != 1)
{
- cerr << "invalid remote metrics size = " << size << endl;
+ cout << "invalid remote metrics size = " << size << endl;
IceMX::MetricsMap* map = collocated ? &im1->collocated : &im1->remotes;
for(IceMX::MetricsMap::const_iterator p = map->begin(); p != map->end(); ++p)
{
- cerr << "- " << (*p)->id << endl;
+ cout << "- " << (*p)->id << endl;
}
}
test(!collocated ? (im1->remotes.size() == 1) : (im1->collocated.size() == 1));
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 812e27643d8..0ca99b5224e 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -505,25 +505,19 @@ ICE_DEFINE_PTR(CertificateVerifierIPtr, CertificateVerifierI);
int keychainN = 0;
static PropertiesPtr
-createClientProps(const Ice::PropertiesPtr& defaultProps, const string& defaultDir, const string& defaultHost, bool p12)
+createClientProps(const Ice::PropertiesPtr& defaultProps, bool p12)
{
PropertiesPtr result = createProperties();
//
// Don't set the plugin property, the client registered the plugin with registerIceSSL.
//
//result->setProperty("Ice.Plugin.IceSSL", "IceSSL:createIceSSL");
- if(!defaultDir.empty())
- {
- result->setProperty("IceSSL.DefaultDir", defaultDir);
- }
+ result->setProperty("IceSSL.DefaultDir", defaultProps->getProperty("IceSSL.DefaultDir"));
+ result->setProperty("Ice.Default.Host", defaultProps->getProperty("Ice.Default.Host"));
if(!defaultProps->getProperty("Ice.IPv6").empty())
{
result->setProperty("Ice.IPv6", defaultProps->getProperty("Ice.IPv6"));
}
- if(!defaultHost.empty())
- {
- result->setProperty("Ice.Default.Host", defaultHost);
- }
if(p12)
{
result->setProperty("IceSSL.Password", "password");
@@ -541,22 +535,16 @@ createClientProps(const Ice::PropertiesPtr& defaultProps, const string& defaultD
}
static Test::Properties
-createServerProps(const Ice::PropertiesPtr& defaultProps, const string& defaultDir, const string& defaultHost, bool p12)
+createServerProps(const Ice::PropertiesPtr& defaultProps, bool p12)
{
Test::Properties result;
result["Ice.Plugin.IceSSL"] = "IceSSL:createIceSSL";
- if(!defaultDir.empty())
- {
- result["IceSSL.DefaultDir"] = defaultDir;
- }
+ result["IceSSL.DefaultDir"] = defaultProps->getProperty("IceSSL.DefaultDir");
+ result["Ice.Default.Host"] = defaultProps->getProperty("Ice.Default.Host");
if(!defaultProps->getProperty("Ice.IPv6").empty())
{
result["Ice.IPv6"] = defaultProps->getProperty("Ice.IPv6");
}
- if(!defaultHost.empty())
- {
- result["Ice.Default.Host"] = defaultHost;
- }
if(p12)
{
result["IceSSL.Password"] = "password";
@@ -573,8 +561,7 @@ createServerProps(const Ice::PropertiesPtr& defaultProps, const string& defaultD
}
static Test::Properties
-createServerProps(const Ice::PropertiesPtr& defaultProps, const string& defaultDir, const string& defaultHost,
- bool p12, const string& cert, const string& ca)
+createServerProps(const Ice::PropertiesPtr& defaultProps, bool p12, const string& cert, const string& ca)
{
Test::Properties d;
@@ -582,7 +569,7 @@ createServerProps(const Ice::PropertiesPtr& defaultProps, const string& defaultD
// If no CA is specified, we don't set IceSSL.DefaultDir since
// with OpenSSL the CAs might still be found.
//
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ d = createServerProps(defaultProps, p12);
if(!ca.empty())
{
d["IceSSL.CAs"] = ca + ".pem";
@@ -604,12 +591,11 @@ createServerProps(const Ice::PropertiesPtr& defaultProps, const string& defaultD
}
static PropertiesPtr
-createClientProps(const Ice::PropertiesPtr& defaultProps, const string& defaultDir, const string& defaultHost,
- bool p12, const string& cert, const string& ca)
+createClientProps(const Ice::PropertiesPtr& defaultProps, bool p12, const string& cert, const string& ca)
{
Ice::PropertiesPtr properties;
- properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ properties = createClientProps(defaultProps, p12);
#ifdef ICE_OS_UWP
//
@@ -697,13 +683,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
string defaultDir = "certs";
#endif
- Ice::PropertiesPtr defaultProps = communicator->getProperties();
+ Ice::PropertiesPtr defaultProps = communicator->getProperties()->clone();
+ defaultProps->setProperty("IceSSL.DefaultDir", defaultDir);
#ifdef _WIN32
string sep = ";";
#else
string sep = ":";
#endif
-
+
string engineName;
Ice::Long engineVersion;
{
@@ -711,7 +698,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Get the IceSSL engine name and version
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
CommunicatorPtr comm = initialize(initData);
IceSSL::PluginPtr plugin = ICE_DYNAMIC_CAST(IceSSL::Plugin, comm->getPluginManager()->getPlugin("IceSSL"));
test(plugin);
@@ -719,7 +706,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
engineVersion = plugin->getEngineVersion();
comm->destroy();
}
-
+
#ifdef ICE_USE_OPENSSL
//
// Parse OpenSSL version from engineName "OpenSSLEngine@OpenSSL 1.0.2g 1 Mar 2016"
@@ -732,7 +719,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
cout << "testing manual initialization... " << flush;
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("Ice.InitPlugins", "0");
CommunicatorPtr comm = initialize(initData);
ObjectPrxPtr p = comm->stringToProxy("dummy:ssl -p 9999");
@@ -758,7 +745,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#if !defined(ICE_USE_SCHANNEL) && !defined(ICE_OS_UWP)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("Ice.InitPlugins", "0");
# ifdef ICE_USE_OPENSSL
initData.properties->setProperty("IceSSL.Ciphers", anonCiphers);
@@ -772,7 +759,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
ObjectPrxPtr obj = comm->stringToProxy(factoryRef);
test(obj);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, obj);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ Test::Properties d = createServerProps(defaultProps, p12);
# ifdef ICE_USE_OPENSSL
d["IceSSL.Ciphers"] = anonCiphers;
# else
@@ -806,13 +793,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// and doesn't trust the server certificate.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "");
+ initData.properties = createClientProps(defaultProps, p12, "", "");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "0";
server = fact->createServer(d);
try
@@ -832,12 +819,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test IceSSL.VerifyPeer=0. Client does not have a certificate,
// but it still verifies the server's.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "", "cacert1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "0";
server = fact->createServer(d);
try
@@ -853,7 +840,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Test IceSSL.VerifyPeer=1. Client does not have a certificate.
//
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "1";
server = fact->createServer(d);
try
@@ -871,7 +858,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test IceSSL.VerifyPeer=2. This should fail because the client
// does not supply a certificate.
//
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "2";
server = fact->createServer(d);
try
@@ -901,13 +888,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// certificate (without this the client connection wouln't be
// able to provide the certificate chain).
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "1";
server = fact->createServer(d);
try
@@ -1018,7 +1005,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Test IceSSL.VerifyPeer=2. Client has a certificate.
//
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "2";
server = fact->createServer(d);
try
@@ -1045,12 +1032,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test IceSSL.VerifyPeer=1. This should fail because the client doesn't
// trust the server's CA.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "");
+ initData.properties = createClientProps(defaultProps, p12, "", "");
initData.properties->setProperty("IceSSL.VerifyPeer", "1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
server = fact->createServer(d);
try
@@ -1074,12 +1061,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test IceSSL.VerifyPeer=1. This should fail because the server doesn't
// trust the client's CA.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca2", "");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca2", "");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "1";
server = fact->createServer(d);
try
@@ -1102,11 +1089,11 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// This should succeed because the self signed certificate used by the server is
// trusted.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert2");
+ initData.properties = createClientProps(defaultProps, p12, "", "cacert2");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "cacert2", "");
+ d = createServerProps(defaultProps, p12, "cacert2", "");
d["IceSSL.VerifyPeer"] = "0";
server = fact->createServer(d);
try
@@ -1124,11 +1111,11 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// This should fail because the self signed certificate used by the server is not
// trusted.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "");
+ initData.properties = createClientProps(defaultProps, p12, "", "");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "cacert2", "");
+ d = createServerProps(defaultProps, p12, "cacert2", "");
d["IceSSL.VerifyPeer"] = "0";
server = fact->createServer(d);
try
@@ -1150,11 +1137,11 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Verify that IceSSL.CheckCertName has no effect in a server.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.CheckCertName"] = "1";
server = fact->createServer(d);
try
@@ -1178,13 +1165,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Test subject alternative name.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.CheckCertName", "1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
server = fact->createServer(d);
try
{
@@ -1200,13 +1187,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Test common name.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.CheckCertName", "1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1_cn1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1_cn1", "cacert1");
server = fact->createServer(d);
try
{
@@ -1224,13 +1211,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test common name again. The certificate used in this test has "127.0.0.11" as its
// common name, therefore the address "127.0.0.1" must NOT match.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.CheckCertName", "1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1_cn2", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1_cn2", "cacert1");
server = fact->createServer(d);
try
{
@@ -1253,7 +1240,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
ImportCerts import(defaultDir, certificates);
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "");
+ initData.properties = createClientProps(defaultProps, p12, "", "");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
CommunicatorPtr comm = initialize(initData);
@@ -1265,7 +1252,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// still provide it. "s_rsa_ca1" doesn't include the root so the
// cert size should be 1.
//
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1285,7 +1272,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Setting the CA for the server shouldn't change anything, it
// shouldn't modify the cert chain sent to the client.
//
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
server = fact->createServer(d);
try
@@ -1313,7 +1300,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
if(p12)
{
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_wroot_ca1", "");
+ d = createServerProps(defaultProps, p12, "s_rsa_wroot_ca1", "");
d["IceSSL.VerifyPeer"] = "0";
server = fact->createServer(d);
try
@@ -1339,7 +1326,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Now the client verifies the server certificate
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "1");
comm = initialize(initData);
@@ -1347,7 +1334,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
test(fact);
{
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1374,7 +1361,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Try certificate with one intermediate and VerifyDepthMax=2
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "1");
initData.properties->setProperty("IceSSL.VerifyDepthMax", "2");
comm = initialize(initData);
@@ -1383,7 +1370,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
test(fact);
{
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_cai1", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai1", "");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1409,7 +1396,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Try with VerifyDepthMax set to 3 (the default)
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "1");
//initData.properties->setProperty("IceSSL.VerifyDepthMax", "3");
comm = initialize(initData);
@@ -1417,7 +1404,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
{
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_cai1", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai1", "");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1436,7 +1423,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_cai2", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1456,7 +1443,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Increase VerifyDepthMax to 4
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "1");
initData.properties->setProperty("IceSSL.VerifyDepthMax", "4");
comm = initialize(initData);
@@ -1465,7 +1452,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
test(fact);
{
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_cai2", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1488,7 +1475,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Increase VerifyDepthMax to 4
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_cai2", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_cai2", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "1");
initData.properties->setProperty("IceSSL.VerifyDepthMax", "4");
comm = initialize(initData);
@@ -1497,7 +1484,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
test(fact);
{
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_cai2", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "cacert1");
d["IceSSL.VerifyPeer"] = "2";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1523,7 +1510,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_cai2", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_cai2", "cacert1");
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.VerifyDepthMax"] = "4";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -1555,7 +1542,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// ADH is allowed but will not have a certificate.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
# ifdef ICE_USE_OPENSSL
initData.properties->setProperty("IceSSL.Ciphers", anonCiphers);
# else
@@ -1576,7 +1563,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ Test::Properties d = createServerProps(defaultProps, p12);
# ifdef ICE_USE_OPENSSL
//
// With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
@@ -1634,7 +1621,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Verify that a server certificate is present.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
CommunicatorPtr comm = initialize(initData);
IceSSL::PluginPtr plugin = ICE_DYNAMIC_CAST(IceSSL::Plugin, comm->getPluginManager()->getPlugin("IceSSL"));
@@ -1649,7 +1636,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#endif
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "2";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1680,14 +1667,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// in common.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
initData.properties->setProperty("IceSSL.Protocols", "tls1_1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
d["IceSSL.Protocols"] = "tls1_2";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -1717,7 +1704,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
d["IceSSL.Protocols"] = "tls1_1, tls1_2";
server = fact->createServer(d);
@@ -1746,14 +1733,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
initData.properties->setProperty("IceSSL.Protocols", "ssl3");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1785,13 +1772,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// //
// {
// InitializationData initData;
- // initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ // initData.properties = createClientProps(defaultProps, p12, "", "cacert1");
// initData.properties->setProperty("IceSSL.Protocols", "ssl3");
// CommunicatorPtr comm = initialize(initData);
// Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
// test(fact);
- // Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ // Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
// d["IceSSL.VerifyPeer"] = "0";
// d["IceSSL.Protocols"] = "ssl3, tls, tls1_1, tls1_2";
// Test::ServerPrxPtr server = fact->createServer(d);
@@ -1818,7 +1805,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// in common.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
initData.properties->setProperty("IceSSL.ProtocolVersionMax", "tls1");
@@ -1826,7 +1813,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ Test::Properties d = createServerProps(defaultProps, p12);
d["IceSSL.Ciphers"] = "(DH_anon*)";
d["IceSSL.VerifyPeer"] = "0";
d["IceSSL.ProtocolVersionMax"] = "tls1_2";
@@ -1858,7 +1845,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ d = createServerProps(defaultProps, p12);
d["IceSSL.Ciphers"] = "(DH_anon*)";
d["IceSSL.VerifyPeer"] = "0";
d["IceSSL.ProtocolVersionMax"] = "tls1";
@@ -1881,7 +1868,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
initData.properties->setProperty("IceSSL.ProtocolVersionMin", "ssl3");
initData.properties->setProperty("IceSSL.ProtocolVersionMax", "ssl3");
@@ -1889,7 +1876,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -1918,7 +1905,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
initData.properties->setProperty("IceSSL.ProtocolVersionMin", "ssl3");
initData.properties->setProperty("IceSSL.ProtocolVersionMax", "ssl3");
@@ -1926,7 +1913,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
d["IceSSL.ProtocolVersionMin"] = "ssl3";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -1967,11 +1954,11 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#endif
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1_exp", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1_exp", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2004,11 +1991,11 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
#endif
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1_exp", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1_exp", "cacert1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
server = fact->createServer(d);
try
{
@@ -2037,12 +2024,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// certificate in the default directory.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "");
initData.properties->setProperty("IceSSL.CAs", defaultDir);
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.CAs"] = defaultDir;
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2067,11 +2054,11 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
cout << "testing multiple CA certificates... " << flush;
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacerts");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacerts");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca2", "cacerts");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca2", "cacerts");
d["IceSSL.VerifyPeer"] = "2";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2096,12 +2083,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
cout << "testing DER CA certificate... " << flush;
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "");
initData.properties->setProperty("IceSSL.CAs", "cacert1.der");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "");
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.CAs"] = "cacert1.der";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -2132,7 +2119,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Use the correct password.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_pass_ca1","cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_pass_ca1","cacert1");
initData.properties->setProperty("IceSSL.Password", ""); // Clear the password
initData.properties->setProperty("Ice.InitPlugins", "0");
@@ -2151,7 +2138,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
test(prompt->count() == 1);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2171,7 +2158,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#ifdef ICE_OS_UWP
removePersonalCertificate();
#endif
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_pass_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_pass_ca1", "cacert1");
initData.properties->setProperty("IceSSL.Password", ""); // Clear password
initData.properties->setProperty("IceSSL.PasswordRetryMax", "4");
initData.properties->setProperty("Ice.InitPlugins", "0");
@@ -2220,7 +2207,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// negotiate to use ADH since we explicitly enable it.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
# ifdef ICE_USE_OPENSSL
initData.properties->setProperty("IceSSL.Ciphers", anonCiphers);
# else
@@ -2229,7 +2216,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
# ifdef ICE_USE_OPENSSL
//
// With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
@@ -2273,7 +2260,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// provide a certificate.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
# ifdef ICE_USE_OPENSSL
initData.properties->setProperty("IceSSL.Ciphers", "ALL:!ADH");
# else
@@ -2282,7 +2269,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ Test::Properties d = createServerProps(defaultProps, p12);
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2312,7 +2299,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// This should fail because the client disabled all ciphers.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.Ciphers", "NONE");
try
{
@@ -2334,12 +2321,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test IceSSL.DHParams
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ Test::Properties d = createServerProps(defaultProps, p12);
d["IceSSL.Ciphers"] = "(DH_anon*)";
d["IceSSL.DHParams"] = "dh_params512.der";
d["IceSSL.VerifyPeer"] = "0";
@@ -2365,12 +2352,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test IceSSL.DHParams
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ Test::Properties d = createServerProps(defaultProps, p12);
d["IceSSL.Ciphers"] = "(DH_anon*)";
d["IceSSL.DHParams"] = "dh_params1024.der";
d["IceSSL.VerifyPeer"] = "0";
@@ -2394,14 +2381,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Client and server should negotiate to use 3DES as it is enabled in both.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.Ciphers", "3DES");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.Ciphers"] = "3DES AES_256";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -2424,14 +2411,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Client and server doesn't enable a common cipher negotiate to use 3DES as it is enabled in both.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.Ciphers", "3DES");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.Ciphers"] = "AES_256";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2472,12 +2459,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// First try a client with a DSA certificate.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_dsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_dsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.Ciphers", "DHE:DSS");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_dsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_dsa_ca1", "cacert1");
d["IceSSL.Ciphers"] = "DHE:DSS";
d["IceSSL.VerifyPeer"] = "1";
@@ -2495,11 +2482,11 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Next try a client with an RSA certificate.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ d = createServerProps(defaultProps, p12, "", "cacert1");
if(p12)
{
d["IceSSL.CertFile"] = "s_rsa_ca1.p12" + sep + "s_dsa_ca1.p12";
@@ -2531,12 +2518,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
// Next try a client with ADH. This should fail.
//
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.Ciphers", "ADH");
comm = initialize(initData);
fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "", "cacert1");
+ d = createServerProps(defaultProps, p12, "", "cacert1");
d["IceSSL.CertFile"] = "s_rsa_ca1_pub.pem" + sep + "s_dsa_ca1_pub.pem";
d["IceSSL.KeyFile"] = "s_rsa_ca1_priv.pem" + sep + "s_dsa_ca1_priv.pem";
d["IceSSL.Ciphers"] = "DEFAULT:DSS";
@@ -2565,13 +2552,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Configure a server with RSA and a client with DSA. This should fail.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_dsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_dsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.Ciphers", "DSS");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "2";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -2612,14 +2599,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
//
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "C=US, ST=Florida, O=ZeroC\\, Inc.,"
"OU=Ice, emailAddress=info@zeroc.com, CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2636,14 +2623,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "!C=US, ST=Florida, O=ZeroC\\, Inc.,"
"OU=Ice, emailAddress=info@zeroc.com, CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2658,14 +2645,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "C=US, ST=Florida, O=\"ZeroC, Inc.\","
"OU=Ice, emailAddress=info@zeroc.com, CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2681,12 +2668,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#endif
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com,CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -2703,12 +2690,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -2725,13 +2712,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2746,13 +2733,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "!CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2767,12 +2754,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2788,12 +2775,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "!CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2809,13 +2796,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "CN=Client");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2830,12 +2817,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "CN=Server";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2853,13 +2840,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#ifndef ICE_OS_UWP
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "C=Canada,CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2874,13 +2861,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "!C=Canada,CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2895,13 +2882,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "C=Canada;CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2916,13 +2903,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "!C=Canada;!CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2938,13 +2925,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#endif
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "!CN=Server1"); // Should not match "Server"
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -2959,12 +2946,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "!CN=Client1"; // Should not match "Client"
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -2984,13 +2971,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test rejection when client does not supply a certificate.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "");
+ initData.properties = createClientProps(defaultProps, p12, "", "");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.VerifyPeer"] = "0";
d["IceSSL.TrustOnly"] = "CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -3010,13 +2997,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Test rejection when client does not supply a certificate.
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "", "");
+ initData.properties = createClientProps(defaultProps, p12, "", "");
initData.properties->setProperty("IceSSL.VerifyPeer", "0");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "!CN=Client";
d["IceSSL.VerifyPeer"] = "0";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -3038,13 +3025,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Rejection takes precedence (client).
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly", "ST=Florida;!CN=Server;C=US");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -3063,12 +3050,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
// Rejection takes precedence (server).
//
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly"] = "C=US;!CN=Client;ST=Florida";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -3089,14 +3076,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#ifndef ICE_OS_UWP
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "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");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "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";
@@ -3115,14 +3102,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "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");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -3138,12 +3125,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
#endif
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
// Should have no effect.
d["IceSSL.TrustOnly.Client"] = "!CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -3160,13 +3147,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly.Client", "CN=Client");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -3181,13 +3168,13 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
initData.properties->setProperty("IceSSL.TrustOnly.Client", "!CN=Client");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -3205,7 +3192,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
cout << "testing IceSSL.TrustOnly.Server... " << flush;
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "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");
@@ -3213,7 +3200,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly.Server"] = "C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com,"
"CN=Client";
@@ -3231,12 +3218,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly.Server"] =
"!C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com, CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
@@ -3253,14 +3240,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
// Should have no effect.
initData.properties->setProperty("IceSSL.TrustOnly.Server", "!CN=Server");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
Test::ServerPrxPtr server = fact->createServer(d);
try
{
@@ -3275,12 +3262,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly.Server"] = "CN=Server";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -3296,12 +3283,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly.Server"] = "!CN=Client";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -3320,12 +3307,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
cout << "testing IceSSL.TrustOnly.Server.<AdapterName>... " << flush;
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly.Server.ServerAdapter"] =
"C=US, ST=Florida, O=ZeroC\\, Inc., OU=Ice, emailAddress=info@zeroc.com,CN=Client";
d["IceSSL.TrustOnly.Server"] = "CN=bogus";
@@ -3343,12 +3330,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "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::ServerPrxPtr server = fact->createServer(d);
@@ -3365,12 +3352,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly.Server.ServerAdapter"] = "CN=bogus";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -3386,12 +3373,12 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
}
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12, "c_rsa_ca1", "cacert1");
+ initData.properties = createClientProps(defaultProps, p12, "c_rsa_ca1", "cacert1");
CommunicatorPtr comm = initialize(initData);
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.TrustOnly.Server.ServerAdapter"] = "!CN=bogus";
Test::ServerPrxPtr server = fact->createServer(d);
try
@@ -3450,7 +3437,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; clientFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.CAs", "cacert1.pem");
initData.properties->setProperty("IceSSL.CertStore", "My");
initData.properties->setProperty("IceSSL.CertStoreLocation", "CurrentUser");
@@ -3464,7 +3451,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.CAs"] = "cacert1.pem";
d["IceSSL.FindCert"] = serverFindCertProperties[i];
//
@@ -3493,7 +3480,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; failFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.CAs", "cacert1.pem");
initData.properties->setProperty("IceSSL.FindCert", failFindCertProperties[i]);
try
@@ -3523,7 +3510,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; clientFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.CAs", "cacert1.pem");
initData.properties->setProperty("IceSSL.FindCert", clientFindCertProperties[i]);
try
@@ -3566,7 +3553,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; clientFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.CAs", "cacert1.pem");
initData.properties->setProperty("IceSSL.CertStore", "My");
initData.properties->setProperty("IceSSL.FindCert", clientFindCertProperties[i]);
@@ -3579,7 +3566,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12, "s_rsa_ca1", "cacert1");
+ Test::Properties d = createServerProps(defaultProps, p12, "s_rsa_ca1", "cacert1");
d["IceSSL.CAs"] = "cacert1.pem";
//
// Use TrustOnly to ensure the peer has pick the expected certificate.
@@ -3607,7 +3594,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; failFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.CAs", "cacert1.pem");
initData.properties->setProperty("IceSSL.FindCert", failFindCertProperties[i]);
try
@@ -3636,7 +3623,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; clientFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.CAs", "cacert1.pem");
initData.properties->setProperty("IceSSL.FindCert", clientFindCertProperties[i]);
try
@@ -3702,7 +3689,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; clientFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.CAs", "cacert1.pem");
initData.properties->setProperty("IceSSL.Keychain", "../certs/Find.keychain");
initData.properties->setProperty("IceSSL.KeychainPassword", "password");
@@ -3716,7 +3703,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
Test::ServerFactoryPrxPtr fact = ICE_CHECKED_CAST(Test::ServerFactoryPrx, comm->stringToProxy(factoryRef));
test(fact);
- Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
+ Test::Properties d = createServerProps(defaultProps, p12);
d["IceSSL.CAs"] = "cacert1.pem";
d["IceSSL.Keychain"] = "../certs/Find.keychain";
d["IceSSL.KeychainPassword"] = "password";
@@ -3744,7 +3731,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
for(int i = 0; failFindCertProperties[i] != 0; i++)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
+ initData.properties = createClientProps(defaultProps, p12);
initData.properties->setProperty("IceSSL.Keychain", "../certs/Find.keychain");
initData.properties->setProperty("IceSSL.KeychainPassword", "password");
initData.properties->setProperty("IceSSL.FindCert", failFindCertProperties[i]);
@@ -3776,7 +3763,8 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
{
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, "", defaultHost, false);
+ initData.properties = createClientProps(defaultProps, false);
+ initData.properties->setProperty("IceSSL.DefaultDir", "");
initData.properties->setProperty("IceSSL.VerifyDepthMax", "4");
initData.properties->setProperty("Ice.Override.Timeout", "5000"); // 5s timeout
CommunicatorPtr comm = initialize(initData);
@@ -3799,7 +3787,8 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12)
{
InitializationData initData;
- initData.properties = createClientProps(defaultProps, "", defaultHost, false);
+ initData.properties = createClientProps(defaultProps, false);
+ 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");
diff --git a/cpp/test/IceSSL/configuration/Server.cpp b/cpp/test/IceSSL/configuration/Server.cpp
index 3b411160c37..ed1ddb25e74 100644
--- a/cpp/test/IceSSL/configuration/Server.cpp
+++ b/cpp/test/IceSSL/configuration/Server.cpp
@@ -16,12 +16,22 @@ DEFINE_TEST("server")
using namespace std;
int
-run(int, char**, const Ice::CommunicatorPtr& communicator)
+run(int argc, char** argv, const Ice::CommunicatorPtr& communicator)
{
+ string testdir;
+#if TARGET_OS_IPHONE == 0
+ if(argc < 2)
+ {
+ cerr << "Usage: " << argv[0] << " testdir" << endl;
+ return 1;
+ }
+ testdir = string(argv[1]) + "/../certs";
+#endif
+
communicator->getProperties()->setProperty("TestAdapter.Endpoints", getTestEndpoint(communicator, 0, "tcp"));
Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
Ice::Identity id = Ice::stringToIdentity("factory");
- adapter->add(ICE_MAKE_SHARED(ServerFactoryI), id);
+ adapter->add(ICE_MAKE_SHARED(ServerFactoryI, testdir), id);
adapter->activate();
TEST_READY
communicator->waitForShutdown();
diff --git a/cpp/test/IceSSL/configuration/TestI.cpp b/cpp/test/IceSSL/configuration/TestI.cpp
index b467dc264ee..dec6aea05e3 100644
--- a/cpp/test/IceSSL/configuration/TestI.cpp
+++ b/cpp/test/IceSSL/configuration/TestI.cpp
@@ -83,10 +83,13 @@ ServerI::checkCipher(ICE_IN(string) cipher, const Ice::Current& c)
void
ServerI::destroy()
{
- string defaultDir = _communicator->getProperties()->getProperty("IceSSL.DefaultDir");
_communicator->destroy();
}
+ServerFactoryI::ServerFactoryI(const string& defaultDir) : _defaultDir(defaultDir)
+{
+}
+
Test::ServerPrxPtr
ServerFactoryI::createServer(ICE_IN(Test::Properties) props, const Current&)
{
@@ -96,6 +99,7 @@ ServerFactoryI::createServer(ICE_IN(Test::Properties) props, const Current&)
{
initData.properties->setProperty(p->first, p->second);
}
+ initData.properties->setProperty("IceSSL.DefaultDir", _defaultDir);
CommunicatorPtr communicator = initialize(initData);
ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("ServerAdapter", "ssl");
diff --git a/cpp/test/IceSSL/configuration/TestI.h b/cpp/test/IceSSL/configuration/TestI.h
index d68fdf49c65..b0f3eeeacbe 100644
--- a/cpp/test/IceSSL/configuration/TestI.h
+++ b/cpp/test/IceSSL/configuration/TestI.h
@@ -34,12 +34,15 @@ class ServerFactoryI : public Test::ServerFactory
{
public:
+ ServerFactoryI(const std::string&);
+
virtual Test::ServerPrxPtr createServer(ICE_IN(Test::Properties), const Ice::Current&);
virtual void destroyServer(ICE_IN(Test::ServerPrxPtr), const Ice::Current&);
virtual void shutdown(const Ice::Current&);
private:
+ std::string _defaultDir;
std::map<Ice::Identity, ServerIPtr> _servers;
};
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 17:23:15 +0000