diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-11-20 11:24:11 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-11-20 11:24:11 +0100 |
| commit | 547b3a6b6f875f85610bc8773b4d44b34923dd02 (patch) | |
| tree | 4e8cd3a2522f0a719ae1df0e5799b9d6f43d9db1 /scripts/TestUtil.py | |
| parent | more dist fixes (diff) | |
| download | ice-547b3a6b6f875f85610bc8773b4d44b34923dd02.tar.bz2 ice-547b3a6b6f875f85610bc8773b4d44b34923dd02.tar.xz ice-547b3a6b6f875f85610bc8773b4d44b34923dd02.zip | |
Fixed ICE-5939: OS X cross test java/C++ ssl failure
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 3af0a6823db..44eb55bb6a8 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -752,13 +752,16 @@ sslConfigTree = { } if isDarwin(): - sslConfigTree["cpp"]["client"] += " --IceSSL.Keychain=client.keychain --IceSSL.KeychainPassword=password" # - # Run OS X server with TLS 1.1 to workaround a bug in Secure Transport TLS 1.2 implementation. + # Use TLS 1.1 for OS X to workaround a bug in Secure Transport TLS + # 1.2 implementation, reported to Apple as bug #18029769. # - sslConfigTree["cpp"]["server"] += " --IceSSL.Keychain=server.keychain --IceSSL.KeychainPassword=password " + \ - "--IceSSL.ProtocolVersionMax=tls1_1" + sslConfigTree["cpp"]["client"] += " --IceSSL.Keychain=client.keychain --IceSSL.KeychainPassword=password" + \ + " --IceSSL.ProtocolVersionMax=tls1_1" + 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"] sslConfigTree["rb"] = sslConfigTree["cpp"] |