summaryrefslogtreecommitdiff
path: root/cpp/config/TestUtil.py
diff options
context:
space:
mode:
authorAnthony Neal <aneal@zeroc.com>2001-11-17 20:06:01 +0000
committerAnthony Neal <aneal@zeroc.com>2001-11-17 20:06:01 +0000
commit3bfcb9e80be20d74a6f1e2a104dbb7892949b212 (patch)
tree1436c83a5bdf16c54051e2fc0601e94eb6a59441 /cpp/config/TestUtil.py
parentfixes (diff)
downloadice-3bfcb9e80be20d74a6f1e2a104dbb7892949b212.tar.bz2
ice-3bfcb9e80be20d74a6f1e2a104dbb7892949b212.tar.xz
ice-3bfcb9e80be20d74a6f1e2a104dbb7892949b212.zip
SSL Update:
Security Excpetions re-done, expressed in Slice. Trace has been cut down to a more reasonable level. Cleaned up macros.
Diffstat (limited to 'cpp/config/TestUtil.py')
-rw-r--r--cpp/config/TestUtil.py11
1 files changed, 7 insertions, 4 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py
index 6e0de3a7ac9..0a416ee8057 100644
--- a/cpp/config/TestUtil.py
+++ b/cpp/config/TestUtil.py
@@ -11,14 +11,17 @@
import sys, os
-protocol = "tcp"
+protocol = "ssl"
serverOptions = " --Ice.PrintProcessId --Ice.PrintAdapterReady --Ice.ServerIdleTime=30" + \
- " --Ice.Ssl.Config=TOPLEVELDIR/Certs/server_sslconfig.xml --Ice.Protocol=" + protocol
+ " --Ice.Ssl.CertPath=TOPLEVELDIR/Certs --Ice.Ssl.Config=server_sslconfig.xml --Ice.Protocol=" + \
+ protocol
-clientOptions = " --Ice.Ssl.Config=TOPLEVELDIR/Certs/client_sslconfig.xml --Ice.Protocol=" + protocol
+clientOptions = " --Ice.Ssl.CertPath=TOPLEVELDIR/Certs --Ice.Ssl.Config=client_sslconfig.xml --Ice.Protocol=" + \
+ protocol
-collocatedOptions = " --Ice.Ssl.Config=TOPLEVELDIR/Certs/sslconfig.xml --Ice.Protocol=" + protocol
+collocatedOptions = " --Ice.Ssl.CertPath=TOPLEVELDIR/Certs --Ice.Ssl.Config=sslconfig.xml --Ice.Protocol=" + \
+ protocol
serverPids = []