X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fcarddav2%2Fcarddav2.h;h=fd1212cc3c3f03f9d1112762a570bc37a384be71;hb=a578ed436123242f807cb59eae02fcf6c22e2458;hp=3828d0776490b869f9daf614e2a1806b3d1eeb63;hpb=b1467ce3cde3c61f79030bf4329f7037904043e1;p=xestiaab%2F.git diff --git a/source/carddav2/carddav2.h b/source/carddav2/carddav2.h index 3828d07..fd1212c 100644 --- a/source/carddav2/carddav2.h +++ b/source/carddav2/carddav2.h @@ -38,7 +38,7 @@ class CardDAV2 : public ConnectionObject { public: using ConnectionObject::ConnectionObject; - + // Destructor. ~CardDAV2(); @@ -54,9 +54,9 @@ class CardDAV2 : public ConnectionObject { COServerResponse GetDefaultPrefix(std::string *ServerPrefix); COServerResponse AddContact(std::string Location, std::string Data); COServerResponse EditContact(std::string Location, std::string Data); - COServerResponse DeleteContact(std::string Location, std::string EntityTag); + COServerResponse DeleteContact(std::string Location); COServerResponse GetServerEntityTagValue(std::string Location); - COServerResponse GetContact(std::string Location); + COServerResponse GetContact(std::string Location, std::string *ContactData); COContactList GetContactList(std::string SyncToken); bool CanDoProcessing(); @@ -71,6 +71,9 @@ class CardDAV2 : public ConnectionObject { #if defined(__APPLE__) #elif defined(__WIN32__) + + PCCERT_CONTEXT BuildSSLCollection(); + #else SSLCertCollectionString BuildSSLCollection(); @@ -99,13 +102,18 @@ class CardDAV2 : public ConnectionObject { void ResetResults(); std::vector GetDAVHeader(); std::string GetETagHeader(); + std::string GetETagValue(); std::string GetUserPrincipalURI(); std::string GetAddressBookHomeURI(); std::string GetDefaultAddressBookURI(); + void ProcessContactData(COContactList *ContactList); #if defined(__APPLE__) #elif defined(__WIN32__) + + PCCERT_CONTEXT CertificateData; + #else bool EnableSSLBypass = false; #endif