diff options
| author | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2016-03-17 11:44:37 -0400 |
| commit | db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2 (patch) | |
| tree | 3c05d7f841a1585360d0a6450748fd6dc26b050c /cpp/test/IceSSL/configuration/AllTests.cpp | |
| parent | fixing .gitignore in checksum test (diff) | |
| parent | Update Ice Builder for Gradle version to 1.2.1 (diff) | |
| download | ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.bz2 ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.tar.xz ice-db1006f76622d1dd995bc1e2c1fc761c6ac7d7c2.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'cpp/test/IceSSL/configuration/AllTests.cpp')
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 6b937c0c229..667341af8c1 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -1355,8 +1355,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b } catch(const LocalException& ex) { + // + // OpenSSL < 1.0 doesn't support tls 1.1 so it will also fail, we ignore in this + // case. + // +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER >= 0x10000000L cerr << ex << endl; test(false); +#endif } fact->destroyServer(server); comm->destroy(); |