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

Storing/retrieval of passwords to Windows Credential Manager introduced; UI development continues...

Browse Source
This commit is contained in:
Simon Rozman 2016-06-08 15:29:30 +02:00
parent 120da591b4
commit 6b541ce1ff
25 changed files with 39 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
EAPMethods/EAPTTLS/StdAfx.h
View File

Binary file not shown.

BIN
EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
View File

Binary file not shown.

1
EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
View File

@ -80,6 +80,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
<ItemGroup> <ItemGroup>
<ClInclude Include="..\include\EAP.h" /> <ClInclude Include="..\include\EAP.h" />
<ClInclude Include="..\include\EAPXML.h" />
<ClInclude Include="..\include\EAP_UI.h" /> <ClInclude Include="..\include\EAP_UI.h" />
<ClInclude Include="..\include\TLS.h" /> <ClInclude Include="..\include\TLS.h" />
<ClInclude Include="..\include\TTLS.h" /> <ClInclude Include="..\include\TTLS.h" />

3
EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters
View File

@ -57,6 +57,9 @@
<ClInclude Include="..\include\TTLS_UI.h"> <ClInclude Include="..\include\TTLS_UI.h">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\include\EAPXML.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="StdAfx.cpp"> <ClCompile Include="StdAfx.cpp">

BIN
EAPMethods/EAPTTLSUI/StdAfx.h
View File

Binary file not shown.

BIN
EAPMethods/include/EAP.h
View File

Binary file not shown.

BIN
EAPMethods/include/EAPXML.h
View File

Binary file not shown.

BIN
EAPMethods/include/EAP_UI.h
View File

Binary file not shown.

BIN
EAPMethods/include/TLS.h
View File

Binary file not shown.

BIN
EAPMethods/include/TLS_UI.h
View File

Binary file not shown.

BIN
EAPMethods/include/TTLS_UI.h
View File

Binary file not shown.

10
EAPMethods/res/wxEAP_UI.cpp
View File

@ -70,7 +70,7 @@ wxEAPBannerPanelBase::~wxEAPBannerPanelBase()
{ {
} }
wxPasswordConfigCredentialsPanelBase::wxPasswordConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) wxPasswordCredentialsPanelBase::wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{ {
wxStaticBoxSizer* sb_credentials; 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 Certificate") ), wxVERTICAL );
@ -112,10 +112,10 @@ wxPasswordConfigCredentialsPanelBase::wxPasswordConfigCredentialsPanelBase( wxWi
sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 ); sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 );
m_prompt = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Prompt when connecting"), wxDefaultPosition, wxDefaultSize, 0 ); m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember credentials"), wxDefaultPosition, wxDefaultSize, 0 );
m_prompt->SetHelpText( _("Check if you would like to enter credentials on every connection") ); m_remember->SetHelpText( _("Check if you would like to save username and password") );
sb_credentials_vert->Add( m_prompt, 0, wxALL|wxEXPAND, 5 ); sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 );
sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 );
@ -128,6 +128,6 @@ wxPasswordConfigCredentialsPanelBase::wxPasswordConfigCredentialsPanelBase( wxWi
this->Layout(); this->Layout();
} }
wxPasswordConfigCredentialsPanelBase::~wxPasswordConfigCredentialsPanelBase() wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase()
{ {
} }

8
EAPMethods/res/wxEAP_UI.fbp
View File

@ -446,7 +446,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">wxPasswordConfigCredentialsPanelBase</property> <property name="name">wxPasswordCredentialsPanelBase</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">500,-1</property> <property name="size">500,-1</property>
<property name="subclass"></property> <property name="subclass"></property>
@ -1056,7 +1056,7 @@
<property name="center_pane">0</property> <property name="center_pane">0</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="context_help">Check if you would like to enter credentials on every connection</property> <property name="context_help">Check if you would like to save username and password</property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property> <property name="default_pane">0</property>
<property name="dock">Dock</property> <property name="dock">Dock</property>
@ -1069,7 +1069,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">&amp;Prompt when connecting</property> <property name="label">&amp;Remember credentials</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -1077,7 +1077,7 @@
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
<property name="name">m_prompt</property> <property name="name">m_remember</property>
<property name="pane_border">1</property> <property name="pane_border">1</property>
<property name="pane_position"></property> <property name="pane_position"></property>
<property name="pane_size"></property> <property name="pane_size"></property>

10
EAPMethods/res/wxEAP_UI.h
View File

@ -72,9 +72,9 @@ class wxEAPBannerPanelBase : public wxPanel
}; };
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class wxPasswordConfigCredentialsPanelBase /// Class wxPasswordCredentialsPanelBase
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class wxPasswordConfigCredentialsPanelBase : public wxPanel class wxPasswordCredentialsPanelBase : public wxPanel
{ {
private: private:
@ -85,12 +85,12 @@ class wxPasswordConfigCredentialsPanelBase : public wxPanel
wxTextCtrl* m_identity; wxTextCtrl* m_identity;
wxStaticText* m_password_label; wxStaticText* m_password_label;
wxTextCtrl* m_password; wxTextCtrl* m_password;
wxCheckBox* m_prompt; wxCheckBox* m_remember;
public: public:
wxPasswordConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); wxPasswordCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
~wxPasswordConfigCredentialsPanelBase(); ~wxPasswordCredentialsPanelBase();
}; };

18
EAPMethods/res/wxTLS_UI.cpp
View File

@ -114,7 +114,7 @@ wxEAPTLSConfigPanelBase::~wxEAPTLSConfigPanelBase()
} }
wxTLSConfigCredentialsPanelBase::wxTLSConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{ {
wxStaticBoxSizer* sb_credentials; wxStaticBoxSizer* sb_credentials;
sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL ); sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL );
@ -161,10 +161,10 @@ wxTLSConfigCredentialsPanelBase::wxTLSConfigCredentialsPanelBase( wxWindow* pare
sb_credentials_vert->Add( sb_cert_radio, 0, wxEXPAND|wxALL, 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_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember credentials"), wxDefaultPosition, wxDefaultSize, 0 );
m_prompt->SetHelpText( _("Check if you would like to select certificate on every connection") ); m_remember->SetHelpText( _("Check if you would like to save certificate selection") );
sb_credentials_vert->Add( m_prompt, 0, wxALL|wxEXPAND, 5 ); sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 );
sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 ); sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 );
@ -177,14 +177,14 @@ wxTLSConfigCredentialsPanelBase::wxTLSConfigCredentialsPanelBase( wxWindow* pare
this->Layout(); this->Layout();
// Connect Events // Connect Events
m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnCertSelect ), NULL, this ); m_cert_select->Connect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
m_prompt->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnPrompt ), NULL, this ); m_remember->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnRemember ), NULL, this );
} }
wxTLSConfigCredentialsPanelBase::~wxTLSConfigCredentialsPanelBase() wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase()
{ {
// Disconnect Events // Disconnect Events
m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnCertSelect ), NULL, this ); m_cert_select->Disconnect( wxEVT_COMMAND_RADIOBUTTON_SELECTED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnCertSelect ), NULL, this );
m_prompt->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSConfigCredentialsPanelBase::OnPrompt ), NULL, this ); m_remember->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( wxTLSCredentialsPanelBase::OnRemember ), NULL, this );
} }

10
EAPMethods/res/wxTLS_UI.fbp
View File

@ -1013,7 +1013,7 @@
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">wxTLSConfigCredentialsPanelBase</property> <property name="name">wxTLSCredentialsPanelBase</property>
<property name="pos"></property> <property name="pos"></property>
<property name="size">500,-1</property> <property name="size">500,-1</property>
<property name="subclass"></property> <property name="subclass"></property>
@ -1547,7 +1547,7 @@
<property name="center_pane">0</property> <property name="center_pane">0</property>
<property name="checked">0</property> <property name="checked">0</property>
<property name="close_button">1</property> <property name="close_button">1</property>
<property name="context_help">Check if you would like to select certificate on every connection</property> <property name="context_help">Check if you would like to save certificate selection</property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property> <property name="default_pane">0</property>
<property name="dock">Dock</property> <property name="dock">Dock</property>
@ -1560,7 +1560,7 @@
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">&amp;Prompt when connecting</property> <property name="label">&amp;Remember credentials</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
<property name="maximum_size"></property> <property name="maximum_size"></property>
@ -1568,7 +1568,7 @@
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
<property name="name">m_prompt</property> <property name="name">m_remember</property>
<property name="pane_border">1</property> <property name="pane_border">1</property>
<property name="pane_position"></property> <property name="pane_position"></property>
<property name="pane_size"></property> <property name="pane_size"></property>
@ -1590,7 +1590,7 @@
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>
<event name="OnChar"></event> <event name="OnChar"></event>
<event name="OnCheckBox">OnPrompt</event> <event name="OnCheckBox">OnRemember</event>
<event name="OnEnterWindow"></event> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event> <event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event> <event name="OnKeyDown"></event>

12
EAPMethods/res/wxTLS_UI.h
View File

@ -68,9 +68,9 @@ class wxEAPTLSConfigPanelBase : public wxPanel
}; };
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class wxTLSConfigCredentialsPanelBase /// Class wxTLSCredentialsPanelBase
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class wxTLSConfigCredentialsPanelBase : public wxPanel class wxTLSCredentialsPanelBase : public wxPanel
{ {
private: private:
@ -80,17 +80,17 @@ class wxTLSConfigCredentialsPanelBase : public wxPanel
wxRadioButton* m_cert_none; wxRadioButton* m_cert_none;
wxRadioButton* m_cert_select; wxRadioButton* m_cert_select;
wxChoice* m_cert_select_val; wxChoice* m_cert_select_val;
wxCheckBox* m_prompt; wxCheckBox* m_remember;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnCertSelect( wxCommandEvent& event ) { event.Skip(); } virtual void OnCertSelect( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPrompt( wxCommandEvent& event ) { event.Skip(); } virtual void OnRemember( wxCommandEvent& event ) { event.Skip(); }
public: public:
wxTLSConfigCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL );
~wxTLSConfigCredentialsPanelBase(); ~wxTLSCredentialsPanelBase();
}; };

BIN
EAPMethods/src/EAP.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/EAP_UI.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/Main.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/Main_UI.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/TLS.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/TLS_UI.cpp
View File

Binary file not shown.

BIN
EAPMethods/src/TTLS_UI.cpp
View File

Binary file not shown.

2
lib/WinStd

@ -1 +1 @@
Subproject commit 3eca4d9ef4f1b8c6bcc70d792aa45876ccbb39f7 Subproject commit 1920ec5d3567b52f6e9cf1f449d56f75d5d1e5db