Amebis/GEANTLink
1
1
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 50 Wiki Activity

Backport EAPSup code changes

Browse Source 
This introduces some PEAP/EAP-TTLS split code, but helps maintain shared
code base.

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2021-11-22 14:40:28 +01:00
parent 1994da974a
commit 12ef3059e9
4 changed files with 271 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
lib/TTLS_UI/include/Module.h
View File

@@ -37,22 +37,26 @@ namespace eap
/// @{
///
/// TTLS UI peer
/// PEAP UI peer
///
class peer_ttls_ui : public peer_ui
class peer_peap_ui : public peer_ui
{
public:
///
/// Constructs a EAP-TTLS UI peer module
/// Constructs a PEAP UI peer module
///
peer_ttls_ui();
peer_peap_ui();
protected:
///
/// @copydoc eap::method::make_config()
/// \returns This implementation always returns `eap::config_method_ttls` type of configuration
/// Constructs a peer module
///
virtual config_method* make_config();
/// \param[in] eap_method EAP method type ID
/// \param[in] domain Localization catalog domain name. Usually EAP method name followed by "_UI".
///
peer_peap_ui(_In_ winstd::eap_type_t eap_method, _In_opt_ LPCTSTR domain);
public:
virtual void invoke_config_ui(
_In_ HWND hwndParent,
_In_count_(dwConnectionDataInSize) const BYTE *pConnectionDataIn,
@@ -77,6 +81,37 @@ namespace eap
_In_ DWORD dwUIContextDataSize,
_Inout_ BYTE **ppDataFromInteractiveUI,
_Inout_ DWORD *pdwDataFromInteractiveUISize);
protected:
virtual wxEAPCredentialsPanelBase* make_inner_credential_panel(const config_provider &prov, const config_method_with_cred &cfg, credentials *cred, wxWindow *parent) const;
};
///
/// EAP-TTLS UI peer
///
class peer_ttls_ui : public peer_peap_ui
{
public:
///
/// Constructs a EAP-TTLS UI peer module
///
peer_ttls_ui();
///
/// @copydoc eap::method::make_config()
/// \returns This implementation always returns `eap::config_method_ttls` type of configuration
///
virtual config_method* make_config();
virtual void invoke_config_ui(
_In_ HWND hwndParent,
_In_count_(dwConnectionDataInSize) const BYTE *pConnectionDataIn,
_In_ DWORD dwConnectionDataInSize,
_Out_ BYTE **ppConnectionDataOut,
_Out_ DWORD *pdwConnectionDataOutSize);
protected:
virtual wxEAPCredentialsPanelBase* make_inner_credential_panel(const config_provider &prov, const config_method_with_cred &cfg, credentials *cred, wxWindow *parent) const;
};
/// @}

55
lib/TTLS_UI/include/TTLS_UI.h
View File

@@ -19,6 +19,7 @@
*/
class wxTLSTunnelConfigWindow;
class wxPEAPConfigWindow;
class wxTTLSConfigWindow;
#pragma once
@@ -26,6 +27,12 @@ class wxTTLSConfigWindow;
#include "../../TLS_UI/include/TLS_UI.h"
#include "../../TTLS/include/Config.h"
#include "../../EapHost_UI/include/EapHost_UI.h"
#include "../../PAP_UI/include/PAP_UI.h"
#include "../../MSCHAPv2_UI/include/MSCHAPv2_UI.h"
#include "../../GTC_UI/include/GTC_UI.h"
#include "../../EapHost/include/Config.h"
#include "../../PAP/include/Config.h"
#include "../../MSCHAPv2/include/Config.h"
@@ -80,9 +87,41 @@ protected:
///
/// TTLS configuration scrollable window
/// PEAP configuration scrollable window
///
class wxTTLSConfigWindow : public wxTLSTunnelConfigWindow
class wxPEAPConfigWindow : public wxTLSTunnelConfigWindow
{
public:
///
/// Constructs a configuration window
///
/// \param[in] prov Provider configuration data
/// \param[inout] cfg Method configuration data
/// \param[in] parent Parent window
///
wxPEAPConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent);
protected:
/// \cond internal
virtual bool TransferDataToWindow();
virtual bool TransferDataFromWindow();
/// \endcond
protected:
eap::config_method_eapmschapv2 m_cfg_eapmschapv2; ///< EAP-MSCHAPv2 configuration to hold data until applied
wxMSCHAPv2ConfigPanel *m_panel_eapmschapv2; ///< EAP-MSCHAPv2 config panel
eap::config_method_eapgtc m_cfg_eapgtc; ///< EAP-GTC configuration to hold data until applied
wxGTCConfigPanel *m_panel_eapgtc; ///< EAP-GTC config panel
#if EAP_INNER_EAPHOST
eap::config_method_eaphost m_cfg_eaphost; ///< Inner EAP configuration to hold data until applied
wxEapHostConfigPanel *m_panel_eaphost; ///< Inner EAP config panel
#endif
};
///
/// EAP-TTLS configuration scrollable window
///
class wxTTLSConfigWindow : public wxPEAPConfigWindow
{
public:
///
@@ -101,14 +140,10 @@ protected:
/// \endcond
protected:
// Temporary inner method configurations to hold data until applied
eap::config_method_pap m_cfg_pap; ///< PAP configuration
eap::config_method_mschapv2 m_cfg_mschapv2; ///< MSCHAPv2 configuration
eap::config_method_eapmschapv2 m_cfg_eapmschapv2; ///< EAP-MSCHAPv2 configuration
eap::config_method_eapgtc m_cfg_eapgtc; ///< EAP-GTC configuration
#if EAP_INNER_EAPHOST
eap::config_method_eaphost m_cfg_eaphost; ///< Inner EAP configuration
#endif
eap::config_method_pap m_cfg_pap; ///< PAP configuration to hold data until applied
wxPAPConfigPanel *m_panel_pap; ///< PAP config panel
eap::config_method_mschapv2 m_cfg_mschapv2; ///< MSCHAPv2 configuration to hold data until applied
wxMSCHAPv2ConfigPanel *m_panel_mschapv2; ///< MSCHAPv2 config panel
};
/// @}