From 6f92e8259846e9c00c6d0c11c73360b07f905b04 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Thu, 3 Feb 2022 13:03:59 +0100 Subject: [PATCH] WinStd: Update Signed-off-by: Simon Rozman --- CredWrite/CredWrite.vcxproj | 3 --- EAPMethods/Common.props | 3 --- EventMonitor/EventMonitor.vcxproj | 3 --- GEANTLink.sln | 15 --------------- MsiUseFeature/MsiUseFeature.vcxproj | 5 ----- WLANManager/WLANManager.vcxproj | 5 ----- lib/EAPBase/src/Credentials.cpp | 12 ++++++------ lib/EAPBase/src/Module.cpp | 8 ++++---- lib/EapHost/src/Credentials.cpp | 10 +++++----- lib/EapHost/src/PCH.cpp | 2 ++ lib/Events/build/Events.vcxproj | 5 ----- lib/GTC/src/Method.cpp | 6 +++--- lib/MSCHAPv2/src/Method.cpp | 10 +++++----- lib/PAP/src/Method.cpp | 2 +- lib/TLS/src/Credentials.cpp | 6 +++--- lib/TLS/src/Method.cpp | 20 ++++++++++---------- lib/TLS/src/Module.cpp | 10 +++++----- lib/TTLS/src/Module.cpp | 10 +++++----- lib/TTLS_UI/src/Module.cpp | 2 +- lib/WinStd | 2 +- 20 files changed, 51 insertions(+), 88 deletions(-) diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj index 4e92627..6f0d043 100644 --- a/CredWrite/CredWrite.vcxproj +++ b/CredWrite/CredWrite.vcxproj @@ -86,9 +86,6 @@ {4d40cb8a-812e-4f12-b23a-31af743878e8} - - {47399d91-7eb9-41de-b521-514ba5db0c43} - diff --git a/EAPMethods/Common.props b/EAPMethods/Common.props index d350c6f..e755cfd 100644 --- a/EAPMethods/Common.props +++ b/EAPMethods/Common.props @@ -20,8 +20,5 @@ {d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b} - - {47399d91-7eb9-41de-b521-514ba5db0c43} - \ No newline at end of file diff --git a/EventMonitor/EventMonitor.vcxproj b/EventMonitor/EventMonitor.vcxproj index 772185c..667fde9 100644 --- a/EventMonitor/EventMonitor.vcxproj +++ b/EventMonitor/EventMonitor.vcxproj @@ -89,9 +89,6 @@ {d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b} - - {47399d91-7eb9-41de-b521-514ba5db0c43} - {d3e29951-d9f5-486d-a167-20ae8e90b1fa} diff --git a/GEANTLink.sln b/GEANTLink.sln index b8d8940..8b9eeee 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -15,8 +15,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS", "EAPMethods\EAP- EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinStd", "lib\WinStd\build\WinStd.vcxproj", "{47399D91-7EB9-41DE-B521-514BA5DB0C43}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Utilities", "Utilities", "{7B5EC9B7-208C-426A-941D-DAF9271BD4A4}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\CredWrite.vcxproj", "{2D3CE079-7EB1-4F47-B79E-F0310671ECCB}" @@ -83,18 +81,6 @@ Global {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|Win32.Build.0 = Release|Win32 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.ActiveCfg = Release|x64 {331B6077-E3E2-4867-B93E-9D3F57280DE7}.Release|x64.Build.0 = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|ARM64.Build.0 = Debug|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.ActiveCfg = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|Win32.Build.0 = Debug|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.ActiveCfg = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Debug|x64.Build.0 = Debug|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.ActiveCfg = Release|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|ARM64.Build.0 = Release|ARM64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.ActiveCfg = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|Win32.Build.0 = Release|Win32 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.ActiveCfg = Release|x64 - {47399D91-7EB9-41DE-B521-514BA5DB0C43}.Release|x64.Build.0 = Release|x64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.ActiveCfg = Debug|ARM64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|ARM64.Build.0 = Debug|ARM64 {2D3CE079-7EB1-4F47-B79E-F0310671ECCB}.Debug|Win32.ActiveCfg = Debug|Win32 @@ -353,7 +339,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {331B6077-E3E2-4867-B93E-9D3F57280DE7} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C} - {47399D91-7EB9-41DE-B521-514BA5DB0C43} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4} {D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393} {DD7A97CA-F18E-43B7-95C4-D06E6A291624} = {60BAAC3D-DC98-4C19-BC40-1A86963DE86C} diff --git a/MsiUseFeature/MsiUseFeature.vcxproj b/MsiUseFeature/MsiUseFeature.vcxproj index 017c220..8187394 100644 --- a/MsiUseFeature/MsiUseFeature.vcxproj +++ b/MsiUseFeature/MsiUseFeature.vcxproj @@ -76,11 +76,6 @@ - - - {47399d91-7eb9-41de-b521-514ba5db0c43} - - \ No newline at end of file diff --git a/WLANManager/WLANManager.vcxproj b/WLANManager/WLANManager.vcxproj index a8aab4d..70e791a 100644 --- a/WLANManager/WLANManager.vcxproj +++ b/WLANManager/WLANManager.vcxproj @@ -73,11 +73,6 @@ - - - {47399d91-7eb9-41de-b521-514ba5db0c43} - - diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index 1384e29..93ba36e 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -292,7 +292,7 @@ eap::credentials::source_t eap::credentials_identity::combine( if (cred_cached) { // Using EAP service cached credentials. *this = *dynamic_cast(cred_cached); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), blank_event_data); return source_t::cache; } @@ -300,7 +300,7 @@ eap::credentials::source_t eap::credentials_identity::combine( if (cfg_with_cred && cfg_with_cred->m_use_cred) { // Using configured credentials. *this = *dynamic_cast(cfg_with_cred->m_cred.get()); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), blank_event_data); return source_t::config; } @@ -311,7 +311,7 @@ eap::credentials::source_t eap::credentials_identity::combine( // Using stored credentials. *this = std::move(cred_loaded); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), blank_event_data); return source_t::storage; } catch (...) { // Not actually an error. @@ -609,7 +609,7 @@ eap::credentials::source_t eap::credentials_pass::combine( if (cred_cached) { // Using EAP service cached credentials. *this = *dynamic_cast(cred_cached); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), blank_event_data); return source_t::cache; } @@ -617,7 +617,7 @@ eap::credentials::source_t eap::credentials_pass::combine( if (cfg_with_cred && cfg_with_cred->m_use_cred) { // Using configured credentials. *this = *dynamic_cast(cfg_with_cred->m_cred.get()); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), blank_event_data); return source_t::config; } @@ -628,7 +628,7 @@ eap::credentials::source_t eap::credentials_pass::combine( // Using stored credentials. *this = std::move(cred_loaded); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), blank_event_data); return source_t::storage; } catch (...) { // Not actually an error. diff --git a/lib/EAPBase/src/Module.cpp b/lib/EAPBase/src/Module.cpp index fe9fdfa..a9e5bdd 100644 --- a/lib/EAPBase/src/Module.cpp +++ b/lib/EAPBase/src/Module.cpp @@ -19,7 +19,7 @@ eap::module::module(_In_ eap_type_t eap_method) : m_instance(NULL) { m_ep.create(&EAPMETHOD_TRACE_EVENT_PROVIDER); - m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, event_data((unsigned int)m_eap_method), event_data::blank); + m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_LOAD, event_data((unsigned int)m_eap_method), blank_event_data); m_heap.create(0, 0, 0); } @@ -27,7 +27,7 @@ eap::module::module(_In_ eap_type_t eap_method) : eap::module::~module() { - m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, event_data((unsigned int)m_eap_method), event_data::blank); + m_ep.write(&EAPMETHOD_TRACE_EVT_MODULE_UNLOAD, event_data((unsigned int)m_eap_method), blank_event_data); } @@ -367,7 +367,7 @@ void eap::peer::get_identity( // Credentials missing or incomplete. if ((dwFlags & EAP_FLAG_MACHINE_AUTH) == 0) { // Per-user authentication, request UI. - log_event(&EAPMETHOD_TRACE_EVT_CRED_INVOKE_UI2, event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_INVOKE_UI2, blank_event_data); *ppUserDataOut = NULL; *pdwUserDataOutSize = 0; *pfInvokeUI = TRUE; @@ -381,7 +381,7 @@ void eap::peer::get_identity( // Build our identity. ;) wstring identity(std::move(cfg_method->get_public_identity(*cred_out.m_cred.get()))); - log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)cfg_method->get_method_id()), event_data(identity), event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)cfg_method->get_method_id()), event_data(identity), blank_event_data); size_t size = sizeof(WCHAR)*(identity.length() + 1); *ppwszIdentity = (WCHAR*)alloc_memory(size); memcpy(*ppwszIdentity, identity.c_str(), size); diff --git a/lib/EapHost/src/Credentials.cpp b/lib/EapHost/src/Credentials.cpp index 784007a..dc2bef1 100644 --- a/lib/EapHost/src/Credentials.cpp +++ b/lib/EapHost/src/Credentials.cpp @@ -220,7 +220,7 @@ eap::credentials::source_t eap::credentials_eaphost::combine( if (cred_cached) { // Using EAP service cached credentials. *this = *dynamic_cast(cred_cached); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), blank_event_data); src = source_t::cache; } @@ -232,7 +232,7 @@ eap::credentials::source_t eap::credentials_eaphost::combine( if (cfg_with_cred && cfg_with_cred->m_use_cred) { // Using configured credentials. *this = *dynamic_cast(cfg_with_cred->m_cred.get()); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_eaphost::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_eaphost::get_name()), event_data(pszTargetName), blank_event_data); src = source_t::config; } } @@ -244,7 +244,7 @@ eap::credentials::source_t eap::credentials_eaphost::combine( // Using stored credentials. *this = std::move(cred_loaded); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), blank_event_data); src = source_t::storage; } catch (...) { // Not actually an error. @@ -276,7 +276,7 @@ eap::credentials::source_t eap::credentials_eaphost::combine( BYTE *_cred_data = cred_data.get(); m_cred_blob.assign(_cred_data, _cred_data + cred_data_size); SecureZeroMemory(_cred_data, cred_data_size); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_EAPHOST, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_EAPHOST, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), blank_event_data); return source_t::lower; } else SecureZeroMemory(cred_data.get(), cred_data_size); @@ -285,7 +285,7 @@ eap::credentials::source_t eap::credentials_eaphost::combine( m_module.log_error(error.get()); } else { // A runtime error in inner EAP method occurred. - m_module.log_event(&EAPMETHOD_TRACE_EVT_WIN_ERROR, event_data((unsigned int)dwResult), event_data(__FUNCTION__ " EapHostPeerGetIdentity failed."), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_WIN_ERROR, event_data((unsigned int)dwResult), event_data(__FUNCTION__ " EapHostPeerGetIdentity failed."), blank_event_data); } return source_t::unknown; diff --git a/lib/EapHost/src/PCH.cpp b/lib/EapHost/src/PCH.cpp index 976ea10..ed409ce 100644 --- a/lib/EapHost/src/PCH.cpp +++ b/lib/EapHost/src/PCH.cpp @@ -5,3 +5,5 @@ */ #include "PCH.h" + +#pragma comment(lib, "Eappcfg.lib") diff --git a/lib/Events/build/Events.vcxproj b/lib/Events/build/Events.vcxproj index 14780ba..f100dab 100644 --- a/lib/Events/build/Events.vcxproj +++ b/lib/Events/build/Events.vcxproj @@ -131,11 +131,6 @@ - - - {47399d91-7eb9-41de-b521-514ba5db0c43} - - diff --git a/lib/GTC/src/Method.cpp b/lib/GTC/src/Method.cpp index df792a9..e3f9eaf 100644 --- a/lib/GTC/src/Method.cpp +++ b/lib/GTC/src/Method.cpp @@ -43,14 +43,14 @@ EapPeerMethodResponseAction eap::method_gtc::process_request_packet( { assert(pReceivedPacket || dwReceivedPacketSize == 0); - m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::gtc), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::gtc), blank_event_data); credentials_pass *cred_pass; if (dynamic_cast(&m_cred)) { // Read authenticator challenge as UTF-8 encoded string. MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)pReceivedPacket, dwReceivedPacketSize, m_challenge); - m_module.log_event(&EAPMETHOD_GTC_RESPONSE_REQ, event_data((unsigned int)eap_type_t::gtc), event_data::blank); + m_module.log_event(&EAPMETHOD_GTC_RESPONSE_REQ, event_data((unsigned int)eap_type_t::gtc), blank_event_data); // User must respond to the challenge. return EapPeerMethodResponseActionInvokeUI; @@ -110,7 +110,7 @@ EapPeerMethodResponseAction eap::method_gtc::set_ui_context( _In_count_(dwUIContextDataSize) const BYTE *pUIContextData, _In_ DWORD dwUIContextDataSize) { - m_module.log_event(&EAPMETHOD_GTC_RESPONSE, event_data((unsigned int)eap_type_t::gtc), event_data::blank); + m_module.log_event(&EAPMETHOD_GTC_RESPONSE, event_data((unsigned int)eap_type_t::gtc), blank_event_data); // Save GTC response. m_response.assign( diff --git a/lib/MSCHAPv2/src/Method.cpp b/lib/MSCHAPv2/src/Method.cpp index fd6eda9..ff4c929 100644 --- a/lib/MSCHAPv2/src/Method.cpp +++ b/lib/MSCHAPv2/src/Method.cpp @@ -90,7 +90,7 @@ void eap::method_mschapv2_base::process_success(_In_ const list &argv) if (resp.size() != sizeof(resp_exp) || memcmp(resp.data(), &resp_exp, sizeof(resp_exp)) != 0) throw invalid_argument(__FUNCTION__ " MS-CHAP2-Success authentication response string failed."); - m_module.log_event(&EAPMETHOD_METHOD_SUCCESS, event_data((unsigned int)m_cfg.get_method_id()), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_SUCCESS, event_data((unsigned int)m_cfg.get_method_id()), blank_event_data); is_success = true; } } @@ -107,7 +107,7 @@ void eap::method_mschapv2_base::process_error(_In_ const list &argv) const string &val = *arg; if ((val[0] == 'E' || val[0] == 'e') && val[1] == '=') { DWORD dwResult = strtoul(val.data() + 2, NULL, 10); - m_module.log_event(&EAPMETHOD_METHOD_FAILURE_ERROR, event_data((unsigned int)m_cfg.get_method_id()), event_data(dwResult), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_FAILURE_ERROR, event_data((unsigned int)m_cfg.get_method_id()), event_data(dwResult), blank_event_data); switch (dwResult) { case ERROR_ACCT_DISABLED : m_cfg.m_last_status = config_method::status_t::account_disabled ; break; case ERROR_RESTRICTED_LOGON_HOURS: m_cfg.m_last_status = config_method::status_t::account_logon_hours; break; @@ -122,7 +122,7 @@ void eap::method_mschapv2_base::process_error(_In_ const list &argv) dec.decode(m_challenge_server, is_last, val.data() + 2, (size_t)-1); } else if ((val[0] == 'M' || val[0] == 'm') && val[1] == '=') { MultiByteToWideChar(CP_UTF8, 0, val.data() + 2, (int)val.length() - 2, m_cfg.m_last_msg); - m_module.log_event(&EAPMETHOD_METHOD_FAILURE_ERROR1, event_data((unsigned int)m_cfg.get_method_id()), event_data(m_cfg.m_last_msg), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_FAILURE_ERROR1, event_data((unsigned int)m_cfg.get_method_id()), event_data(m_cfg.m_last_msg), blank_event_data); } } } @@ -185,7 +185,7 @@ EapPeerMethodResponseAction eap::method_mschapv2::process_request_packet( switch (hdr->code) { case chap_packet_code_t::challenge: { - m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::mschapv2), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::mschapv2), blank_event_data); if (msg + 1 > msg_end) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Incomplete CHAP challenge packet."); @@ -282,7 +282,7 @@ EapPeerMethodResponseAction eap::method_mschapv2_diameter::process_request_packe switch (m_phase) { case phase_t::init: { - m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::legacy_mschapv2), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::legacy_mschapv2), blank_event_data); // Randomize Peer-Challenge. m_challenge_client.randomize(m_cp); diff --git a/lib/PAP/src/Method.cpp b/lib/PAP/src/Method.cpp index f605704..3a1bec3 100644 --- a/lib/PAP/src/Method.cpp +++ b/lib/PAP/src/Method.cpp @@ -49,7 +49,7 @@ EapPeerMethodResponseAction eap::method_pap_diameter::process_request_packet( switch (m_phase) { case phase_t::init: { - m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::legacy_pap), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_t::legacy_pap), blank_event_data); // Convert username and password to UTF-8. sanitizing_string identity_utf8, password_utf8; diff --git a/lib/TLS/src/Credentials.cpp b/lib/TLS/src/Credentials.cpp index 120c2ca..4c66143 100644 --- a/lib/TLS/src/Credentials.cpp +++ b/lib/TLS/src/Credentials.cpp @@ -235,7 +235,7 @@ eap::credentials::source_t eap::credentials_tls::combine( if (cred_cached) { // Using EAP service cached credentials. *this = *dynamic_cast(cred_cached); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)eap_type_t::tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)eap_type_t::tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), blank_event_data); return source_t::cache; } @@ -243,7 +243,7 @@ eap::credentials::source_t eap::credentials_tls::combine( if (cfg_with_cred && cfg_with_cred->m_use_cred) { // Using configured credentials. *this = *dynamic_cast(cfg_with_cred->m_cred.get()); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)eap_type_t::tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)eap_type_t::tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), blank_event_data); return source_t::config; } @@ -254,7 +254,7 @@ eap::credentials::source_t eap::credentials_tls::combine( // Using stored credentials. *this = std::move(cred_loaded); - m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)eap_type_t::tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), event_data::blank); + m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)eap_type_t::tls), event_data(credentials_tls::get_name()), event_data(pszTargetName), blank_event_data); return source_t::storage; } catch (...) { // Not actually an error. diff --git a/lib/TLS/src/Method.cpp b/lib/TLS/src/Method.cpp index 4370fda..131b01f 100644 --- a/lib/TLS/src/Method.cpp +++ b/lib/TLS/src/Method.cpp @@ -57,7 +57,7 @@ EapPeerMethodResponseAction eap::method_defrag::process_request_packet( m_module.log_event(&EAPMETHOD_DEFRAG_VERSION, event_data(m_version), event_data(data_version), - event_data::blank); + blank_event_data); m_phase = phase_t::established; } else if (data_version != m_version) throw win_runtime_error(EAP_E_EAPHOST_METHOD_INVALID_PACKET, __FUNCTION__ " Protocol version mismatch."); @@ -272,7 +272,7 @@ EapPeerMethodResponseAction eap::method_tls::process_request_packet( switch (m_phase) { case phase_t::handshake_init: { - m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)m_cfg.get_method_id()), event_data::blank); + m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)m_cfg.get_method_id()), blank_event_data); // Prepare input buffer(s). SecBuffer buf_in[] = { @@ -416,7 +416,7 @@ EapPeerMethodResponseAction eap::method_tls::process_request_packet( } else { SecPkgContext_Authority auth; if (FAILED(status = QueryContextAttributes(m_sc_ctx, SECPKG_ATTR_AUTHORITY, &auth))) { - m_module.log_event(&EAPMETHOD_TLS_QUERY_FAILED, event_data((unsigned int)SECPKG_ATTR_AUTHORITY), event_data(status), event_data::blank); + m_module.log_event(&EAPMETHOD_TLS_QUERY_FAILED, event_data((unsigned int)SECPKG_ATTR_AUTHORITY), event_data(status), blank_event_data); auth.sAuthorityName = _T(""); } @@ -432,9 +432,9 @@ EapPeerMethodResponseAction eap::method_tls::process_request_packet( event_data(info.dwHashStrength), event_data(info.aiExch), event_data(info.dwExchStrength), - event_data::blank); + blank_event_data); else - m_module.log_event(&EAPMETHOD_TLS_QUERY_FAILED, event_data((unsigned int)SECPKG_ATTR_CONNECTION_INFO), event_data(status), event_data::blank); + m_module.log_event(&EAPMETHOD_TLS_QUERY_FAILED, event_data((unsigned int)SECPKG_ATTR_CONNECTION_INFO), event_data(status), blank_event_data); m_phase = phase_t::finished; m_cfg.m_last_status = config_method::status_t::auth_failed; // Blame protocol if we fail beyond this point. @@ -557,7 +557,7 @@ void eap::method_tls::get_result( m_eap_attr.push_back(std::move(a)); // Append blank EAP attribute. - m_eap_attr.push_back(eap_attr::blank); + m_eap_attr.push_back(blank_eap_attr); m_eap_attr_desc.dwNumberOfAttributes = (DWORD)m_eap_attr.size(); m_eap_attr_desc.pAttribs = m_eap_attr.data(); @@ -651,7 +651,7 @@ void eap::method_tls::verify_server_trust() const memcmp(m_sc_cert->pbCertEncoded, (*c)->pbCertEncoded, m_sc_cert->cbCertEncoded) == 0) { // Server certificate found directly on the trusted root CA list. - m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_TRUSTED_EX1, event_data((unsigned int)m_cfg.get_method_id()), event_data::blank); + m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_TRUSTED_EX1, event_data((unsigned int)m_cfg.get_method_id()), blank_event_data); return; } } @@ -700,7 +700,7 @@ void eap::method_tls::verify_server_trust() const if (san_info->rgAltEntry[idx_entry].dwAltNameChoice == CERT_ALT_NAME_DNS_NAME && _wcsicmp(s->c_str(), san_info->rgAltEntry[idx_entry].pwszDNSName) == 0) { - m_module.log_event(&EAPMETHOD_TLS_SERVER_NAME_TRUSTED2, event_data((unsigned int)m_cfg.get_method_id()), event_data(san_info->rgAltEntry[idx_entry].pwszDNSName), event_data::blank); + m_module.log_event(&EAPMETHOD_TLS_SERVER_NAME_TRUSTED2, event_data((unsigned int)m_cfg.get_method_id()), event_data(san_info->rgAltEntry[idx_entry].pwszDNSName), blank_event_data); found = true; } } @@ -715,7 +715,7 @@ void eap::method_tls::verify_server_trust() const for (auto s = m_cfg.m_server_names.cbegin(), s_end = m_cfg.m_server_names.cend(); !found && s != s_end; ++s) { if (_wcsicmp(s->c_str(), subj.c_str()) == 0) { - m_module.log_event(&EAPMETHOD_TLS_SERVER_NAME_TRUSTED2, event_data((unsigned int)m_cfg.get_method_id()), event_data(subj), event_data::blank); + m_module.log_event(&EAPMETHOD_TLS_SERVER_NAME_TRUSTED2, event_data((unsigned int)m_cfg.get_method_id()), event_data(subj), blank_event_data); found = true; } } @@ -805,7 +805,7 @@ void eap::method_tls::verify_server_trust() const } } - m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_TRUSTED1, event_data((unsigned int)m_cfg.get_method_id()), event_data::blank); + m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_TRUSTED1, event_data((unsigned int)m_cfg.get_method_id()), blank_event_data); } #endif diff --git a/lib/TLS/src/Module.cpp b/lib/TLS/src/Module.cpp index 87dc618..9bde80a 100644 --- a/lib/TLS/src/Module.cpp +++ b/lib/TLS/src/Module.cpp @@ -182,7 +182,7 @@ DWORD WINAPI eap::peer_tls_base::crl_checker::verify(_In_ crl_checker *obj) // This "error" is expected for the root CA certificate. } else { // This really was an error, as it appeared before the root CA cerficate in the chain. - obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKE_SKIPPED, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), event_data::blank); + obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKE_SKIPPED, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), blank_event_data); } break; @@ -194,12 +194,12 @@ DWORD WINAPI eap::peer_tls_base::crl_checker::verify(_In_ crl_checker *obj) case CRL_REASON_CESSATION_OF_OPERATION: case CRL_REASON_CERTIFICATE_HOLD: // The revocation was of administrative nature. No need to black-list. - obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKED1, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), event_data(status_rev.dwReason), event_data::blank); + obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKED1, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), event_data(status_rev.dwReason), blank_event_data); break; default: { // One of the certificates in the chain was revoked as compromised. Black-list it. - obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKED, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), event_data(status_rev.dwReason), event_data::blank); + obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKED, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), event_data(status_rev.dwReason), blank_event_data); reg_key key; if (key.create(HKEY_LOCAL_MACHINE, _T("SOFTWARE\\") _T(VENDOR_NAME_STR) _T("\\") _T(PRODUCT_NAME_STR) _T("\\TLSCRL"), NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE)) { vector hash; @@ -223,7 +223,7 @@ DWORD WINAPI eap::peer_tls_base::crl_checker::verify(_In_ crl_checker *obj) default: // Checking one of the certificates in the chain for revocation failed. Resume checking the rest. - obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKE_FAILED, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), event_data(status_rev.dwError), event_data::blank); + obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKE_FAILED, event_data((unsigned int)obj->m_module.m_eap_method), event_data(subj), event_data(status_rev.dwError), blank_event_data); c += (size_t)status_rev.dwIndex + 1; } } else { @@ -233,6 +233,6 @@ DWORD WINAPI eap::peer_tls_base::crl_checker::verify(_In_ crl_checker *obj) } // Revocation check succeeded. - obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKE_FINISHED, event_data((unsigned int)obj->m_module.m_eap_method), event_data::blank); + obj->m_module.log_event(&EAPMETHOD_TLS_SERVER_CERT_REVOKE_FINISHED, event_data((unsigned int)obj->m_module.m_eap_method), blank_event_data); return 0; } diff --git a/lib/TTLS/src/Module.cpp b/lib/TTLS/src/Module.cpp index 966e3a5..4ca82f1 100644 --- a/lib/TTLS/src/Module.cpp +++ b/lib/TTLS/src/Module.cpp @@ -70,7 +70,7 @@ _Success_(return != 0) const eap::config_method_with_cred* eap::peer_tls_tunnel: // Get method configuration. if (cfg_prov->m_methods.empty()) { - log_event(&EAPMETHOD_TRACE_EVT_CRED_NO_METHOD, event_data(target_name), event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_NO_METHOD, event_data(target_name), blank_event_data); continue; } const config_method_tls_tunnel *cfg_method = dynamic_cast(cfg_prov->m_methods.front().get()); @@ -95,7 +95,7 @@ _Success_(return != 0) const eap::config_method_with_cred* eap::peer_tls_tunnel: *cfg_method, cfg_method->m_allow_save ? _target_name : NULL); if (src_outer == eap::credentials::source_t::unknown) { - log_event(&EAPMETHOD_TRACE_EVT_CRED_UNKNOWN3, event_data(target_name), event_data((unsigned int)eap_type_t::tls), event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_UNKNOWN3, event_data(target_name), event_data((unsigned int)eap_type_t::tls), blank_event_data); continue; } @@ -110,7 +110,7 @@ _Success_(return != 0) const eap::config_method_with_cred* eap::peer_tls_tunnel: *cfg_method->m_inner, cfg_method->m_inner->m_allow_save ? _target_name : NULL); if (src_inner == eap::credentials::source_t::unknown) { - log_event(&EAPMETHOD_TRACE_EVT_CRED_UNKNOWN3, event_data(target_name), event_data((unsigned int)cfg_method->m_inner->get_method_id()), event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_UNKNOWN3, event_data(target_name), event_data((unsigned int)cfg_method->m_inner->get_method_id()), blank_event_data); continue; } @@ -119,13 +119,13 @@ _Success_(return != 0) const eap::config_method_with_cred* eap::peer_tls_tunnel: if ((dwFlags & EAP_FLAG_MACHINE_AUTH) == 0) { if (config_method::status_t::cred_begin <= cfg_method->m_last_status && cfg_method->m_last_status < config_method::status_t::cred_end) { // Outer: Credentials failed on last connection attempt. - log_event(&EAPMETHOD_TRACE_EVT_CRED_PROBLEM2, event_data(target_name), event_data((unsigned int)eap_type_t::tls), event_data((unsigned int)cfg_method->m_last_status), event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_PROBLEM2, event_data(target_name), event_data((unsigned int)eap_type_t::tls), event_data((unsigned int)cfg_method->m_last_status), blank_event_data); continue; } if (config_method::status_t::cred_begin <= cfg_method->m_inner->m_last_status && cfg_method->m_inner->m_last_status < config_method::status_t::cred_end) { // Inner: Credentials failed on last connection attempt. - log_event(&EAPMETHOD_TRACE_EVT_CRED_PROBLEM2, event_data(target_name), event_data((unsigned int)cfg_method->m_inner->get_method_id()), event_data((unsigned int)cfg_method->m_inner->m_last_status), event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_PROBLEM2, event_data(target_name), event_data((unsigned int)cfg_method->m_inner->get_method_id()), event_data((unsigned int)cfg_method->m_inner->m_last_status), blank_event_data); continue; } } diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index 1c6788b..88ddea8 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -277,7 +277,7 @@ void eap::peer_peap_ui::invoke_identity_ui( // Build our identity. ;) wstring identity(std::move(cfg_method->get_public_identity(*cred_out.m_cred.get()))); - log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)cfg_method->get_method_id()), event_data(identity), event_data::blank); + log_event(&EAPMETHOD_TRACE_EVT_CRED_OUTER_ID1, event_data((unsigned int)cfg_method->get_method_id()), event_data(identity), blank_event_data); size_t size = sizeof(WCHAR)*(identity.length() + 1); *ppwszIdentity = (WCHAR*)alloc_memory(size); memcpy(*ppwszIdentity, identity.c_str(), size); diff --git a/lib/WinStd b/lib/WinStd index 0d56d79..c49ea10 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 0d56d79c3503982beab400a210e49c60a8827997 +Subproject commit c49ea100550a64b92857e7792bdd472514b9c162