diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-06-23 17:30:20 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-06-23 17:30:20 +0200 |
| commit | dfaf35d6570df6b2a0abab48f8af744f94e57af5 (patch) | |
| tree | dca9e409b668dac7107630572912ab553148848c /scripts/TestUtil.py | |
| parent | Fixed IceDiscovery and collocation optimization issue which could cause indef... (diff) | |
| download | ice-dfaf35d6570df6b2a0abab48f8af744f94e57af5.tar.bz2 ice-dfaf35d6570df6b2a0abab48f8af744f94e57af5.tar.xz ice-dfaf35d6570df6b2a0abab48f8af744f94e57af5.zip | |
Fix for 6626: Java -> C++/C# SSL issue on Windowsv3.6.0
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 5342cad411f..0c47fbffd0a 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -900,6 +900,8 @@ if isDarwin(): " --IceSSL.ProtocolVersionMax=tls1_1" sslConfigTree["cpp"]["colloc"] += " --IceSSL.Keychain=colloc.keychain --IceSSL.KeychainPassword=password" +if isWin32(): + sslConfigTree["java"]["client"] += " --IceSSL.Ciphers=!TLS_DHE_RSA_WITH_AES_128_GCM_SHA256" sslConfigTree["python"] = sslConfigTree["cpp"] sslConfigTree["ruby"] = sslConfigTree["cpp"] |