diff options
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 6c56ac930f2..b466b903923 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -920,14 +920,8 @@ sslConfigTree = { } if isDarwin(): - # - # 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"]["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"]["client"] += " --IceSSL.Keychain=client.keychain --IceSSL.KeychainPassword=password" + sslConfigTree["cpp"]["server"] += " --IceSSL.Keychain=server.keychain --IceSSL.KeychainPassword=password" sslConfigTree["cpp"]["colloc"] += " --IceSSL.Keychain=colloc.keychain --IceSSL.KeychainPassword=password" if isWin32(): @@ -1053,6 +1047,7 @@ def getCommandLineProperties(exe, config, cfgName): # Turn on network tracing. # #components.append("--Ice.Trace.Network=3") + #components.append("--Ice.Trace.Protocol=1") # # Now we add additional components depending on the desired configuration. |