summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-07-15 14:04:43 +0200
committerJose <jose@zeroc.com>2016-07-15 14:04:43 +0200
commit8e9ce68dc2b350cb8daede0c9e8a50f4fbd6568c (patch)
treeaff3a3c954c7305d65782f68c231b523dc975649 /cpp/src
parentICE-7088 - Fix exception default constructor (diff)
downloadice-8e9ce68dc2b350cb8daede0c9e8a50f4fbd6568c.tar.bz2
ice-8e9ce68dc2b350cb8daede0c9e8a50f4fbd6568c.tar.xz
ice-8e9ce68dc2b350cb8daede0c9e8a50f4fbd6568c.zip
Remove cshar IceSSL deprecated features
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/Ice/PropertyNames.cpp5
-rw-r--r--cpp/src/Ice/PropertyNames.h2
2 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index 2776d3dfc5e..b8944060c1f 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:14:00 2016
+// Generated by makeprops.py from file ..\config\PropertyNames.xml, Fri Jul 15 14:02:34 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -1009,10 +1009,8 @@ const IceInternal::Property IceSSLPropsData[] =
IceInternal::Property("IceSSL.EntropyDaemon", false, 0),
IceInternal::Property("IceSSL.FindCert", false, 0),
IceInternal::Property("IceSSL.FindCert.*", true, "IceSSL.FindCert"),
- 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.Keychain", false, 0),
IceInternal::Property("IceSSL.KeychainPassword", false, 0),
IceInternal::Property("IceSSL.Keystore", false, 0),
@@ -1021,7 +1019,6 @@ const IceInternal::Property IceSSLPropsData[] =
IceInternal::Property("IceSSL.Password", false, 0),
IceInternal::Property("IceSSL.PasswordCallback", false, 0),
IceInternal::Property("IceSSL.PasswordRetryMax", false, 0),
- IceInternal::Property("IceSSL.PersistKeySet", true, 0),
IceInternal::Property("IceSSL.Protocols", false, 0),
IceInternal::Property("IceSSL.ProtocolVersionMax", false, 0),
IceInternal::Property("IceSSL.ProtocolVersionMin", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 0e794e84607..ddb1cdb23f4 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:14:00 2016
+// Generated by makeprops.py from file ..\config\PropertyNames.xml, Fri Jul 15 14:02:34 2016
// IMPORTANT: Do not edit this file -- any edits made here will be lost!