Fixed (ICE-5663) - Rename IceSSL FindCert properties?

5 files changed, 14 insertions, 15 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())
                 {
diff --git a/cpp/test/IceSSL/configuration/AllTests.cpp b/cpp/test/IceSSL/configuration/AllTests.cpp
index 7e8e576d229..79fb8d1be57 100644
--- a/cpp/test/IceSSL/configuration/AllTests.cpp
+++ b/cpp/test/IceSSL/configuration/AllTests.cpp
@@ -3488,7 +3488,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
     
     {
 #if defined(ICE_USE_SCHANNEL)
-        cerr << "testing IceSSL.SChannel.FindCert... " << flush;
+        cerr << "testing IceSSL.FindCert... " << flush;
         const char* clientFindCertProperties[] =
         {
             "SUBJECTDN:'CN = Client, E = info@zeroc.com, OU = Ice, O = \"ZeroC, Inc.\", S = Florida, C = US'",
@@ -3567,7 +3567,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
             InitializationData initData;
             initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx);
             initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem");
-            initData.properties->setProperty("IceSSL.SChannel.FindCert.CurrentUser.My", clientFindCertProperties[i]);
+            initData.properties->setProperty("IceSSL.FindCert.CurrentUser.My", clientFindCertProperties[i]);
             //
             // Use TrustOnly to ensure the peer has pick the expected certificate.
             //
@@ -3579,7 +3579,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
             test(fact);
             Test::Properties d = createServerProps(defaultProperties, defaultDir, defaultHost, pfx);
             d["IceSSL.CertAuthFile"] = "cacert1.pem";
-            d["IceSSL.SChannel.FindCert.CurrentUser.My"] = serverFindCertProperties[i];
+            d["IceSSL.FindCert.CurrentUser.My"] = serverFindCertProperties[i];
             //
             // Use TrustOnly to ensure the peer has pick the expected certificate.
             //
@@ -3608,7 +3608,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
             InitializationData initData;
             initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx);
             initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem");
-            initData.properties->setProperty("IceSSL.SChannel.FindCert.CurrentUser.My", failFindCertProperties[i]);
+            initData.properties->setProperty("IceSSL.FindCert.CurrentUser.My", failFindCertProperties[i]);
             try
             {
                 CommunicatorPtr comm = initialize(initData);
@@ -3637,7 +3637,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
             InitializationData initData;
             initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx);
             initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem");
-            initData.properties->setProperty("IceSSL.SChannel.FindCert.CurrentUser.My", clientFindCertProperties[i]);
+            initData.properties->setProperty("IceSSL.FindCert.CurrentUser.My", clientFindCertProperties[i]);
             try
             {
                 CommunicatorPtr comm = initialize(initData);
@@ -3655,7 +3655,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
         }
         cerr << "ok" << endl;
 #elif defined(ICE_USE_SECURE_TRANSPORT)
-        cerr << "testing IceSSL.SecureTransport.FindCert... " << flush;
+        cerr << "testing IceSSL.FindCert... " << flush;
         const char* clientFindCertProperties[] =
         {
             "SUBJECT:Client",
@@ -3693,7 +3693,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
             initData.properties->setProperty("IceSSL.CertAuthFile", "cacert1.pem");
             initData.properties->setProperty("IceSSL.Keychain", "../certs/Find.keychain");
             initData.properties->setProperty("IceSSL.KeychainPassword", "password");
-            initData.properties->setProperty("IceSSL.SecureTransport.FindCert", clientFindCertProperties[i]);
+            initData.properties->setProperty("IceSSL.FindCert", clientFindCertProperties[i]);
             //
             // Use TrustOnly to ensure the peer has pick the expected certificate.
             //
@@ -3707,7 +3707,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
             d["IceSSL.CertAuthFile"] = "cacert1.pem";
             d["IceSSL.Keychain"] = "../certs/Find.keychain";
             d["IceSSL.KeychainPassword"] = "password";
-            d["IceSSL.SecureTransport.FindCert"] = serverFindCertProperties[i];
+            d["IceSSL.FindCert"] = serverFindCertProperties[i];
             //
             // Use TrustOnly to ensure the peer has pick the expected certificate.
             //
@@ -3733,7 +3733,7 @@ allTests(const CommunicatorPtr& communicator, const string& testDir, bool pfx, b
             initData.properties = createClientProps(defaultProperties, defaultDir, defaultHost, pfx);
             initData.properties->setProperty("IceSSL.Keychain", "../certs/Find.keychain");
             initData.properties->setProperty("IceSSL.KeychainPassword", "password");
-            initData.properties->setProperty("IceSSL.SecureTransport.FindCert", failFindCertProperties[i]);
+            initData.properties->setProperty("IceSSL.FindCert", failFindCertProperties[i]);
             try
             {
                 CommunicatorPtr comm = initialize(initData);