From a406bc5b89808072925934e1772a5f1521f93483 Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Tue, 7 Jun 2016 18:18:15 +0200 Subject: [PATCH] UI development continues... --- EAPMethods/include/EAP_UI.h | Bin 19068 -> 17858 bytes EAPMethods/include/TLS.h | Bin 11248 -> 11240 bytes EAPMethods/include/TLS_UI.h | Bin 11004 -> 13950 bytes EAPMethods/include/TTLS_UI.h | Bin 11226 -> 11846 bytes EAPMethods/res/wxEAP_UI.cpp | 86 +---- EAPMethods/res/wxEAP_UI.fbp | 535 +----------------------------- EAPMethods/res/wxEAP_UI.h | 41 +-- EAPMethods/res/wxTLS_UI.cpp | 75 +++++ EAPMethods/res/wxTLS_UI.fbp | 624 ++++++++++++++++++++++++++++++++++- EAPMethods/res/wxTLS_UI.h | 30 ++ EAPMethods/res/wxTTLS_UI.fbp | 2 +- EAPMethods/src/EAP_UI.cpp | Bin 7682 -> 5602 bytes EAPMethods/src/TLS_UI.cpp | Bin 28518 -> 38238 bytes EAPMethods/src/TTLS_UI.cpp | Bin 13748 -> 15784 bytes lib/WinStd | 2 +- 15 files changed, 754 insertions(+), 641 deletions(-) diff --git a/EAPMethods/include/EAP_UI.h b/EAPMethods/include/EAP_UI.h index 4472c171a31ed78e69836eca6ee95b153c6beabf..f50c541818e2504fbdfa2d5a12f66137b050745e 100644 GIT binary patch delta 113 zcmew}h4D}~q_Nv^u45iRMQYO3W8cr^;|03wfkOPGI4CM^L42cY745^cg z9ZV-*u;!RN&t711lmj2gB<5hCc%g$ix;UpZP;V+wUlCAOA&U8iHj$e>9OW1%U$IRA fdc*_dnaMV`29wq7geJ4tKbu@-ud?}!!#5THpIRF3v delta 23 fcmaD6{vmurn!@BHg;kRjStcuRvuzeqyv79pdw2-F diff --git a/EAPMethods/include/TLS_UI.h b/EAPMethods/include/TLS_UI.h index 4f9951d7461730204641b211cc91e451b3b9fdf0..52666753887ba6a44310ae65c5d09a8fdbc86187 100644 GIT binary patch delta 1035 zcmbV~O>0^~6o!vkjK+^>)GNUXO*90p6`>y#qBRleF3>=dZW;)pLJC(cDkc&_7VWx$ z9yf(9TIf0v?k3CpfYLwEMY3*I*>zD$-WiR06JkObhC6fKGv_|%s zC!18F0yU^gHOi2S?0jf_!JkBcYr?DLU@cJ*y8@qglqa3){6R!MyQBO|h`k1+GQEd6 z4~G(^5lo)zSktsYtJI>$IGL?k+J@~Vb{(&ZG>;`i>%b_eND?RAd!GTAIl>m+zro)M zqD#&TZcXBFTX=ZM8&>?sVHGGNrKKgG-|%F;6EmS{!AzLq9`vBpP~ z;I}n0Le*@>&8l%?du{RMfL{as3ck8bg&I8Lc-g@6UO0e3p-#?RcFwm8VWm z=?SF(Jxxiq(m0t^W6O0m#vh%2UUb^{_+ila>M2?{Gto)izg-#L7n(yAeW>P9cSjqZ zAlarW#-YX8P~@ujUR0?S)%4-k4@bCcx*VDfG-+Eke~y}JKw_}YW0#?IEz!P$*@eS9QP>Ro8K2s}_!JHBDo=#l=^;y@> delta 85 zcmeyD^Cxse4BO;aY#yS{46Y183?U584E_v$K-!fdf+1vbKfCngR~#ynf3ONo&SMLj pe2ZUg@-{w+%|4t<*f#5lsxUF|Vx>{9&63>ggh44Dkc45Y#|11|#?&|U~E2f81NkASjT47m*PKtJUHVJgtfcqEr1`LNy- zu0jDAE=2hh!v)SLfu0YHfNUHtsAMPry2cvreuc@r>cYSf;sb@Y9Vu>sm;?%oTA+C# F8UV)fZiN5< delta 103 zcmX>Wb1Qs<0>|bMj$MkA4~Vl(4p3v8tfgf%`G7XZWIk<|$w}I)pyFzi|0qjLPS9Zy zb!I4HNM%R?;yi{DhD?S;h8%|C$@Wrap( -1 ); - m_product_name->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); - m_product_name->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); + m_title = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT ); + m_title->Wrap( -1 ); + m_title->SetFont( wxFont( 14, 70, 90, 90, false, wxEmptyString ) ); + m_title->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_HIGHLIGHTTEXT ) ); - sc_content->Add( m_product_name, 0, wxALL|wxEXPAND, 5 ); + sc_content->Add( m_title, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( sc_content ); @@ -70,74 +70,10 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase() { } -wxCredentialsConfigPanelBase::wxCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +wxPasswordConfigCredentialsPanelBase::wxPasswordConfigCredentialsPanelBase( 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 to identify you during the connection attempt."), wxDefaultPosition, wxDefaultSize, 0 ); - m_credentials_label->Wrap( 446 ); - sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); - - m_allow_save = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("Allow credentials to be &remembered in Credential Manager"), wxDefaultPosition, wxDefaultSize, 0 ); - m_allow_save->SetHelpText( _("Check if you would like to allow saving credentials to Windows Credential Manager") ); - - sb_credentials_vert->Add( m_allow_save, 0, wxALL, 5 ); - - wxBoxSizer* sb_cred_store_btn; - sb_cred_store_btn = new wxBoxSizer( wxHORIZONTAL ); - - m_cred_store_set = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Set Credentials..."), wxDefaultPosition, wxDefaultSize, 0 ); - m_cred_store_set->SetToolTip( _("Adds a new certificate authority from the file to the list") ); - - sb_cred_store_btn->Add( m_cred_store_set, 0, wxRIGHT|wxLEFT, 5 ); - - m_cred_store_clear = new wxButton( sb_credentials->GetStaticBox(), wxID_ANY, _("&Clear Credentials"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cred_store_clear->SetToolTip( _("Removes selected certificate authorities from the list") ); - - sb_cred_store_btn->Add( m_cred_store_clear, 0, wxLEFT, 5 ); - - - sb_credentials_vert->Add( sb_cred_store_btn, 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 - m_allow_save->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnAllowSave ), NULL, this ); - m_cred_store_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsSet ), NULL, this ); - m_cred_store_clear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsClear ), NULL, this ); -} - -wxCredentialsConfigPanelBase::~wxCredentialsConfigPanelBase() -{ - // Disconnect Events - m_allow_save->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnAllowSave ), NULL, this ); - m_cred_store_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsSet ), NULL, this ); - m_cred_store_clear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxCredentialsConfigPanelBase::OnCredentialsClear ), 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, _("Session Credentials") ), wxVERTICAL ); + sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Certificate") ), wxVERTICAL ); wxBoxSizer* sb_credentials_horiz; sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL ); @@ -176,10 +112,10 @@ wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); - m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember my credentials"), wxDefaultPosition, wxDefaultSize, 0 ); - m_remember->SetHelpText( _("Check if you would like to save the credentials to Windows Credential Manager") ); + m_prompt = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Prompt when connecting"), wxDefaultPosition, wxDefaultSize, 0 ); + m_prompt->SetHelpText( _("Check if you would like to enter credentials on every connection") ); - sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 ); + sb_credentials_vert->Add( m_prompt, 0, wxALL|wxEXPAND, 5 ); sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); @@ -192,6 +128,6 @@ wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent this->Layout(); } -wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase() +wxPasswordConfigCredentialsPanelBase::~wxPasswordConfigCredentialsPanelBase() { } diff --git a/EAPMethods/res/wxEAP_UI.fbp b/EAPMethods/res/wxEAP_UI.fbp index 41e790d..ca57e0d 100644 --- a/EAPMethods/res/wxEAP_UI.fbp +++ b/EAPMethods/res/wxEAP_UI.fbp @@ -387,7 +387,7 @@ 0 1 - m_product_name + m_title 1 @@ -446,7 +446,7 @@ wxID_ANY - wxCredentialsConfigPanelBase + wxPasswordConfigCredentialsPanelBase 500,-1 @@ -486,530 +486,7 @@ 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 to identify you during the connection attempt. - - 0 - - - 0 - - 1 - m_credentials_label - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - 446 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - Check if you would like to allow saving credentials to Windows Credential Manager - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Allow credentials to be &remembered in Credential Manager - - 0 - - - 0 - - 1 - m_allow_save - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnAllowSave - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxALL - 0 - - - sb_cred_store_btn - wxHORIZONTAL - none - - 5 - wxRIGHT|wxLEFT - 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_cred_store_set - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Adds a new certificate authority from the file to the list - - wxFILTER_NONE - wxDefaultValidator - - - - - OnCredentialsSet - - - - - - - - - - - - - - - - - - - - - - - - - - - 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_cred_store_clear - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Removes selected certificate authorities from the list - - wxFILTER_NONE - wxDefaultValidator - - - - - OnCredentialsClear - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - wxAUI_MGR_DEFAULT - - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - - - wxPasswordCredentialsPanelBase - - 500,-1 - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxID_ANY - Session Credentials + Client Certificate sb_credentials wxVERTICAL @@ -1579,7 +1056,7 @@ 0 0 1 - Check if you would like to save the credentials to Windows Credential Manager + Check if you would like to enter credentials on every connection 1 0 Dock @@ -1592,7 +1069,7 @@ 0 0 wxID_ANY - &Remember my credentials + &Prompt when connecting 0 @@ -1600,7 +1077,7 @@ 0 1 - m_remember + m_prompt 1 diff --git a/EAPMethods/res/wxEAP_UI.h b/EAPMethods/res/wxEAP_UI.h index b26b12f..5d885ed 100644 --- a/EAPMethods/res/wxEAP_UI.h +++ b/EAPMethods/res/wxEAP_UI.h @@ -27,9 +27,9 @@ class wxEAPBannerPanel; #include #include #include +#include #include #include -#include /////////////////////////////////////////////////////////////////////////// @@ -62,7 +62,7 @@ class wxEAPBannerPanelBase : public wxPanel private: protected: - wxStaticText* m_product_name; + wxStaticText* m_title; public: @@ -72,36 +72,9 @@ class wxEAPBannerPanelBase : public wxPanel }; /////////////////////////////////////////////////////////////////////////////// -/// Class wxCredentialsConfigPanelBase +/// Class wxPasswordConfigCredentialsPanelBase /////////////////////////////////////////////////////////////////////////////// -class wxCredentialsConfigPanelBase : public wxPanel -{ - private: - - protected: - wxStaticBitmap* m_credentials_icon; - wxStaticText* m_credentials_label; - wxCheckBox* m_allow_save; - wxButton* m_cred_store_set; - wxButton* m_cred_store_clear; - - // Virtual event handlers, overide them in your derived class - virtual void OnAllowSave( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCredentialsSet( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCredentialsClear( wxCommandEvent& event ) { event.Skip(); } - - - public: - - wxCredentialsConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxCredentialsConfigPanelBase(); - -}; - -/////////////////////////////////////////////////////////////////////////////// -/// Class wxPasswordCredentialsPanelBase -/////////////////////////////////////////////////////////////////////////////// -class wxPasswordCredentialsPanelBase : public wxPanel +class wxPasswordConfigCredentialsPanelBase : public wxPanel { private: @@ -112,12 +85,12 @@ class wxPasswordCredentialsPanelBase : public wxPanel wxTextCtrl* m_identity; wxStaticText* m_password_label; wxTextCtrl* m_password; - wxCheckBox* m_remember; + wxCheckBox* m_prompt; public: - wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); - ~wxPasswordCredentialsPanelBase(); + wxPasswordConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxPasswordConfigCredentialsPanelBase(); }; diff --git a/EAPMethods/res/wxTLS_UI.cpp b/EAPMethods/res/wxTLS_UI.cpp index e4aeb5e..c9f7ca7 100644 --- a/EAPMethods/res/wxTLS_UI.cpp +++ b/EAPMethods/res/wxTLS_UI.cpp @@ -113,3 +113,78 @@ wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase() m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSConfigPanelBase::OnRootCARemove ), NULL, this ); } + +wxTLSConfigCredentialsPanelBase::wxTLSConfigCredentialsPanelBase( 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, _("Please select your client certificate to use for authentication."), wxDefaultPosition, wxDefaultSize, 0 ); + m_credentials_label->Wrap( 446 ); + sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* sb_cert_radio; + sb_cert_radio = new wxBoxSizer( wxVERTICAL ); + + m_cert_none = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Co&nnect without providing a client certificate"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_cert_none->SetToolTip( _("Select if your server does not require you to provide a client certificate") ); + + sb_cert_radio->Add( m_cert_none, 1, wxEXPAND, 5 ); + + wxBoxSizer* sb_cert_select; + sb_cert_select = new wxBoxSizer( wxHORIZONTAL ); + + m_cert_select = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Use the following &certificate:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_cert_select->SetToolTip( _("Select if you need to provide a client certificate when connecting") ); + + sb_cert_select->Add( m_cert_select, 0, wxEXPAND, 5 ); + + wxArrayString m_cert_select_valChoices; + m_cert_select_val = new wxChoice( sb_credentials->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cert_select_valChoices, wxCB_SORT ); + m_cert_select_val->SetSelection( 0 ); + m_cert_select_val->SetToolTip( _("Client certificate to use for authentication") ); + + sb_cert_select->Add( m_cert_select_val, 1, wxEXPAND, 5 ); + + + sb_cert_radio->Add( sb_cert_select, 1, wxEXPAND, 5 ); + + + sb_credentials_vert->Add( sb_cert_radio, 0, wxEXPAND|wxALL, 5 ); + + m_prompt = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Prompt when connecting"), wxDefaultPosition, wxDefaultSize, 0 ); + m_prompt->SetHelpText( _("Check if you would like to select certificate on every connection") ); + + sb_credentials_vert->Add( m_prompt, 0, wxALL|wxEXPAND, 5 ); + + + sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); + + + sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 ); + + + this->SetSizer( sb_credentials ); + this->Layout(); + + // Connect Events + m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnCertSelect ), NULL, this ); + m_prompt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnPrompt ), NULL, this ); +} + +wxTLSConfigCredentialsPanelBase::~wxTLSConfigCredentialsPanelBase() +{ + // Disconnect Events + m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnCertSelect ), NULL, this ); + m_prompt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnPrompt ), NULL, this ); + +} diff --git a/EAPMethods/res/wxTLS_UI.fbp b/EAPMethods/res/wxTLS_UI.fbp index 62c1635..fb7dc35 100644 --- a/EAPMethods/res/wxTLS_UI.fbp +++ b/EAPMethods/res/wxTLS_UI.fbp @@ -15,7 +15,7 @@ 1000 none 1 - TLS_UI + wxTLS_UI . #include <StdAfx.h> @@ -999,5 +999,627 @@ + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxTLSConfigCredentialsPanelBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Client Credentials + + sb_credentials + wxVERTICAL + none + + + 5 + wxEXPAND + 0 + + + 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 + Please select your client certificate to use for authentication. + + 0 + + + 0 + + 1 + m_credentials_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + sb_cert_radio + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Co&nnect without providing a client certificate + + 0 + + + 0 + + 1 + m_cert_none + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + + 0 + Select if your server does not require you to provide a client certificate + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_cert_select + wxHORIZONTAL + none + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Use the following &certificate: + + 0 + + + 0 + + 1 + m_cert_select + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Select if you need to provide a client certificate when connecting + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnCertSelect + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_cert_select_val + 1 + + + protected + 1 + + Resizable + 0 + 1 + + wxCB_SORT + ; + 0 + Client certificate to use for authentication + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + Check if you would like to select certificate on every connection + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Prompt when connecting + + 0 + + + 0 + + 1 + m_prompt + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPrompt + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EAPMethods/res/wxTLS_UI.h b/EAPMethods/res/wxTLS_UI.h index da2ed89..e46c8d5 100644 --- a/EAPMethods/res/wxTLS_UI.h +++ b/EAPMethods/res/wxTLS_UI.h @@ -27,6 +27,9 @@ #include #include #include +#include +#include +#include /////////////////////////////////////////////////////////////////////////// @@ -64,4 +67,31 @@ class wxEAPTLSConfigPanelBase : public wxPanel }; +/////////////////////////////////////////////////////////////////////////////// +/// Class wxTLSConfigCredentialsPanelBase +/////////////////////////////////////////////////////////////////////////////// +class wxTLSConfigCredentialsPanelBase : public wxPanel +{ + private: + + protected: + wxStaticBitmap* m_credentials_icon; + wxStaticText* m_credentials_label; + wxRadioButton* m_cert_none; + wxRadioButton* m_cert_select; + wxChoice* m_cert_select_val; + wxCheckBox* m_prompt; + + // Virtual event handlers, overide them in your derived class + virtual void OnCertSelect( wxCommandEvent& event ) { event.Skip(); } + virtual void OnPrompt( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxTLSConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxTLSConfigCredentialsPanelBase(); + +}; + #endif //__WXTLS_UI_H__ diff --git a/EAPMethods/res/wxTTLS_UI.fbp b/EAPMethods/res/wxTTLS_UI.fbp index d654a3d..1d26854 100644 --- a/EAPMethods/res/wxTTLS_UI.fbp +++ b/EAPMethods/res/wxTTLS_UI.fbp @@ -15,7 +15,7 @@ 1000 none 1 - TTLS_UI + wxTTLS_UI . #include <StdAfx.h> diff --git a/EAPMethods/src/EAP_UI.cpp b/EAPMethods/src/EAP_UI.cpp index c9ef17eaa52de21d0cf39b22c5b49c1c8477db57..67c008022276c4b161fb0def610c1592eb237658 100644 GIT binary patch delta 838 zcmaix%}WAN6vb~5<;SS0jWae5PLe@|x`{Tni8i$;#7)bX(nJ^?zew6dv}|F}f%fe~ zg7&p*+rJ>uf6=CEYBtVLJch?RbMEimd*0R7`}*UCYpz9QYLS6G*C+0zklUmxow8O! zU0%Yg)U_yC%V`OQXAvLrBM*BAt3pRq8`jsTg&Th+ z-q*@ZDRR|d+;dh8CLFV7;9gBRdPYp%e>^p=YVvAxPYq@|aV9-hP7@eS8R7#Ibl46mu(&^XW;p}A7_u9 IBO@mYUp&^p$p8QV delta 1311 zcmd5+OHUI~6h4TLnGVe3&XnQ z^&)ZEs3Rk!MLCB*C91K?duNKAb53tJjjgUz1)8K$zN%9E-Zo>YJN7W&H9fxIDE{8- z#o_~IFjfQL42@77*YROjDHqulz+4814fr1e_!A1)a?@@rzhmY3hu3r72R#AkksTrS z%9q%<5bwG!e@XUBUb=OjkMjbYw1(V4er|fBW!VXI6(IAYdJ7=80gRcbzO0ML$$-ct zzjAtdGttQv_yfvu;1%28P4TR)_?xA5fcshpc*nb*@f#=2P5VlW##?7&K~M+HAugmn&8N{AHVzHacaNEWz>`oZ>pF7V;7IX z)MZzUv;0y!QvTi8GV{ diff --git a/EAPMethods/src/TLS_UI.cpp b/EAPMethods/src/TLS_UI.cpp index 58dcc0b99afb03a406329ba2985662088565e001..e5444e1142cbbec2cbc38e4e5e70cb24f1cf8bef 100644 GIT binary patch delta 4920 zcmd5=OK)3M5I&`C>gMIxuJdxzTsLuY9o0_KmP)jVBj?pu(uCM`R3YKGj?=h}?GT%` z;h~g2(2~rK4J{iG8z`_rEKu1Mfy540rDeeqRDJ>9oa<{}JAQ;B9=b~I8-c%{1?A?abQ}mzFF;H|u3>Bjms4pu=s8bfR0S3y8}ifT&H18H#oQP>qK%97m320eDq%Hut4QO7I z2x`a<$~Aa202JTAi1wW^<+l{DS9i{)2OcLig-m8AY}YV8gL{VV_qT1PfL#V}xA1>X za)wvrIBY;yH2YkL%?0>-S)wwBr*S-KXwKp396Vs@-ko+BzU%h8J0SWNE=4$ZPM}Cn zH?0L4X?mrW3DC#%y$NSCpa_ROgZDKU8y7b~Om;&N*F}s{3HSEZn*CfulC(MI*mjt< znMclgI_znpYhKmQHZp_KP{aQ6J1bem*CqI&=TGr><{Il=rHH4CIez@Fa9n3L=3bZr zR@1;Qi2DrgoH@+?a#rjdEwE+Q$k@D2W?FfjJ4f?6Is1I$%?-?o7+{X@o$elKYhmP) zu$HqrA%TzMIY|~zCrzI)QK+$lzVj~A7oNk0_w#hS@zBsYa5sPq;*1H4DInk%XC(T@ zJTyc`vKLzS=Qz9YJe)m?bpogWrMRj`1$nYL#j%CILEIDao`Q`jWCC-ecvJ;I@hen~l|zf#GdJSSjKycmNZ zd<&pjFqdM$Oh=BfDe}(fT-N`c3@mW}Z?2ZJyzFW@2?@637%G@nOs3$O&Tthhm_=;; zGH1hJuvYcMke&oD{Bjow%5^62#`_NMB4=e)4?;@&rbWGs*Zp$CW)WjDlqv`sH~u?w zC2ajNS1OsCN7vF}=W0^tM|I`B8a)BM>}}f)H6@C-^fYM1Daefjw}aXySFQEv1>N)p zWkt^6W<=k>@=e87&`F^IYiEAMxL&qYlEvIjPh8ebG?WM>H-0V{ZSEZwu#IJ5?WF~~4!z^*9!SsOlEDZoFG;Au}ubuS;^vhqo<4j6AUXh8Uf<+P)-OJo;qviVi=bNqf7!_x4 zoA=dmzs3iXH8h~l+HLe?xS77Oqro3*=0KGZDI2E}{*xA`rn0zaJ*_IIQ#K07?Neh`XhLu_*CLXtyV_0M|%>#RbK98XFJ;xAHh!W_ayf6)dqf*Y6_S{tq?u>t5IAcZPl%`4fSJ B0A2t9 delta 14 Vcmcb&is{)s#tj-qn-wDLYymX~1^@s6 diff --git a/EAPMethods/src/TTLS_UI.cpp b/EAPMethods/src/TTLS_UI.cpp index d33b30a8d90b09c8d5ef61cfe6ed601147c2f186..392bc39992973fb5c0c14a69e043ac5c387023f5 100644 GIT binary patch delta 1279 zcmcgs!EO>!6g?zHYon$qC2HehKumyPVym*#CP+arfYoBOZYBs*OA3rZv~64vf5E$P z;ify5B=raU0Dr~Uu3UQF8!}KjOLg%w_q})SednDy_kG(PejKfvgFag5qYVcJ9&mIS z?eV*ZeQa{4&e1{xHLmY7PH^mS_kwq0-dd(&#h9`JWq=Oz&Ssm|i)*V;# zs=DZ&BQzQ0uQX9gfa=) zB$wAK&pEH1!ESPGi#vHDtIU6f%1fq~&j4Q#Qo;tj8PXl5_^ddv6p)6cO5`58Zd^vWEDbTl1M{wI#OCBnIxa(299j1zVJyjs5m(ul zy}w+AlA|n9GfborS;dNGKl$=z^20I*9r958l`ndXeg3@p-}Fn#KjV~Nmh^#*u?>|6 zX8jTw1k?L(-f2#o=O20}6A8Si9Gm&v>74_*FQ}h$>|9rOvxC=+T2K9x vy&DWW480VCMb#73S8kwD56w(CKmtmWJ^F1GFR-_+Dffqxa%|j^jZE_o%M||P delta 82 zcmZ2cy(N2ti}oZXfywVw*f#IdUBNgx!H{M08htfUXNDq%RE88F&SNNH$Ye-l$YCg+ moTw%~`GTI$WIJ7+$teallM5_(Hg7ZaV4u7~Ut+S4Z43a16dL>h diff --git a/lib/WinStd b/lib/WinStd index 1022a2c..dfe7a56 160000 --- a/lib/WinStd +++ b/lib/WinStd @@ -1 +1 @@ -Subproject commit 1022a2cc0d64db189b5bd44ce36e5c32e599ecb3 +Subproject commit dfe7a56b5f491e0675cb28be44fef4e29ff122e6