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/SecureTransportEngine.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/SecureTransportEngine.cpp')
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportEngine.cpp | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp index 80c4a1cd489..4ae8b39ec01 100644 --- a/cpp/src/IceSSL/SecureTransportEngine.cpp +++ b/cpp/src/IceSSL/SecureTransportEngine.cpp @@ -857,7 +857,6 @@ IceSSL::SecureTransport::SSLEngine::initialize() PasswordPromptPtr passwordPrompt = getPasswordPrompt(); string certFile = properties->getProperty("IceSSL.CertFile"); - string keyFile = properties->getProperty("IceSSL.KeyFile"); string findCert = properties->getProperty("IceSSL.FindCert"); string keychain = properties->getProperty("IceSSL.Keychain"); string keychainPassword = properties->getProperty("IceSSL.KeychainPassword"); @@ -871,21 +870,24 @@ IceSSL::SecureTransport::SSLEngine::initialize() "IceSSL: invalid value for IceSSL.CertFile:\n" + certFile); } vector<string> keyFiles; - if(!keyFile.empty()) { - if(!IceUtilInternal::splitString(keyFile, IceUtilInternal::pathsep, keyFiles) || keyFiles.size() > 2) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: invalid value for IceSSL.KeyFile:\n" + keyFile); - } - if(files.size() != keyFiles.size()) + string keyFile = properties->getProperty("IceSSL.KeyFile"); + if(!keyFile.empty()) { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: IceSSL.KeyFile does not agree with IceSSL.CertFile"); + if(!IceUtilInternal::splitString(keyFile, IceUtilInternal::pathsep, keyFiles) || keyFiles.size() > 2) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: invalid value for IceSSL.KeyFile:\n" + keyFile); + } + if(files.size() != keyFiles.size()) + { + throw PluginInitializationException(__FILE__, __LINE__, + "IceSSL: IceSSL.KeyFile does not agree with IceSSL.CertFile"); + } } } - for(int i = 0; i < files.size(); ++i) + for(size_t i = 0; i < files.size(); ++i) { string file = files[i]; string keyFile = keyFiles.empty() ? "" : keyFiles[i]; |