summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cpp/src/Ice/PropertyNames.cpp2
-rw-r--r--cpp/src/Ice/PropertyNames.h2
-rw-r--r--cpp/test/IceSSL/configuration/AllTests.cpp43
-rw-r--r--cpp/test/IceSSL/configuration/Makefile2
-rw-r--r--csharp/src/Ice/PropertyNames.cs2
-rw-r--r--java/src/Ice/src/main/java/IceInternal/PropertyNames.java2
-rw-r--r--js/src/Ice/PropertyNames.js2
7 files changed, 27 insertions, 28 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index e4f02285b90..cd6c4182ff1 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 19:08:40 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 12:39:37 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 151097655fc..75e449c9dbd 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 19:08:40 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 12:39:37 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 458aded1cbb..12608b4164d 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -9,6 +9,9 @@
#include <Ice/Ice.h>
#include <IceSSL/Plugin.h>
+#if ICE_USE_OPENSSL
+# include <openssl/ssl.h> // Required for OPENSSL_VERSION_NUMBER
+#endif
#include <TestCommon.h>
#include <Test.h>
#include <fstream>
@@ -20,6 +23,17 @@
using namespace std;
using namespace Ice;
+#ifdef ICE_USE_OPENSSL
+//
+// With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
+//
+# if OPENSSL_VERSION_NUMBER >= 0x10100000L
+const string anonCiphers = "ADH:@SECLEVEL=0";
+# else
+const string anonCiphers = "ADH";
+# endif
+#endif
+
void
readFile(const string& file, vector<char>& buffer)
{
@@ -476,11 +490,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
initData.properties->setProperty("Ice.InitPlugins", "0");
# ifdef ICE_USE_OPENSSL
- //
- // With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
- //
- initData.properties->setProperty("IceSSL.SecurityLevel", "0");
- initData.properties->setProperty("IceSSL.Ciphers", "ADH");
+ initData.properties->setProperty("IceSSL.Ciphers", anonCiphers);
# else
initData.properties->setProperty("IceSSL.Ciphers", "DH_anon_WITH_AES_256_CBC_SHA");
# endif
@@ -493,11 +503,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
Test::ServerFactoryPrx fact = Test::ServerFactoryPrx::checkedCast(obj);
Test::Properties d = createServerProps(defaultProps, defaultDir, defaultHost, p12);
# ifdef ICE_USE_OPENSSL
- //
- // With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
- //
- d["IceSSL.SecurityLevel"] = "0";
- d["IceSSL.Ciphers"] = "ADH";
+ d["IceSSL.Ciphers"] = anonCiphers;
# else
d["IceSSL.Ciphers"] = "DH_anon_WITH_AES_256_CBC_SHA";
# endif
@@ -1205,11 +1211,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
InitializationData initData;
initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
# ifdef ICE_USE_OPENSSL
- //
- // With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
- //
- initData.properties->setProperty("IceSSL.SecurityLevel", "0");
- initData.properties->setProperty("IceSSL.Ciphers", "ADH");
+ initData.properties->setProperty("IceSSL.Ciphers", anonCiphers);
# else
initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
# endif
@@ -1228,8 +1230,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
// With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
//
string cipherSub = "ADH-";
- d["IceSSL.SecurityLevel"] = "0";
- d["IceSSL.Ciphers"] = "ADH";
+ d["IceSSL.Ciphers"] = anonCiphers;
# else
string cipherSub = "DH_anon";
d["IceSSL.Ciphers"] = "(DH_anon*)";
@@ -1816,11 +1817,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
InitializationData initData;
initData.properties = createClientProps(defaultProps, defaultDir, defaultHost, p12);
# ifdef ICE_USE_OPENSSL
- //
- // With OpenSSL 1.1.0 we need to set SECLEVEL=0 to allow ADH ciphers
- //
- initData.properties->setProperty("IceSSL.SecurityLevel", "0");
- initData.properties->setProperty("IceSSL.Ciphers", "ADH");
+ initData.properties->setProperty("IceSSL.Ciphers", anonCiphers);
# else
initData.properties->setProperty("IceSSL.Ciphers", "(DH_anon*)");
# endif
@@ -1834,7 +1831,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool p12, b
//
d["IceSSL.SecurityLevel"] = "0";
string cipherSub = "ADH-";
- d["IceSSL.Ciphers"] = "RSA:ADH";
+ d["IceSSL.Ciphers"] = "RSA:" + anonCiphers;
# else
string cipherSub = "DH_";
d["IceSSL.Ciphers"] = "(RSA_*) (DH_anon*)";
diff --git a/cpp/test/IceSSL/configuration/Makefile b/cpp/test/IceSSL/configuration/Makefile
index 1c5d24f1cdf..489dcb2b4fe 100644
--- a/cpp/test/IceSSL/configuration/Makefile
+++ b/cpp/test/IceSSL/configuration/Makefile
@@ -35,6 +35,8 @@ CPPFLAGS := -I. -I../../include $(CPPFLAGS)
ifeq ($(UNAME),Darwin)
LINK_WITH = -framework Security -framework CoreFoundation
+else
+CPPFLAGS += $(OPENSSL_FLAGS)
endif
ifeq ($(UNAME),MINGW)
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs
index 8e6ed0163c9..6c72eb3c61a 100644
--- a/csharp/src/Ice/PropertyNames.cs
+++ b/csharp/src/Ice/PropertyNames.cs
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:08:40 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 12:39:37 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
index 92fc0f48027..838d58f06db 100644
--- a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
+++ b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:08:40 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 12:39:37 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
diff --git a/js/src/Ice/PropertyNames.js b/js/src/Ice/PropertyNames.js
index 29c4cb866b0..e0fda6f3744 100644
--- a/js/src/Ice/PropertyNames.js
+++ b/js/src/Ice/PropertyNames.js
@@ -6,7 +6,7 @@
// ICE_LICENSE file included in this distribution.
//
// **********************************************************************
-// Generated by makeprops.py from file ../config/PropertyNames.xml, Fri Jul 1 19:08:40 2016
+// Generated by makeprops.py from file ./config/PropertyNames.xml, Wed Jul 6 12:39:37 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 16:42:24 +0000