diff options
| author | Jose <jose@zeroc.com> | 2016-09-20 10:58:14 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-09-20 10:58:14 +0200 |
| commit | a4d8e20411191934115fb3672caa90a9d9adefca (patch) | |
| tree | 22b5da27862f053558ffb98d717501612769eb36 /cpp/src/IceSSL/OpenSSLEngine.cpp | |
| parent | ICE-7318 - Should /usr/[local]/share/slice be a directory or link (diff) | |
| download | ice-a4d8e20411191934115fb3672caa90a9d9adefca.tar.bz2 ice-a4d8e20411191934115fb3672caa90a9d9adefca.tar.xz ice-a4d8e20411191934115fb3672caa90a9d9adefca.zip | |
Fix ICE-7192 - Review deprecatedBy usage
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLEngine.cpp')
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLEngine.cpp | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/cpp/src/IceSSL/OpenSSLEngine.cpp b/cpp/src/IceSSL/OpenSSLEngine.cpp index a7232b06f7f..8c459506f0d 100644 --- a/cpp/src/IceSSL/OpenSSLEngine.cpp +++ b/cpp/src/IceSSL/OpenSSLEngine.cpp @@ -467,37 +467,6 @@ OpenSSLEngine::initialize() } } - if(!file && !dir) - { - // Deprecated properties - path = properties->getProperty(propPrefix + "CertAuthFile"); - if(!path.empty()) - { - if(!checkPath(path, defaultDir, false, resolved)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: CA certificate file not found:\n" + path); - } - path = resolved; - file = path.c_str(); - } - else - { - path = properties->getProperty(propPrefix + "CertAuthDir"); - if(!path.empty()) - { - if(!checkPath(path, defaultDir, true, resolved)) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: CA certificate directory not found:\n" + - path); - } - path = resolved; - dir = path.c_str(); - } - } - } - if(file || dir) { // |