summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-10-11 17:34:02 +0200
committerJose <jose@zeroc.com>2012-10-11 17:34:02 +0200
commit64025533849d9caf6f125c6ad6c8bafbb25e54f6 (patch)
tree2f90130f62b223ba7d9e4e3ee27e5d3bce9a5718 /cpp
parentFixed test/Ice/hold failure (diff)
downloadice-64025533849d9caf6f125c6ad6c8bafbb25e54f6.tar.bz2
ice-64025533849d9caf6f125c6ad6c8bafbb25e54f6.tar.xz
ice-64025533849d9caf6f125c6ad6c8bafbb25e54f6.zip
ICE-4829 - Certificate failure on W2003
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/PropertyNames.cpp4
-rw-r--r--cpp/src/Ice/PropertyNames.h2
2 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp
index af3b5e2dafb..c53761bfc81 100644
--- a/cpp/src/Ice/PropertyNames.cpp
+++ b/cpp/src/Ice/PropertyNames.cpp
@@ -8,7 +8,7 @@
// **********************************************************************
//
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 10 08:48:24 2012
+// Generated by makeprops.py from file ..\config\PropertyNames.xml, Thu Oct 11 00:04:00 2012
// IMPORTANT: Do not edit this file -- any edits made here will be lost!
@@ -659,12 +659,14 @@ const IceInternal::Property IceSSLPropsData[] =
IceInternal::Property("IceSSL.ImportCert.*", false, 0),
IceInternal::Property("IceSSL.InitOpenSSL", false, 0),
IceInternal::Property("IceSSL.KeyFile", false, 0),
+ IceInternal::Property("IceSSL.KeySet", false, 0),
IceInternal::Property("IceSSL.Keystore", false, 0),
IceInternal::Property("IceSSL.KeystorePassword", false, 0),
IceInternal::Property("IceSSL.KeystoreType", false, 0),
IceInternal::Property("IceSSL.Password", false, 0),
IceInternal::Property("IceSSL.PasswordCallback", false, 0),
IceInternal::Property("IceSSL.PasswordRetryMax", false, 0),
+ IceInternal::Property("IceSSL.PersistKeySet", false, 0),
IceInternal::Property("IceSSL.Protocols", false, 0),
IceInternal::Property("IceSSL.Random", false, 0),
IceInternal::Property("IceSSL.Trace.Security", false, 0),
diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h
index 400700cb2fd..977663dcee7 100644
--- a/cpp/src/Ice/PropertyNames.h
+++ b/cpp/src/Ice/PropertyNames.h
@@ -8,7 +8,7 @@
// **********************************************************************
//
-// Generated by makeprops.py from file ./config/PropertyNames.xml, Mon Sep 10 08:48:24 2012
+// Generated by makeprops.py from file ..\config\PropertyNames.xml, Thu Oct 11 00:04:00 2012
// IMPORTANT: Do not edit this file -- any edits made here will be lost!