[cpp-xmltooling COMMIT] in /branches/REL_1/xmltooling: XMLToolingConfig.cpp soap/impl/CURLSOAPTransport.cpp util/Curl...

[noreply at shibboleth.net]

Author: scantor
Date: Mon May 20 12:27:35 2013
New Revision: 1027

URL: http://svn.shibboleth.net/view/cpp-xmltooling?rev=1027&view=rev
Log:
https://issues.shibboleth.net/jira/browse/CPPXT-95

Modified:
    branches/REL_1/xmltooling/XMLToolingConfig.cpp
    branches/REL_1/xmltooling/soap/impl/CURLSOAPTransport.cpp
    branches/REL_1/xmltooling/util/CurlURLInputStream.cpp

Modified: branches/REL_1/xmltooling/XMLToolingConfig.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/XMLToolingConfig.cpp?rev=1027&r1=1026&r2=1027&view=diff
==============================================================================
--- branches/REL_1/xmltooling/XMLToolingConfig.cpp (original)
+++ branches/REL_1/xmltooling/XMLToolingConfig.cpp Mon May 20 12:27:35 2013
@@ -397,7 +397,9 @@
         if (curlver) {
             log.debug("libcurl %s initialization complete", curlver->version);
             if (!(curlver->features & CURL_VERSION_SSL)) {
-                log.warn("libcurl lacks TLS/SSL support, this will greatly limit functionality");
+                log.crit("libcurl lacks TLS/SSL support, this will greatly limit functionality");
+            } else if (curlver->ssl_version && !strstr(curlver->ssl_version, "OpenSSL")) {
+                log.crit("libcurl lacks OpenSSL-specific options, this will greatly limit functionality");
             }
         }
         else {

Modified: branches/REL_1/xmltooling/soap/impl/CURLSOAPTransport.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/soap/impl/CURLSOAPTransport.cpp?rev=1027&r1=1026&r2=1027&view=diff
==============================================================================
--- branches/REL_1/xmltooling/soap/impl/CURLSOAPTransport.cpp (original)
+++ branches/REL_1/xmltooling/soap/impl/CURLSOAPTransport.cpp Mon May 20 12:27:35 2013
@@ -568,7 +568,11 @@
 
     // Make the call.
     log.debug("sending SOAP message to %s", m_endpoint.c_str());
-    if (curl_easy_perform(m_handle) != CURLE_OK) {
+    CURLcode code = curl_easy_perform(m_handle);
+    if (code != CURLE_OK) {
+        if (code == CURLE_SSL_CIPHER) {
+            log.error("on Red Hat 6+, make sure libcurl used is built with OpenSSL");
+        }
         throw IOException(
             string("CURLSOAPTransport failed while contacting SOAP endpoint (") + m_endpoint + "): " +
                 (curl_errorbuf[0] ? curl_errorbuf : "no further information available"));

Modified: branches/REL_1/xmltooling/util/CurlURLInputStream.cpp
URL: http://svn.shibboleth.net/view/cpp-xmltooling/branches/REL_1/xmltooling/util/CurlURLInputStream.cpp?rev=1027&r1=1026&r2=1027&view=diff
==============================================================================
--- branches/REL_1/xmltooling/util/CurlURLInputStream.cpp (original)
+++ branches/REL_1/xmltooling/util/CurlURLInputStream.cpp Mon May 20 12:27:35 2013
@@ -523,6 +523,9 @@
 
         default:
             fLog.error("error while fetching %s: (%d) %s", fURL.c_str(), msg->data.result, fError);
+            if (msg->data.result == CURLE_SSL_CIPHER) {
+                fLog.error("on Red Hat 6+, make sure libcurl used is built with OpenSSL");
+            }
             ThrowXML1(NetAccessorException, XMLExcepts::NetAcc_InternalError, fURL.c_str());
             break;
         }