X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FfrmSSLCertificate.cpp;h=1f374db2e9fa8b040f684d382f41fe85fcce6276;hp=fee0b59d569c75b5450eca7be1f25cd64a523ec1;hb=26d19ed9ed27c5775dc9033ab2afe5983eb34619;hpb=175200bd40a5b9f9001f21e3cf7ae8ea205d8e41

diff --git a/source/frmSSLCertificate.cpp b/source/frmSSLCertificate.cpp
index fee0b59..1f374db 100644
--- a/source/frmSSLCertificate.cpp
+++ b/source/frmSSLCertificate.cpp
@@ -205,7 +205,9 @@ void frmSSLCertificate::SetupCertsString(SSLCertCollectionString SSLCertsInc)
 	std::map<string, string>::iterator Validiter = SCDIter->second.CertData.find("Start date");
 	
 	wxDateTime ValidFromDate;
-	ValidFromDate.ParseDate(Validiter->second);
+	const wxString validFromDateToParse = wxString(Validiter->second);
+	wxString::const_iterator validFromDateToParseEnd = validFromDateToParse.end();
+	ValidFromDate.ParseDateTime(validFromDateToParse, &validFromDateToParseEnd);
 	
 	lblValidFromData->SetLabel(ValidFromDate.FormatDate());
 	
@@ -300,7 +302,7 @@ std::map<wxString,wxString> frmSSLCertificate::GetSubjectData(wxString SubjectDa
 	// Get the subject data and put into a map<wxString,wxString>
 	
 	std::map<wxString,wxString> SubjectDataFinal;
-	wxStringTokenizer SubjectDataToken(SubjectData, wxT(";"));
+	wxStringTokenizer SubjectDataToken(SubjectData, wxT(","));
 	wxString StringData;
 	wxString SettingName;
 	wxString SettingValue;
@@ -343,7 +345,7 @@ std::map<string,string> frmSSLCertificate::GetSubjectData(std::string SubjectDat
 	// Get the subject data and put into a map<wxString,wxString>
 	
 	std::map<string,string> SubjectDataFinal;
-	wxStringTokenizer SubjectDataToken(wxString(SubjectData.c_str(), wxConvUTF8), wxT(";"));
+	wxStringTokenizer SubjectDataToken(wxString(SubjectData.c_str(), wxConvUTF8), wxT(","));
 	wxString StringData;
 	wxString SettingName;
 	wxString SettingValue;