diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-23 14:32:34 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-23 14:32:34 +0200 |
| commit | b67b45deb5cd40e40df78f068d391a488f90b503 (patch) | |
| tree | b0987ac78951f9a2c4a61505f98e851927ffdc43 /cpp/test | |
| parent | Fix (ICE-7900) - VC100 distribution testing fails (diff) | |
| download | ice-b67b45deb5cd40e40df78f068d391a488f90b503.tar.bz2 ice-b67b45deb5cd40e40df78f068d391a488f90b503.tar.xz ice-b67b45deb5cd40e40df78f068d391a488f90b503.zip | |
Fixed ICE-7886 - IceSSL/configuration failure, disabled testing of DSA keys on Windows
Diffstat (limited to 'cpp/test')
| -rw-r--r-- | cpp/test/Glacier2/router/Client.cpp | 3 | ||||
| -rw-r--r-- | cpp/test/IceSSL/configuration/AllTests.cpp | 28 |
2 files changed, 14 insertions, 17 deletions
diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp index 14ee079e71e..e759edf9135 100644 --- a/cpp/test/Glacier2/router/Client.cpp +++ b/cpp/test/Glacier2/router/Client.cpp @@ -874,8 +874,9 @@ CallbackClient::run(int argc, char* argv[]) { router->destroySession(); } - catch(const Ice::LocalException&) + catch(const Ice::LocalException& ex) { + cerr << ex << endl; test(false); } cout << "ok" << endl; diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp index 15836e3ed7b..94b1ae2e2cb 100644 --- a/cpp/test/IceSSL/configuration/AllTests.cpp +++ b/cpp/test/IceSSL/configuration/AllTests.cpp @@ -33,6 +33,10 @@ using namespace Windows::Security::Cryptography; using namespace Windows::Security::Cryptography::Certificates; #endif +#ifdef _WIN32 +# include <VersionHelpers.h> +#endif + #ifdef ICE_CPP11_MAPPING # define ICE_TARGET_EQUAL_TO(A,B) Ice::targetEqualTo(A, B) #else @@ -2867,16 +2871,14 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) // // No DSA support in Secure Transport / AIX 7.1 // -# if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) +# if !defined(ICE_USE_SECURE_TRANSPORT) && !defined(_AIX) && !defined(ICE_USE_SCHANNEL) { + // + // DSA PEM keys are not supported with SChannel. Since Windows 10 + // Creator Update DHE_DSS is also disabled by default so DSA keys + // can no longer be used. + // - // - // DSA PEM certificates are not supported with SChannel. - // -# ifdef ICE_USE_SCHANNEL - if(p12) - { -# endif // // Configure a server with RSA and DSA certificates. // @@ -2935,11 +2937,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) } fact->destroyServer(server); comm->destroy(); -# ifdef ICE_USE_SCHANNEL - } -# endif -# ifndef ICE_USE_SCHANNEL // // Next try a client with ADH. This should fail. // @@ -2969,9 +2967,8 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) } fact->destroyServer(server); comm->destroy(); -# endif } -# ifndef ICE_USE_SCHANNEL + { // // Configure a server with RSA and a client with DSA. This should fail. @@ -3008,8 +3005,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12) fact->destroyServer(server); comm->destroy(); } -# endif -# endif +# endif cout << "ok" << endl; #endif |