summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-08-08 01:32:44 +0200
committerJose <jose@zeroc.com>2014-08-08 01:32:44 +0200
commitfdae154017d77fc1cbc52573eec5b721854eb5a5 (patch)
tree3ea6e545b5a2ae2a33e6c9878824ca945a4b775c /scripts/TestUtil.py
parentICE-5311 - more fixes (diff)
downloadice-fdae154017d77fc1cbc52573eec5b721854eb5a5.tar.bz2
ice-fdae154017d77fc1cbc52573eec5b721854eb5a5.tar.xz
ice-fdae154017d77fc1cbc52573eec5b721854eb5a5.zip
Fixed (ICE-5583) - Consider adding IceSSL.CertAuthFile to C# implementation
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index b3f4751945f..55044f19089 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -699,12 +699,11 @@ sslConfigTree = {
"colloc" : " --IceSSL.Keystore=client.jks"
},
"cs" : {
- "plugin" : " --Ice.Plugin.IceSSL=%(icesslcs)s:IceSSL.PluginFactory " +
- " --IceSSL.Password=password --IceSSL.DefaultDir=%(certsdir)s --IceSSL.VerifyPeer=%(verifyPeer)s",
+ "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 --IceSSL.ImportCert.CurrentUser.Root=cacert.pem",
- "colloc" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.ImportCert.CurrentUser.Root=cacert.pem " +
- "--IceSSL.CheckCertName=0"
+ "server" : " --IceSSL.CertFile=s_rsa1024.pfx",
+ "colloc" : " --IceSSL.CertFile=c_rsa1024.pfx --IceSSL.CheckCertName=0"
},
}