diff options
| author | Jose <jose@zeroc.com> | 2016-07-01 18:50:05 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-07-01 19:10:17 +0200 |
| commit | bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0 (patch) | |
| tree | 035f56429cccdd3c519a6792d4f54dbe4953a6cf /cpp/src/Ice | |
| parent | Fix (ICE-7200) - _tempnam usage in Windows (diff) | |
| download | ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.tar.bz2 ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.tar.xz ice-bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0.zip | |
OpenSSL-1.1.0-pre5 support
Conflicts:
cpp/src/Ice/PropertyNames.cpp
cpp/src/Ice/PropertyNames.h
csharp/src/Ice/PropertyNames.cs
java/src/Ice/src/main/java/IceInternal/PropertyNames.java
js/src/Ice/PropertyNames.js
Diffstat (limited to 'cpp/src/Ice')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 69f03cade5f..e4f02285b90 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, Thu Apr 7 10:23:17 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:08:40 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1032,6 +1032,7 @@ 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 d5712c8e2ab..151097655fc 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, Thu Apr 7 10:23:17 2016 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:08:40 2016 // IMPORTANT: Do not edit this file -- any edits made here will be lost! |