if (testConnection.SSLVerify() == COSSL_UNABLETOVERIFY){
#if defined(__APPLE__)
-
+
testConnection.BypassSSLVerification(true);
- CalDAVServerResult testConnection = testConnection.Connect(false);
+ CalDAVServerResult testConnectionResult = testConnection.Connect(false);
testConnection.BypassSSLVerification(false);
- int SSLResult = DisplayTrustPanel(&TestConnection);
+ int SSLResult = DisplayTrustPanel(&testConnection);
if (SSLResult != NSOKButton){
lblServerResponse->SetLabel(_("Not applicable"));
lblServerSSLResult->SetLabel(_("Used"));
lblServerSSLValid->SetLabel(_("No"));
- lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + TestConnection.GetErrorMessage());
+ lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + testConnection.GetErrorMessage());
btnPrevious->Enable(true);
return;
switch(evalResult){
case kSecTrustResultProceed:
lblServerSSLValid->SetLabel(_("Verified"));
- break;
+ break;
+ case kSecTrustResultUnspecified:
case kSecTrustResultConfirm:
lblServerSSLValid->SetLabel(_("Verified (user)"));
break;
lblServerSSLValid->SetLabel(_("Unable to verify"));
}
+ lblServerConnResult->SetLabel(_("Connected"));
lblServerResponse->SetLabel(_("Not applicable"));
lblServerSSLResult->SetLabel(_("Used"));
- if (evalResult != kSecTrustResultProceed){
+ btnPrevious->Enable(true);
+
+ if (evalResult != kSecTrustResultProceed && evalResult != kSecTrustResultUnspecified){
+ lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + testConnection.GetErrorMessage());
return;
}
wxCommandEvent resultsEvent(UPDATERESULTS);
resultsEvent.SetClientData(resultData);
wxPostEvent(this, resultsEvent);
-}
\ No newline at end of file
+}