diff options
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"] |