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 | |
| 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')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 6 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLEngine.cpp | 31 |
3 files changed, 4 insertions, 35 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 0a7379f15fe..2fab17a7c4d 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 13:12:34 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 20 10:36:23 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1014,11 +1014,11 @@ const IceInternal::Property IceSSLPropsData[] = IceInternal::Property("IceSSL.DHParams", false, 0), IceInternal::Property("IceSSL.EntropyDaemon", false, 0), IceInternal::Property("IceSSL.FindCert", false, 0), - IceInternal::Property("IceSSL.FindCert.*", true, "IceSSL.FindCert"), + IceInternal::Property("IceSSL.FindCert.*", true, 0), IceInternal::Property("IceSSL.ImportCert.*", true, 0), IceInternal::Property("IceSSL.InitOpenSSL", false, 0), IceInternal::Property("IceSSL.KeyFile", true, 0), - IceInternal::Property("IceSSL.KeySet", true, "IceSSL.CertStoreLocation"), + IceInternal::Property("IceSSL.KeySet", true, 0), IceInternal::Property("IceSSL.Keychain", false, 0), IceInternal::Property("IceSSL.KeychainPassword", false, 0), IceInternal::Property("IceSSL.Keystore", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 9dc1b027274..5b50724a7c3 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -6,7 +6,7 @@ // ICE_LICENSE file included in this distribution. // // ********************************************************************** -// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 13:12:34 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Sep 20 10:36:23 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! 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) { // |