From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sat, 28 May 2016 06:56:55 +0000 (+0100)
Subject: Ensure fetching and storage of SSL certificates on Linux.
X-Git-Tag: release-0.13~3
X-Git-Url: http://Server1/repobrowser/?a=commitdiff_plain;h=48fac3027c76343fabc71f943005a8dbd651ccd3;p=xestiaab%2F.git

Ensure fetching and storage of SSL certificates on Linux.
---

diff --git a/source/actmgr/frmActivityMgr.cpp b/source/actmgr/frmActivityMgr.cpp
index b08b7b5..9c1e2a4 100644
--- a/source/actmgr/frmActivityMgr.cpp
+++ b/source/actmgr/frmActivityMgr.cpp
@@ -614,7 +614,7 @@ void frmActivityMgr::ProcessTasksThread()
 								
 								SSLInvalidCertNotifObj SSLICNProcData;
 								
-								SSLCertCollection certcol = ConnHandle.GetCertificateData();
+								SSLCertCollection certcol = ConnHandle.GetSSLVerifyResults();
 								
 								bool *PauseMode = new bool;
 								QRNotif qrn;
@@ -643,14 +643,14 @@ void frmActivityMgr::ProcessTasksThread()
 									// Accept the certificate. Write the certificate into the account
 									// directory (as server.crt) - will overwrite old certificate.
 									
-									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
-									WriteServerCertificate(AccountDir, ConnHandle.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
+									WriteServerCertificate(AccountDir, ConnHandle.GetSSLVerifyResults());
 									
 								} else if (SSLResult == 2){
 									
 									// Reject the certificate, abort the task and mark as failed.
 									
-									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults());
 									iter->second = 2;
 									break;
 									
@@ -692,7 +692,7 @@ void frmActivityMgr::ProcessTasksThread()
 
 #else
 					
-					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
+					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
 					
 #endif
 					
@@ -954,14 +954,14 @@ void frmActivityMgr::ProcessTasksThread()
 									// Accept the certificate. Write the certificate into the account
 									// directory (as server.crt) - will overwrite old certificate.
 								
-									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
-									WriteServerCertificate(AccountDir, ConnHandle.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
+									WriteServerCertificate(AccountDir, ConnHandle.GetSSLVerifyResults());
 								
 								} else if (SSLResult == 2){
 								
 								// Reject the certificate, abort the task and mark as failed.
 								
-									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults());
 									iter->second = 2;
 									break;
 								
@@ -1003,7 +1003,7 @@ void frmActivityMgr::ProcessTasksThread()
 
 #else
 				
-					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
+					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
 				
 #endif
 
@@ -1226,14 +1226,14 @@ void frmActivityMgr::ProcessTasksThread()
 									// Accept the certificate. Write the certificate into the account
 									// directory (as server.crt) - will overwrite old certificate.
 
-									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
-									WriteServerCertificate(AccountDir, ConnHandle.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
+									WriteServerCertificate(AccountDir, ConnHandle.GetSSLVerifyResults());
 								
 								} else if (SSLResult == 2){
 								
 									// Reject the certificate, abort the task and mark as failed.
 
-									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetCertificateData());
+									frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 1, ConnHandle.GetSSLVerifyResults());
 									iter->second = 2;
 									break;
 								
@@ -1275,7 +1275,7 @@ void frmActivityMgr::ProcessTasksThread()
 
 #else
                                         
-					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetCertificateData());
+					frmMainPtrGet->UpdateSSLAccountStatus(AccountID, 0, ConnHandle.GetSSLVerifyResults());
 			
 #endif