From 5a82dc2a25127cf3540c6eac9c38793d4e2b2475 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Fri, 14 Jun 2019 09:35:17 +0200 Subject: [PATCH] Unify LPCBYTE Signed-off-by: Simon Rozman --- lib/EapHost/src/Config.cpp | 2 +- lib/EapHost/src/Method.cpp | 2 +- lib/EapHost_UI/src/EapHost_UI.cpp | 2 +- lib/TLS/include/Config.h | 2 +- lib/TLS/src/Config.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/EapHost/src/Config.cpp b/lib/EapHost/src/Config.cpp index beb85ee..7c76eb0 100644 --- a/lib/EapHost/src/Config.cpp +++ b/lib/EapHost/src/Config.cpp @@ -130,7 +130,7 @@ void eap::config_method_eaphost::load(_In_ IXMLDOMNode *pConfigRoot) DWORD dwResult = EapHostPeerConfigXml2Blob(0, pXmlElEapHostConfig, &cfg_data_size, get_ptr(cfg_data), &m_type, get_ptr(error)); if (dwResult == ERROR_SUCCESS) { update_type(); - const BYTE *_cfg_data = cfg_data.get(); + LPCBYTE _cfg_data = cfg_data.get(); m_cfg_blob.assign(_cfg_data, _cfg_data + cfg_data_size); } else if (error) throw eap_runtime_error(*error , __FUNCTION__ " EapHostPeerConfigXml2Blob failed."); diff --git a/lib/EapHost/src/Method.cpp b/lib/EapHost/src/Method.cpp index 8556acf..8bc1bee 100644 --- a/lib/EapHost/src/Method.cpp +++ b/lib/EapHost/src/Method.cpp @@ -151,7 +151,7 @@ void eap::method_eaphost::get_response_packet( get_ptr(error)); if (dwResult == ERROR_SUCCESS) { // Packet successfuly prepared. - const BYTE *__packet = _packet.get(); + LPCBYTE __packet = _packet.get(); packet.assign(__packet, __packet + size_max); } else if (error) throw eap_runtime_error(*error , __FUNCTION__ " EapHostPeerGetSendPacket failed."); diff --git a/lib/EapHost_UI/src/EapHost_UI.cpp b/lib/EapHost_UI/src/EapHost_UI.cpp index 3b149a5..4c637bf 100644 --- a/lib/EapHost_UI/src/EapHost_UI.cpp +++ b/lib/EapHost_UI/src/EapHost_UI.cpp @@ -128,7 +128,7 @@ void wxEapHostMethodConfigPanel::OnSettings(wxCommandEvent& event) winstd::eap_error error; DWORD dwResult = EapHostPeerInvokeConfigUI(GetHWND(), 0, data->m_type, (DWORD)data->m_cfg_blob.size(), data->m_cfg_blob.data(), &cfg_data_size, get_ptr(cfg_data), get_ptr(error)); if (dwResult == ERROR_SUCCESS) { - const BYTE *_cfg_data = cfg_data.get(); + LPCBYTE _cfg_data = cfg_data.get(); data->m_cfg_blob.assign(_cfg_data, _cfg_data + cfg_data_size); } else if (dwResult == ERROR_CANCELLED) { // Not really an error. diff --git a/lib/TLS/include/Config.h b/lib/TLS/include/Config.h index fe5a3e6..9ba79a9 100644 --- a/lib/TLS/include/Config.h +++ b/lib/TLS/include/Config.h @@ -155,7 +155,7 @@ namespace eap /// - \c true when adding succeeds; /// - \c false otherwise. /// - bool add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ const BYTE *pbCertEncoded, _In_ DWORD cbCertEncoded); + bool add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ LPCBYTE pbCertEncoded, _In_ DWORD cbCertEncoded); public: std::list m_trusted_root_ca; ///< Trusted root CAs diff --git a/lib/TLS/src/Config.cpp b/lib/TLS/src/Config.cpp index 712ebf7..d80dd50 100644 --- a/lib/TLS/src/Config.cpp +++ b/lib/TLS/src/Config.cpp @@ -272,7 +272,7 @@ eap::credentials* eap::config_method_tls::make_credentials() const } -bool eap::config_method_tls::add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ const BYTE *pbCertEncoded, _In_ DWORD cbCertEncoded) +bool eap::config_method_tls::add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ LPCBYTE pbCertEncoded, _In_ DWORD cbCertEncoded) { cert_context cert; if (!cert.create(dwCertEncodingType, pbCertEncoded, cbCertEncoded)) {