1 files changed, 13 insertions, 0 deletions
diff --git a/cpp/src/IceSSL/SecureTransportEngine.cpp b/cpp/src/IceSSL/SecureTransportEngine.cpp
index 37ae0a2dceb..00d4611a017 100644
--- a/cpp/src/IceSSL/SecureTransportEngine.cpp
+++ b/cpp/src/IceSSL/SecureTransportEngine.cpp
@@ -1032,6 +1032,19 @@ IceSSL::SecureTransportEngine::initialize()
                     }
                 }
             }
+
+            if(!cert)
+            {
+                const string prop = propPrefix + "SecureTransport.FindCert";
+                string val = properties->getProperty(prop);
+                if(!val.empty())
+                {
+                    if(!(cert = findCertificates(keychain, prop, val)))
+                    {
+                        throw PluginInitializationException(__FILE__, __LINE__, "IceSSL: no certificates found");
+                    }
+                }
+            }
             
             if(cert)
             {