summaryrefslogtreecommitdiff
path: root/csharp/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2015-04-16 09:37:33 +0200
committerBenoit Foucher <benoit@zeroc.com>2015-04-16 09:37:33 +0200
commitd931421851c73b676a0a5c566780ad940791ad1e (patch)
treec24d59b82eebc898216673212994ea0b893217d6 /csharp/test
parentREADME updates (diff)
downloadice-d931421851c73b676a0a5c566780ad940791ad1e.tar.bz2
ice-d931421851c73b676a0a5c566780ad940791ad1e.tar.xz
ice-d931421851c73b676a0a5c566780ad940791ad1e.zip
New set of certificates for IceSSL/configuration test and various
IceSSL fixes. - Windows C++ and C# implementation of IceSSL is now a bit less picky for SUBJECTDN and ISSUERDN - Windows SChannel implementation now accept PKCS#1 certificates
Diffstat (limited to 'csharp/test')
-rw-r--r--csharp/test/IceSSL/certs/README.md9
-rw-r--r--csharp/test/IceSSL/certs/c_rsa_ca1.p12bin0 -> 2892 bytes
-rw-r--r--csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12bin0 -> 2892 bytes
-rw-r--r--csharp/test/IceSSL/certs/c_rsa_ca2.p12bin0 -> 2900 bytes
-rw-r--r--csharp/test/IceSSL/certs/c_rsa_nopass_ca1.pfxbin1949 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfxbin1949 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/certs/c_rsa_nopass_ca2.pfxbin1949 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/certs/cacert1.pem42
-rw-r--r--csharp/test/IceSSL/certs/cacert2.p12bin0 -> 2654 bytes
-rw-r--r--csharp/test/IceSSL/certs/cacert2.pem42
-rw-r--r--csharp/test/IceSSL/certs/cacert2.pfxbin1973 -> 0 bytes
-rwxr-xr-xcsharp/test/IceSSL/certs/makecerts.py107
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_ca1.p12bin0 -> 2892 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12bin0 -> 2892 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12bin0 -> 2892 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12bin0 -> 2892 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_ca2.p12bin0 -> 2900 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_nopass_ca1.pfxbin1981 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfxbin1957 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfxbin1957 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfxbin1981 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/certs/s_rsa_nopass_ca2.pfxbin1981 -> 0 bytes
-rw-r--r--csharp/test/IceSSL/configuration/AllTests.cs254
23 files changed, 219 insertions, 235 deletions
diff --git a/csharp/test/IceSSL/certs/README.md b/csharp/test/IceSSL/certs/README.md
new file mode 100644
index 00000000000..9236ac1e241
--- /dev/null
+++ b/csharp/test/IceSSL/certs/README.md
@@ -0,0 +1,9 @@
+This directory contains certificates that are required by the tests in
+test/IceSSL/configuration. The 'makecerts.py' script generates
+certificates in the current directory using the CA databases stored in
+the cpp/test/IceSSL/certs/db directory.
+
+Running this script, we'll just re-save the certificates in the
+current directory without creating new certificates.
+
+See cpp/test/IceSSL/certs/README.md for more information
diff --git a/csharp/test/IceSSL/certs/c_rsa_ca1.p12 b/csharp/test/IceSSL/certs/c_rsa_ca1.p12
new file mode 100644
index 00000000000..c84af424096
--- /dev/null
+++ b/csharp/test/IceSSL/certs/c_rsa_ca1.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12 b/csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12
new file mode 100644
index 00000000000..40198141621
--- /dev/null
+++ b/csharp/test/IceSSL/certs/c_rsa_ca1_exp.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_ca2.p12 b/csharp/test/IceSSL/certs/c_rsa_ca2.p12
new file mode 100644
index 00000000000..79e097ba266
--- /dev/null
+++ b/csharp/test/IceSSL/certs/c_rsa_ca2.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_nopass_ca1.pfx b/csharp/test/IceSSL/certs/c_rsa_nopass_ca1.pfx
deleted file mode 100644
index 2f8c19f0a74..00000000000
--- a/csharp/test/IceSSL/certs/c_rsa_nopass_ca1.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfx b/csharp/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfx
deleted file mode 100644
index 30f06e76592..00000000000
--- a/csharp/test/IceSSL/certs/c_rsa_nopass_ca1_exp.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/c_rsa_nopass_ca2.pfx b/csharp/test/IceSSL/certs/c_rsa_nopass_ca2.pfx
deleted file mode 100644
index 922ed17dd5b..00000000000
--- a/csharp/test/IceSSL/certs/c_rsa_nopass_ca2.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/cacert1.pem b/csharp/test/IceSSL/certs/cacert1.pem
index 05771c456b1..bafe93f2416 100644
--- a/csharp/test/IceSSL/certs/cacert1.pem
+++ b/csharp/test/IceSSL/certs/cacert1.pem
@@ -1,22 +1,24 @@
-----BEGIN CERTIFICATE-----
-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
+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
+XI4tRAGQ
-----END CERTIFICATE-----
diff --git a/csharp/test/IceSSL/certs/cacert2.p12 b/csharp/test/IceSSL/certs/cacert2.p12
new file mode 100644
index 00000000000..fdf145239aa
--- /dev/null
+++ b/csharp/test/IceSSL/certs/cacert2.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/cacert2.pem b/csharp/test/IceSSL/certs/cacert2.pem
index fc30d9970b7..4985e942a1c 100644
--- a/csharp/test/IceSSL/certs/cacert2.pem
+++ b/csharp/test/IceSSL/certs/cacert2.pem
@@ -1,22 +1,24 @@
-----BEGIN CERTIFICATE-----
-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
+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
+x85pU3uAVw==
-----END CERTIFICATE-----
diff --git a/csharp/test/IceSSL/certs/cacert2.pfx b/csharp/test/IceSSL/certs/cacert2.pfx
deleted file mode 100644
index fbc0b9c0771..00000000000
--- a/csharp/test/IceSSL/certs/cacert2.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/makecerts.py b/csharp/test/IceSSL/certs/makecerts.py
index 839a2442ab6..5a99f899d56 100755
--- a/csharp/test/IceSSL/certs/makecerts.py
+++ b/csharp/test/IceSSL/certs/makecerts.py
@@ -1,83 +1,56 @@
#!/usr/bin/env python
# **********************************************************************
#
-# Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
+# Copyright (c) 2015 ZeroC, Inc. All rights reserved.
#
# **********************************************************************
-import os, sys, shutil
+import os, sys, socket, getopt
+
+try:
+ import IceCertUtils
+except Exception as ex:
+ print("error: couldn't find IceCertUtils, install `zeroc-ice-certutils' package "
+ "from Python package repository:\n" + str(ex))
+ sys.exit(1)
-for toplevel in [".", "..", "../..", "../../..", "../../../..", "../../../../.."]:
- toplevel = os.path.normpath(toplevel)
+toplevel="."
+while(toplevel != "/"):
+ toplevel = os.path.normpath(os.path.join("..", toplevel))
if os.path.exists(os.path.join(toplevel, "scripts", "TestUtil.py")):
break
else:
raise RuntimeError("can't find toplevel directory!")
-sys.path.append(toplevel)
-from scripts import *
-
-#
-# Show usage information.
-#
-def usage():
- print("Usage: " + sys.argv[0] + " [options]")
- print("")
- print("Options:")
- print("-h Show this message.")
- print("-f Force an update to the C# files.")
-
-#
-# Check arguments
-#
-force = 0
-for x in sys.argv[1:]:
- if x == "-h":
- usage()
- sys.exit(0)
- elif x == "-f":
- force = 1
- elif x.startswith("-"):
- print(sys.argv[0] + ": unknown option `" + x + "'")
- print("")
- usage()
- sys.exit(1)
- else:
- usage()
- sys.exit(1)
-
-cppcerts = os.path.join(TestUtil.getIceDir("cpp"), "test", "IceSSL", "certs")
-
-for x in ("cacert1.pem", "cacert2.pem"):
- if force or not os.path.exists(x):
- shutil.copyfile(os.path.join(cppcerts, x), x)
-
-certs = [\
- "c_rsa_nopass_ca1_exp", \
- "c_rsa_nopass_ca1", \
- "c_rsa_nopass_ca2", \
- "s_rsa_nopass_ca1_exp", \
- "s_rsa_nopass_ca1", \
- "s_rsa_nopass_ca2", \
- "s_rsa_nopass_ca1_cn1", \
- "s_rsa_nopass_ca1_cn2", \
+cppcerts = os.path.join(toplevel, "cpp", "test", "IceSSL", "certs")
+if not os.path.exists(os.path.join(cppcerts, "db", "ca1", "ca.pem")):
+ print("error: CA database is not initialized in `" + os.path.join(cppcerts, "db") + "',"
+ " run makecerts.py in `" + cppcerts + "' first")
+ sys.exit(1)
+
+ca1 = IceCertUtils.CertificateFactory(home=os.path.join(cppcerts, "db", "ca1"))
+ca2 = IceCertUtils.CertificateFactory(home=os.path.join(cppcerts, "db", "ca2"))
+
+ca1.getCA().save("cacert1.pem")
+ca2.getCA().save("cacert2.pem")
+
+certs = [
+ (ca1, "s_rsa_ca1"),
+ (ca1, "c_rsa_ca1"),
+ (ca1, "s_rsa_ca1_exp"), # Expired certificate
+ (ca1, "c_rsa_ca1_exp"), # Expired certificate
+ (ca1, "s_rsa_ca1_cn1"), # No subjectAltName, CN=127.0.0.1
+ (ca1, "s_rsa_ca1_cn2"), # No subjectAltName, CN=127.0.0.11
+ (ca2, "s_rsa_ca2"),
+ (ca2, "c_rsa_ca2"),
]
-for x in certs:
- if force or not os.path.exists(x + ".pfx"):
- cert = os.path.join(cppcerts, x)
- os.system("openssl pkcs12 -in " + cert + "_pub.pem -inkey " + cert + "_priv.pem -export -out " + x + \
- ".pfx -passout pass:password")
- print("Created " + x + ".pfx")
-
-if force or not os.path.exists("cacert2.pfx"):
- cert = os.path.join(cppcerts, "cacert2.pem")
- key = os.path.join(cppcerts, "cakey2.pem")
- os.system("openssl pkcs12 -in " + cert + " -inkey " + key + " -export -out cacert2.pfx -passout pass:password")
#
-# Done.
+# Save the certificate as PKCS12 files.
#
-print("Done.")
+for (ca, alias) in certs:
+ cert = ca.get(alias) or ca.create(alias, **args)
+ cert.save(alias + ".p12")
+
+# Also export the ca2 self-signed certificate, it's used by the tests to test self-signed certificates
+ca2.getCA().save("cacert2.p12", addkey=True)
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1.p12
new file mode 100644
index 00000000000..4e53b2205fb
--- /dev/null
+++ b/csharp/test/IceSSL/certs/s_rsa_ca1.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12
new file mode 100644
index 00000000000..dd78b2d98e8
--- /dev/null
+++ b/csharp/test/IceSSL/certs/s_rsa_ca1_cn1.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12
new file mode 100644
index 00000000000..6f8a2074b09
--- /dev/null
+++ b/csharp/test/IceSSL/certs/s_rsa_ca1_cn2.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12 b/csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12
new file mode 100644
index 00000000000..092b33db88e
--- /dev/null
+++ b/csharp/test/IceSSL/certs/s_rsa_ca1_exp.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_ca2.p12 b/csharp/test/IceSSL/certs/s_rsa_ca2.p12
new file mode 100644
index 00000000000..95d603b5384
--- /dev/null
+++ b/csharp/test/IceSSL/certs/s_rsa_ca2.p12
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1.pfx
deleted file mode 100644
index d4da4b14be9..00000000000
--- a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfx
deleted file mode 100644
index abaf88af9cb..00000000000
--- a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn1.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfx
deleted file mode 100644
index b87113ebccf..00000000000
--- a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_cn2.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfx
deleted file mode 100644
index db463ca3d75..00000000000
--- a/csharp/test/IceSSL/certs/s_rsa_nopass_ca1_exp.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx b/csharp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx
deleted file mode 100644
index 8ba6e819bd6..00000000000
--- a/csharp/test/IceSSL/certs/s_rsa_nopass_ca2.pfx
+++ /dev/null
Binary files differ
diff --git a/csharp/test/IceSSL/configuration/AllTests.cs b/csharp/test/IceSSL/configuration/AllTests.cs
index 6cceb46947d..c2fb0e630d7 100644
--- a/csharp/test/IceSSL/configuration/AllTests.cs
+++ b/csharp/test/IceSSL/configuration/AllTests.cs
@@ -137,7 +137,7 @@ public class AllTests
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
initData.properties.setProperty("Ice.InitPlugins", "0");
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
@@ -148,7 +148,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
d["IceSSL.CertAuthFile"] = caCert1File;
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
Test.ServerPrx server = fact.createServer(d);
try
@@ -166,7 +166,7 @@ public class AllTests
//
// Supply our own certificate.
//
- X509Certificate2 cert = new X509Certificate2(defaultDir + "/c_rsa_nopass_ca1.pfx", "password");
+ X509Certificate2 cert = new X509Certificate2(defaultDir + "/c_rsa_ca1.p12", "password");
X509Certificate2Collection coll = new X509Certificate2Collection();
coll.Add(cert);
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
@@ -182,7 +182,7 @@ public class AllTests
test(obj != null);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.CertAuthFile"] = caCert1File;
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
@@ -208,7 +208,7 @@ public class AllTests
coll.Add(cert);
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
initData.properties.setProperty("Ice.InitPlugins", "0");
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Ice.PluginManager pm = comm.getPluginManager();
@@ -220,7 +220,7 @@ public class AllTests
test(obj != null);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(obj);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.CertAuthFile"] = defaultDir + "/cacert1.pem";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
@@ -251,7 +251,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "1";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -285,7 +285,7 @@ public class AllTests
// does not supply a certificate.
//
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -311,13 +311,13 @@ public class AllTests
//
// Test IceSSL.VerifyPeer=1. Client has a certificate.
//
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
comm = Ice.Util.initialize(ref args, initData);
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "1";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -325,11 +325,11 @@ public class AllTests
try
{
X509Certificate2 clientCert =
- new X509Certificate2(defaultDir + "/c_rsa_nopass_ca1.pfx", "password");
+ new X509Certificate2(defaultDir + "/c_rsa_ca1.p12", "password");
server.checkCert(clientCert.Subject, clientCert.Issuer);
X509Certificate2 serverCert =
- new X509Certificate2(defaultDir + "/s_rsa_nopass_ca1.pfx", "password");
+ new X509Certificate2(defaultDir + "/s_rsa_ca1.p12", "password");
X509Certificate2 caCert = new X509Certificate2(defaultDir + "/cacert1.pem");
IceSSL.NativeConnectionInfo info = (IceSSL.NativeConnectionInfo)server.ice_getConnection().getInfo();
@@ -348,7 +348,7 @@ public class AllTests
// Test IceSSL.VerifyPeer=2. Client has a certificate.
//
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -356,7 +356,7 @@ public class AllTests
try
{
X509Certificate2 clientCert =
- new X509Certificate2(defaultDir + "/c_rsa_nopass_ca1.pfx", "password");
+ new X509Certificate2(defaultDir + "/c_rsa_ca1.p12", "password");
server.checkCert(clientCert.Subject, clientCert.Issuer);
}
catch(Exception ex)
@@ -377,7 +377,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "1";
// Don't add the CA certificate.
@@ -409,7 +409,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/cacert2.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/cacert2.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "0";
server = fact.createServer(d);
@@ -434,7 +434,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/cacert2.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/cacert2.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "0";
server = fact.createServer(d);
@@ -460,14 +460,14 @@ public class AllTests
// Verify that IceSSL.CheckCertName has no effect in a server.
//
initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
comm = Ice.Util.initialize(ref args, initData);
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CheckCertName"] = "1";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -502,7 +502,7 @@ public class AllTests
//
{
initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CheckCertName", "1");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -511,7 +511,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CheckCertName"] = "1";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -532,7 +532,7 @@ public class AllTests
//
{
initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CheckCertName", "1");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -541,7 +541,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1_cn1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1_cn1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CheckCertName"] = "1";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -563,7 +563,7 @@ public class AllTests
//
{
initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CheckCertName", "1");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -572,7 +572,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1_cn2.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1_cn2.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CheckCertName"] = "1";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -600,7 +600,7 @@ public class AllTests
// Verify that a server certificate is present.
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
@@ -612,7 +612,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -661,7 +661,7 @@ public class AllTests
// Verify that verifier is installed via property.
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertVerifier", "CertificateVerifierI");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
@@ -680,7 +680,7 @@ public class AllTests
// in common.
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.Protocols", "ssl3");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -688,7 +688,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.Protocols"] = "tls1";
@@ -717,7 +717,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.Protocols"] = "tls1, ssl3";
@@ -750,7 +750,7 @@ public class AllTests
try
{
initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.Protocols", "tls1_2");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -758,7 +758,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.Protocols"] = "tls1_2";
@@ -785,7 +785,7 @@ public class AllTests
// uses the default protocol set that disables SSLv3
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.Protocols", "ssl3");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -793,7 +793,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -821,7 +821,7 @@ public class AllTests
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.Protocols"] = "ssl3, tls1_0, tls1_1, tls1_2";
@@ -847,14 +847,14 @@ public class AllTests
// This should fail because the server's certificate is expired.
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1_exp.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1_exp.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -878,14 +878,14 @@ public class AllTests
//
// This should fail because the client's certificate is expired.
//
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1_exp.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1_exp.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
comm = Ice.Util.initialize(ref args, initData);
fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -914,13 +914,13 @@ public class AllTests
Console.Out.Flush();
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
test(fact != null);
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca2.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca2.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.VerifyPeer"] = "2";
store.Add(caCert1);
@@ -948,7 +948,7 @@ public class AllTests
// Test password failure.
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
// Don't specify the password.
//props.setProperty("IceSSL.Password", "password");
try
@@ -971,7 +971,7 @@ public class AllTests
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
initData.properties.setProperty("Ice.InitPlugins", "0");
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Ice.PluginManager pm = comm.getPluginManager();
IceSSL.Plugin plugin = (IceSSL.Plugin)pm.getPlugin("IceSSL");
@@ -999,7 +999,7 @@ public class AllTests
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
initData.properties.setProperty("Ice.InitPlugins", "0");
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Ice.PluginManager pm = comm.getPluginManager();
IceSSL.Plugin plugin = (IceSSL.Plugin)pm.getPlugin("IceSSL");
@@ -1022,7 +1022,7 @@ public class AllTests
// Test password callback property.
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.PasswordCallback", "PasswordCallbackI");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Ice.PluginManager pm = comm.getPluginManager();
@@ -1037,7 +1037,7 @@ public class AllTests
Console.Out.Flush();
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly",
"C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server");
@@ -1046,7 +1046,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1063,7 +1063,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly",
"!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server");
@@ -1072,7 +1072,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1089,7 +1089,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly",
"C=US, ST=Florida, O=\"ZeroC, Inc.\",OU=Ice, emailAddress=info@zeroc.com, CN=Server");
@@ -1098,7 +1098,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1115,14 +1115,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly"] =
"C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client";
@@ -1141,14 +1141,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly"] =
"!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client";
@@ -1167,7 +1167,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "CN=Server");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1175,7 +1175,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1192,7 +1192,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "!CN=Server");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1200,7 +1200,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1217,14 +1217,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly"] = "CN=Client";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1242,14 +1242,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly"] = "!CN=Client";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1267,7 +1267,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "CN=Client");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1275,7 +1275,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1292,14 +1292,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly"] = "CN=Server";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1317,7 +1317,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "C=Canada,CN=Server");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1325,7 +1325,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1342,7 +1342,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "!C=Canada,CN=Server");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1350,7 +1350,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1367,7 +1367,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "C=Canada;CN=Server");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1375,7 +1375,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1392,7 +1392,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "!C=Canada;!CN=Server");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1400,7 +1400,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1417,7 +1417,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "!CN=Server1"); // Should not match "Server"
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1425,7 +1425,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1442,14 +1442,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly"] = "!CN=Client1"; // Should not match "Client"
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1470,7 +1470,7 @@ public class AllTests
// Rejection takes precedence (client).
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly", "ST=Florida;!CN=Server;C=US");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1478,7 +1478,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1498,14 +1498,14 @@ public class AllTests
// Rejection takes precedence (server).
//
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly"] = "C=US;!CN=Client;ST=Florida";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1527,7 +1527,7 @@ public class AllTests
Console.Out.Flush();
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly.Client",
"C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server");
@@ -1536,7 +1536,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
// Should have no effect.
d["IceSSL.TrustOnly.Client"] =
@@ -1556,7 +1556,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly.Client",
"!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Server");
@@ -1565,7 +1565,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1582,14 +1582,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
// Should have no effect.
d["IceSSL.TrustOnly.Client"] = "!CN=Client";
@@ -1608,7 +1608,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly.Client", "CN=Client");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1616,7 +1616,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1633,7 +1633,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.TrustOnly.Client", "!CN=Client");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
@@ -1641,7 +1641,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1662,7 +1662,7 @@ public class AllTests
Console.Out.Flush();
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
// Should have no effect.
initData.properties.setProperty("IceSSL.TrustOnly.Server",
@@ -1672,7 +1672,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server"] =
"C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client";
@@ -1691,14 +1691,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server"] =
"!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client";
@@ -1717,7 +1717,7 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
// Should have no effect.
initData.properties.setProperty("IceSSL.TrustOnly.Server", "!CN=Server");
@@ -1726,7 +1726,7 @@ public class AllTests
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.CertAuthFile"] = caCert1File;
Test.ServerPrx server = fact.createServer(d);
@@ -1743,14 +1743,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server"] = "CN=Server";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1768,14 +1768,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server"] = "!CN=Client";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1797,14 +1797,14 @@ public class AllTests
Console.Out.Flush();
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server"] = "CN=bogus";
d["IceSSL.TrustOnly.Server.ServerAdapter"] =
@@ -1824,14 +1824,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server.ServerAdapter"] =
"!C=US, ST=Florida, O=ZeroC\\, Inc.,OU=Ice, emailAddress=info@zeroc.com, CN=Client";
@@ -1850,14 +1850,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server.ServerAdapter"] = "CN=bogus";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1875,14 +1875,14 @@ public class AllTests
}
{
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
- initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", defaultDir + "/c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.CertAuthFile", caCert1File);
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
Test.ServerFactoryPrx fact = Test.ServerFactoryPrxHelper.checkedCast(comm.stringToProxy(factoryRef));
Dictionary<string, string> d = createServerProps(defaultProperties, testDir, defaultHost);
- d["IceSSL.CertFile"] = defaultDir + "/s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = defaultDir + "/s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
d["IceSSL.TrustOnly.Server.ServerAdapter"] = "!CN=bogus";
d["IceSSL.CertAuthFile"] = caCert1File;
@@ -1908,7 +1908,7 @@ public class AllTests
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
initData.properties.setProperty("IceSSL.ImportCert.LocalMachine.Root", "cacert1.pem");
- initData.properties.setProperty("IceSSL.CertFile", "c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", "c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.KeySet", "MachineKeySet");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
@@ -1918,7 +1918,7 @@ public class AllTests
d["IceSSL.DefaultDir"] = defaultDir;
d["IceSSL.ImportCert.LocalMachine.Root"] = "cacert1.pem";
d["IceSSL.KeySet"] = "MachineKeySet";
- d["IceSSL.CertFile"] = "s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = "s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
Test.ServerPrx server = fact.createServer(d);
@@ -1941,7 +1941,7 @@ public class AllTests
Ice.InitializationData initData = createClientProps(defaultProperties, testDir, defaultHost);
initData.properties.setProperty("IceSSL.DefaultDir", defaultDir);
initData.properties.setProperty("IceSSL.ImportCert.CurrentUser.Root", "cacert1.pem");
- initData.properties.setProperty("IceSSL.CertFile", "c_rsa_nopass_ca1.pfx");
+ initData.properties.setProperty("IceSSL.CertFile", "c_rsa_ca1.p12");
initData.properties.setProperty("IceSSL.Password", "password");
initData.properties.setProperty("IceSSL.KeySet", "UserKeySet");
Ice.Communicator comm = Ice.Util.initialize(ref args, initData);
@@ -1951,7 +1951,7 @@ public class AllTests
d["IceSSL.DefaultDir"] = defaultDir;
d["IceSSL.ImportCert.CurrentUser.Root"] = "cacert1.pem";
d["IceSSL.KeySet"] = "UserKeySet";
- d["IceSSL.CertFile"] = "s_rsa_nopass_ca1.pfx";
+ d["IceSSL.CertFile"] = "s_rsa_ca1.p12";
d["IceSSL.Password"] = "password";
Test.ServerPrx server = fact.createServer(d);
@@ -1978,22 +1978,20 @@ public class AllTests
{
string[] clientFindCertProperties = new string[]
{
- "SUBJECTDN:'CN=Client, E=info@zeroc.com, OU=Ice, O=\"ZeroC, Inc.\", S=Florida, C=US'",
+ "SUBJECTDN:'CN=Client, OU=Ice, O=\"ZeroC, Inc.\", L=Jupiter, S=Florida, C=US, E=info@zeroc.com'",
"ISSUER:'ZeroC, Inc.' SUBJECT:Client SERIAL:02",
- "ISSUERDN:'E=info@zeroc.com, CN=ZeroC Test CA 1, OU=Ice, O=\"ZeroC, Inc.\"," +
- " L=Palm Beach Gardens, S=Florida, C=US' SUBJECT:Client",
- "THUMBPRINT:'54 26 20 f0 93 a9 b6 bc 2a 8c 83 ef 14 d4 49 18 a3 18 67 46'",
- "SUBJECTKEYID:'58 77 81 07 55 2a 0c 10 19 88 13 47 6f 27 6e 21 75 5f 85 ca'"
+ "ISSUERDN:'CN=ZeroC Test CA 1, OU=Ice, O=\"ZeroC, Inc.\",L=Jupiter, S=Florida, C=US,E=info@zeroc.com' SUBJECT:Client",
+ "THUMBPRINT:'82 30 1E 35 9E 39 C1 D0 63 0D 67 3D 12 DD D4 96 90 1E EF 54'",
+ "SUBJECTKEYID:'FC 5D 4F AB F0 6C 03 11 B8 F3 68 CF 89 54 92 3F F9 79 2A 06'"
};
string[] serverFindCertProperties = new string[]
{
- "SUBJECTDN:'CN=Server, E=info@zeroc.com, OU=Ice, O=\"ZeroC, Inc.\", S=Florida, C=US'",
+ "SUBJECTDN:'CN=Server, OU=Ice, O=\"ZeroC, Inc.\", L=Jupiter, S=Florida, C=US, E=info@zeroc.com'",
"ISSUER:'ZeroC, Inc.' SUBJECT:Server SERIAL:01",
- "ISSUERDN:'E=info@zeroc.com, CN=ZeroC Test CA 1, OU=Ice, O=\"ZeroC, Inc.\"," +
- " L=Palm Beach Gardens, S=Florida, C=US' SUBJECT:Server",
- "THUMBPRINT:'27 e0 18 c9 23 12 6c f0 5c da fa 36 5a 4c 63 5a e2 53 07 1a'",
- "SUBJECTKEYID:'a6 42 aa 17 04 41 86 56 67 e4 04 64 59 34 30 c7 4c 6b ef a4'"
+ "ISSUERDN:'CN=ZeroC Test CA 1, OU=Ice, O=\"ZeroC, Inc.\", L=Jupiter, S=Florida, C=US,E=info@zeroc.com' SUBJECT:Server",
+ "THUMBPRINT:'C0 01 FF 9C C9 DA C8 0D 34 F6 2F DE 09 FB 28 0D 69 AB 78 BA'",
+ "SUBJECTKEYID:'47 84 AE F9 F2 85 3D 99 30 6A 03 38 41 1A B9 EB C3 9C B5 4D'"
};
string[] failFindCertProperties = new string[]
@@ -2004,12 +2002,12 @@ public class AllTests
"SUBJECTDN:'CN = Client, E = infox@zeroc.com, OU = Ice, O = \"ZeroC, Inc.\", S = Florida, C = US'",
"ISSUER:'ZeroC, Inc.' SUBJECT:Client SERIAL:'02 02'",
"ISSUERDN:'E=info@zeroc.com, CN=ZeroC Test CA 1, OU=Ice, O=\"ZeroC, Inc.\"," +
- " L=Palm Beach Gardens, S=Florida, C=ES' SUBJECT:Client",
+ " L=Jupiter, S=Florida, C=ES' SUBJECT:Client",
"THUMBPRINT:'27 e0 18 c9 23 12 6c f0 5c da fa 36 5a 4c 63 5a e2 53 07 ff'",
"SUBJECTKEYID:'a6 42 aa 17 04 41 86 56 67 e4 04 64 59 34 30 c7 4c 6b ef ff'"
};
- string[] certificates = new string[] {"/s_rsa_nopass_ca1.pfx", "/c_rsa_nopass_ca1.pfx"};
+ string[] certificates = new string[] {"/s_rsa_ca1.p12", "/c_rsa_ca1.p12"};
X509Store certStore = new X509Store("My", StoreLocation.CurrentUser);
certStore.Open(OpenFlags.ReadWrite);
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 17:01:20 +0000