diff options
| author | Jose <jose@zeroc.com> | 2016-03-23 19:19:09 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-03-23 19:19:09 +0100 |
| commit | bcd26a13b72dfe15ed20af48e1421e27e15d69fc (patch) | |
| tree | c0702940f4b2d0ab955707d8f928defa50b0165d | |
| parent | Fix for yocto python testing (diff) | |
| download | ice-bcd26a13b72dfe15ed20af48e1421e27e15d69fc.tar.bz2 ice-bcd26a13b72dfe15ed20af48e1421e27e15d69fc.tar.xz ice-bcd26a13b72dfe15ed20af48e1421e27e15d69fc.zip | |
ICE-7043 - Firefox wss can't connect
| -rwxr-xr-x | scripts/TestUtil.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 3ba922de2b7..7f7ad138c83 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -904,14 +904,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(): |