diff options
| author | Jose <jose@zeroc.com> | 2016-07-06 12:30:54 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-06 12:30:54 +0200 |
| commit | 7921e36e9131091945941f6b6b70ae4561697f0b (patch) | |
| tree | 04ca5f4415a5df07eda1dbe4b2009f040444032f /cpp/src | |
| parent | OpenSSL-1.1.0-pre5 support (diff) | |
| download | ice-7921e36e9131091945941f6b6b70ae4561697f0b.tar.bz2 ice-7921e36e9131091945941f6b6b70ae4561697f0b.tar.xz ice-7921e36e9131091945941f6b6b70ae4561697f0b.zip | |
Remove IceSSL.SecurityLevel property
The security level can be set without this property by adding
@SECLEVEL=n in the cipher string
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/OpenSSLEngine.cpp | 12 |
3 files changed, 2 insertions, 15 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 21a11c99c05..911ff97841d 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, Fri Jul 1 14:37:27 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 5 22:01:38 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1031,7 +1031,6 @@ const IceInternal::Property IceSSLPropsData[] = IceInternal::Property("IceSSL.ProtocolVersionMax", false, 0), IceInternal::Property("IceSSL.ProtocolVersionMin", false, 0), IceInternal::Property("IceSSL.Random", false, 0), - IceInternal::Property("IceSSL.SecurityLevel", false, 0), IceInternal::Property("IceSSL.Trace.Security", false, 0), IceInternal::Property("IceSSL.TrustOnly", false, 0), IceInternal::Property("IceSSL.TrustOnly.Client", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 47f9c3727d3..5189d6d80d0 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, Fri Jul 1 14:37:27 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 5 22:01:38 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..a275c04287d 100644 --- a/cpp/src/IceSSL/OpenSSLEngine.cpp +++ b/cpp/src/IceSSL/OpenSSLEngine.cpp @@ -399,18 +399,6 @@ OpenSSLEngine::initialize() "IceSSL: unable to create SSL context:\n" + sslErrors()); } -#if OPENSSL_VERSION_NUMBER >= 0x10100000L - int securityLevel = properties->getPropertyAsIntWithDefault(propPrefix + "SecurityLevel", -1); - if(securityLevel != -1) - { - SSL_CTX_set_security_level(_ctx, securityLevel); - if(SSL_CTX_get_security_level(_ctx) != securityLevel) - { - throw PluginInitializationException(__FILE__, __LINE__, - "IceSSL: unable to set SSL security level:\n" + sslErrors()); - } - } -#endif // // Check for a default directory. We look in this directory for // files mentioned in the configuration. |