summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-08-07 01:00:42 +0200
committerJose <jose@zeroc.com>2014-08-07 01:00:42 +0200
commitd86ef31c63190285dda3233b8ee2cb5d381c7686 (patch)
tree653d33813fef2d5997916d8462f516646af919c3 /scripts/TestUtil.py
parentupdating .depend files (diff)
downloadice-d86ef31c63190285dda3233b8ee2cb5d381c7686.tar.bz2
ice-d86ef31c63190285dda3233b8ee2cb5d381c7686.tar.xz
ice-d86ef31c63190285dda3233b8ee2cb5d381c7686.zip
Windows SSL SChannel implementation & OS X Secure Transport fixes.
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index c45d3fb650f..b3f4751945f 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -685,11 +685,11 @@ class InvalidSelectorString(Exception):
sslConfigTree = {
"cpp" : {
- "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL " +
+ "plugin" : " --Ice.Plugin.IceSSL=IceSSL:createIceSSL --IceSSL.Password=password " +
"--IceSSL.DefaultDir=%(certsdir)s --IceSSL.CertAuthFile=cacert.pem --IceSSL.VerifyPeer=%(verifyPeer)s",
- "client" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem",
- "server" : " --IceSSL.CertFile=s_rsa1024_pub.pem --IceSSL.KeyFile=s_rsa1024_priv.pem",
- "colloc" : " --IceSSL.CertFile=c_rsa1024_pub.pem --IceSSL.KeyFile=c_rsa1024_priv.pem"
+ "client" : " --IceSSL.CertFile=c_rsa1024.pfx",
+ "server" : " --IceSSL.CertFile=s_rsa1024.pfx",
+ "colloc" : " --IceSSL.CertFile=c_rsa1024.pfx"
},
"java" : {
"plugin" : " --Ice.Plugin.IceSSL=IceSSL.PluginFactory " +