diff options
| author | Jose <jose@zeroc.com> | 2017-03-01 21:31:10 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-01 21:31:10 +0100 |
| commit | 6df6d1d6a283ca631d973dd886d1266572d55504 (patch) | |
| tree | 50984075876b82f5b2c592ae2a7d977a63780392 /cpp/src/IceSSL/UWPTransceiverI.cpp | |
| parent | Added missing IceMX directory (diff) | |
| download | ice-6df6d1d6a283ca631d973dd886d1266572d55504.tar.bz2 ice-6df6d1d6a283ca631d973dd886d1266572d55504.tar.xz ice-6df6d1d6a283ca631d973dd886d1266572d55504.zip | |
Fixed (ICE-7626) - UWP IceSSL/configuration failure
Diffstat (limited to 'cpp/src/IceSSL/UWPTransceiverI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/UWPTransceiverI.cpp | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/cpp/src/IceSSL/UWPTransceiverI.cpp b/cpp/src/IceSSL/UWPTransceiverI.cpp index 9fa5cc72a2e..27b8c76502d 100644 --- a/cpp/src/IceSSL/UWPTransceiverI.cpp +++ b/cpp/src/IceSSL/UWPTransceiverI.cpp @@ -258,7 +258,7 @@ IceSSL::TransceiverI::startWrite(IceInternal::Buffer& buf) // // Check if we need to enable host name verification // - if(!_engine->getCheckCertName() || _host.empty()) + if(!_engine->getCheckCertName() || _host.empty() || _engine->getVerifyPeer() == 0) { stream->Control->IgnorableServerCertificateErrors->Append(ChainValidationResult::InvalidName); } @@ -305,14 +305,12 @@ IceSSL::TransceiverI::finishWrite(IceInternal::Buffer& buf) _instance->logger()->trace(_instance->traceCategory(), msg); } - if(_engine->getVerifyPeer() > 0) - { - SecurityException ex(__FILE__, __LINE__); - ex.reason = msg; - throw ex; - } + throw SecurityException(__FILE__, __LINE__, msg); + } + else + { + IceInternal::checkErrorCode(__FILE__, __LINE__, asyncInfo->error); } - IceInternal::checkErrorCode(__FILE__, __LINE__, asyncInfo->error); } return; } |