From bbbcf7e1b1be7c78c86f5c9c9f28880f7ec4cec0 Mon Sep 17 00:00:00 2001 From: Jose Date: Fri, 1 Jul 2016 18:50:05 +0200 Subject: 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 --- cpp/src/Ice/PropertyNames.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'cpp/src/Ice/PropertyNames.cpp') 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), -- cgit v1.2.3