diff options
| author | Jose <jose@zeroc.com> | 2014-08-19 17:13:55 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-08-19 17:13:55 +0200 |
| commit | 52a2903244d992388813fa9624f61b9cadda199d (patch) | |
| tree | bd39b38f04b97981c41f39a025d12d35287a78c0 /cpp/src/IceSSL/SecureTransportEngine.cpp | |
| parent | Fixed (ICE-5641) - MinGW compile error (diff) | |
| download | ice-52a2903244d992388813fa9624f61b9cadda199d.tar.bz2 ice-52a2903244d992388813fa9624f61b9cadda199d.tar.xz ice-52a2903244d992388813fa9624f61b9cadda199d.zip | |
Fixed (ICE-5592) - Add IceSSL.FindCert for OS X and Windows
Diffstat (limited to 'cpp/src/IceSSL/SecureTransportEngine.cpp')
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportEngine.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp index 37ae0a2dceb..00d4611a017 100644 --- a/cpp/src/IceSSL/SecureTransportEngine.cpp +++ b/cpp/src/IceSSL/SecureTransportEngine.cpp @@ -1032,6 +1032,19 @@ IceSSL::SecureTransportEngine::initialize() } } } + + if(!cert) + { + const string prop = propPrefix + "SecureTransport.FindCert"; + string val = properties->getProperty(prop); + if(!val.empty()) + { + if(!(cert = findCertificates(keychain, prop, val))) + { + throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: no certificates found"); + } + } + } if(cert) { |