diff options
Diffstat (limited to 'cpp/config/TestUtil.py')
| -rw-r--r-- | cpp/config/TestUtil.py | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/cpp/config/TestUtil.py b/cpp/config/TestUtil.py index de764030638..e1dda31ccf8 100644 --- a/cpp/config/TestUtil.py +++ b/cpp/config/TestUtil.py @@ -242,24 +242,16 @@ else: if protocol == "ssl": plugin = " --Ice.Plugin.IceSSL=IceSSL:create" clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Client.DefaultDir=" + os.path.join(toplevel, "certs") + \ - " --IceSSL.Client.CertFile=c_rsa1024_pub.pem" + \ - " --IceSSL.Client.KeyFile=c_rsa1024_priv.pem" + \ - " --IceSSL.Client.CertAuthFile=cacert.pem" + " --IceSSL.DefaultDir=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.CertFile=c_rsa1024_pub.pem" + \ + " --IceSSL.KeyFile=c_rsa1024_priv.pem" + \ + " --IceSSL.CertAuthFile=cacert.pem" serverProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Server.DefaultDir=" + os.path.join(toplevel, "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.DefaultDir=" + os.path.join(toplevel, "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(toplevel, "certs") + \ - " --IceSSL.Server.CertFile=s_rsa1024_pub.pem" + \ - " --IceSSL.Server.KeyFile=s_rsa1024_priv.pem" + \ - " --IceSSL.Server.CertAuthFile=cacert.pem" + " --IceSSL.DefaultDir=" + os.path.join(toplevel, "certs") + \ + " --IceSSL.CertFile=s_rsa1024_pub.pem" + \ + " --IceSSL.KeyFile=s_rsa1024_priv.pem" + \ + " --IceSSL.CertAuthFile=cacert.pem" + clientServerProtocol = clientProtocol else: clientProtocol = "" serverProtocol = "" |