summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/PropertyNames.xml4
-rw-r--r--cpp/src/Ice/PropertyNames.cpp6
-rw-r--r--cpp/src/Ice/PropertyNames.h2
-rw-r--r--cpp/src/IceSSL/OpenSSLEngine.cpp31
-rw-r--r--csharp/src/Ice/PropertyNames.cs6
-rw-r--r--java/src/Ice/src/main/java/IceInternal/PropertyNames.java6
-rw-r--r--js/src/Ice/PropertyNames.js2
7 files changed, 13 insertions, 44 deletions
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml
index 54e448629c8..03e23624064 100644
--- a/config/PropertyNames.xml
+++ b/config/PropertyNames.xml
@@ -576,11 +576,11 @@ generated from the section label.
<property name="DHParams" />
<property name="EntropyDaemon" />
<property name="FindCert" />
- <property name="FindCert.[any]" deprecatedBy="IceSSL.FindCert"/>
+ <property name="FindCert.[any]" deprecated="true"/>
<property name="ImportCert.[any]" deprecated="true"/>
<property name="InitOpenSSL" />
<property name="KeyFile" deprecated="true"/>
- <property name="KeySet" deprecatedBy="IceSSL.CertStoreLocation" />
+ <property name="KeySet" deprecated="true" />
<property name="Keychain"/>
<property name="KeychainPassword"/>
<property name="Keystore" />
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)
{
//
diff --git a/csharp/src/Ice/PropertyNames.cs b/csharp/src/Ice/PropertyNames.cs
index faddc7c2cd5..f5a9a6b8fb8 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, 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!
@@ -986,11 +986,11 @@ namespace IceInternal
new Property(@"^IceSSL\.DHParams$", false, null),
new Property(@"^IceSSL\.EntropyDaemon$", false, null),
new Property(@"^IceSSL\.FindCert$", false, null),
- new Property(@"^IceSSL\.FindCert\.[^\s]+$", true, @"IceSSL.FindCert"),
+ new Property(@"^IceSSL\.FindCert\.[^\s]+$", true, null),
new Property(@"^IceSSL\.ImportCert\.[^\s]+$", true, null),
new Property(@"^IceSSL\.InitOpenSSL$", false, null),
new Property(@"^IceSSL\.KeyFile$", true, null),
- new Property(@"^IceSSL\.KeySet$", true, @"IceSSL.CertStoreLocation"),
+ new Property(@"^IceSSL\.KeySet$", true, null),
new Property(@"^IceSSL\.Keychain$", false, null),
new Property(@"^IceSSL\.KeychainPassword$", false, null),
new Property(@"^IceSSL\.Keystore$", false, null),
diff --git a/java/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/IceInternal/PropertyNames.java
index e6d7607f8a0..6d4edf7ec0b 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, 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!
@@ -986,11 +986,11 @@ public final class PropertyNames
new Property("IceSSL\\.DHParams", false, null),
new Property("IceSSL\\.EntropyDaemon", false, null),
new Property("IceSSL\\.FindCert", false, null),
- new Property("IceSSL\\.FindCert\\.[^\\s]+", true, "IceSSL.FindCert"),
+ new Property("IceSSL\\.FindCert\\.[^\\s]+", true, null),
new Property("IceSSL\\.ImportCert\\.[^\\s]+", true, null),
new Property("IceSSL\\.InitOpenSSL", false, null),
new Property("IceSSL\\.KeyFile", true, null),
- new Property("IceSSL\\.KeySet", true, "IceSSL.CertStoreLocation"),
+ new Property("IceSSL\\.KeySet", true, null),
new Property("IceSSL\\.Keychain", false, null),
new Property("IceSSL\\.KeychainPassword", false, null),
new Property("IceSSL\\.Keystore", false, null),
diff --git a/js/src/Ice/PropertyNames.js b/js/src/Ice/PropertyNames.js
index 4f206b7eaa2..71d992e6c70 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, 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!
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 15:55:12 +0000