diff options
| author | Jose <jose@zeroc.com> | 2016-07-12 08:10:01 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-12 08:10:01 +0200 |
| commit | ed1d54e2bfbb0913eaf68941ff08490d459a080e (patch) | |
| tree | 1fe6ed4e1576ea5e5c140246b5d03cb216d1d0f0 /cpp/test/IceSSL/configuration/AllTests.cpp | |
| parent | CSharp updates for Visual Studio 2013 compatibility (diff) | |
| parent | IceSSL/configuration bogus property (diff) | |
| download | ice-ed1d54e2bfbb0913eaf68941ff08490d459a080e.tar.bz2 ice-ed1d54e2bfbb0913eaf68941ff08490d459a080e.tar.xz ice-ed1d54e2bfbb0913eaf68941ff08490d459a080e.zip | |
Merge remote-tracking branch 'origin/3.6'v3.7.0-alpha2
Diffstat (limited to 'cpp/test/IceSSL/configuration/AllTests.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 66c29fb1404..7261fdfbd8f 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -1947,7 +1947,6 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // // With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers // - d["IceSSL.SecurityLevel"] = "0"; string cipherSub = "ADH-"; d["IceSSL.Ciphers"] = "RSA:" + anonCiphers; # else |