X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmNewAccount-CardDAV2.cpp;h=8e5fe3c701db9d80bf1b89fa487972fb83dd8e83;hb=547ab1fe605cdb4884179ab011dabba4d0bd7bc2;hp=d8bd4fb03a1bfcd898f527b0fbdd9932ab9d41d5;hpb=b1467ce3cde3c61f79030bf4329f7037904043e1;p=xestiaab%2F.git

diff --git a/source/frmNewAccount-CardDAV2.cpp b/source/frmNewAccount-CardDAV2.cpp
index d8bd4fb..8e5fe3c 100644
--- a/source/frmNewAccount-CardDAV2.cpp
+++ b/source/frmNewAccount-CardDAV2.cpp
@@ -49,6 +49,33 @@ void frmNewAccount::RunCardDAV2Test( wxCommandEvent& event ){
 	if (TestConnection.SSLVerify() == COSSL_UNABLETOVERIFY){
 #if defined(__APPLE__)
 #elif defined(__WIN32__)
+
+		TestConnection.BypassSSLVerification(true);
+
+		COConnectResult TestConnectionResult = TestConnection.Connect(false);
+
+		TestConnection.BypassSSLVerification(false);
+
+		BOOL ModifiedCertificateData = false;
+
+		CRYPTUI_VIEWCERTIFICATE_STRUCTW CertificateDialogData = BuildCertificateData(&TestConnection, (HWND)this->GetHandle());
+
+		if (!CryptUIDlgViewCertificate(&CertificateDialogData, &ModifiedCertificateData)){
+			wxMessageBox(_("An error occured while trying to open the certificate dialog."), _("Error opening Certificate Information dialog"));
+		}
+
+		if (ModifiedCertificateData == false){
+
+			lblServerConnResult->SetLabel(_("Failed"));
+			lblServerResponse->SetLabel(_("Not applicable"));
+			lblServerSSLResult->SetLabel(_("Used"));
+			lblServerSSLValid->SetLabel(_("No"));
+			lblConnectionResultText->SetLabel(_("An error occured whilst connnecting: ") + TestConnection.GetErrorMessage());
+			btnPrevious->Enable(true);
+			return;
+
+		}
+
 #else
 	
 		// Connect again and fetch SSL certificate information.
@@ -98,6 +125,8 @@ void frmNewAccount::RunCardDAV2Test( wxCommandEvent& event ){
 #endif
 	}
 	
+	TestConnectionResult = TestConnection.Connect(true);
+
 	// Get the server prefix if the connection was successful.
 	
 	if (TestConnectionResult == COCONNECT_OK){