diff options
| author | Jose <jose@zeroc.com> | 2014-09-25 17:52:24 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-09-25 17:52:24 +0200 |
| commit | e9c068ae334fad11649e69a04f16c780897dcfc6 (patch) | |
| tree | 0040cd2348abe62637bd81e361586640f3e83ec2 /cpp/src | |
| parent | ICE-5611 on RouterFinder failure use default identity rather than failing (diff) | |
| download | ice-e9c068ae334fad11649e69a04f16c780897dcfc6.tar.bz2 ice-e9c068ae334fad11649e69a04f16c780897dcfc6.tar.xz ice-e9c068ae334fad11649e69a04f16c780897dcfc6.zip | |
Fixed (ICE-5663) - Rename IceSSL FindCert properties?
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 5 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SChannelEngine.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceSSL/SecureTransportEngine.cpp | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 0c334c1c23f..bad41d3a756 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 Sep 12 18:07:11 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Sep 25 17:13:47 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -1021,6 +1021,7 @@ const IceInternal::Property IceSSLPropsData[] = IceInternal::Property("IceSSL.DH.*", false, 0), IceInternal::Property("IceSSL.DHParams", false, 0), IceInternal::Property("IceSSL.EntropyDaemon", false, 0), + IceInternal::Property("IceSSL.FindCert", false, 0), IceInternal::Property("IceSSL.FindCert.*", false, 0), IceInternal::Property("IceSSL.ImportCert.*", true, 0), IceInternal::Property("IceSSL.InitOpenSSL", false, 0), @@ -1039,8 +1040,6 @@ 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.SecureTransport.FindCert", false, 0), - IceInternal::Property("IceSSL.SChannel.FindCert.*", false, 0), IceInternal::Property("IceSSL.Trace.Security", false, 0), IceInternal::Property("IceSSL.TrustOnly", false, 0), IceInternal::Property("IceSSL.TrustOnly.Client", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index 94942c0a914..96409bdd53f 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 Sep 12 18:07:11 2014 +// Generated by makeprops.py from file ../config/PropertyNames.xml, Thu Sep 25 17:13:47 2014 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cpp/src/IceSSL/SChannelEngine.cpp b/cpp/src/IceSSL/SChannelEngine.cpp index 71b6f5882cd..595a85aa220 100644 --- a/cpp/src/IceSSL/SChannelEngine.cpp +++ b/cpp/src/IceSSL/SChannelEngine.cpp @@ -530,7 +530,7 @@ SChannelEngine::initialize() _allCerts.insert(_allCerts.end(), _certs.begin(), _certs.end()); } - const string findPrefix = prefix + "SChannel.FindCert."; + const string findPrefix = prefix + "FindCert."; map<string, string> certProps = properties->getPropertiesForPrefix(findPrefix); if(!certProps.empty()) { diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp index 9e023ac0ab7..75d2e0013dc 100644 --- a/cpp/src/IceSSL/SecureTransportEngine.cpp +++ b/cpp/src/IceSSL/SecureTransportEngine.cpp @@ -1035,7 +1035,7 @@ IceSSL::SecureTransportEngine::initialize() if(!cert) { - const string prop = propPrefix + "SecureTransport.FindCert"; + const string prop = propPrefix + "FindCert"; string val = properties->getProperty(prop); if(!val.empty()) { |