From ee947566554f58262172092c34b53f3d197932e3 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Mon, 17 Oct 2016 14:04:21 +0200
Subject: [PATCH] Missing type-cast preventing correct CA certificate file
 import fixed (broken in 559ffc5ead99b6848386588319bf49005da9b5d4)

---
 lib/TLS_UI/include/TLS_UI.h | 2 +-
 lib/TLS_UI/src/TLS_UI.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/TLS_UI/include/TLS_UI.h b/lib/TLS_UI/include/TLS_UI.h
index e1a2460..38b9160 100644
--- a/lib/TLS_UI/include/TLS_UI.h
+++ b/lib/TLS_UI/include/TLS_UI.h
@@ -100,7 +100,7 @@ class wxTLSCredentialsPanel : public wxEAPCredentialsPanel<eap::credentials_tls,
 {
 public:
     ///
-    /// Constructs a configuration panel
+    /// Constructs a TLS credentials panel
     ///
     /// \param[in]    prov       Provider configuration data
     /// \param[in]    cfg        Configuration data
diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp
index b1845c5..619136c 100644
--- a/lib/TLS_UI/src/TLS_UI.cpp
+++ b/lib/TLS_UI/src/TLS_UI.cpp
@@ -257,11 +257,11 @@ void wxTLSServerTrustPanel::OnRootCAAddFile(wxCommandEvent& event)
     for (size_t i = 0, i_end = paths.GetCount(); i < i_end; i++) {
         // Load certificate(s) from file.
         winstd::cert_store cs;
-        if (cs.create(CERT_STORE_PROV_FILENAME, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, NULL, CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG, paths[i])) {
+        if (cs.create(CERT_STORE_PROV_FILENAME, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, NULL, CERT_STORE_OPEN_EXISTING_FLAG | CERT_STORE_READONLY_FLAG, static_cast<LPCTSTR>(paths[i]))) {
             for (PCCERT_CONTEXT cert = NULL; (cert = CertEnumCertificatesInStore(cs, cert)) != NULL;)
                 AddRootCA(cert);
         } else
-            wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i]), _("Error"), wxOK | wxICON_EXCLAMATION, this);
+            wxMessageBox(wxString::Format(_("Invalid or unsupported certificate file %s"), paths[i].c_str()), _("Error"), wxOK | wxICON_EXCLAMATION, this);
     }
 }