summaryrefslogtreecommitdiff
path: root/php/config/TestUtil.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2006-04-07 18:48:38 +0000
committerMark Spruiell <mes@zeroc.com>2006-04-07 18:48:38 +0000
commit14d8acd69cd3e2f82884d13252d0eda726f539ae (patch)
treeafc171a5345e95464518c6558933357be6faba65 /php/config/TestUtil.py
parentremoving obsolete @see entries (diff)
downloadice-14d8acd69cd3e2f82884d13252d0eda726f539ae.tar.bz2
ice-14d8acd69cd3e2f82884d13252d0eda726f539ae.tar.xz
ice-14d8acd69cd3e2f82884d13252d0eda726f539ae.zip
fixing IceSSL properties
Diffstat (limited to 'php/config/TestUtil.py')
-rw-r--r--php/config/TestUtil.py24
1 files changed, 16 insertions, 8 deletions
diff --git a/php/config/TestUtil.py b/php/config/TestUtil.py
index d0a97c26115..1c1b74748dd 100644
--- a/php/config/TestUtil.py
+++ b/php/config/TestUtil.py
@@ -174,16 +174,24 @@ else:
if protocol == "ssl":
plugin = " --Ice.Plugin.IceSSL=IceSSL:create"
clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.CertPath=" + os.path.join(ice_home, "certs") + \
- " --IceSSL.Client.Config=client_sslconfig.xml"
+ " --IceSSL.Client.DefaultDir=" + os.path.join(ice_home, "certs") + \
+ " --IceSSL.Client.CertFile=c_rsa1024_pub.pem" + \
+ " --IceSSL.Client.KeyFile=c_rsa1024_priv.pem" + \
+ " --IceSSL.Client.CertAuthFile=cacert.pem"
serverProtocol = plugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Server.CertPath=" + os.path.join(ice_home, "certs") + \
- " --IceSSL.Server.Config=server_sslconfig.xml"
+ " --IceSSL.Server.DefaultDir=" + os.path.join(ice_home, "certs") + \
+ " --IceSSL.Server.CertFile=s_rsa1024_pub.pem" + \
+ " --IceSSL.Server.KeyFile=s_rsa1024_priv.pem" + \
+ " --IceSSL.Server.CertAuthFile=cacert.pem"
clientServerProtocol = plugin + " --Ice.Default.Protocol=ssl" + \
- " --IceSSL.Client.CertPath=" + os.path.join(ice_home, "certs") + \
- " --IceSSL.Client.Config=sslconfig.xml" + \
- " --IceSSL.Server.CertPath=" + os.path.join(ice_home, "certs") + \
- " --IceSSL.Server.Config=sslconfig.xml"
+ " --IceSSL.Client.DefaultDir=" + os.path.join(ice_home, "certs") + \
+ " --IceSSL.Client.CertFile=c_rsa1024_pub.pem" + \
+ " --IceSSL.Client.KeyFile=c_rsa1024_priv.pem" + \
+ " --IceSSL.Client.CertAuthFile=cacert.pem" + \
+ " --IceSSL.Server.DefaultDir=" + os.path.join(ice_home, "certs") + \
+ " --IceSSL.Server.CertFile=s_rsa1024_pub.pem" + \
+ " --IceSSL.Server.KeyFile=s_rsa1024_priv.pem" + \
+ " --IceSSL.Server.CertAuthFile=cacert.pem"
else:
clientProtocol = ""
serverProtocol = ""