diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj index e9bb5a7..5ad8b94 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj @@ -87,6 +87,8 @@ + + diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters index 7de2a85..32d826d 100644 --- a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters +++ b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters @@ -53,6 +53,12 @@ Source Files + + Source Files + + + Source Files + diff --git a/EAPMethods/EAPTTLSUI/StdAfx.h b/EAPMethods/EAPTTLSUI/StdAfx.h index 9a831f9..8dd7b83 100644 Binary files a/EAPMethods/EAPTTLSUI/StdAfx.h and b/EAPMethods/EAPTTLSUI/StdAfx.h differ diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot new file mode 100644 index 0000000..2d259b7 --- /dev/null +++ b/EAPMethods/locale/EAPMethods.pot @@ -0,0 +1,125 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: EAPMethods\n" +"POT-Creation-Date: 2016-06-02 15:58+0200\n" +"PO-Revision-Date: 2016-06-02 12:27+0200\n" +"Last-Translator: Simon Rozman \n" +"Language-Team: Amebis, d. o. o., Kamnik \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.8\n" +"X-Poedit-Basepath: ..\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Language: en_US\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-Poedit-KeywordsList: _\n" +"X-Poedit-SearchPath-0: res\n" +"X-Poedit-SearchPath-1: MSIBuild\n" + +#: res/EAPTLSUI.cpp:23 +msgid "Server Trust" +msgstr "" + +#: res/EAPTLSUI.cpp:34 +msgid "Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks." +msgstr "" + +#: res/EAPTLSUI.cpp:41 +msgid "Acceptable Certificate Authorities:" +msgstr "" + +#: res/EAPTLSUI.cpp:46 +msgid "List of certificate authorities server's certificate must be issued by" +msgstr "" + +#: res/EAPTLSUI.cpp:53 +msgid "Add CA" +msgstr "" + +#: res/EAPTLSUI.cpp:54 +msgid "Adds a new certificate authority to the list" +msgstr "" + +#: res/EAPTLSUI.cpp:58 +msgid "&Remove CA" +msgstr "" + +#: res/EAPTLSUI.cpp:59 +msgid "Removes selected certificate authorities from the list" +msgstr "" + +#: res/EAPTLSUI.cpp:72 +msgid "Acceptable server &names:" +msgstr "" + +#: res/EAPTLSUI.cpp:77 +msgid "A semicolon delimited list of acceptable server FQDN names; blank to skip name check; \"*\" wildchar allowed" +msgstr "" + +#: res/EAPTLSUI.cpp:81 +msgid "(Example: foo.bar.com;*.domain.org)" +msgstr "" + +#: res/EAPTTLSUI.cpp:23 +msgid "Outer Identity" +msgstr "" + +#: res/EAPTTLSUI.cpp:34 +msgid "Select the user ID supplicant introduces itself as to authenticator:" +msgstr "" + +#: res/EAPTTLSUI.cpp:41 +msgid "&Same as inner identity" +msgstr "" + +#: res/EAPTTLSUI.cpp:42 +msgid "Use my true user name" +msgstr "" + +#: res/EAPTTLSUI.cpp:46 +msgid "Use &empty outer identity (RFC 4822)" +msgstr "" + +#: res/EAPTTLSUI.cpp:48 +msgid "Ommit my user name and use @mydomain.org only" +msgstr "" + +#: res/EAPTTLSUI.cpp:55 +msgid "&Custom outer identity:" +msgstr "" + +#: res/EAPTTLSUI.cpp:56 +msgid "Specify custom outer identity" +msgstr "" + +#: res/EAPTTLSUI.cpp:61 +msgid "Custom outer identity to use" +msgstr "" + +#: MSIBuild/En.Win32.Release.Feature-2.idtx:3 +#: MSIBuild/En.x64.Release.Feature-2.idtx:3 +#, fuzzy +msgid "1252" +msgstr "1250" + +#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +msgid "EAP Peer Methods" +msgstr "" + +#: MSIBuild/En.Win32.Release.Feature-2.idtx:4 +#: MSIBuild/En.x64.Release.Feature-2.idtx:4 +msgid "Modules to support individual EAP methods" +msgstr "" + +#: MSIBuild/En.Win32.Release.Feature-2.idtx:5 +#: MSIBuild/En.x64.Release.Feature-2.idtx:5 +msgid "TTLS" +msgstr "" + +#: MSIBuild/En.Win32.Release.Feature-2.idtx:5 +#: MSIBuild/En.x64.Release.Feature-2.idtx:5 +msgid "Tunneled Transport Layer Security" +msgstr "" diff --git a/EAPMethods/res/EAPTLSUI.cpp b/EAPMethods/res/EAPTLSUI.cpp new file mode 100644 index 0000000..f2b6d3f --- /dev/null +++ b/EAPMethods/res/EAPTLSUI.cpp @@ -0,0 +1,101 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 17 2015) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include + +#include "EAPTLSUI.h" + +/////////////////////////////////////////////////////////////////////////// + +BEGIN_EVENT_TABLE( wxEAPTLSConfigBase, wxPanel ) + EVT_LISTBOX_DCLICK( wxID_ANY, wxEAPTLSConfigBase::_wxFB_OnRootCADClick ) + EVT_BUTTON( wxID_ANY, wxEAPTLSConfigBase::_wxFB_OnRootCAAdd ) + EVT_BUTTON( wxID_ANY, wxEAPTLSConfigBase::_wxFB_OnRootCARemove ) +END_EVENT_TABLE() + +wxEAPTLSConfigBase::wxEAPTLSConfigBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + wxStaticBoxSizer* sb_server_trust; + sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL ); + + wxBoxSizer* sb_server_trust_horiz; + sb_server_trust_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_server_trust_icon = new wxStaticBitmap( sb_server_trust->GetStaticBox(), wxID_ANY, wxIcon( wxT("server_trust.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 32, 32 ), wxDefaultPosition, wxDefaultSize, 0 ); + sb_server_trust_horiz->Add( m_server_trust_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_server_trust_vert; + sb_server_trust_vert = new wxBoxSizer( wxVERTICAL ); + + m_server_trust_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks."), wxDefaultPosition, wxDefaultSize, 0 ); + m_server_trust_label->Wrap( 446 ); + sb_server_trust_vert->Add( m_server_trust_label, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* sb_root_ca; + sb_root_ca = new wxBoxSizer( wxVERTICAL ); + + m_root_ca_lbl = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable Certificate Authorities:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_lbl->Wrap( -1 ); + sb_root_ca->Add( m_root_ca_lbl, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_MULTIPLE ); + m_root_ca->SetToolTip( _("List of certificate authorities server's certificate must be issued by") ); + + sb_root_ca->Add( m_root_ca, 1, wxEXPAND|wxBOTTOM, 5 ); + + wxBoxSizer* sb_root_ca_btn; + sb_root_ca_btn = new wxBoxSizer( wxHORIZONTAL ); + + m_root_ca_add = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA"), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_add->SetToolTip( _("Adds a new certificate authority to the list") ); + + sb_root_ca_btn->Add( m_root_ca_add, 0, wxRIGHT, 5 ); + + m_root_ca_remove = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 ); + m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") ); + + sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, 5 ); + + + sb_root_ca->Add( sb_root_ca_btn, 0, wxALIGN_RIGHT, 5 ); + + + sb_server_trust_vert->Add( sb_root_ca, 1, wxEXPAND|wxALL, 5 ); + + wxBoxSizer* sb_server_names; + sb_server_names = new wxBoxSizer( wxVERTICAL ); + + m_server_names_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable server &names:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_server_names_label->Wrap( -1 ); + sb_server_names->Add( m_server_names_label, 0, wxBOTTOM, 5 ); + + m_server_names = new wxTextCtrl( sb_server_trust->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_server_names->SetToolTip( _("A semicolon delimited list of acceptable server FQDN names; blank to skip name check; \"*\" wildchar allowed") ); + + sb_server_names->Add( m_server_names, 0, wxEXPAND|wxBOTTOM, 5 ); + + m_server_names_note = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("(Example: foo.bar.com;*.domain.org)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_server_names_note->Wrap( -1 ); + sb_server_names->Add( m_server_names_note, 0, wxALIGN_RIGHT, 5 ); + + + sb_server_trust_vert->Add( sb_server_names, 0, wxEXPAND|wxALL, 5 ); + + + sb_server_trust_horiz->Add( sb_server_trust_vert, 1, wxEXPAND, 5 ); + + + sb_server_trust->Add( sb_server_trust_horiz, 1, wxEXPAND, 5 ); + + + this->SetSizer( sb_server_trust ); + this->Layout(); +} + +wxEAPTLSConfigBase::~wxEAPTLSConfigBase() +{ +} diff --git a/EAPMethods/res/EAPTLSUI.fbp b/EAPMethods/res/EAPTLSUI.fbp new file mode 100644 index 0000000..5782e5a --- /dev/null +++ b/EAPMethods/res/EAPTLSUI.fbp @@ -0,0 +1,915 @@ + + + + + ; + C++ + 1 + source_name + 0 + 0 + ..\res + UTF-8 + table + EAPTLSUI + 1000 + none + 1 + EAPTLSUI + + . + #include <StdAfx.h> + 1 + 1 + 1 + 1 + UI + 1 + 1 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxEAPTLSConfigBase + + 500,300 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Server Trust + + sb_server_trust + wxVERTICAL + none + + + 5 + wxEXPAND + 1 + + + sb_server_trust_horiz + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Icon Resource; server_trust.ico; [32; 32] + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_server_trust_icon + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_server_trust_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 + Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks. + + 0 + + + 0 + + 1 + m_server_trust_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 1 + + + sb_root_ca + wxVERTICAL + none + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Acceptable Certificate Authorities: + + 0 + + + 0 + + 1 + m_root_ca_lbl + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_root_ca + 1 + + + protected + 1 + + Resizable + 1 + + wxLB_MULTIPLE + + 0 + List of certificate authorities server's certificate must be issued by + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + OnRootCADClick + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT + 0 + + + sb_root_ca_btn + wxHORIZONTAL + none + + 5 + wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Add CA + + 0 + + + 0 + + 1 + m_root_ca_add + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Adds a new certificate authority to the list + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRootCAAdd + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Remove CA + + 0 + + + 0 + + 1 + m_root_ca_remove + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Removes selected certificate authorities from the list + + wxFILTER_NONE + wxDefaultValidator + + + + + OnRootCARemove + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + sb_server_names + wxVERTICAL + none + + 5 + wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Acceptable server &names: + + 0 + + + 0 + + 1 + m_server_names_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxBOTTOM + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + + 0 + + 1 + m_server_names + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + A semicolon delimited list of acceptable server FQDN names; blank to skip name check; "*" wildchar allowed + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + (Example: foo.bar.com;*.domain.org) + + 0 + + + 0 + + 1 + m_server_names_note + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EAPMethods/res/EAPTLSUI.h b/EAPMethods/res/EAPTLSUI.h new file mode 100644 index 0000000..4f0f579 --- /dev/null +++ b/EAPMethods/res/EAPTLSUI.h @@ -0,0 +1,71 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 17 2015) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __EAPTLSUI_H__ +#define __EAPTLSUI_H__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPTLSConfigBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPTLSConfigBase : public wxPanel +{ + DECLARE_EVENT_TABLE() + private: + + // Private event handlers + void _wxFB_OnRootCADClick( wxCommandEvent& event ){ OnRootCADClick( event ); } + void _wxFB_OnRootCAAdd( wxCommandEvent& event ){ OnRootCAAdd( event ); } + void _wxFB_OnRootCARemove( wxCommandEvent& event ){ OnRootCARemove( event ); } + + + protected: + wxStaticBitmap* m_server_trust_icon; + wxStaticText* m_server_trust_label; + wxStaticText* m_root_ca_lbl; + wxListBox* m_root_ca; + wxButton* m_root_ca_add; + wxButton* m_root_ca_remove; + wxStaticText* m_server_names_label; + wxTextCtrl* m_server_names; + wxStaticText* m_server_names_note; + + // Virtual event handlers, overide them in your derived class + virtual void OnRootCADClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRootCAAdd( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRootCARemove( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxEAPTLSConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPTLSConfigBase(); + +}; + +#endif //__EAPTLSUI_H__ diff --git a/EAPMethods/res/EAPTTLSUI.cpp b/EAPMethods/res/EAPTTLSUI.cpp new file mode 100644 index 0000000..a9f4b37 --- /dev/null +++ b/EAPMethods/res/EAPTTLSUI.cpp @@ -0,0 +1,84 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 17 2015) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include + +#include "EAPTTLSUI.h" + +/////////////////////////////////////////////////////////////////////////// + +BEGIN_EVENT_TABLE( wxEAPTTLSConfigBase, wxPanel ) + EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigBase::_wxFB_OnOuterIdentitySame ) + EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigBase::_wxFB_OnOuterIdentityEmpty ) + EVT_RADIOBUTTON( wxID_ANY, wxEAPTTLSConfigBase::_wxFB_OnOuterIdentityCustom ) +END_EVENT_TABLE() + +wxEAPTTLSConfigBase::wxEAPTTLSConfigBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style ) +{ + wxStaticBoxSizer* sb_outer_identity; + sb_outer_identity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Outer Identity") ), wxVERTICAL ); + + wxBoxSizer* sb_outer_identity_horiz; + sb_outer_identity_horiz = new wxBoxSizer( wxHORIZONTAL ); + + m_outer_identity_icon = new wxStaticBitmap( sb_outer_identity->GetStaticBox(), wxID_ANY, wxIcon( wxT("outer_identity.ico"), wxBITMAP_TYPE_ICO_RESOURCE, 32, 32 ), wxDefaultPosition, wxDefaultSize, 0 ); + sb_outer_identity_horiz->Add( m_outer_identity_icon, 0, wxALL, 5 ); + + wxBoxSizer* sb_outer_identity_vert; + sb_outer_identity_vert = new wxBoxSizer( wxVERTICAL ); + + m_outer_identity_label = new wxStaticText( sb_outer_identity->GetStaticBox(), wxID_ANY, _("Select the user ID supplicant introduces itself as to authenticator:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_outer_identity_label->Wrap( 446 ); + sb_outer_identity_vert->Add( m_outer_identity_label, 0, wxALL|wxEXPAND, 5 ); + + wxBoxSizer* sb_outer_identity_radio; + sb_outer_identity_radio = new wxBoxSizer( wxVERTICAL ); + + m_outer_identity_same = new wxRadioButton( sb_outer_identity->GetStaticBox(), wxID_ANY, _("&Same as inner identity"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_outer_identity_same->SetToolTip( _("Use my true user name") ); + + sb_outer_identity_radio->Add( m_outer_identity_same, 1, wxEXPAND, 5 ); + + m_outer_identity_empty = new wxRadioButton( sb_outer_identity->GetStaticBox(), wxID_ANY, _("Use &empty outer identity (RFC 4822)"), wxDefaultPosition, wxDefaultSize, 0 ); + m_outer_identity_empty->SetValue( true ); + m_outer_identity_empty->SetToolTip( _("Ommit my user name and use @mydomain.org only") ); + + sb_outer_identity_radio->Add( m_outer_identity_empty, 1, wxEXPAND, 5 ); + + wxBoxSizer* sb_outer_identity_custom; + sb_outer_identity_custom = new wxBoxSizer( wxHORIZONTAL ); + + m_outer_identity_custom = new wxRadioButton( sb_outer_identity->GetStaticBox(), wxID_ANY, _("&Custom outer identity:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_outer_identity_custom->SetToolTip( _("Specify custom outer identity") ); + + sb_outer_identity_custom->Add( m_outer_identity_custom, 0, wxEXPAND, 5 ); + + m_outer_identity_custom_val_ = new wxTextCtrl( sb_outer_identity->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_outer_identity_custom_val_->SetToolTip( _("Custom outer identity to use") ); + + sb_outer_identity_custom->Add( m_outer_identity_custom_val_, 1, wxEXPAND, 5 ); + + + sb_outer_identity_radio->Add( sb_outer_identity_custom, 1, wxEXPAND, 5 ); + + + sb_outer_identity_vert->Add( sb_outer_identity_radio, 0, wxEXPAND|wxALL, 5 ); + + + sb_outer_identity_horiz->Add( sb_outer_identity_vert, 1, wxEXPAND, 5 ); + + + sb_outer_identity->Add( sb_outer_identity_horiz, 0, wxEXPAND, 5 ); + + + this->SetSizer( sb_outer_identity ); + this->Layout(); +} + +wxEAPTTLSConfigBase::~wxEAPTTLSConfigBase() +{ +} diff --git a/EAPMethods/res/EAPTTLSUI.fbp b/EAPMethods/res/EAPTTLSUI.fbp new file mode 100644 index 0000000..71e5271 --- /dev/null +++ b/EAPMethods/res/EAPTTLSUI.fbp @@ -0,0 +1,655 @@ + + + + + ; + C++ + 1 + source_name + 0 + 0 + ..\res + UTF-8 + table + EAPTTLSUI + 1000 + none + 1 + EAPTTLSUI + + . + #include <StdAfx.h> + 1 + 1 + 1 + 1 + UI + 1 + 1 + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxEAPTTLSConfigBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Outer Identity + + sb_outer_identity + wxVERTICAL + none + + + 5 + wxEXPAND + 0 + + + sb_outer_identity_horiz + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + Load From Icon Resource; outer_identity.ico; [32; 32] + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + + 1 + m_outer_identity_icon + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_outer_identity_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 + Select the user ID supplicant introduces itself as to authenticator: + + 0 + + + 0 + + 1 + m_outer_identity_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 446 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + sb_outer_identity_radio + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Same as inner identity + + 0 + + + 0 + + 1 + m_outer_identity_same + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + + 0 + Use my true user name + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnOuterIdentitySame + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Use &empty outer identity (RFC 4822) + + 0 + + + 0 + + 1 + m_outer_identity_empty + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Ommit my user name and use @mydomain.org only + + wxFILTER_NONE + wxDefaultValidator + + 1 + + + + + + + + + + + + + + + + + + + + + OnOuterIdentityEmpty + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_outer_identity_custom + wxHORIZONTAL + none + + 5 + wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + &Custom outer identity: + + 0 + + + 0 + + 1 + m_outer_identity_custom + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Specify custom outer identity + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + OnOuterIdentityCustom + + + + + + + + + + 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_outer_identity_custom_val_ + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Custom outer identity to use + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/EAPMethods/res/EAPTTLSUI.h b/EAPMethods/res/EAPTTLSUI.h new file mode 100644 index 0000000..b524d21 --- /dev/null +++ b/EAPMethods/res/EAPTTLSUI.h @@ -0,0 +1,67 @@ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Jun 17 2015) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __EAPTTLSUI_H__ +#define __EAPTTLSUI_H__ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +/////////////////////////////////////////////////////////////////////////////// +/// Class wxEAPTTLSConfigBase +/////////////////////////////////////////////////////////////////////////////// +class wxEAPTTLSConfigBase : public wxPanel +{ + DECLARE_EVENT_TABLE() + private: + + // Private event handlers + void _wxFB_OnOuterIdentitySame( wxCommandEvent& event ){ OnOuterIdentitySame( event ); } + void _wxFB_OnOuterIdentityEmpty( wxCommandEvent& event ){ OnOuterIdentityEmpty( event ); } + void _wxFB_OnOuterIdentityCustom( wxCommandEvent& event ){ OnOuterIdentityCustom( event ); } + + + protected: + wxStaticBitmap* m_outer_identity_icon; + wxStaticText* m_outer_identity_label; + wxRadioButton* m_outer_identity_same; + wxRadioButton* m_outer_identity_empty; + wxRadioButton* m_outer_identity_custom; + wxTextCtrl* m_outer_identity_custom_val_; + + // Virtual event handlers, overide them in your derived class + virtual void OnOuterIdentitySame( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOuterIdentityEmpty( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOuterIdentityCustom( wxCommandEvent& event ) { event.Skip(); } + + + public: + + wxEAPTTLSConfigBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); + ~wxEAPTTLSConfigBase(); + +}; + +#endif //__EAPTTLSUI_H__ diff --git a/include/Common.props b/include/Common.props index 54e4bd8..39c1efa 100644 --- a/include/Common.props +++ b/include/Common.props @@ -26,6 +26,8 @@ temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\ temp\$(ProjectName).$(Platform).$(Configuration).$(PlatformToolset)\ + $(WXWIN)\include\msvc;$(WXWIN)\include;$(IncludePath) + $(WXWIN)\src\aui;$(WXWIN)\src\cocoa;$(WXWIN)\src\common;$(WXWIN)\src\dfb;$(WXWIN)\src\expat;$(WXWIN)\src\generic;$(WXWIN)\src\gtk;$(WXWIN)\src\gtk1;$(WXWIN)\src\html;$(WXWIN)\src\jpeg;$(WXWIN)\src\motif;$(WXWIN)\src\msdos;$(WXWIN)\src\msw;$(WXWIN)\src\os2;$(WXWIN)\src\osx;$(WXWIN)\src\png;$(WXWIN)\src\propgrid;$(WXWIN)\src\regex;$(WXWIN)\src\ribbon;$(WXWIN)\src\richtext;$(WXWIN)\src\stc;$(WXWIN)\src\tiff;$(WXWIN)\src\univ;$(WXWIN)\src\unix;$(WXWIN)\src\x11;$(WXWIN)\src\xml;$(WXWIN)\src\xrc;$(WXWIN)\src\zlib;$(SourcePath) diff --git a/include/Win32.props b/include/Win32.props index 2d273ba..ef266cc 100644 --- a/include/Win32.props +++ b/include/Win32.props @@ -23,6 +23,9 @@ + + $(WXWIN)\lib\vc_lib;$(LibraryPath) + MachineX86 diff --git a/include/x64.props b/include/x64.props index 3198183..5729fbf 100644 --- a/include/x64.props +++ b/include/x64.props @@ -23,6 +23,9 @@ + + $(WXWIN)\lib\vc_x64_lib;$(LibraryPath) + MachineX64