X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav%2Fcarddav.cpp;h=7e73c5f59546d0a12a7764f722de7a01dc4cbb94;hb=33d42b86e8f3b66c7af4f8bfceeee4d4987a59c5;hp=8cbc71e75e2a0a57788b9a8e97ae6ba35750c207;hpb=71b5282bb2ee3a21c714c005a99cb9d859991586;p=xestiaab%2F.git diff --git a/source/carddav/carddav.cpp b/source/carddav/carddav.cpp index 8cbc71e..7e73c5f 100644 --- a/source/carddav/carddav.cpp +++ b/source/carddav/carddav.cpp @@ -50,6 +50,26 @@ size_t CardDAV::WritebackFunc(char *ptr, size_t size, size_t nmemb, wxString *st SSLCopyPeerTrust((SSLContext*)TLSInfo->internals, &SecTrustObject); } +#elif defined(__WIN32__) + + const struct curl_tlssessioninfo *TLSInfo; + CURLcode TLSCode; + CURL *Connection = GetConnectionObject(); + TLSCode = curl_easy_getinfo(Connection, CURLINFO_TLS_SSL_PTR, &TLSInfo); + + std::string CertName; + + if (TLSInfo->internals != nullptr && TLSCode == CURLE_OK){ + + // Free the previous certificate data. + + CertFreeCertificateContext(CertificateData); + + PCtxtHandle SSLHandle = (PCtxtHandle)TLSInfo->internals; + SECURITY_STATUS GetData = QueryContextAttributes(SSLHandle, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &CertificateData); + + } + #endif return size * nmemb; @@ -110,6 +130,11 @@ bool CardDAV::AllowSelfSign; #if defined(__APPLE__) SSLContext *CardDAV::SSLContextPointer; SecTrustRef CardDAV::SecTrustObject; +#endif +#if defined(__WIN32__) +PCCERT_CONTEXT CardDAV::CertificateData; +#endif +#if defined(__APPLE__) || defined(__WIN32__) CURL *CardDAV::ConnectionObject; #endif @@ -480,7 +505,7 @@ wxString CardDAV::GetErrorMessage(){ } -#if defined(__APPLE__) +#if defined(__APPLE__) || defined(__WIN32__) CURL* CardDAV::GetConnectionObject(){ @@ -498,4 +523,24 @@ void CardDAV::SetConnectionObject(CURL *ConnectionObjectIn){ } +#endif + +#if defined(__WIN32__) + +PCCERT_CONTEXT CardDAV::GetCertificateContextPointer(){ + + // Get the certificate data. + + return CertificateData; + +} + +CERT_CONTEXT CardDAV::GetCertificateContext(){ + + // Get the certificate data. + + return *CertificateData; + +} + #endif \ No newline at end of file