summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py6
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"]