summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/SChannelEngine.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-05-24 14:37:46 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-05-24 14:37:46 +0200
commit6c6306e10fa62b0566e7920786b97d305ac897f4 (patch)
tree54c42c00d9226f34fea79276ccc25dbf7088b453 /cpp/src/IceSSL/SChannelEngine.cpp
parentAndroid test controller class loader fix (diff)
downloadice-6c6306e10fa62b0566e7920786b97d305ac897f4.tar.bz2
ice-6c6306e10fa62b0566e7920786b97d305ac897f4.tar.xz
ice-6c6306e10fa62b0566e7920786b97d305ac897f4.zip
Fixed ICE-7906 - Check for invalid ciphers in IceSSL.Ciphers
Diffstat (limited to 'cpp/src/IceSSL/SChannelEngine.cpp')
-rw-r--r--cpp/src/IceSSL/SChannelEngine.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp
index 44fdd8eb7af..2d378344ac2 100644
--- a/cpp/src/IceSSL/SChannelEngine.cpp
+++ b/cpp/src/IceSSL/SChannelEngine.cpp
@@ -1182,10 +1182,11 @@ SChannel::SSLEngine::parseCiphers(const std::string& ciphers)
for(vector<string>::const_iterator i = tokens.begin(); i != tokens.end(); ++i)
{
ALG_ID id = algorithmId(*i);
- if(id)
+ if(id == 0)
{
- _ciphers.push_back(id);
+ throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: no such cipher " + *i);
}
+ _ciphers.push_back(id);
}
}