- CardDAVConn.SetupConnection(txtServerAddress->GetValue(),
- wxAtoi(txtServerPort->GetValue()),
- txtUsername->GetValue(),
- txtPassword->GetValue(),
- UseSSL);
- CardDAVConn.SetupResultBools(&ServerResult, &ServerAction);
-
- std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);
+ // Verify SSL trust first before doing anything.
+
+ if (UseSSL == TRUE){
+
+ CURLcode sslcode = CardDAVConn.SSLVerifyTest();
+
+ if (sslcode == CURLE_OK){
+
+
+
+ } else if (sslcode == CURLE_SSL_CACERT || sslcode == CURLE_SSL_CONNECT_ERROR){
+
+ // Certificate is more than likely a self-signed or
+ // expired certificate so display the invalid
+ // SSL certificate message.
+
+ // Setup the data to be sent in the wxPostEvent command.
+
+ int SSLResult;
+
+ frmInvalidSSLCertificate *frmICPtr = new frmInvalidSSLCertificate(this);
+
+ frmICPtr->LoadDataNew(CardDAVConn.GetSSLVerifyResults(), txtServerAddress->GetValue());
+ frmICPtr->ShowModal();
+
+ SSLResult = frmICPtr->GetResult();
+
+ // Clean up before processing response.
+
+ delete frmICPtr;
+ frmICPtr = NULL;
+
+ // Process the response from the user.
+
+ if (SSLResult == 1){
+
+ // Accept the Certificate.
+
+ CardDAVConn.AllowSelfSignTest(TRUE);
+
+ } else if (SSLResult == 2){
+
+ // Reject the certificate, abort the task and mark as failed.
+
+ lblServerConnResult->SetLabel(_("Failed"));
+ lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage() + wxString::Format(wxT(" (%i)\n%s"), sslcode, CardDAVConn.GetErrorBuffer().mb_str()));
+ return;
+
+ }
+
+ } else {
+
+ // Something else happened. Stop the process and
+ // display an error message instead.
+
+ lblServerConnResult->SetLabel(_("Failed"));
+ lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + CardDAVConn.GetErrorMessage() + wxString::Format(wxT(" (%i)\n%s"), sslcode, CardDAVConn.GetErrorBuffer().mb_str()));
+ return;
+
+ }
+
+ }
+
+ std::thread ConnTest(&CardDAV::Connect, &CardDAVConn);