summaryrefslogtreecommitdiff
path: root/cs/config/TestUtil.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2006-03-29 00:25:57 +0000
committerMark Spruiell <mes@zeroc.com>2006-03-29 00:25:57 +0000
commit51af44ea7ea5acdf96f0f15d1b32a50a9c27d284 (patch)
tree079fdf6573b7fd930e1f9cadedce01e8657902e7 /cs/config/TestUtil.py
parentfix for Mono compile error (diff)
downloadice-51af44ea7ea5acdf96f0f15d1b32a50a9c27d284.tar.bz2
ice-51af44ea7ea5acdf96f0f15d1b32a50a9c27d284.tar.xz
ice-51af44ea7ea5acdf96f0f15d1b32a50a9c27d284.zip
new IceSSL/C++ plugin
Diffstat (limited to 'cs/config/TestUtil.py')
-rw-r--r--cs/config/TestUtil.py24
1 files changed, 16 insertions, 8 deletions
diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py
index beb75c01789..9f6c4309efc 100644
--- a/cs/config/TestUtil.py
+++ b/cs/config/TestUtil.py
@@ -179,16 +179,24 @@ if protocol == "ssl":
" --IceSSL.Server.Password=password"
cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:create"
cppClientProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \
- " --IceSSL.Client.Config=client_sslconfig.xml"
+ " --IceSSL.Client.DefaultDir=" + os.path.join(toplevel, "certs") + \
+ " --IceSSL.Client.CertAuthFile=cacert.pem" + \
+ " --IceSSL.Client.CertFile=c_rsa1024_pub.pem" + \
+ " --IceSSL.Client.KeyFile=c_rsa1024_priv.pem"
cppServerProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \
- " --IceSSL.Server.Config=server_sslconfig.xml"
+ " --IceSSL.Server.DefaultDir=" + os.path.join(toplevel, "certs") + \
+ " --IceSSL.Server.CertAuthFile=cacert.pem" + \
+ " --IceSSL.Server.CertFile=s_rsa1024_pub.pem" + \
+ " --IceSSL.Server.KeyFile=s_rsa1024_priv.pem"
cppClientServerProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \
- " --IceSSL.Client.Config=sslconfig.xml" + \
- " --IceSSL.Server.CertPath=" + os.path.join(toplevel, "certs") + \
- " --IceSSL.Server.Config=sslconfig.xml"
+ " --IceSSL.Client.DefaultDir=" + os.path.join(toplevel, "certs") + \
+ " --IceSSL.Client.CertAuthFile=cacert.pem" + \
+ " --IceSSL.Client.CertFile=c_rsa1024_pub.pem" + \
+ " --IceSSL.Client.KeyFile=c_rsa1024_priv.pem" + \
+ " --IceSSL.Server.DefaultDir=" + os.path.join(toplevel, "certs") + \
+ " --IceSSL.Server.CertAuthFile=cacert.pem" + \
+ " --IceSSL.Server.CertFile=s_rsa1024_pub.pem" + \
+ " --IceSSL.Server.KeyFile=s_rsa1024_priv.pem"
else:
clientProtocol = ""
serverProtocol = ""