summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2017-02-22 17:40:08 +0100
committerJose <jose@zeroc.com>2017-02-22 17:40:08 +0100
commitaa3e8bd6874a69aa25ea19625c6493de2b9cb7e0 (patch)
tree8d42b267f1ddb06123b09b1c89b1a300a21a530a /cpp/src
parentLinux build failure (diff)
downloadice-aa3e8bd6874a69aa25ea19625c6493de2b9cb7e0.tar.bz2
ice-aa3e8bd6874a69aa25ea19625c6493de2b9cb7e0.tar.xz
ice-aa3e8bd6874a69aa25ea19625c6493de2b9cb7e0.zip
Fix hostname verification to ignore errors when IceSSL.VerifyPeer is 0
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceSSL/SSLEngine.cpp10
1 files changed, 7 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/SSLEngine.cpp b/cpp/src/IceSSL/SSLEngine.cpp
index 3ee453925e9..355b8fad16f 100644
--- a/cpp/src/IceSSL/SSLEngine.cpp
+++ b/cpp/src/IceSSL/SSLEngine.cpp
@@ -210,9 +210,13 @@ IceSSL::SSLEngine::verifyPeer(const string& address, const NativeConnectionInfoP
Trace out(_logger, _securityTraceCategory);
out << msg;
}
- SecurityException ex(__FILE__, __LINE__);
- ex.reason = msg;
- throw ex;
+
+ if(_verifyPeer > 0)
+ {
+ SecurityException ex(__FILE__, __LINE__);
+ ex.reason = msg;
+ throw ex;
+ }
}
}
#endif