X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav-sslverify.cpp;h=57b11c0ffd35f708a619f3bf4824adf1f0186011;hb=71fe3c25d1299666d5752df3e3263b03fa85594e;hp=9418e5af2f221890b01d7bc7cc118eab2fc52f71;hpb=3b6b6a7c6b49dd7adda12d7b469a0da356f2a999;p=xestiaab%2F.git diff --git a/source/carddav/carddav-sslverify.cpp b/source/carddav/carddav-sslverify.cpp index 9418e5a..57b11c0 100644 --- a/source/carddav/carddav-sslverify.cpp +++ b/source/carddav/carddav-sslverify.cpp @@ -74,10 +74,10 @@ CURLcode CardDAV::SSLVerifyTest(){ curl_easy_setopt(conn, CURLOPT_WRITEDATA, &PageData); curl_easy_setopt(conn, CURLOPT_WRITEHEADER, &PageHeader); -#if defined(__APPLE__) +#if defined(__APPLE__) || defined(__WIN32__) SetConnectionObject(conn); - + #endif conncode = (curl_easy_perform(conn)); @@ -107,16 +107,18 @@ CURLcode CardDAV::SSLVerifyTest(){ curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYPEER, 0L); curl_easy_setopt(connssldata, CURLOPT_SSL_VERIFYHOST, 0L); -#if defined(__APPLE__) +#if defined(__APPLE__) || defined(__WIN32__) SetConnectionObject(connssldata); - + #endif CURLcode certfetchcode; certfetchcode = (curl_easy_perform(connssldata)); +#if !defined(__APPLE__) && !defined(__WIN32__) + VerifyCertCollection = BuildSSLCollection(connssldata); if (certfetchcode == CURLE_OK){ @@ -131,6 +133,8 @@ CURLcode CardDAV::SSLVerifyTest(){ } +#endif + *ServerResult = FALSE; } else {