summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-09-30 11:30:31 +0200
committerJose <jose@zeroc.com>2014-09-30 11:30:31 +0200
commitf6f53dce101cd431aa102fdae3f451a679d8da41 (patch)
tree12a0fd27db7df3609d76a48035013b53a51958a7 /cpp/src
parentICE-5692 - PHP type objects should be global (diff)
downloadice-f6f53dce101cd431aa102fdae3f451a679d8da41.tar.bz2
ice-f6f53dce101cd431aa102fdae3f451a679d8da41.tar.xz
ice-f6f53dce101cd431aa102fdae3f451a679d8da41.zip
Fixed (ICE-5696) - Trying to connect openssl 0.9.8 client to OS X secure transport fails
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceSSL/SecureTransportEngine.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp
index 75d2e0013dc..7a4d16d7c5e 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.cpp
+++ b/cpp/src/IceSSL/SecureTransportEngine.cpp
@@ -753,11 +753,7 @@ CiphersHelper::ciphers()
SSLProtocol
parseProtocol(const string& prot)
{
- if(prot == "ssl2" || prot == "sslv2")
- {
- return kSSLProtocol2;
- }
- else if(prot == "ssl3" || prot == "sslv3")
+ if(prot == "ssl3" || prot == "sslv3")
{
return kSSLProtocol3;
}