X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcarddav2%2Fcarddav2.cpp;h=f4041b85ecf2a28b2331d5b7712a316c4cf68c17;hp=1fba14026486ab25d60c10abfdd0f50a112f48f6;hb=e8efcf96e52c4d8d82ded85327070dcb7a4e3609;hpb=d2f1e7f0975a5dabc007a5633df5f7266bbdfc7c

diff --git a/source/carddav2/carddav2.cpp b/source/carddav2/carddav2.cpp
index 1fba140..f4041b8 100644
--- a/source/carddav2/carddav2.cpp
+++ b/source/carddav2/carddav2.cpp
@@ -156,6 +156,8 @@ SSLCertCollectionString CardDAV2::BuildSSLCollection(){
 
 	// Build and return the SSL collection.
 	
+	cout << "Build SSL Collection!" << endl;
+	
 	SSLCertCollectionString SSLCertInfo;
 
 	// Grab the certificate data.
@@ -167,13 +169,15 @@ SSLCertCollectionString CardDAV2::BuildSSLCollection(){
 
 	certptr.certdata = NULL;
 	
-	curl_easy_getinfo(ConnectionSession, CURLINFO_CERTINFO, &certptr.certinfo);
+	CURLcode result = curl_easy_getinfo(ConnectionSession, CURLINFO_CERTINFO, &certptr.certinfo);
 
+	cout << certptr.certinfo->num_of_certs << endl;
+	
 	std::string CertPropName;
 	std::string CertPropValue;
-
+	
 	for (int i = 0; i < certptr.certinfo->num_of_certs; i++){
-
+		
 		struct curl_slist *slist;
 		SSLCertDataString SSLCertDataInc;
 		
@@ -231,7 +235,7 @@ COConnectResult CardDAV2::Connect(bool DoAuthentication){
 	
 	COConnectResult ConnectResult = COCONNECT_UNITTESTFAIL;
 	string ServerAddressURL = BuildURL("/principals/");
-
+	
 	curl_easy_setopt(ConnectionSession, CURLOPT_URL, ServerAddressURL.c_str());
 	
 	if (TestMode == true){
@@ -1453,6 +1457,7 @@ void CardDAV2::SetupDefaultParametersSSL(bool DoAuthentication){
 	
 	curl_easy_setopt(ConnectionSession, CURLOPT_URL, ServerAddressURL.c_str());
 	curl_easy_setopt(ConnectionSession, CURLOPT_NOPROGRESS, 1L);
+	curl_easy_setopt(ConnectionSession, CURLOPT_CERTINFO, 1L);
 	curl_easy_setopt(ConnectionSession, CURLOPT_HTTPAUTH, CURLAUTH_DIGEST|CURLAUTH_BASIC);
 	curl_easy_setopt(ConnectionSession, CURLOPT_TIMEOUT, 60);
 	curl_easy_setopt(ConnectionSession, CURLOPT_FAILONERROR, 0L);
@@ -1461,9 +1466,6 @@ void CardDAV2::SetupDefaultParametersSSL(bool DoAuthentication){
 	curl_easy_setopt(ConnectionSession, CURLOPT_WRITEDATA, &PageDataObject);
 	curl_easy_setopt(ConnectionSession, CURLOPT_WRITEHEADER, &PageHeaderObject);
 	curl_easy_setopt(ConnectionSession, CURLOPT_ERRORBUFFER, SessionErrorBuffer);
-	//curl_easy_setopt(ConnectionSession, CURLOPT_NOSIGNAL, 1L);
-	curl_easy_setopt(ConnectionSession, CURLOPT_CERTINFO, 1L);
-	//curl_easy_setopt(ConnectionSession, CURLOPT_VERBOSE, 2L);
 	curl_easy_setopt(ConnectionSession, CURLOPT_CUSTOMREQUEST, "GET");
 	curl_easy_setopt(ConnectionSession, CURLOPT_HTTPHEADER, nullptr);
 	curl_easy_setopt(ConnectionSession, CURLOPT_POSTFIELDS, nullptr);
@@ -1509,7 +1511,7 @@ string CardDAV2::BuildURL(string URI){
 	
 	string ServerAddressURL;
 	
-	if (SSLStatus == true){
+	if (ServerSSL == true){
 		ServerAddressURL = "https://" + ServerAddress + ":" + to_string(ServerPort) + URI;	
 	} else {
 		ServerAddressURL = "http://" + ServerAddress + ":" + to_string(ServerPort) + URI;