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

Revert "EAP-GTC method renamed to "EAP-GTC (Token Generator)""

Browse Source 
This reverts commit 2908bc31a3ce309b866ab1b2eeae2b706a7feb29.
This commit is contained in:
Simon Rozman 2017-02-09 09:33:39 +01:00
parent 2908bc31a3
commit bda31a487f
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
EAPMethods/locale/EAPMethods.pot
View File

@ -2,7 +2,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: EAPMethods\n" "Project-Id-Version: EAPMethods\n"
"POT-Creation-Date: 2017-02-09 08:06+0100\n" "POT-Creation-Date: 2017-02-02 18:14+0100\n"
"PO-Revision-Date: 2016-06-02 12:27+0200\n" "PO-Revision-Date: 2016-06-02 12:27+0200\n"
"Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n" "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
"Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n" "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@ -782,7 +782,7 @@ msgid "EAP-MSCHAPv2"
msgstr "" msgstr ""
#: master/lib/TTLS_UI/src/TTLS_UI.cpp:132 #: master/lib/TTLS_UI/src/TTLS_UI.cpp:132
msgid "EAP-GTC (Token Generator)" msgid "EAP-GTC"
msgstr "" msgstr ""
#: master/lib/TTLS_UI/src/TTLS_UI.cpp:135 #: master/lib/TTLS_UI/src/TTLS_UI.cpp:135
@ -884,38 +884,62 @@ msgstr ""
msgid "EAP Identity Provider" msgid "EAP Identity Provider"
msgstr "" msgstr ""
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
msgid "EAP Methods" msgid "EAP Methods"
msgstr "" msgstr ""
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
msgid "Modules to support individual EAP methods" msgid "Modules to support individual EAP methods"
msgstr "" msgstr ""
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
msgid "TTLS" msgid "TTLS"
msgstr "" msgstr ""
#: master/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
#: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
#: master/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
#: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 #: master/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
#: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 #: ver1.0/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
#: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5 #: ver1.1/EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
msgid "Tunneled Transport Layer Security" msgid "Tunneled Transport Layer Security"
msgstr "" msgstr ""

6
lib/TTLS_UI/src/TTLS_UI.cpp
View File

@ -129,7 +129,7 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m
wxMSCHAPv2ConfigPanel *panel_eapmschapv2 = new wxMSCHAPv2ConfigPanel(m_prov, m_cfg_eapmschapv2, m_inner_type); wxMSCHAPv2ConfigPanel *panel_eapmschapv2 = new wxMSCHAPv2ConfigPanel(m_prov, m_cfg_eapmschapv2, m_inner_type);
m_inner_type->AddPage(panel_eapmschapv2, _("EAP-MSCHAPv2")); m_inner_type->AddPage(panel_eapmschapv2, _("EAP-MSCHAPv2"));
wxGTCConfigPanel *panel_eapgtc = new wxGTCConfigPanel(m_prov, m_cfg_eapgtc, m_inner_type); wxGTCConfigPanel *panel_eapgtc = new wxGTCConfigPanel(m_prov, m_cfg_eapgtc, m_inner_type);
m_inner_type->AddPage(panel_eapgtc, _("EAP-GTC (Token Generator)")); m_inner_type->AddPage(panel_eapgtc, _("EAP-GTC"));
#if EAP_INNER_EAPHOST #if EAP_INNER_EAPHOST
wxEapHostConfigPanel *panel_eaphost = new wxEapHostConfigPanel(m_prov, m_cfg_eaphost, m_inner_type); wxEapHostConfigPanel *panel_eaphost = new wxEapHostConfigPanel(m_prov, m_cfg_eaphost, m_inner_type);
m_inner_type->AddPage(panel_eaphost, _("Other EAP methods...")); m_inner_type->AddPage(panel_eaphost, _("Other EAP methods..."));
@ -203,7 +203,7 @@ bool wxTTLSConfigWindow::TransferDataToWindow()
case winstd::eap_type_gtc: case winstd::eap_type_gtc:
m_cfg_eapgtc = dynamic_cast<eap::config_method_eapgtc&>(*cfg_ttls.m_inner); m_cfg_eapgtc = dynamic_cast<eap::config_method_eapgtc&>(*cfg_ttls.m_inner);
m_inner_type->SetSelection(3); // 3=EAP-GTC (Token Generator) m_inner_type->SetSelection(3); // 3=EAP-GTC
break; break;
default: default:
@ -245,7 +245,7 @@ bool wxTTLSConfigWindow::TransferDataFromWindow()
cfg_ttls.m_inner.reset(new eap::config_method_eapmschapv2(m_cfg_eapmschapv2)); cfg_ttls.m_inner.reset(new eap::config_method_eapmschapv2(m_cfg_eapmschapv2));
break; break;
case 3: // 3=EAP-GTC (Token Generator) case 3: // 3=EAP-GTC
cfg_ttls.m_inner.reset(new eap::config_method_eapgtc(m_cfg_eapgtc)); cfg_ttls.m_inner.reset(new eap::config_method_eapgtc(m_cfg_eapgtc));
break; break;