diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp index 06dd825..33c96be 100644 Binary files a/CredWrite/Main.cpp and b/CredWrite/Main.cpp differ diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc index c80b6e1..3a7ae39 100644 Binary files a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc and b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc differ diff --git a/EAPMethods/include/EAP.h b/EAPMethods/include/EAP.h index 0b0a580..e5a9bd3 100644 Binary files a/EAPMethods/include/EAP.h and b/EAPMethods/include/EAP.h differ diff --git a/EAPMethods/include/EAP_UI.h b/EAPMethods/include/EAP_UI.h index a98bdf0..9b985d9 100644 Binary files a/EAPMethods/include/EAP_UI.h and b/EAPMethods/include/EAP_UI.h differ diff --git a/EAPMethods/include/TLS.h b/EAPMethods/include/TLS.h index c159229..f4c4b79 100644 Binary files a/EAPMethods/include/TLS.h and b/EAPMethods/include/TLS.h differ diff --git a/EAPMethods/include/TLS_UI.h b/EAPMethods/include/TLS_UI.h index 3f87b92..1e4c717 100644 Binary files a/EAPMethods/include/TLS_UI.h and b/EAPMethods/include/TLS_UI.h differ diff --git a/EAPMethods/include/TTLS_UI.h b/EAPMethods/include/TTLS_UI.h index 8430515..bd70f3c 100644 Binary files a/EAPMethods/include/TTLS_UI.h and b/EAPMethods/include/TTLS_UI.h differ diff --git a/EAPMethods/res/wxEAP_UI.cpp b/EAPMethods/res/wxEAP_UI.cpp index 1a85449..ffd1c33 100644 --- a/EAPMethods/res/wxEAP_UI.cpp +++ b/EAPMethods/res/wxEAP_UI.cpp @@ -11,7 +11,7 @@ /////////////////////////////////////////////////////////////////////////// -wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +wxEAPConfigDialogBase::wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) { this->SetSizeHints( wxDefaultSize, wxDefaultSize ); @@ -39,9 +39,50 @@ wxEAPConfigBase::wxEAPConfigBase( wxWindow* parent, wxWindowID id, const wxStrin this->SetSizer( sz_content ); this->Layout(); sz_content->Fit( this ); + + // Connect Events + this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); } -wxEAPConfigBase::~wxEAPConfigBase() +wxEAPConfigDialogBase::~wxEAPConfigDialogBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPConfigDialogBase::OnInitDialog ) ); + +} + +wxEAPCredentialsDialogBase::wxEAPCredentialsDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* sz_content; + sz_content = new wxBoxSizer( wxVERTICAL ); + + m_banner = new wxEAPBannerPanel( this ); + + sz_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_panels = new wxBoxSizer( wxVERTICAL ); + + + sz_content->Add( m_panels, 1, wxEXPAND|wxALL, 5 ); + + m_buttons = new wxStdDialogButtonSizer(); + m_buttonsOK = new wxButton( this, wxID_OK ); + m_buttons->AddButton( m_buttonsOK ); + m_buttonsCancel = new wxButton( this, wxID_CANCEL ); + m_buttons->AddButton( m_buttonsCancel ); + m_buttons->Realize(); + + sz_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 ); + + + this->SetSizer( sz_content ); + this->Layout(); + sz_content->Fit( this ); +} + +wxEAPCredentialsDialogBase::~wxEAPCredentialsDialogBase() { } @@ -70,10 +111,87 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase() { } +wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + wxStaticBoxSizer* sb_credentials; + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL ); + + wxBoxSizer* sb_credentials_horiz; + sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_credentials_icon = new wxStaticBitmap( sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_credentials_vert; + sb_credentials_vert = new wxBoxSizer( wxVERTICAL ); + + m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Manage your credentials stored in Windows Credential Manager."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 446 ); + sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + wxFlexGridSizer* sb_credentials_tbl; + sb_credentials_tbl = new wxFlexGridSizer( 0, 2, 5, 5 ); + sb_credentials_tbl->AddGrowableCol( 1 ); + sb_credentials_tbl->SetFlexibleDirection( wxBOTH ); + sb_credentials_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + m_identity_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Identity:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_label->Wrap( -1 ); + sb_credentials_tbl->Add( m_identity_label, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + + m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_READONLY ); + m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); + + sb_credentials_tbl->Add( m_identity, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); + + + sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); + + wxBoxSizer* sb_buttons; + sb_buttons = new wxBoxSizer( wxHORIZONTAL ); + + m_set = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); + m_set->SetToolTip( _("Click here to set or modify your credentials") ); + + sb_buttons->Add( m_set, 0, wxRIGHT, 5 ); + + m_clear = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Clear Credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_clear->SetToolTip( _("Click to clear your credentials from Credential Manager.\nNote: You will be prompted to enter credentials when connecting.") ); + + sb_buttons->Add( m_clear, 0, wxLEFT, 5 ); + + + sb_credentials_vert->Add( sb_buttons, 0, wxALIGN_RIGHT|wxALL, 5 ); + + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); + + + sb_credentials->Add( sb_credentials_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_credentials ); + this->Layout(); + + // Connect Events + this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsConfigPanelBase::OnUpdateUI ) ); + m_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSet ), NULL, this ); + m_clear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClear ), NULL, this ); +} + +wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase() +{ + // Disconnect Events + this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsConfigPanelBase::OnUpdateUI ) ); + m_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSet ), NULL, this ); + m_clear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClear ), NULL, this ); + +} + wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_credentials; - sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Certificate") ), wxVERTICAL ); + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL ); wxBoxSizer* sb_credentials_horiz; sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); @@ -88,31 +206,34 @@ wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent m_credentials_label->Wrap( 446 ); sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); - wxGridSizer* sb_credentials_tbl; - sb_credentials_tbl = new wxGridSizer( 0, 2, 0, 0 ); + wxFlexGridSizer* sb_credentials_tbl; + sb_credentials_tbl = new wxFlexGridSizer( 0, 2, 5, 5 ); + sb_credentials_tbl->AddGrowableCol( 1 ); + sb_credentials_tbl->SetFlexibleDirection( wxBOTH ); + sb_credentials_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_identity_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 ); m_identity_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_identity_label, 1, wxEXPAND, 5 ); + sb_credentials_tbl->Add( m_identity_label, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAINUser, etc.)") ); - sb_credentials_tbl->Add( m_identity, 2, wxEXPAND, 5 ); + sb_credentials_tbl->Add( m_identity, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_password_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Password:"), wxDefaultPosition, wxDefaultSize, 0 ); m_password_label->Wrap( -1 ); - sb_credentials_tbl->Add( m_password_label, 1, wxEXPAND, 5 ); + sb_credentials_tbl->Add( m_password_label, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_password = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PASSWORD ); m_password->SetToolTip( _("Enter your password here") ); - sb_credentials_tbl->Add( m_password, 2, wxEXPAND, 5 ); + sb_credentials_tbl->Add( m_password, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); - m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember"), wxDefaultPosition, wxDefaultSize, 0 ); m_remember->SetHelpText( _("Check if you would like to save username and password") ); sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 ); diff --git a/EAPMethods/res/wxEAP_UI.fbp b/EAPMethods/res/wxEAP_UI.fbp index 55ee5bc..8dcd5e4 100644 --- a/EAPMethods/res/wxEAP_UI.fbp +++ b/EAPMethods/res/wxEAP_UI.fbp @@ -42,7 +42,7 @@ wxID_ANY - wxEAPConfigBase + wxEAPConfigDialogBase wxDEFAULT_DIALOG_STYLE @@ -67,7 +67,7 @@ - + OnInitDialog @@ -290,6 +290,197 @@ + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + wxEAPCredentialsDialogBase + + + wxDEFAULT_DIALOG_STYLE + ; + EAP Credentials + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sz_content + wxVERTICAL + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + wxEAPBannerPanel + 1 + m_banner = new wxEAPBannerPanel( this ); + + 1 + wxEAPBannerPanel *m_banner; + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + class wxEAPBannerPanel; + + 0 + + + 0 + + 1 + m_banner + 1 + + + protected + 1 + + Resizable + + 1 + -1,-1 + ; ../include/EAP_UI.h + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 1 + + + m_panels + wxVERTICAL + protected + + + + 5 + wxEXPAND|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_buttons + protected + + + + + + + + + + + + 0 wxAUI_MGR_DEFAULT @@ -432,6 +623,633 @@ + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxEAPCredentialsConfigPanelBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUpdateUI + + wxID_ANY + Client Credentials + + sb_credentials + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + sb_credentials_horiz + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Icon Resource; ; [32; 32] + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_credentials_icon + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_credentials_vert + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Manage your credentials stored in Windows Credential Manager. + + 0 + + + 0 + + 1 + m_credentials_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 2 + wxBOTH + 1 + + 5 + + sb_credentials_tbl + wxFLEX_GROWMODE_SPECIFIED + none + 0 + 5 + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Identity: + + 0 + + + 0 + + 1 + m_identity_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_identity + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_READONLY + + 0 + Enter your user name here (user@domain.org, DOMAINUser, etc.) + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALL + 0 + + + sb_buttons + wxHORIZONTAL + none + + 5 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Set Credentials... + + 0 + + + 0 + + 1 + m_set + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Click here to set or modify your credentials + + wxFILTER_NONE + wxDefaultValidator + + + + + OnSet + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Clear Credentials + + 0 + + + 0 + + 1 + m_clear + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Click to clear your credentials from Credential Manager. Note: You will be prompted to enter credentials when connecting. + + wxFILTER_NONE + wxDefaultValidator + + + + + OnClear + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 wxAUI_MGR_DEFAULT @@ -486,7 +1304,7 @@ wxID_ANY - Client Certificate + Client Credentials sb_credentials wxVERTICAL @@ -678,18 +1496,22 @@ 5 wxEXPAND|wxALL 0 - + 2 - 0 + wxBOTH + 1 + + 5 sb_credentials_tbl + wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 5 5 - wxEXPAND - 1 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 1 1 @@ -771,7 +1593,7 @@ 5 - wxEXPAND + wxEXPAND|wxALIGN_CENTER_VERTICAL 2 1 @@ -862,8 +1684,8 @@ 5 - wxEXPAND - 1 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 0 1 1 @@ -945,7 +1767,7 @@ 5 - wxEXPAND + wxEXPAND|wxALIGN_CENTER_VERTICAL 2 1 @@ -1069,7 +1891,7 @@ 0 0 wxID_ANY - &Remember credentials + &Remember 0 diff --git a/EAPMethods/res/wxEAP_UI.h b/EAPMethods/res/wxEAP_UI.h index c30e38a..d3427a8 100644 --- a/EAPMethods/res/wxEAP_UI.h +++ b/EAPMethods/res/wxEAP_UI.h @@ -28,15 +28,15 @@ class wxEAPBannerPanel; #include #include #include -#include #include +#include /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////// -/// Class wxEAPConfigBase +/// Class wxEAPConfigDialogBase /////////////////////////////////////////////////////////////////////////////// -class wxEAPConfigBase : public wxDialog +class wxEAPConfigDialogBase : public wxDialog { private: @@ -46,11 +46,36 @@ class wxEAPConfigBase : public wxDialog wxStdDialogButtonSizer* m_buttons; wxButton* m_buttonsOK; wxButton* m_buttonsCancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); } + public: - wxEAPConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Method Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); - ~wxEAPConfigBase(); + wxEAPConfigDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Method Configuration"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPConfigDialogBase(); + +}; + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPCredentialsDialogBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPCredentialsDialogBase : public wxDialog +{ + private: + + protected: + wxEAPBannerPanel *m_banner; + wxBoxSizer* m_panels; + wxStdDialogButtonSizer* m_buttons; + wxButton* m_buttonsOK; + wxButton* m_buttonsCancel; + + public: + + wxEAPCredentialsDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Credentials"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); + ~wxEAPCredentialsDialogBase(); }; @@ -71,6 +96,34 @@ class wxEAPBannerPanelBase : public wxPanel }; +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPCredentialsConfigPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPCredentialsConfigPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_credentials_icon; + wxStaticText* m_credentials_label; + wxStaticText* m_identity_label; + wxTextCtrl* m_identity; + wxButton* m_set; + wxButton* m_clear; + + // Virtual event handlers, overide them in your derived class + virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } + virtual void OnSet( wxCommandEvent& event ) { event.Skip(); } + virtual void OnClear( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxEAPCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPCredentialsConfigPanelBase(); + +}; + /////////////////////////////////////////////////////////////////////////////// /// Class wxPasswordCredentialsPanelBase /////////////////////////////////////////////////////////////////////////////// diff --git a/EAPMethods/res/wxTLS_UI.cpp b/EAPMethods/res/wxTLS_UI.cpp index d0d6f52..3a8fe16 100644 --- a/EAPMethods/res/wxTLS_UI.cpp +++ b/EAPMethods/res/wxTLS_UI.cpp @@ -114,10 +114,10 @@ wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() } -wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +wxEAPTLSCredentialsPanelBase::wxEAPTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) { wxStaticBoxSizer* sb_credentials; - sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL ); + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("TLS Client Certificate") ), wxVERTICAL ); wxBoxSizer* sb_credentials_horiz; sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); @@ -161,7 +161,7 @@ wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindow sb_credentials_vert->Add( sb_cert_radio, 0, wxEXPAND|wxALL, 5 ); - m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember credentials"), wxDefaultPosition, wxDefaultSize, 0 ); + m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember"), wxDefaultPosition, wxDefaultSize, 0 ); m_remember->SetHelpText( _("Check if you would like to save certificate selection") ); sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 ); @@ -177,14 +177,12 @@ wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindow this->Layout(); // Connect Events - m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this ); - m_remember->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnRemember ), NULL, this ); + m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTLSCredentialsPanelBase::OnCertSelect ), NULL, this ); } -wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase() +wxEAPTLSCredentialsPanelBase::~wxEAPTLSCredentialsPanelBase() { // Disconnect Events - m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this ); - m_remember->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnRemember ), NULL, this ); + m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxEAPTLSCredentialsPanelBase::OnCertSelect ), NULL, this ); } diff --git a/EAPMethods/res/wxTLS_UI.fbp b/EAPMethods/res/wxTLS_UI.fbp index 63f48c7..80959a4 100644 --- a/EAPMethods/res/wxTLS_UI.fbp +++ b/EAPMethods/res/wxTLS_UI.fbp @@ -1013,7 +1013,7 @@ wxID_ANY - wxTLSCredentialsPanelBase + wxEAPTLSCredentialsPanelBase 500,-1 @@ -1053,7 +1053,7 @@ wxID_ANY - Client Credentials + TLS Client Certificate sb_credentials wxVERTICAL @@ -1560,7 +1560,7 @@ 0 0 wxID_ANY - &Remember credentials + &Remember 0 @@ -1590,7 +1590,7 @@ - OnRemember + diff --git a/EAPMethods/res/wxTLS_UI.h b/EAPMethods/res/wxTLS_UI.h index f2ac731..9d722c9 100644 --- a/EAPMethods/res/wxTLS_UI.h +++ b/EAPMethods/res/wxTLS_UI.h @@ -68,9 +68,9 @@ class wxEAPTLSConfigPanelBase : public wxPanel }; /////////////////////////////////////////////////////////////////////////////// -/// Class wxTLSCredentialsPanelBase +/// Class wxEAPTLSCredentialsPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxTLSCredentialsPanelBase : public wxPanel +class wxEAPTLSCredentialsPanelBase : public wxPanel { private: @@ -84,13 +84,12 @@ class wxTLSCredentialsPanelBase : public wxPanel // Virtual event handlers, overide them in your derived class virtual void OnCertSelect( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRemember( wxCommandEvent& event ) { event.Skip(); } public: - wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxTLSCredentialsPanelBase(); + wxEAPTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPTLSCredentialsPanelBase(); }; diff --git a/EAPMethods/src/EAP.cpp b/EAPMethods/src/EAP.cpp index 65fe302..f9f0b5c 100644 Binary files a/EAPMethods/src/EAP.cpp and b/EAPMethods/src/EAP.cpp differ diff --git a/EAPMethods/src/EAP_UI.cpp b/EAPMethods/src/EAP_UI.cpp index d75b352..14e1893 100644 Binary files a/EAPMethods/src/EAP_UI.cpp and b/EAPMethods/src/EAP_UI.cpp differ diff --git a/EAPMethods/src/TLS.cpp b/EAPMethods/src/TLS.cpp index 7417ea5..32a00a6 100644 Binary files a/EAPMethods/src/TLS.cpp and b/EAPMethods/src/TLS.cpp differ diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp index bf724dd..0ca4260 100644 Binary files a/EAPMethods/src/TLS_UI.cpp and b/EAPMethods/src/TLS_UI.cpp differ diff --git a/EAPMethods/src/TTLS_UI.cpp b/EAPMethods/src/TTLS_UI.cpp index c85b92f..d0e7c8c 100644 Binary files a/EAPMethods/src/TTLS_UI.cpp and b/EAPMethods/src/TTLS_UI.cpp differ