CardDAV: Set CURLOPT_SSL_VERIFYSTATUS to 0 when using certificate file

[xestiaab/.git] / source / carddav2 / carddav2.cpp

diff --git a/source/carddav2/carddav2.cpp b/source/carddav2/carddav2.cpp
index f4041b8..dd70bab 100644 (file)
--- a/source/carddav2/carddav2.cpp
+++ b/source/carddav2/carddav2.cpp
@@ -156,8 +156,6 @@ SSLCertCollectionString CardDAV2::BuildSSLCollection(){
 
        // Build and return the SSL collection.
        
-       cout << "Build SSL Collection!" << endl;
-       
        SSLCertCollectionString SSLCertInfo;
 
        // Grab the certificate data.
@@ -170,8 +168,6 @@ SSLCertCollectionString CardDAV2::BuildSSLCollection(){
        certptr.certdata = NULL;
        
        CURLcode result = curl_easy_getinfo(ConnectionSession, CURLINFO_CERTINFO, &certptr.certinfo);
-
-       cout << certptr.certinfo->num_of_certs << endl;
        
        std::string CertPropName;
        std::string CertPropValue;
@@ -251,6 +247,7 @@ COConnectResult CardDAV2::Connect(bool DoAuthentication){
                        SSLVerified = COSSL_VERIFIED;
                        ConnectResult = COCONNECT_OK;
                        break;
+               case CURLE_SSL_INVALIDCERTSTATUS:
                case CURLE_SSL_CACERT:
                case CURLE_SSL_CONNECT_ERROR:
                        SSLStatus = true;
@@ -1272,8 +1269,6 @@ COContactList CardDAV2::GetContactList(std::string SyncToken){
        
        std::string SyncData;
        
-       // TODO: Copy old code from CardDAV class as needed.
-       
        if (SyncToken.size() > 0){
                
                SyncData = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>\n"
@@ -1496,9 +1491,12 @@ void CardDAV2::SetupDefaultParametersSSL(bool DoAuthentication){
                string CertificateFilename = GetAccountDir(ServerAccount, true);
                
                if (wxFile::Exists(CertificateFilename)){
-                       
+               
                        curl_easy_setopt(ConnectionSession, CURLOPT_CAINFO, CertificateFilename.c_str());
                        
+                       // Force CURLOPT_SSL_VERIFYSTATUS to 0.
+                       curl_easy_setopt(ConnectionSession, CURLOPT_SSL_VERIFYSTATUS, 0L);
+                       
                }
                
        }