diff --git a/EAPMethods/locale/EAPMethods.pot b/EAPMethods/locale/EAPMethods.pot index a3f1646..3d7fc91 100644 --- a/EAPMethods/locale/EAPMethods.pot +++ b/EAPMethods/locale/EAPMethods.pot @@ -2,14 +2,14 @@ msgid "" msgstr "" "Project-Id-Version: EAPMethods\n" -"POT-Creation-Date: 2019-08-12 14:04+0200\n" +"POT-Creation-Date: 2020-02-06 16:51+0100\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 2.2.3\n" +"X-Generator: Poedit 2.2.4\n" "X-Poedit-Basepath: ../..\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-KeywordsList: _\n" @@ -22,71 +22,71 @@ msgstr "" "X-Poedit-SearchPath-6: lib/TTLS_UI\n" "X-Poedit-SearchPath-7: EAPMethods\n" -#: lib/EAPBase_UI/include/EAP_UI.h:285 +#: lib/EAPBase_UI/include/EAP_UI.h:294 #, c-format msgid "Are you sure you want to permanently remove %s provider from configuration?" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:285 +#: lib/EAPBase_UI/include/EAP_UI.h:294 msgid "Warning" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:371 lib/EAPBase_UI/res/wxEAP_UI.h:117 +#: lib/EAPBase_UI/include/EAP_UI.h:380 lib/EAPBase_UI/res/wxEAP_UI.h:117 msgid "EAP Credentials" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:641 +#: lib/EAPBase_UI/include/EAP_UI.h:724 msgid "Provider Settings" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:674 lib/EAPBase_UI/res/wxEAP_UI.cpp:229 +#: lib/EAPBase_UI/include/EAP_UI.h:757 lib/EAPBase_UI/res/wxEAP_UI.cpp:229 #, c-format msgid "%s User Credentials" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:793 lib/TTLS_UI/src/Module.cpp:285 -#: lib/TTLS_UI/src/Module.cpp:357 +#: lib/EAPBase_UI/include/EAP_UI.h:876 lib/TTLS_UI/src/Module.cpp:196 +#: lib/TTLS_UI/src/Module.cpp:305 #, c-format msgid "Error writing credentials to Credential Manager: %hs (error %u)" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:796 lib/TTLS_UI/src/Module.cpp:287 -#: lib/TTLS_UI/src/Module.cpp:359 +#: lib/EAPBase_UI/include/EAP_UI.h:879 lib/TTLS_UI/src/Module.cpp:198 +#: lib/TTLS_UI/src/Module.cpp:307 msgid "Writing credentials failed." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:816 +#: lib/EAPBase_UI/include/EAP_UI.h:899 #, c-format msgid "Deleting credentials failed (error %u)." msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:855 +#: lib/EAPBase_UI/include/EAP_UI.h:938 #, c-format msgid "(error %u)" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:859 +#: lib/EAPBase_UI/include/EAP_UI.h:942 msgid "(error)" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:870 lib/EAPBase_UI/include/EAP_UI.h:879 +#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962 #: lib/TLS_UI/src/TLS_UI.cpp:61 -msgid "(empty)" +msgid "(none)" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:870 lib/EAPBase_UI/include/EAP_UI.h:879 +#: lib/EAPBase_UI/include/EAP_UI.h:953 lib/EAPBase_UI/include/EAP_UI.h:962 msgid "(blank ID)" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:919 +#: lib/EAPBase_UI/include/EAP_UI.h:1002 msgid "&Remember" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:920 +#: lib/EAPBase_UI/include/EAP_UI.h:1003 msgid "Check if you would like to save credentials" msgstr "" -#: lib/EAPBase_UI/include/EAP_UI.h:1131 +#: lib/EAPBase_UI/include/EAP_UI.h:1212 msgid "(Your Organization)" msgstr "" @@ -119,7 +119,7 @@ msgid "Select the source where your credentials used to connect are stored." msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244 -msgid "Use credentials from Credential &Manager" +msgid "Use from Credential &Manager" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245 @@ -153,7 +153,7 @@ msgid "Click here to set or modify your credentials" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:288 -msgid "Use credentials from &profile configuration" +msgid "Use from &profile configuration" msgstr "" #: lib/EAPBase_UI/res/wxEAP_UI.cpp:289 @@ -288,6 +288,42 @@ msgstr "" msgid "(Warning: Once locked, you can not revert using this dialog!)" msgstr "" +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:727 +msgid "Identity" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:738 +msgid "Select the user ID supplicant introduces itself as to authenticator:" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:745 +msgid "&True identity" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:746 +msgid "Use my true user name" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:750 +msgid "Use &empty identity" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:751 +msgid "Omit my user name and use @mydomain.org only" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:758 +msgid "&Custom identity:" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:759 +msgid "Specify custom identity" +msgstr "" + +#: lib/EAPBase_UI/res/wxEAP_UI.cpp:764 +msgid "Custom identity to use" +msgstr "" + #: lib/EAPBase_UI/res/wxEAP_UI.h:67 msgid "EAP Connection Configuration" msgstr "" @@ -392,7 +428,7 @@ msgstr "" msgid "Configuring EAP method failed (error %u)." msgstr "" -#: lib/GTC_UI/include/GTC_UI.h:111 lib/GTC_UI/res/wxGTC_UI.cpp:16 +#: lib/GTC_UI/include/GTC_UI.h:114 lib/GTC_UI/res/wxGTC_UI.cpp:16 msgid "GTC Challenge" msgstr "" @@ -442,7 +478,7 @@ msgid "Server Trust" msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:28 -msgid "Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks." +msgid "Describe the servers you trust to prevent man-in-the-middle attacks." msgstr "" #: lib/TLS_UI/res/wxTLS_UI.cpp:35 @@ -489,7 +525,7 @@ msgstr "" msgid "(Example: foo.bar.com;server2.bar.com)" msgstr "" -#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:325 +#: lib/TLS_UI/res/wxTLS_UI.cpp:118 lib/TLS_UI/src/TLS_UI.cpp:329 msgid "User Certificate" msgstr "" @@ -509,121 +545,97 @@ msgstr "" msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:252 +#: lib/TLS_UI/src/TLS_UI.cpp:256 msgid "Add Certificate" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:253 +#: lib/TLS_UI/src/TLS_UI.cpp:257 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:254 +#: lib/TLS_UI/src/TLS_UI.cpp:258 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:255 +#: lib/TLS_UI/src/TLS_UI.cpp:259 msgid "PKCS #7 Certificate Files (*.p7b)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:256 +#: lib/TLS_UI/src/TLS_UI.cpp:260 msgid "All Files (*.*)" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:270 +#: lib/TLS_UI/src/TLS_UI.cpp:274 #, c-format msgid "Invalid or unsupported certificate file %s" msgstr "" -#: lib/TLS_UI/src/TLS_UI.cpp:270 +#: lib/TLS_UI/src/TLS_UI.cpp:274 msgid "Error" msgstr "" -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17 -msgid "Outer Identity" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28 -msgid "Select the user ID supplicant introduces itself as to authenticator:" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35 -msgid "&True identity" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36 -msgid "Use my true user name" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40 -msgid "Use &empty outer identity" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41 -msgid "Omit my user name and use @mydomain.org only" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48 -msgid "&Custom outer identity:" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49 -msgid "Specify custom outer identity" -msgstr "" - -#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54 -msgid "Custom outer identity to use" -msgstr "" - -#: lib/TTLS_UI/src/Module.cpp:395 +#: lib/TTLS_UI/src/Module.cpp:249 #, c-format msgid "Invoking EAP identity UI failed (error %u, %s, %s)." msgstr "" -#: lib/TTLS_UI/src/Module.cpp:397 +#: lib/TTLS_UI/src/Module.cpp:252 #, c-format msgid "Invoking EAP identity UI failed (error %u)." msgstr "" -#: lib/TTLS_UI/src/Module.cpp:533 +#: lib/TTLS_UI/src/Module.cpp:376 #, c-format msgid "Invoking EAP interactive UI failed (error %u, %s, %s)." msgstr "" -#: lib/TTLS_UI/src/Module.cpp:536 +#: lib/TTLS_UI/src/Module.cpp:379 #, c-format msgid "Invoking EAP interactive UI failed (error %u)." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:118 +#: lib/TTLS_UI/src/TTLS_UI.cpp:37 msgid "Inner Authentication" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:124 +#: lib/TTLS_UI/src/TTLS_UI.cpp:43 msgid "Select inner authentication method from the list" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:126 +#: lib/TTLS_UI/src/TTLS_UI.cpp:48 +msgid "Outer Authentication" +msgstr "" + +#: lib/TTLS_UI/src/TTLS_UI.cpp:127 msgid "PAP" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:128 +#: lib/TTLS_UI/src/TTLS_UI.cpp:129 msgid "MSCHAPv2" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:130 +#: lib/TTLS_UI/src/TTLS_UI.cpp:131 msgid "EAP-MSCHAPv2" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:132 +#: lib/TTLS_UI/src/TTLS_UI.cpp:133 msgid "EAP-GTC" msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:135 +#: lib/TTLS_UI/src/TTLS_UI.cpp:136 msgid "Other EAP methods..." msgstr "" -#: lib/TTLS_UI/src/TTLS_UI.cpp:141 -msgid "Outer Authentication" +#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4 +msgid "EAP-TTLS" +msgstr "" + +#: EAPMethods/MSIBuild.EAP-TTLS/en_US.ARM64.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild.EAP-TTLS/en_US.Win32.Release.Feature-2.idtx:4 +#: EAPMethods/MSIBuild.EAP-TTLS/en_US.x64.Release.Feature-2.idtx:4 +msgid "EAP-TTLS Method" msgstr "" #: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:4 @@ -637,15 +649,3 @@ msgstr "" #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 msgid "Modules to support individual EAP methods" msgstr "" - -#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 -msgid "TTLS" -msgstr "" - -#: EAPMethods/MSIBuild/en_US.ARM64.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 -#: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 -msgid "Tunneled Transport Layer Security" -msgstr "" diff --git a/lib/EAPBase/src/Credentials.cpp b/lib/EAPBase/src/Credentials.cpp index 620041f..8cf72ee 100644 --- a/lib/EAPBase/src/Credentials.cpp +++ b/lib/EAPBase/src/Credentials.cpp @@ -159,7 +159,7 @@ tstring eap::credentials::get_name() const tstring identity(std::move(get_identity())); return !identity.empty() ? identity : - empty() ? _T("(empty)") : _T("(blank ID)"); + empty() ? _T("(none)") : _T("(blank ID)"); } diff --git a/lib/EAPBase_UI/include/EAP_UI.h b/lib/EAPBase_UI/include/EAP_UI.h index f77d9e3..0dd6066 100644 --- a/lib/EAPBase_UI/include/EAP_UI.h +++ b/lib/EAPBase_UI/include/EAP_UI.h @@ -950,7 +950,7 @@ protected: wxString identity(m_cred_storage.get_identity()); m_storage_identity->SetLabel( !identity.empty() ? identity : - m_cred_storage.empty() ? _("(empty)") : _("(blank ID)")); + m_cred_storage.empty() ? _("(none)") : _("(blank ID)")); } @@ -959,7 +959,7 @@ protected: wxString identity(m_cred_config.get_identity()); m_config_identity->SetLabel( !identity.empty() ? identity : - m_cred_config.empty() ? _("(empty)") : _("(blank ID)")); + m_cred_config.empty() ? _("(none)") : _("(blank ID)")); } /// \endcond diff --git a/lib/EAPBase_UI/res/wxEAP_UI.cpp b/lib/EAPBase_UI/res/wxEAP_UI.cpp index 29c50d9..f37949c 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.cpp +++ b/lib/EAPBase_UI/res/wxEAP_UI.cpp @@ -241,7 +241,7 @@ wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* pare m_credentials_label->Wrap( FromDIP(440) ); sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - m_storage = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials from Credential &Manager"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_storage = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use from Credential &Manager"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); m_storage->SetToolTip( _("Select this option if you would like to use credentials stored in Windows Credential Manager") ); sb_credentials_vert->Add( m_storage, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, FromDIP(5) ); @@ -285,7 +285,7 @@ wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* pare sb_credentials_vert->Add( sb_storage, 0, wxEXPAND|wxALL, FromDIP(5) ); - m_config = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use credentials from &profile configuration"), wxDefaultPosition, wxDefaultSize, 0 ); + m_config = new wxRadioButton( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Use from &profile configuration"), wxDefaultPosition, wxDefaultSize, 0 ); m_config->SetToolTip( _("Select this option if you would like to store credentials as a part of profile configuration") ); sb_credentials_vert->Add( m_config, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, FromDIP(5) ); @@ -723,62 +723,62 @@ wxEAPProviderSelectDialogBase::~wxEAPProviderSelectDialogBase() wxEAPIdentityConfigPanelBase::wxEAPIdentityConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, long style ) : wxPanel( parent, id, pos, parent->FromDIP(wxSize( 500,-1 )), style ) { - wxStaticBoxSizer* sb_outer_identity; - sb_outer_identity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Outer Identity") ), wxVERTICAL ); + wxStaticBoxSizer* sb_identity; + sb_identity = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Identity") ), wxVERTICAL ); - wxBoxSizer* sb_outer_identity_horiz; - sb_outer_identity_horiz = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* sb_identity_horiz; + sb_identity_horiz = new wxBoxSizer( wxHORIZONTAL ); - m_outer_identity_icon = new wxStaticBitmap( sb_outer_identity->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); - sb_outer_identity_horiz->Add( m_outer_identity_icon, 0, wxALL, FromDIP(5) ); + m_identity_icon = new wxStaticBitmap( sb_identity->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 ); + sb_identity_horiz->Add( m_identity_icon, 0, wxALL, FromDIP(5) ); - wxBoxSizer* sb_outer_identity_vert; - sb_outer_identity_vert = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* sb_identity_vert; + sb_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( FromDIP(440) ); - sb_outer_identity_vert->Add( m_outer_identity_label, 0, wxALL|wxEXPAND, FromDIP(5) ); + m_identity_label = new wxStaticText( sb_identity->GetStaticBox(), wxID_ANY, _("Select the user ID supplicant introduces itself as to authenticator:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_label->Wrap( FromDIP(440) ); + sb_identity_vert->Add( m_identity_label, 0, wxALL|wxEXPAND, FromDIP(5) ); - wxBoxSizer* sb_outer_identity_radio; - sb_outer_identity_radio = new wxBoxSizer( wxVERTICAL ); + wxBoxSizer* sb_identity_radio; + sb_identity_radio = new wxBoxSizer( wxVERTICAL ); - m_outer_identity_same = new wxRadioButton( sb_outer_identity->GetStaticBox(), wxID_ANY, _("&True identity"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); - m_outer_identity_same->SetToolTip( _("Use my true user name") ); + m_identity_same = new wxRadioButton( sb_identity->GetStaticBox(), wxID_ANY, _("&True identity"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP ); + m_identity_same->SetToolTip( _("Use my true user name") ); - sb_outer_identity_radio->Add( m_outer_identity_same, 1, wxEXPAND, FromDIP(5) ); + sb_identity_radio->Add( m_identity_same, 1, wxEXPAND, FromDIP(5) ); - m_outer_identity_empty = new wxRadioButton( sb_outer_identity->GetStaticBox(), wxID_ANY, _("Use &empty outer identity"), wxDefaultPosition, wxDefaultSize, 0 ); - m_outer_identity_empty->SetToolTip( _("Omit my user name and use @mydomain.org only") ); + m_identity_empty = new wxRadioButton( sb_identity->GetStaticBox(), wxID_ANY, _("Use &empty identity"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_empty->SetToolTip( _("Omit my user name and use @mydomain.org only") ); - sb_outer_identity_radio->Add( m_outer_identity_empty, 1, wxEXPAND, FromDIP(5) ); + sb_identity_radio->Add( m_identity_empty, 1, wxEXPAND, FromDIP(5) ); - wxBoxSizer* sb_outer_identity_custom; - sb_outer_identity_custom = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* sb_identity_custom; + sb_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") ); + m_identity_custom = new wxRadioButton( sb_identity->GetStaticBox(), wxID_ANY, _("&Custom identity:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_custom->SetToolTip( _("Specify custom identity") ); - sb_outer_identity_custom->Add( m_outer_identity_custom, 0, wxEXPAND, FromDIP(5) ); + sb_identity_custom->Add( m_identity_custom, 0, wxEXPAND, FromDIP(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") ); + m_identity_custom_val = new wxTextCtrl( sb_identity->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + m_identity_custom_val->SetToolTip( _("Custom identity to use") ); - sb_outer_identity_custom->Add( m_outer_identity_custom_val, 1, wxEXPAND, FromDIP(5) ); + sb_identity_custom->Add( m_identity_custom_val, 1, wxEXPAND, FromDIP(5) ); - sb_outer_identity_radio->Add( sb_outer_identity_custom, 1, wxEXPAND, FromDIP(5) ); + sb_identity_radio->Add( sb_identity_custom, 1, wxEXPAND, FromDIP(5) ); - sb_outer_identity_vert->Add( sb_outer_identity_radio, 0, wxEXPAND|wxALL, FromDIP(5) ); + sb_identity_vert->Add( sb_identity_radio, 0, wxEXPAND|wxALL, FromDIP(5) ); - sb_outer_identity_horiz->Add( sb_outer_identity_vert, 1, wxEXPAND, FromDIP(5) ); + sb_identity_horiz->Add( sb_identity_vert, 1, wxEXPAND, FromDIP(5) ); - sb_outer_identity->Add( sb_outer_identity_horiz, 0, wxEXPAND, FromDIP(5) ); + sb_identity->Add( sb_identity_horiz, 0, wxEXPAND, FromDIP(5) ); - this->SetSizer( sb_outer_identity ); + this->SetSizer( sb_identity ); this->Layout(); // Connect Events diff --git a/lib/EAPBase_UI/res/wxEAP_UI.fbp b/lib/EAPBase_UI/res/wxEAP_UI.fbp index 2c5a171..9d5c772 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.fbp +++ b/lib/EAPBase_UI/res/wxEAP_UI.fbp @@ -1861,7 +1861,7 @@ 0 0 wxID_ANY - Use credentials from Credential &Manager + Use from Credential &Manager 0 @@ -2377,7 +2377,7 @@ 0 0 wxID_ANY - Use credentials from &profile configuration + Use from &profile configuration 0 @@ -6514,630 +6514,681 @@ - - 0 - wxAUI_MGR_DEFAULT - - - 1 - 1 - impl_virtual - - - 0 - wxID_ANY - - - wxEAPIdentityConfigPanelBase - - 500,-1 - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUpdateUI - - 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; ; [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 - + + 0 + wxAUI_MGR_DEFAULT + + + 1 + 1 + impl_virtual + + + 0 + wxID_ANY + + + wxEAPIdentityConfigPanelBase + + 500,-1 + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUpdateUI + + wxID_ANY + Identity + + sb_identity + wxVERTICAL + 1 + 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 - - - - - 440 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL + wxEXPAND 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 - &True 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - 0 - - - 0 - - 1 - m_outer_identity_empty - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - Omit my user name and use @mydomain.org only - - wxFILTER_NONE - wxDefaultValidator - - 0 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - - sb_outer_identity_custom - wxHORIZONTAL - none - + + sb_identity_horiz + wxHORIZONTAL + none + 5 - wxEXPAND + wxALL 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - + + 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_identity_icon + 1 + + + protected + 1 + + Resizable + 1 + + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + 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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + sb_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 + + + 0 + + 1 + m_identity_label + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + 440 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + + sb_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 + &True identity + + 0 + + + 0 + + 1 + m_identity_same + 1 + + + protected + 1 + + Resizable + 1 + + wxRB_GROUP + + 0 + Use my true user name + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Use &empty identity + + 0 + + + 0 + + 1 + m_identity_empty + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Omit my user name and use @mydomain.org only + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + + sb_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 identity: + + 0 + + + 0 + + 1 + m_identity_custom + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Specify custom identity + + wxFILTER_NONE + wxDefaultValidator + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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_identity_custom_val + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + Custom identity to use + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - diff --git a/lib/EAPBase_UI/res/wxEAP_UI.h b/lib/EAPBase_UI/res/wxEAP_UI.h index 60390c0..a2a7826 100644 --- a/lib/EAPBase_UI/res/wxEAP_UI.h +++ b/lib/EAPBase_UI/res/wxEAP_UI.h @@ -344,12 +344,12 @@ class wxEAPIdentityConfigPanelBase : public wxPanel private: 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; + wxStaticBitmap* m_identity_icon; + wxStaticText* m_identity_label; + wxRadioButton* m_identity_same; + wxRadioButton* m_identity_empty; + wxRadioButton* m_identity_custom; + wxTextCtrl* m_identity_custom_val; // Virtual event handlers, overide them in your derived class virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); } diff --git a/lib/EAPBase_UI/src/EAP_UI.cpp b/lib/EAPBase_UI/src/EAP_UI.cpp index e76d345..004dca1 100644 --- a/lib/EAPBase_UI/src/EAP_UI.cpp +++ b/lib/EAPBase_UI/src/EAP_UI.cpp @@ -481,7 +481,7 @@ wxEAPIdentityConfigPanel::wxEAPIdentityConfigPanel(const eap::config_provider &p // Load and set icon. winstd::library lib_shell32; if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE)) - m_outer_identity_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(265))); + m_identity_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(265))); } @@ -491,12 +491,12 @@ bool wxEAPIdentityConfigPanel::TransferDataToWindow() { // Populate identity controls. if (m_cfg.m_anonymous_identity.empty()) { - m_outer_identity_same->SetValue(true); + m_identity_same->SetValue(true); } else if (m_cfg.m_anonymous_identity == L"@") { - m_outer_identity_empty->SetValue(true); + m_identity_empty->SetValue(true); } else { - m_outer_identity_custom->SetValue(true); - m_outer_identity_custom_val->SetValue(m_cfg.m_anonymous_identity); + m_identity_custom->SetValue(true); + m_identity_custom_val->SetValue(m_cfg.m_anonymous_identity); } return wxEAPIdentityConfigPanelBase::TransferDataToWindow(); @@ -509,12 +509,12 @@ bool wxEAPIdentityConfigPanel::TransferDataFromWindow() if (!m_prov.m_read_only) { // This is not a provider-locked configuration. Save the data. - if (m_outer_identity_same->GetValue()) + if (m_identity_same->GetValue()) m_cfg.m_anonymous_identity.clear(); - else if (m_outer_identity_empty->GetValue()) + else if (m_identity_empty->GetValue()) m_cfg.m_anonymous_identity = L"@"; else - m_cfg.m_anonymous_identity = m_outer_identity_custom_val->GetValue(); + m_cfg.m_anonymous_identity = m_identity_custom_val->GetValue(); } return true; @@ -527,16 +527,16 @@ void wxEAPIdentityConfigPanel::OnUpdateUI(wxUpdateUIEvent& event) if (m_prov.m_read_only) { // This is provider-locked configuration. Disable controls. - m_outer_identity_same ->Enable(false); - m_outer_identity_empty ->Enable(false); - m_outer_identity_custom ->Enable(false); - m_outer_identity_custom_val->Enable(false); + m_identity_same ->Enable(false); + m_identity_empty ->Enable(false); + m_identity_custom ->Enable(false); + m_identity_custom_val->Enable(false); } else { // This is not a provider-locked configuration. Selectively enable/disable controls. - m_outer_identity_same ->Enable(true); - m_outer_identity_empty ->Enable(true); - m_outer_identity_custom ->Enable(true); - m_outer_identity_custom_val->Enable(m_outer_identity_custom->GetValue()); + m_identity_same ->Enable(true); + m_identity_empty ->Enable(true); + m_identity_custom ->Enable(true); + m_identity_custom_val->Enable(m_identity_custom->GetValue()); } } diff --git a/lib/EapHost_UI/res/wxEapHost_UI.fbp b/lib/EapHost_UI/res/wxEapHost_UI.fbp index 8b972cd..c1ede9c 100644 --- a/lib/EapHost_UI/res/wxEapHost_UI.fbp +++ b/lib/EapHost_UI/res/wxEapHost_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ wxEapHost_UI 1000 none + 1 wxEapHost_UI @@ -48,13 +49,20 @@ wxTAB_TRAVERSAL - + + + + + + + + @@ -84,6 +92,7 @@ sb_method wxVERTICAL + 1 none @@ -151,7 +160,14 @@ + + + + + + + @@ -218,6 +234,7 @@ 0 wxID_ANY Select and configure inner EAP method + 0 0 @@ -243,7 +260,14 @@ 440 + + + + + + + @@ -339,7 +363,14 @@ + + + + + + + @@ -380,25 +411,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY &Settings + + 0 0 @@ -413,6 +450,8 @@ protected 1 + + Resizable 1 @@ -427,8 +466,15 @@ + + + + + + OnSettings + diff --git a/lib/GTC_UI/res/wxGTC_UI.fbp b/lib/GTC_UI/res/wxGTC_UI.fbp index d6c6344..78b2bef 100644 --- a/lib/GTC_UI/res/wxGTC_UI.fbp +++ b/lib/GTC_UI/res/wxGTC_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ wxGTC_UI 1000 none + 1 wxGTC_UI @@ -48,13 +49,20 @@ wxTAB_TRAVERSAL - + + + + + + + + @@ -84,6 +92,7 @@ m_sb_response wxVERTICAL + 1 protected @@ -151,7 +160,14 @@ + + + + + + + @@ -218,6 +234,7 @@ 0 wxID_ANY Please provide your response. + 0 0 @@ -243,7 +260,14 @@ 440 + + + + + + + @@ -317,6 +341,7 @@ 0 wxID_ANY + 0 0 @@ -342,7 +367,14 @@ -1 + + + + + + + @@ -429,7 +461,14 @@ + + + + + + + @@ -488,13 +527,20 @@ wxTAB_TRAVERSAL - + + + + + + + + @@ -556,6 +602,7 @@ 0 wxID_ANY EAP-GTC authentication &mode: + 0 0 @@ -581,7 +628,14 @@ -1 + + + + + + + @@ -662,7 +716,14 @@ + + + + + + + diff --git a/lib/TLS_UI/res/wxTLS_UI.cpp b/lib/TLS_UI/res/wxTLS_UI.cpp index f247a13..91cb605 100644 --- a/lib/TLS_UI/res/wxTLS_UI.cpp +++ b/lib/TLS_UI/res/wxTLS_UI.cpp @@ -25,7 +25,7 @@ wxTLSServerTrustPanelBase::wxTLSServerTrustPanelBase( wxWindow* parent, wxWindow 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 = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Describe the servers you trust to prevent man-in-the-middle attacks."), wxDefaultPosition, wxDefaultSize, 0 ); m_server_trust_label->Wrap( FromDIP(440) ); sb_server_trust_vert->Add( m_server_trust_label, 0, wxALL|wxEXPAND, FromDIP(5) ); diff --git a/lib/TLS_UI/res/wxTLS_UI.fbp b/lib/TLS_UI/res/wxTLS_UI.fbp index 4791353..2741c65 100644 --- a/lib/TLS_UI/res/wxTLS_UI.fbp +++ b/lib/TLS_UI/res/wxTLS_UI.fbp @@ -1,6 +1,6 @@ - + ; C++ @@ -14,6 +14,7 @@ wxTLS_UI 1000 none + 1 wxTLS_UI @@ -48,13 +49,20 @@ wxTAB_TRAVERSAL - + + + + + + + + @@ -84,6 +92,7 @@ sb_server_trust wxVERTICAL + 1 none @@ -151,7 +160,14 @@ + + + + + + + @@ -217,7 +233,8 @@ 0 0 wxID_ANY - Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks. + Describe the servers you trust to prevent man-in-the-middle attacks. + 0 0 @@ -243,7 +260,14 @@ 440 + + + + + + + @@ -310,6 +334,7 @@ 0 wxID_ANY Acceptable Certificate Authorities: + 0 0 @@ -335,7 +360,14 @@ -1 + + + + + + + @@ -421,7 +453,14 @@ + + + + + + + @@ -472,25 +511,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Add CA from Store... + + 0 0 @@ -505,6 +550,8 @@ protected 1 + + Resizable 1 @@ -519,8 +566,15 @@ + + + + + + OnRootCAAddStore + @@ -560,25 +614,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY Add CA from File... + + 0 0 @@ -593,6 +653,8 @@ protected 1 + + Resizable 1 @@ -607,8 +669,15 @@ + + + + + + OnRootCAAddFile + @@ -648,25 +717,31 @@ + 1 0 1 1 + 0 0 + Dock 0 Left 1 1 + 0 0 wxID_ANY &Remove CA + + 0 0 @@ -681,6 +756,8 @@ protected 1 + + Resizable 1 @@ -695,8 +772,15 @@ + + + + + + OnRootCARemove + @@ -767,6 +851,7 @@ 0 wxID_ANY Acceptable server &names: + 0 0 @@ -792,7 +877,14 @@ -1 + + + + + + + @@ -879,7 +971,14 @@ + + + + + + + @@ -941,6 +1040,7 @@ 0 wxID_ANY (Example: foo.bar.com;server2.bar.com) + 0 0 @@ -966,7 +1066,14 @@ -1 + + + + + + + @@ -1021,13 +1128,20 @@ wxTAB_TRAVERSAL - + + + + + + + + @@ -1057,6 +1171,7 @@ m_sb_credentials wxVERTICAL + 1 protected @@ -1124,7 +1239,14 @@ + + + + + + + @@ -1191,6 +1313,7 @@ 0 wxID_ANY Please select your &certificate to use for authentication. + 0 0 @@ -1216,7 +1339,14 @@ 440 + + + + + + + @@ -1303,7 +1433,14 @@ + + + + + + + @@ -1371,6 +1508,7 @@ 0 wxID_ANY Custom &identity: + 0 0 @@ -1396,7 +1534,14 @@ -1 + + + + + + + @@ -1483,7 +1628,14 @@ + + + + + + + diff --git a/lib/TLS_UI/src/TLS_UI.cpp b/lib/TLS_UI/src/TLS_UI.cpp index 9b8f751..ba7f6ea 100644 --- a/lib/TLS_UI/src/TLS_UI.cpp +++ b/lib/TLS_UI/src/TLS_UI.cpp @@ -58,7 +58,7 @@ wxTLSCredentialsPanel::wxTLSCredentialsPanel(const eap::config_provider &prov, c bool wxTLSCredentialsPanel::TransferDataToWindow() { // Populate certificate list. - m_certificate->Append(_("(empty)"), (wxCertificateHashClientData*)NULL); + m_certificate->Append(_("(none)"), (wxCertificateHashClientData*)NULL); bool is_found = false; winstd::cert_store store; if (store.create(CERT_STORE_PROV_SYSTEM, X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, (HCRYPTPROV)NULL, CERT_SYSTEM_STORE_CURRENT_USER, _T("My"))) {