diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-04-07 19:24:08 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-04-07 19:24:08 +0200 |
| commit | 92b20f89662b327edf8f732d082d9fd07da9c665 (patch) | |
| tree | 1224af8f2d610322a2ab6520471c503af0e20fe0 /scripts/TestUtil.py | |
| parent | Fixed IceSSL OpenSSL bug which could cause a crash when loading a certificate... (diff) | |
| download | ice-92b20f89662b327edf8f732d082d9fd07da9c665.tar.bz2 ice-92b20f89662b327edf8f732d082d9fd07da9c665.tar.xz ice-92b20f89662b327edf8f732d082d9fd07da9c665.zip | |
ICE-6382: removed iceca and fixed makecerts.py to depend on IceCertUtils PyPI package
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index f0c1d56a3eb..28fcb541bbb 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -858,9 +858,9 @@ sslConfigTree = { "cpp" : { "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.pfx", - "server" : " --IceSSL.CertFile=s_rsa1024.pfx", - "colloc" : " --IceSSL.CertFile=c_rsa1024.pfx" + "client" : " --IceSSL.CertFile=client.p12", + "server" : " --IceSSL.CertFile=server.p12", + "colloc" : " --IceSSL.CertFile=client.p12" }, "java" : { "plugin" : " --Ice.Plugin.IceSSL=IceSSL.PluginFactory " + @@ -872,9 +872,9 @@ sslConfigTree = { "csharp" : { "plugin" : " --Ice.Plugin.IceSSL=%(icesslcs)s:IceSSL.PluginFactory --IceSSL.CertAuthFile=cacert.pem " + "--IceSSL.Password=password --IceSSL.DefaultDir=%(certsdir)s --IceSSL.VerifyPeer=%(verifyPeer)s", - "client" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.CheckCertName=0", - "server" : " --IceSSL.CertFile=s_rsa1024.pfx", - "colloc" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.CheckCertName=0" + "client" : " --IceSSL.CertFile=client.p12 --IceSSL.CheckCertName=0", + "server" : " --IceSSL.CertFile=server.p12", + "colloc" : " --IceSSL.CertFile=client.p12 --IceSSL.CheckCertName=0" }, } |