diff options
| author | Mark Spruiell <mes@zeroc.com> | 2006-03-18 00:32:50 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2006-03-18 00:32:50 +0000 |
| commit | c53a3128be2f308c394d1dea4252148f4421d74e (patch) | |
| tree | f390bcadc313004254294e02c0e39121e072b189 /cs/config/TestUtil.py | |
| parent | removing Server.CheckCertName - unnecessary (diff) | |
| download | ice-c53a3128be2f308c394d1dea4252148f4421d74e.tar.bz2 ice-c53a3128be2f308c394d1dea4252148f4421d74e.tar.xz ice-c53a3128be2f308c394d1dea4252148f4421d74e.zip | |
SSL fixes
Diffstat (limited to 'cs/config/TestUtil.py')
| -rw-r--r-- | cs/config/TestUtil.py | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/cs/config/TestUtil.py b/cs/config/TestUtil.py index 8a011c43473..30e67396ac5 100644 --- a/cs/config/TestUtil.py +++ b/cs/config/TestUtil.py @@ -21,16 +21,16 @@ protocol = "" # protocol compression. # -#compress = 0 -compress = 1 +compress = 0 +#compress = 1 # # Set threadPerConnection to 1 in case you want to run the tests in # thread per connection mode. # -#threadPerConnection = 0 -threadPerConnection = 1 +threadPerConnection = 0 +#threadPerConnection = 1 if protocol == "ssl": threadPerConnection = 1 @@ -160,15 +160,23 @@ if isWin32(): if protocol == "ssl": plugin = " --Ice.Plugin.IceSSL=" + os.path.join(toplevel, "bin", "icesslcs.dll") + \ ":IceSSL.PluginFactory" - clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + clientProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ + " --IceSSL.Client.CertFile=" + os.path.join(toplevel, "certs", "c_rsa1024.pfx") + \ + " --IceSSL.Client.CertPassword=password" + \ + " --IceSSL.Client.CheckCertName=0" serverProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.ImportCert.LocalMachine.Root=" + \ + " --IceSSL.ImportCert.LocalMachine.AuthRoot=" + \ os.path.join(toplevel, "certs", "cacert.pem") + \ - " --IceSSL.Server.Cert.File=" + os.path.join(toplevel, "certs", "s_rsa1024.pfx") + \ - " --IceSSL.Server.Cert.Password=password" + " --IceSSL.Server.CertFile=" + os.path.join(toplevel, "certs", "s_rsa1024.pfx") + \ + " --IceSSL.Server.CertPassword=password" clientServerProtocol = plugin + " --Ice.Default.Protocol=ssl" + \ - " --IceSSL.Server.Cert.File=" + os.path.join(toplevel, "certs", "s_rsa1024.pfx") + \ - " --IceSSL.Server.Cert.Password=password" + " --IceSSL.ImportCert.LocalMachine.AuthRoot=" + \ + os.path.join(toplevel, "certs", "cacert.pem") + \ + " --IceSSL.Client.CertFile=" + os.path.join(toplevel, "certs", "c_rsa1024.pfx") + \ + " --IceSSL.Client.CertPassword=password" + \ + " --IceSSL.Client.CheckCertName=0" + \ + " --IceSSL.Server.CertFile=" + os.path.join(toplevel, "certs", "s_rsa1024.pfx") + \ + " --IceSSL.Server.CertPassword=password" cppPlugin = " --Ice.Plugin.IceSSL=IceSSL:create" cppClientProtocol = cppPlugin + " --Ice.Default.Protocol=ssl" + \ " --IceSSL.Client.CertPath=" + os.path.join(toplevel, "certs") + \ |