diff --git a/lib/EAPBase/include/Config.h b/lib/EAPBase/include/Config.h index 93081fc..417396c 100644 --- a/lib/EAPBase/include/Config.h +++ b/lib/EAPBase/include/Config.h @@ -550,7 +550,6 @@ namespace eap /// @} public: - GUID m_connection_id; ///< Unique connection ID std::vector m_providers; ///< Array of provider configurations }; } diff --git a/lib/EAPBase/src/Config.cpp b/lib/EAPBase/src/Config.cpp index c9ddbbf..01c9ac8 100644 --- a/lib/EAPBase/src/Config.cpp +++ b/lib/EAPBase/src/Config.cpp @@ -614,12 +614,10 @@ void eap::config_provider::operator>>(_Inout_ cursor_in &cursor) eap::config_connection::config_connection(_In_ module &mod) : config(mod) { - memset(&m_connection_id, 0, sizeof(m_connection_id)); } eap::config_connection::config_connection(_In_ const config_connection &other) : - m_connection_id(other.m_connection_id), m_providers(other.m_providers), config(other) { @@ -627,7 +625,6 @@ eap::config_connection::config_connection(_In_ const config_connection &other) : eap::config_connection::config_connection(_Inout_ config_connection &&other) : - m_connection_id(std::move(other.m_connection_id)), m_providers(std::move(other.m_providers)), config(std::move(other)) { @@ -637,9 +634,8 @@ eap::config_connection::config_connection(_Inout_ config_connection &&other) : eap::config_connection& eap::config_connection::operator=(_In_ const config_connection &other) { if (this != &other) { - (config&)*this = other; - m_connection_id = other.m_connection_id; - m_providers = other.m_providers; + (config&)*this = other; + m_providers = other.m_providers; } return *this; @@ -650,7 +646,6 @@ eap::config_connection& eap::config_connection::operator=(_Inout_ config_connect { if (this != &other) { (config&&)*this = std::move(other); - m_connection_id = std::move(other.m_connection_id); m_providers = std::move(other.m_providers); } @@ -698,9 +693,6 @@ void eap::config_connection::load(_In_ IXMLDOMNode *pConfigRoot) config::load(pConfigRoot); - // On each configuration import reset ID. - CoCreateGuid(&m_connection_id); - // Iterate authentication providers (). com_obj pXmlListProviders; if (FAILED(hr = eapxml::select_nodes(pConfigRoot, bstr(L"eap-metadata:EAPIdentityProviderList/eap-metadata:EAPIdentityProvider"), &pXmlListProviders))) @@ -725,7 +717,6 @@ void eap::config_connection::load(_In_ IXMLDOMNode *pConfigRoot) void eap::config_connection::operator<<(_Inout_ cursor_out &cursor) const { config::operator<<(cursor); - cursor << m_connection_id; cursor << m_providers; } @@ -734,8 +725,7 @@ size_t eap::config_connection::get_pk_size() const { return config::get_pk_size() + - pksizeof(m_connection_id) + - pksizeof(m_providers ); + pksizeof(m_providers); } @@ -743,8 +733,6 @@ void eap::config_connection::operator>>(_Inout_ cursor_in &cursor) { config::operator>>(cursor); - cursor >> m_connection_id; - list::size_type count; cursor >> count; m_providers.clear(); diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index d08376b..afe33f0 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -88,7 +88,6 @@ void eap::peer_ttls_ui::invoke_config_ui( unpack(cfg, pConnectionDataIn, dwConnectionDataInSize); } else { // This is a blank network profile. Create default configuraton. - CoCreateGuid(&(cfg.m_connection_id)); // Start with PAP inner configuration. unique_ptr cfg_method(new config_method_ttls(*this));