X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FfrmNewAccount.cpp;h=4eb1259e9196eefe73842b5a71b68b914ba1c726;hb=da98f1ad6ed83618c96826a1098f51fbcf0daea3;hp=1681134eac33410c3e4fa1ef391d879ea865143a;hpb=969329975a0af9d346c76dc34e9ff9cd54cc61ee;p=xestiaab%2F.git

diff --git a/source/frmNewAccount.cpp b/source/frmNewAccount.cpp
index 1681134..4eb1259 100644
--- a/source/frmNewAccount.cpp
+++ b/source/frmNewAccount.cpp
@@ -6,6 +6,7 @@
 
 #include "carddav/carddav.h"
 #include "common/dirs.h"
+#include "frmInvalidSSLCertificate.h"
 
 frmNewAccount::frmNewAccount( wxWindow* parent )
 :
@@ -128,7 +129,6 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
         lblServerConnResult->SetLabel(_("Testing..."));
         
         UseSSL = chkUseSSL->GetValue();
-        
         CardDAVConn.SetupConnection(txtServerAddress->GetValue(),
                                     wxAtoi(txtServerPort->GetValue()),
                                     txtUsername->GetValue(),
@@ -136,6 +136,40 @@ void frmNewAccount::ProcessNext( wxCommandEvent& event )
                                     UseSSL);
         CardDAVConn.SetupResultBools(&ServerResult, &ServerAction);
         
+		// 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.
+
+				frmInvalidSSLCertificate *frmICPtr = new frmInvalidSSLCertificate(this);
+
+				frmICPtr->LoadDataNew(CardDAVConn.GetSSLVerifyResults(), txtServerAddress->GetValue());
+				frmICPtr->ShowModal();
+
+			} 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);
         
         ConnTest.join();