diff options
| author | Jose <jose@zeroc.com> | 2014-08-20 17:16:37 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-08-20 17:16:37 +0200 |
| commit | 265578c48002b840dcff93d53bd295a587d64460 (patch) | |
| tree | 00f595b4571a2718c7c2d8a378e4773844b32e76 /scripts/TestUtil.py | |
| parent | Automate load of CryptPermissionsVerifier plug-in (diff) | |
| download | ice-265578c48002b840dcff93d53bd295a587d64460.tar.bz2 ice-265578c48002b840dcff93d53bd295a587d64460.tar.xz ice-265578c48002b840dcff93d53bd295a587d64460.zip | |
ICE-5628 - Failure in IceGrid/simple with java+ssl
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 7d4eedf669a..052f2617667 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -709,7 +709,11 @@ sslConfigTree = { if isDarwin(): sslConfigTree["cpp"]["client"] += " --IceSSL.Keychain=client.keychain --IceSSL.KeychainPassword=password" - sslConfigTree["cpp"]["server"] += " --IceSSL.Keychain=server.keychain --IceSSL.KeychainPassword=password" + # + # Run OS X server with TLS 1.1 to workaround a bug in Secure Transport TLS 1.2 implementation. + # + sslConfigTree["cpp"]["server"] += " --IceSSL.Keychain=server.keychain --IceSSL.KeychainPassword=password " + \ + "--IceSSL.ProtocolVersionMax=tls1_1" sslConfigTree["cpp"]["colloc"] += " --IceSSL.Keychain=colloc.keychain --IceSSL.KeychainPassword=password" sslConfigTree["py"] = sslConfigTree["cpp"] |