diff options
| author | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2018-10-26 17:17:11 -0400 |
| commit | 42c905a3ca29a1e911e7def9c2d9d9b8e95383cd (patch) | |
| tree | 1b704d084e39c0acd15859f2dd258eff7aaa7fc6 /cpp/src/IceSSL/OpenSSLEngine.cpp | |
| parent | Do not use time.clock() with Python >= 3.3 as it is deprecated (diff) | |
| download | ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.bz2 ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.tar.xz ice-42c905a3ca29a1e911e7def9c2d9d9b8e95383cd.zip | |
Extra C++ warning flags with clang and g++.
Fixes 223.
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLEngine.cpp')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLEngine.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp index 17d48b342ef..9cf0b277242 100644 --- a/cpp/src/IceSSL/OpenSSLEngine.cpp +++ b/cpp/src/IceSSL/OpenSSLEngine.cpp @@ -748,10 +748,10 @@ OpenSSL::SSLEngine::initialize() } else { - string err = sslErrors(); - if(!err.empty()) + string errStr = sslErrors(); + if(!errStr.empty()) { - msg += ":\n" + err; + msg += ":\n" + errStr; } } throw PluginInitializationException(__FILE__, __LINE__, msg); @@ -847,13 +847,13 @@ OpenSSL::SSLEngine::initialize() // // Establish the cipher list. // - string ciphers = properties->getProperty(propPrefix + "Ciphers"); - if(!ciphers.empty()) + string ciphersStr = properties->getProperty(propPrefix + "Ciphers"); + if(!ciphersStr.empty()) { - if(!SSL_CTX_set_cipher_list(_ctx, ciphers.c_str())) + if(!SSL_CTX_set_cipher_list(_ctx, ciphersStr.c_str())) { throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: unable to set ciphers using `" + ciphers + "':\n" + sslErrors()); + "IceSSL: unable to set ciphers using `" + ciphersStr + "':\n" + sslErrors()); } } |