Version set to 1.1a

# Conflicts:
#	Makefile

Doxyfile

@@ -794,7 +794,6 @@ EXCLUDE                = \
 	EventMonitor\res \
 	lib\EAPBase_UI\res \
 	lib\EapHost_UI\res \
-	lib\GTC_UI\res \
 	lib\TLS_UI\res \
 	lib\TTLS_UI\res \
 	lib\WinStd \

EAPMethods/EAPTTLS/EAPTTLS.vcxproj

@@ -103,9 +103,6 @@
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
-      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
       <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
     </ProjectReference>

EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj

@@ -109,12 +109,6 @@
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC\build\GTC.vcxproj">
-      <Project>{114a70bb-8698-4a0c-8c90-58f22edd8129}</Project>
-    </ProjectReference>
-    <ProjectReference Include="..\..\lib\GTC_UI\build\GTC_UI.vcxproj">
-      <Project>{34680813-3a52-46fb-b5a8-1e4bbf770855}</Project>
-    </ProjectReference>
     <ProjectReference Include="..\..\lib\MSCHAPv2\build\MSCHAPv2.vcxproj">
       <Project>{86a6d6a0-4b7d-4134-be81-a5755c77584d}</Project>
     </ProjectReference>

EAPMethods/locale/ko_KR.po

@@ -439,7 +439,7 @@ msgid "Use my true user name"
 msgstr ""
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
-msgid "Use &empty outer identity"
+msgid "Use &empty outer identity (RFC 4822)"
 msgstr ""
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41

EventMonitor/locale/EventMonitor.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
+"POT-Creation-Date: 2016-11-08 11:55+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -16,12 +16,10 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/EventMonitor\n"
-"X-Poedit-SearchPath-1: ver1.1/EventMonitor\n"
+"X-Poedit-SearchPath-1: ver1.0/EventMonitor\n"
-"X-Poedit-SearchPath-2: ver1.0/EventMonitor\n"
 
 #: master/EventMonitor/App.cpp:61 ver1.0/EventMonitor/App.cpp:61
-#: ver1.1/EventMonitor/App.cpp:61 master/EventMonitor/Frame.h:75
+#: master/EventMonitor/Frame.h:75 ver1.0/EventMonitor/Frame.h:75
-#: ver1.0/EventMonitor/Frame.h:75 ver1.1/EventMonitor/Frame.h:75
 #: master/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: master/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: master/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
@@ -30,57 +28,44 @@ msgstr ""
 #: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:83 ver1.0/EventMonitor/ETWLog.cpp:83
-#: ver1.1/EventMonitor/ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:171 ver1.0/EventMonitor/ETWLog.cpp:171
-#: ver1.1/EventMonitor/ETWLog.cpp:171
 msgid "Time"
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:172 ver1.0/EventMonitor/ETWLog.cpp:172
-#: ver1.1/EventMonitor/ETWLog.cpp:172
 msgid "PID"
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:173 ver1.0/EventMonitor/ETWLog.cpp:173
-#: ver1.1/EventMonitor/ETWLog.cpp:173
 msgid "TID"
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:174 ver1.0/EventMonitor/ETWLog.cpp:174
-#: ver1.1/EventMonitor/ETWLog.cpp:174
 msgid "Source"
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:175 ver1.0/EventMonitor/ETWLog.cpp:175
-#: ver1.1/EventMonitor/ETWLog.cpp:175
 msgid "Event"
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:232 ver1.0/EventMonitor/ETWLog.cpp:232
-#: ver1.1/EventMonitor/ETWLog.cpp:232
 msgid "Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:235 ver1.0/EventMonitor/ETWLog.cpp:235
-#: ver1.1/EventMonitor/ETWLog.cpp:235
 #, c-format
 msgid "The %s event session already exists."
 msgstr ""
 
 #: master/EventMonitor/ETWLog.cpp:239 ver1.0/EventMonitor/ETWLog.cpp:239
-#: ver1.1/EventMonitor/ETWLog.cpp:239
 #, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
@@ -88,8 +73,6 @@ msgstr ""
 #: master/EventMonitor/ETWLog.cpp:255 master/EventMonitor/ETWLog.cpp:271
 #: master/EventMonitor/ETWLog.cpp:285 ver1.0/EventMonitor/ETWLog.cpp:255
 #: ver1.0/EventMonitor/ETWLog.cpp:271 ver1.0/EventMonitor/ETWLog.cpp:285
-#: ver1.1/EventMonitor/ETWLog.cpp:255 ver1.1/EventMonitor/ETWLog.cpp:271
-#: ver1.1/EventMonitor/ETWLog.cpp:285
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
@@ -99,157 +82,128 @@ msgstr ""
 #: master/EventMonitor/Frame.cpp:170 ver1.0/EventMonitor/Frame.cpp:48
 #: ver1.0/EventMonitor/Frame.cpp:108 ver1.0/EventMonitor/Frame.cpp:113
 #: ver1.0/EventMonitor/Frame.cpp:168 ver1.0/EventMonitor/Frame.cpp:170
-#: ver1.1/EventMonitor/Frame.cpp:48 ver1.1/EventMonitor/Frame.cpp:108
-#: ver1.1/EventMonitor/Frame.cpp:113 ver1.1/EventMonitor/Frame.cpp:168
-#: ver1.1/EventMonitor/Frame.cpp:170
 #, c-format
 msgid "Toggles display of %s records"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:65 ver1.0/EventMonitor/Frame.cpp:65
-#: ver1.1/EventMonitor/Frame.cpp:65
 msgid "Quits this program"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:69 ver1.0/EventMonitor/Frame.cpp:69
-#: ver1.1/EventMonitor/Frame.cpp:69
 msgid "&Program"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:73
-#: ver1.1/EventMonitor/Frame.cpp:73
 msgid "&Copy"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:73 master/EventMonitor/Frame.cpp:154
 #: ver1.0/EventMonitor/Frame.cpp:73 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:73 ver1.1/EventMonitor/Frame.cpp:154
 msgid "Copies selected records to clipboard"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:78
-#: ver1.1/EventMonitor/Frame.cpp:78
 msgid "Copy A&ll"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:78 master/EventMonitor/Frame.cpp:156
 #: ver1.0/EventMonitor/Frame.cpp:78 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:78 ver1.1/EventMonitor/Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
 #: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
 msgid "Clear"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:83 master/EventMonitor/Frame.cpp:158
 #: ver1.0/EventMonitor/Frame.cpp:83 ver1.0/EventMonitor/Frame.cpp:158
-#: ver1.1/EventMonitor/Frame.cpp:83 ver1.1/EventMonitor/Frame.cpp:158
 msgid "Clears all records from the log"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
 msgid "Select &All"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:90 ver1.0/EventMonitor/Frame.cpp:90
-#: ver1.1/EventMonitor/Frame.cpp:90
 msgid "Selects all visible records"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
 msgid "Select &None"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:94 ver1.0/EventMonitor/Frame.cpp:94
-#: ver1.1/EventMonitor/Frame.cpp:94
 msgid "Clears record selection"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:97 master/EventMonitor/Frame.cpp:142
 #: ver1.0/EventMonitor/Frame.cpp:97 ver1.0/EventMonitor/Frame.cpp:142
-#: ver1.1/EventMonitor/Frame.cpp:97 ver1.1/EventMonitor/Frame.cpp:142
 msgid "&Edit"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:101
-#: ver1.1/EventMonitor/Frame.cpp:101
 msgid "Auto &Scroll"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:101 master/EventMonitor/Frame.cpp:164
 #: ver1.0/EventMonitor/Frame.cpp:101 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:101 ver1.1/EventMonitor/Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
 #: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
 msgid "Verbose"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:123 master/EventMonitor/Frame.cpp:176
 #: ver1.0/EventMonitor/Frame.cpp:123 ver1.0/EventMonitor/Frame.cpp:176
-#: ver1.1/EventMonitor/Frame.cpp:123 ver1.1/EventMonitor/Frame.cpp:176
 msgid "Displays all levels of records"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
 #: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
 msgid "Informational"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:127 master/EventMonitor/Frame.cpp:178
 #: ver1.0/EventMonitor/Frame.cpp:127 ver1.0/EventMonitor/Frame.cpp:178
-#: ver1.1/EventMonitor/Frame.cpp:127 ver1.1/EventMonitor/Frame.cpp:178
 msgid "Displays all records up to informational level"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
 #: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
 msgid "Warning"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:131 master/EventMonitor/Frame.cpp:180
 #: ver1.0/EventMonitor/Frame.cpp:131 ver1.0/EventMonitor/Frame.cpp:180
-#: ver1.1/EventMonitor/Frame.cpp:131 ver1.1/EventMonitor/Frame.cpp:180
 msgid "Displays all records up to warning level"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
 #: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
 msgid "Error"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:135 master/EventMonitor/Frame.cpp:182
 #: ver1.0/EventMonitor/Frame.cpp:135 ver1.0/EventMonitor/Frame.cpp:182
-#: ver1.1/EventMonitor/Frame.cpp:135 ver1.1/EventMonitor/Frame.cpp:182
 msgid "Displays error level records only"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: ver1.0/EventMonitor/Frame.cpp:142 ver1.0/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
 msgstr ""
@@ -257,39 +211,31 @@ msgstr ""
 #: master/EventMonitor/Frame.cpp:142 master/EventMonitor/Frame.cpp:146
 #: master/EventMonitor/Frame.cpp:185 ver1.0/EventMonitor/Frame.cpp:142
 #: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:185
-#: ver1.1/EventMonitor/Frame.cpp:142 ver1.1/EventMonitor/Frame.cpp:146
-#: ver1.1/EventMonitor/Frame.cpp:185
 msgid "View"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:146 master/EventMonitor/Frame.cpp:149
 #: ver1.0/EventMonitor/Frame.cpp:146 ver1.0/EventMonitor/Frame.cpp:149
-#: ver1.1/EventMonitor/Frame.cpp:146 ver1.1/EventMonitor/Frame.cpp:149
 msgid "&View"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:154 ver1.0/EventMonitor/Frame.cpp:154
-#: ver1.1/EventMonitor/Frame.cpp:154
 msgid "Copy"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:156 ver1.0/EventMonitor/Frame.cpp:156
-#: ver1.1/EventMonitor/Frame.cpp:156
 msgid "Copy All"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:161 ver1.0/EventMonitor/Frame.cpp:161
-#: ver1.1/EventMonitor/Frame.cpp:161
 msgid "Edit"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:164 ver1.0/EventMonitor/Frame.cpp:164
-#: ver1.1/EventMonitor/Frame.cpp:164
 msgid "Auto Scroll"
 msgstr ""
 
 #: master/EventMonitor/Frame.cpp:189 ver1.0/EventMonitor/Frame.cpp:189
-#: ver1.1/EventMonitor/Frame.cpp:189
 msgid "Trace Log"
 msgstr ""
 
@@ -309,14 +255,6 @@ msgstr ""
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
 msgstr ""
 
@@ -328,9 +266,5 @@ msgstr ""
 #: ver1.0/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: ver1.0/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
-#: ver1.1/EventMonitor/MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""

MSI/Base/locale/MSIBase.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2017-02-02 18:14+0100\n"
+"POT-Creation-Date: 2016-11-08 11:55+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
@@ -16,8 +16,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/MSI/Base/Main\n"
-"X-Poedit-SearchPath-1: ver1.1/MSI/Base/Main\n"
+"X-Poedit-SearchPath-1: ver1.0/MSI/Base/Main\n"
-"X-Poedit-SearchPath-2: ver1.0/MSI/Base/Main\n"
 
 #: master/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
 #: master/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
@@ -27,10 +26,6 @@ msgstr ""
 #: ver1.0/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
 #: ver1.0/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.LaunchCondition-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""
 
@@ -50,14 +45,6 @@ msgstr ""
 #: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:5
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:4
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
 msgstr ""
 
@@ -69,9 +56,5 @@ msgstr ""
 #: ver1.0/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
 #: ver1.0/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
 #: ver1.0/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.Win32.Release.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Debug.Property-2.idtx:6
-#: ver1.1/MSI/Base/Main/en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"
 msgstr ""

README.md

@@ -9,7 +9,6 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X plug-ins for enterp
     - PAP
     - MSCHAPv2
     - EAP-MSCHAPv2
-    - EAP-GTC: Challenge/Response and Password authentication modes
     - System-installed EAP method chaining (experimental)
 
 ### Security
@@ -31,12 +30,9 @@ Suite of EAP supplicants for Microsoft Windows - IEEE 802.1X plug-ins for enterp
 
 ### Deployment
 - Released as multi-lingual 32 and 64-bit MSI packages
-- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/master/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
+- [MsiUseFeature utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/MsiUseFeature) for GÉANTLink install state testing (for embedding GÉANTLink into other setup packages)
-- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/master/CredWrite) for automated user credential import to Credential Manager
+- [CredWrite utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/CredWrite) for automated user credential import to Credential Manager
-- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/master/WLANManager) to allow network profile configuration dialog shortcuts
+- [WLANManager utility](https://github.com/Amebis/GEANTLink/tree/ver1.1/WLANManager) to allow network profile configuration dialog shortcuts
-
-## Download
-Binaries are available for download [here](https://github.com/Amebis/GEANTLink/releases).
 
 ## Building
 
@@ -120,6 +116,3 @@ Command            | Explanation
 `nmake SetupDebug` | Builds a debug version of project and debug MSI setup files. The resulting files can be found in `output\Setup` folder.
 
 The `/ls` flag can be appended to the commands above to reduce NMAKE’s verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.
-
-### Translating into your language
-GÉANTLink is fully localizable. We kindly invite you to help [translating it on Transifex](https://www.transifex.com/eduroam_devel/geantlink/).

VS10Solution.sln

@@ -55,10 +55,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost", "lib\EapHost\buil
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost_UI", "lib\EapHost_UI\build\EapHost_UI.vcxproj", "{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC", "lib\GTC\build\GTC.vcxproj", "{114A70BB-8698-4A0C-8C90-58F22EDD8129}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GTC_UI", "lib\GTC_UI\build\GTC_UI.vcxproj", "{34680813-3A52-46FB-B5A8-1E4BBF770855}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -235,22 +231,6 @@ Global
 		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.Build.0 = Release|Win32
 		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.ActiveCfg = Release|x64
 		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|Win32.ActiveCfg = Debug|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|Win32.Build.0 = Debug|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.ActiveCfg = Debug|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Debug|x64.Build.0 = Debug|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|Win32.ActiveCfg = Release|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|Win32.Build.0 = Release|Win32
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.ActiveCfg = Release|x64
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129}.Release|x64.Build.0 = Release|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|Win32.ActiveCfg = Debug|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|Win32.Build.0 = Debug|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.ActiveCfg = Debug|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Debug|x64.Build.0 = Debug|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|Win32.ActiveCfg = Release|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|Win32.Build.0 = Release|Win32
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.ActiveCfg = Release|x64
-		{34680813-3A52-46FB-B5A8-1E4BBF770855}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -273,8 +253,6 @@ Global
 		{7AF5B922-7C17-428A-97E0-09E3B41A684D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{114A70BB-8698-4A0C-8C90-58F22EDD8129} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
-		{34680813-3A52-46FB-B5A8-1E4BBF770855} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
 		{679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
 		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}

WLANManager/Main.cpp

@@ -90,6 +90,7 @@ static int WLANManager()
         }
 
         // Launch WLAN profile config dialog.
+        // Note: When a debugger is attached to this process the WlanUIEditProfile() will raise an exception and fail.
         WLAN_REASON_CODE wlrc;
         DWORD dwResult = WlanUIEditProfile(WLAN_UI_API_VERSION, pwcArglist[2], &(interfaces->InterfaceInfo[i].InterfaceGuid), NULL, WLSecurityPage, NULL, &wlrc);
         if (dwResult != ERROR_SUCCESS) {
@@ -118,26 +119,18 @@ int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In
     UNREFERENCED_PARAMETER(lpCmdLine);
     UNREFERENCED_PARAMETER(nCmdShow);
 
-    int res = 0;
-
     {
-        // Note: When a debugger is attached to this process, the WlanUIEditProfile() will raise an exception and fail.
+        // Initialize Windows XP visual styles
-        // It was accidentially discovered, that COM initialization resolves this issue.
+        INITCOMMONCONTROLSEX icc;
-        com_initializer com_init(NULL);
+        icc.dwSize = sizeof(INITCOMMONCONTROLSEX);
-
+        icc.dwICC = ICC_WIN95_CLASSES | ICC_STANDARD_CLASSES | ICC_LINK_CLASS;
-        {
+        InitCommonControlsEx(&icc);
-            // Initialize Windows XP visual styles
-            INITCOMMONCONTROLSEX icc;
-            icc.dwSize = sizeof(INITCOMMONCONTROLSEX);
-            icc.dwICC = ICC_WIN95_CLASSES | ICC_STANDARD_CLASSES | ICC_LINK_CLASS;
-            InitCommonControlsEx(&icc);
-        }
-
-        pfnWlanReasonCodeToString = WlanReasonCodeToString;
-
-        res = WLANManager();
     }
 
+    pfnWlanReasonCodeToString = WlanReasonCodeToString;
+
+    int res = WLANManager();
+
     assert(!_CrtDumpMemoryLeaks());
     return res;
 }

WLANManager/locale/WLANManager.pot

@@ -16,8 +16,7 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: master/WLANManager\n"
-"X-Poedit-SearchPath-1: ver1.1/WLANManager\n"
+"X-Poedit-SearchPath-1: ver1.0/WLANManager\n"
-"X-Poedit-SearchPath-2: ver1.0/WLANManager\n"
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4

include/Version.h

@@ -29,7 +29,7 @@
 // Product version as a single DWORD
 // Note: Used for version comparison within C/C++ code.
 //
-#define PRODUCT_VERSION          0x01020300
+#define PRODUCT_VERSION          0x01010400
 
 //
 // Product version by components
@@ -38,27 +38,27 @@
 // separately.
 //
 #define PRODUCT_VERSION_MAJ      1
-#define PRODUCT_VERSION_MIN      2
+#define PRODUCT_VERSION_MIN      1
-#define PRODUCT_VERSION_REV      3
+#define PRODUCT_VERSION_REV      4
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.2-beta2"
+#define PRODUCT_VERSION_STR      "1.1a"
 #define PRODUCT_BUILD_YEAR_STR   "2016"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "1.2.3"
+#define PRODUCT_VERSION_INST     "1.1.4"
 
 //
 // The product code for ProductCode property in MSI packages
 // Replace with new on every version change, regardless how minor it is.
 //
-#define PRODUCT_VERSION_GUID     "{4C8DDB7D-3297-4B6A-ACF3-19702F85DE49}"
+#define PRODUCT_VERSION_GUID     "{701B8E8C-56E1-46FA-B568-57867564E573}"
 
 //
 // Product vendor

lib/EAPBase/build/EAPBase.vcxproj

@@ -85,7 +85,6 @@
     <ClInclude Include="..\include\EAPXML.h" />
     <ClInclude Include="..\include\Method.h" />
     <ClInclude Include="..\include\Module.h" />
-    <ClInclude Include="..\include\UIContext.h" />
     <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
@@ -100,7 +99,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Events\build\Events.vcxproj">

lib/EAPBase/build/EAPBase.vcxproj.filters

@@ -32,9 +32,6 @@
     <ClInclude Include="..\include\Credentials.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\UIContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\StdAfx.cpp">
@@ -55,8 +52,5 @@
     <ClCompile Include="..\src\EAP.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>

lib/EAPBase/include/Config.h

@@ -31,6 +31,36 @@ namespace eap
     class config_connection;
 }
 
+/// \addtogroup EAPBaseStream
+/// @{
+
+///
+/// Packs a configuration
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Configuration to pack
+///
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config &val);
+
+///
+/// Returns packed size of a configuration
+///
+/// \param[in] val  Configuration to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
+inline size_t pksizeof(_In_ const eap::config &val);
+
+///
+/// Unpacks a configuration
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Configuration to unpack to
+///
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val);
+
+/// @}
+
 #pragma once
 
 #include "Module.h"
@@ -59,9 +89,9 @@ namespace eap
     /// @{
 
     ///
-    /// Base class for packable and XML-exportable storage
+    /// Base class for configuration storage
     ///
-    class config : public packable
+    class config
     {
     public:
         ///
@@ -130,6 +160,32 @@ namespace eap
 
         /// @}
 
+        /// \name BLOB management
+        /// @{
+
+        ///
+        /// Packs this object
+        ///
+        /// \param[inout] cursor  Memory cursor
+        ///
+        virtual void operator<<(_Inout_ cursor_out &cursor) const;
+
+        ///
+        /// Returns packed size of this object
+        ///
+        /// \returns Size of data when packed (in bytes)
+        ///
+        virtual size_t get_pk_size() const;
+
+        ///
+        /// Unpacks this object
+        ///
+        /// \param[inout] cursor  Memory cursor
+        ///
+        virtual void operator>>(_Inout_ cursor_in &cursor);
+
+        /// @}
+
     public:
         module &m_module;                                   ///< EAP module
 
@@ -474,6 +530,24 @@ namespace eap
 }
 
 
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config &val)
+{
+    val.operator<<(cursor);
+}
+
+
+inline size_t pksizeof(_In_ const eap::config &val)
+{
+    return val.get_pk_size();
+}
+
+
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val)
+{
+    val.operator>>(cursor);
+}
+
+
 /// \addtogroup EAPBaseStream
 /// @{
 
@@ -510,7 +584,6 @@ inline size_t pksizeof(_In_ const eap::config_method::status_t &val)
 ///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config_method::status_t &val)
 {
-    val = (eap::config_method::status_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }
 

lib/EAPBase/include/Credentials.h

@@ -226,98 +226,6 @@ namespace eap
     };
 
 
-    ///
-    /// Identity-only based method credentials
-    ///
-    class credentials_identity : public credentials
-    {
-    public:
-        ///
-        /// Constructs credentials
-        ///
-        /// \param[in] mod  EAP module to use for global services
-        ///
-        credentials_identity(_In_ module &mod);
-
-        ///
-        /// Copies credentials
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        credentials_identity(_In_ const credentials_identity &other);
-
-        ///
-        /// Moves credentials
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        credentials_identity(_Inout_ credentials_identity &&other);
-
-        ///
-        /// Copies credentials
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        credentials_identity& operator=(_In_ const credentials_identity &other);
-
-        ///
-        /// Moves credentials
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        credentials_identity& operator=(_Inout_ credentials_identity &&other);
-
-        virtual config* clone() const;
-
-        /// \name XML management
-        /// @{
-        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-        /// @}
-
-        /// \name Storage
-        /// @{
-        virtual void store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const;
-        virtual void retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level);
-
-        ///
-        /// @copydoc eap::credentials::target_suffix()
-        /// \returns This implementation always returns `_T("pass")`
-        ///
-        virtual LPCTSTR target_suffix() const;
-        /// @}
-
-        ///
-        /// Combine credentials in the following order:
-        ///
-        /// 1. Cached credentials
-        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
-        /// 3. Stored credentials
-        ///
-        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
-        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
-        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL)
-        /// \param[in] cfg                    Method configuration (when derived from `config_method_with_cred`, metod attempt to load credentials from \p cfg)
-        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
-        ///
-        /// \returns
-        /// - \c source_cache   Credentials were obtained from EapHost cache
-        /// - \c source_config  Credentials were set by method configuration
-        /// - \c source_storage Credentials were loaded from Windows Credential Manager
-        ///
-        virtual source_t combine(
-            _In_             DWORD         dwFlags,
-            _In_             HANDLE        hTokenImpersonateUser,
-            _In_opt_   const credentials   *cred_cached,
-            _In_       const config_method &cfg,
-            _In_opt_z_       LPCTSTR       pszTargetName);
-    };
-
-
     ///
     /// Password based method credentials
     ///
@@ -571,7 +479,6 @@ inline size_t pksizeof(_In_ const eap::credentials_pass::enc_alg_t &val)
 ///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::credentials_pass::enc_alg_t &val)
 {
-    val = (eap::credentials_pass::enc_alg_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }
 

lib/EAPBase/include/EAP.h

@@ -80,8 +80,6 @@ namespace eap
     struct cursor_out;
     struct cursor_in;
 
-    class packable;
-
     template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f;
     template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf;
 
@@ -501,31 +499,6 @@ inline size_t pksizeof(_In_ const EAP_METHOD_TYPE &val);
 ///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ EAP_METHOD_TYPE &val);
 
-///
-/// Packs a packable object
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[in]    val     Object to pack
-///
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::packable &val);
-
-///
-/// Returns packed size of a packable object
-///
-/// \param[in] val  Object to pack
-///
-/// \returns Size of data when packed (in bytes)
-///
-inline size_t pksizeof(_In_ const eap::packable &val);
-
-///
-/// Unpacks a packable object
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[out]   val     Object to unpack to
-///
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::packable &val);
-
 /// @}
 
 ///
@@ -601,45 +574,6 @@ namespace eap
         ptr_type ptr_end;   ///< Pointer to the end of BLOB
     };
 
-
-    ///
-    /// Base class for all packable data classes
-    ///
-    class packable
-    {
-    public:
-        ///
-        /// Constructs configuration
-        ///
-        packable();
-
-        /// \name BLOB management
-        /// @{
-
-        ///
-        /// Packs this object
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of this object
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
-        virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks this object
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-
-        /// @}
-    };
-
     /// @}
 
     /// \addtogroup EAPBaseSanitizing
@@ -1153,11 +1087,9 @@ inline size_t pksizeof(_In_ const winstd::cert_context &val)
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::cert_context &val)
 {
     DWORD dwCertEncodingType;
-    assert(sizeof(dwCertEncodingType) == sizeof(unsigned int));
     cursor >> (unsigned int&)dwCertEncodingType;
 
     DWORD dwCertEncodedSize;
-    assert(sizeof(dwCertEncodingType) == sizeof(unsigned int));
     cursor >> (unsigned int&)dwCertEncodedSize;
 
     if (dwCertEncodedSize) {
@@ -1184,7 +1116,6 @@ inline size_t pksizeof(_In_ const winstd::eap_type_t &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::eap_type_t &val)
 {
-    val = (winstd::eap_type_t)0; // Reset higher bytes to zero before reading to lower byte.
     cursor >> (unsigned char&)val;
 }
 
@@ -1267,24 +1198,6 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ EAP_METHOD_TYPE &va
 }
 
 
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::packable &val)
-{
-    val.operator<<(cursor);
-}
-
-
-inline size_t pksizeof(_In_ const eap::packable &val)
-{
-    return val.get_pk_size();
-}
-
-
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::packable &val)
-{
-    val.operator>>(cursor);
-}
-
-
 #ifndef htonll
 
 inline unsigned __int64 htonll(unsigned __int64 val)

lib/EAPBase/include/UIContext.h

@@ -1,102 +0,0 @@
-/*
-    Copyright 2015-2017 Amebis
-    Copyright 2016-2017 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace eap
-{
-    class ui_context;
-}
-
-#pragma once
-
-#include "Config.h"
-#include "Credentials.h"
-#include "Module.h"
-
-#include "../../../include/Version.h"
-
-
-namespace eap
-{
-    ///
-    /// \defgroup EAPBaseUICtx  UI Context
-    /// Back and front-end inter-process data exchange
-    ///
-    /// @{
-
-    ///
-    /// UI context
-    ///
-    class ui_context : public packable
-    {
-    public:
-        ///
-        /// Constructs context
-        ///
-        /// \param[in] cfg   Connection configuration
-        /// \param[in] cred  Connection credentials
-        ///
-        ui_context(_In_ config_connection &cfg, _In_ credentials_connection &cred);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        ui_context(_In_ const ui_context &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        ui_context(_Inout_ ui_context &&other);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context& operator=(_In_ const ui_context &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context& operator=(_Inout_ ui_context &&other);
-
-        /// \name BLOB management
-        /// @{
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-        virtual size_t get_pk_size() const;
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-        /// @}
-
-    public:
-        config_connection &m_cfg;       ///< Connection configuration
-        credentials_connection &m_cred; ///< Connection credentials
-    };
-
-    /// @}
-}

lib/EAPBase/src/Config.cpp

@@ -77,6 +77,24 @@ void eap::config::load(_In_ IXMLDOMNode *pConfigRoot)
 }
 
 
+void eap::config::operator<<(_Inout_ cursor_out &cursor) const
+{
+    UNREFERENCED_PARAMETER(cursor);
+}
+
+
+size_t eap::config::get_pk_size() const
+{
+    return 0;
+}
+
+
+void eap::config::operator>>(_Inout_ cursor_in &cursor)
+{
+    UNREFERENCED_PARAMETER(cursor);
+}
+
+
 const bstr eap::config::namespace_eapmetadata(L"urn:ietf:params:xml:ns:yang:ietf-eap-metadata");
 
 

lib/EAPBase/src/Credentials.cpp

@@ -163,183 +163,6 @@ tstring eap::credentials::get_name() const
 }
 
 
-//////////////////////////////////////////////////////////////////////
-// eap::credentials_identity
-//////////////////////////////////////////////////////////////////////
-
-eap::credentials_identity::credentials_identity(_In_ module &mod) : credentials(mod)
-{
-}
-
-
-eap::credentials_identity::credentials_identity(_In_ const credentials_identity &other) : credentials(other)
-{
-}
-
-
-eap::credentials_identity::credentials_identity(_Inout_ credentials_identity &&other) : credentials(std::move(other))
-{
-}
-
-
-eap::credentials_identity& eap::credentials_identity::operator=(_In_ const credentials_identity &other)
-{
-    if (this != &other)
-        (credentials&)*this = other;
-
-    return *this;
-}
-
-
-eap::credentials_identity& eap::credentials_identity::operator=(_Inout_ credentials_identity &&other)
-{
-    if (this != &other)
-        (credentials&)*this = std::move(other);
-
-    return *this;
-}
-
-
-eap::config* eap::credentials_identity::clone() const
-{
-    return new credentials_identity(*this);
-}
-
-
-void eap::credentials_identity::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
-{
-    assert(pDoc);
-    assert(pConfigRoot);
-
-    // We could have used credentials::save() to save identity,
-    // but that method tolerates absence of <UserName> element,
-    // whereas for this class the absence of <UserName> is fatal.
-    config::save(pDoc, pConfigRoot);
-
-    HRESULT hr;
-
-    // <UserName>
-    if (FAILED(hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"UserName"), namespace_eapmetadata, bstr(m_identity))))
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <UserName> element.");
-}
-
-
-void eap::credentials_identity::load(_In_ IXMLDOMNode *pConfigRoot)
-{
-    assert(pConfigRoot);
-    HRESULT hr;
-
-    // We could have used credentials::load() to load identity,
-    // but that method tolerates absence of <UserName> element,
-    // whereas for this class the absence of <UserName> is fatal.
-    config::load(pConfigRoot);
-
-    wstring xpath(eapxml::get_xpath(pConfigRoot));
-
-    if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:UserName"), m_identity)))
-        throw com_runtime_error(hr, __FUNCTION__ " Error reading <UserName> element.");
-
-    m_module.log_config((xpath + L"/UserName").c_str(), m_identity.c_str());
-}
-
-
-void eap::credentials_identity::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const
-{
-    assert(pszTargetName);
-
-    tstring target(target_name(pszTargetName, level));
-
-    // Write credentials.
-    assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH);
-    CREDENTIAL cred = {
-        0,                                     // Flags
-        CRED_TYPE_GENERIC,                     // Type
-        const_cast<LPTSTR>(target.c_str()),    // TargetName
-        _T(""),                                // Comment
-        { 0, 0 },                              // LastWritten
-        0,                                     // CredentialBlobSize
-        NULL,                                  // CredentialBlob
-        CRED_PERSIST_ENTERPRISE,               // Persist
-        0,                                     // AttributeCount
-        NULL,                                  // Attributes
-        NULL,                                  // TargetAlias
-        const_cast<LPTSTR>(m_identity.c_str()) // UserName
-    };
-    if (!CredWrite(&cred, 0))
-        throw win_runtime_error(__FUNCTION__ " CredWrite failed.");
-}
-
-
-void eap::credentials_identity::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level)
-{
-    assert(pszTargetName);
-
-    // Read credentials.
-    unique_ptr<CREDENTIAL, CredFree_delete<CREDENTIAL> > cred;
-    if (!CredRead(target_name(pszTargetName, level).c_str(), CRED_TYPE_GENERIC, 0, (PCREDENTIAL*)&cred))
-        throw win_runtime_error(__FUNCTION__ " CredRead failed.");
-
-    if (cred->UserName)
-        m_identity = cred->UserName;
-    else
-        m_identity.clear();
-
-    wstring xpath(pszTargetName);
-    m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
-}
-
-
-LPCTSTR eap::credentials_identity::target_suffix() const
-{
-    return _T("id");
-}
-
-
-eap::credentials::source_t eap::credentials_identity::combine(
-    _In_             DWORD         dwFlags,
-    _In_             HANDLE        hTokenImpersonateUser,
-    _In_opt_   const credentials   *cred_cached,
-    _In_       const config_method &cfg,
-    _In_opt_z_       LPCTSTR       pszTargetName)
-{
-    UNREFERENCED_PARAMETER(dwFlags);
-
-    if (cred_cached) {
-        // Using EAP service cached credentials.
-        *this = *dynamic_cast<const credentials_identity*>(cred_cached);
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-        return source_cache;
-    }
-
-    auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
-    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
-        // Using configured credentials.
-        *this = *dynamic_cast<const credentials_identity*>(cfg_with_cred->m_cred.get());
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-        return source_config;
-    }
-
-    if (pszTargetName) {
-        // Switch user context.
-        user_impersonator impersonating(hTokenImpersonateUser);
-
-        try {
-            credentials_identity cred_loaded(m_module);
-            cred_loaded.retrieve(pszTargetName, cfg.m_level);
-
-            // Using stored credentials.
-            *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_identity::get_name()), event_data(pszTargetName), event_data::blank);
-            return source_storage;
-        } catch (...) {
-            // Not actually an error.
-        }
-    }
-
-    return source_unknown;
-}
-
-
 //////////////////////////////////////////////////////////////////////
 // eap::credentials_pass
 //////////////////////////////////////////////////////////////////////

lib/EAPBase/src/EAP.cpp

@@ -20,39 +20,10 @@
 
 #include "StdAfx.h"
 
-#pragma comment(lib, "Ws2_32.lib")
-
 using namespace std;
 using namespace winstd;
 
 
-//////////////////////////////////////////////////////////////////////
-// eap::packable
-//////////////////////////////////////////////////////////////////////
-
-eap::packable::packable()
-{
-}
-
-
-void eap::packable::operator<<(_Inout_ cursor_out &cursor) const
-{
-    UNREFERENCED_PARAMETER(cursor);
-}
-
-
-size_t eap::packable::get_pk_size() const
-{
-    return 0;
-}
-
-
-void eap::packable::operator>>(_Inout_ cursor_in &cursor)
-{
-    UNREFERENCED_PARAMETER(cursor);
-}
-
-
 //////////////////////////////////////////////////////////////////////
 // eap::diameter_avp_append
 //////////////////////////////////////////////////////////////////////

lib/EAPBase/src/StdAfx.h

@@ -24,7 +24,6 @@
 #include "../include/Credentials.h"
 #include "../include/Method.h"
 #include "../include/Module.h"
-#include "../include/UIContext.h"
 
 #include "../include/EAP.h"
 #include "../include/EAPXML.h"

lib/EAPBase/src/UIContext.cpp

@@ -1,100 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::ui_context
-//////////////////////////////////////////////////////////////////////
-
-eap::ui_context::ui_context(_In_ config_connection &cfg, _In_ credentials_connection &cred) :
-    m_cfg(cfg),
-    m_cred(cred)
-{
-}
-
-
-eap::ui_context::ui_context(_In_ const ui_context &other) :
-    m_cfg   (other.m_cfg ),
-    m_cred  (other.m_cred),
-    packable(other       )
-{
-}
-
-
-eap::ui_context::ui_context(_Inout_ ui_context &&other) :
-    m_cfg   (          other.m_cfg  ),
-    m_cred  (          other.m_cred ),
-    packable(std::move(other       ))
-{
-}
-
-
-eap::ui_context& eap::ui_context::operator=(_In_ const ui_context &other)
-{
-    if (this != &other) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Copy context within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Copy context within same credentials only!
-        (packable&)*this = other;
-    }
-
-    return *this;
-}
-
-
-eap::ui_context& eap::ui_context::operator=(_Inout_ ui_context &&other)
-{
-    if (this != &other) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move context within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move context within same credentials only!
-        (packable&)*this = std::move(other);
-    }
-
-    return *this;
-}
-
-
-void eap::ui_context::operator<<(_Inout_ cursor_out &cursor) const
-{
-    packable::operator<<(cursor);
-    cursor << m_cfg ;
-    cursor << m_cred;
-}
-
-
-size_t eap::ui_context::get_pk_size() const
-{
-    return
-        packable::get_pk_size() +
-        pksizeof(m_cfg ) +
-        pksizeof(m_cred);
-}
-
-
-void eap::ui_context::operator>>(_Inout_ cursor_in &cursor)
-{
-    packable::operator>>(cursor);
-    cursor >> m_cfg ;
-    cursor >> m_cred;
-}

lib/EAPBase_UI/include/EAP_UI.h

@@ -43,7 +43,6 @@ class wxEAPProviderIDPanel;
 class wxEAPConfigProvider;
 template <class _Tcred, class _wxT> class wxEAPCredentialsConfigPanel;
 template <class _Tcred, class _Tbase> class wxEAPCredentialsPanel;
-template <class _Tcred, class _Tbase> class wxIdentityCredentialsPanel;
 template <class _Tcred, class _Tbase> class wxPasswordCredentialsPanel;
 class wxEAPProviderSelectDialog;
 
@@ -360,14 +359,6 @@ public:
     ///
     /// Constructs a credential dialog
     ///
-    /// \param[in] prov    Provider configuration data
-    /// \param[in] parent  Parent window
-    /// \param[in] id      An identifier for the dialog. A value of -1 is taken to mean a default.
-    /// \param[in] title   The title of the dialog
-    /// \param[in] pos     The dialog position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] size    The dialog size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] style   The window style
-    ///
     wxEAPCredentialsDialog(const eap::config_provider &prov, wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = _("EAP Credentials"), const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
 };
 
@@ -954,14 +945,14 @@ protected:
 
 
 ///
-/// Generic identity credential entry panel
+/// Generic password credential entry panel
 ///
 template <class _Tcred, class _Tbase>
-class wxIdentityCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
+class wxPasswordCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
 {
 public:
     ///
-    /// Constructs a identity credentials panel
+    /// Constructs a password credentials panel
     ///
     /// \param[in]    prov       Provider configuration data
     /// \param[in]    cfg        Method configuration data
@@ -969,13 +960,14 @@ public:
     /// \param[in]    parent     Parent window
     /// \param[in]    is_config  Is this panel used to config credentials?
     ///
-    wxIdentityCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
+    wxPasswordCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
+        m_password_set(false),
         wxEAPCredentialsPanel<_Tcred, _Tbase>(prov, cfg, cred, parent, is_config)
     {
         // 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))
+        if (lib_shell32.load(_T("imageres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(/*16770*/269)));
+            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(82)));
 
         bool layout = false;
         if (!m_prov.m_lbl_alt_credential.empty()) {
@@ -989,6 +981,11 @@ public:
             layout = true;
         }
 
+        if (!m_prov.m_lbl_alt_password.empty()) {
+            m_password_label->SetLabel(m_prov.m_lbl_alt_password);
+            layout = true;
+        }
+
         if (layout)
             this->Layout();
     }
@@ -1000,85 +997,26 @@ protected:
     {
         m_identity->SetValue(m_cred.m_identity);
         m_identity->SetSelection(0, -1);
-
-        if (!m_is_config && m_cfg.m_use_cred) {
-            // Credential prompt mode & Using configured credentials
-            m_identity_label->Enable(false);
-            m_identity      ->Enable(false);
-        }
-
-        return wxEAPCredentialsPanel<_Tcred, _Tbase>::TransferDataToWindow();
-    }
-
-    virtual bool TransferDataFromWindow()
-    {
-        if (!wxEAPCredentialsPanel<_Tcred, _Tbase>::TransferDataFromWindow())
-            return false;
-
-        m_cred.m_identity = m_identity->GetValue();
-
-        return true;
-    }
-
-    /// \endcond
-};
-
-/// @}
-
-
-///
-/// Generic password credential entry panel
-///
-template <class _Tcred, class _Tbase>
-class wxPasswordCredentialsPanel : public wxIdentityCredentialsPanel<_Tcred, _Tbase>
-{
-public:
-    ///
-    /// Constructs a password credentials panel
-    ///
-    /// \param[in]    prov       Provider configuration data
-    /// \param[in]    cfg        Method configuration data
-    /// \param[inout] cred       Credentials data
-    /// \param[in]    parent     Parent window
-    /// \param[in]    is_config  Is this panel used to config credentials?
-    ///
-    wxPasswordCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
-        m_password_set(false),
-        wxIdentityCredentialsPanel<_Tcred, _Tbase>(prov, cfg, cred, parent, is_config)
-    {
-        // Load and set icon.
-        winstd::library lib_shell32;
-        if (lib_shell32.load(_T("imageres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(82)));
-
-        if (!m_prov.m_lbl_alt_password.empty()) {
-            m_password_label->SetLabel(m_prov.m_lbl_alt_password);
-            this->Layout();
-        }
-    }
-
-protected:
-    /// \cond internal
-
-    virtual bool TransferDataToWindow()
-    {
         m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : wxT("dummypass"));
         m_password_set = false;
 
         if (!m_is_config && m_cfg.m_use_cred) {
             // Credential prompt mode & Using configured credentials
+            m_identity_label->Enable(false);
+            m_identity      ->Enable(false);
             m_password_label->Enable(false);
             m_password      ->Enable(false);
         }
 
-        return wxIdentityCredentialsPanel<_Tcred, _Tbase>::TransferDataToWindow();
+        return wxEAPCredentialsPanel<_Tcred, wxPasswordCredentialsPanelBase>::TransferDataToWindow();
     }
 
     virtual bool TransferDataFromWindow()
     {
-        if (!wxIdentityCredentialsPanel<_Tcred, _Tbase>::TransferDataFromWindow())
+        if (!wxEAPCredentialsPanel<_Tcred, wxPasswordCredentialsPanelBase>::TransferDataFromWindow())
             return false;
 
+        m_cred.m_identity = m_identity->GetValue();
         if (m_password_set)
             m_cred.m_password = m_password->GetValue();
 
@@ -1087,7 +1025,7 @@ protected:
 
     virtual void OnPasswordText(wxCommandEvent& event)
     {
-        wxIdentityCredentialsPanel<_Tcred, _Tbase>::OnPasswordText(event);
+        wxEAPCredentialsPanel<_Tcred, _Tbase>::OnPasswordText(event);
 
         m_password_set = true;
     }

lib/EAPBase_UI/res/wxEAP_UI.cpp

@@ -418,55 +418,6 @@ wxPasswordCredentialsPanelBase::~wxPasswordCredentialsPanelBase()
 	
 }
 
-wxIdentityCredentialsPanelBase::wxIdentityCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, size, style )
-{
-	m_sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User ID") ), wxVERTICAL );
-	
-	wxBoxSizer* sb_credentials_horiz;
-	sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_credentials_icon = new wxStaticBitmap( m_sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 );
-	
-	m_sb_credentials_vert = new wxBoxSizer( wxVERTICAL );
-	
-	m_credentials_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("Please provide your user ID."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_credentials_label->Wrap( 440 );
-	m_sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 );
-	
-	wxFlexGridSizer* sb_credentials_tbl;
-	sb_credentials_tbl = new wxFlexGridSizer( 0, 2, 5, 5 );
-	sb_credentials_tbl->AddGrowableCol( 1 );
-	sb_credentials_tbl->SetFlexibleDirection( wxBOTH );
-	sb_credentials_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_identity_label = new wxStaticText( m_sb_credentials->GetStaticBox(), wxID_ANY, _("User ID:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_identity_label->Wrap( -1 );
-	sb_credentials_tbl->Add( m_identity_label, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_identity = new wxTextCtrl( m_sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_identity->SetToolTip( _("Enter your user name here (user@domain.org, DOMAIN\\User, etc.)") );
-	
-	sb_credentials_tbl->Add( m_identity, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_sb_credentials_vert->Add( sb_credentials_tbl, 0, wxEXPAND|wxALL, 5 );
-	
-	
-	sb_credentials_horiz->Add( m_sb_credentials_vert, 1, wxEXPAND, 5 );
-	
-	
-	m_sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( m_sb_credentials );
-	this->Layout();
-}
-
-wxIdentityCredentialsPanelBase::~wxIdentityCredentialsPanelBase()
-{
-}
-
 wxEAPProviderContactInfoPanelBase::wxEAPProviderContactInfoPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_provider_contact;

lib/EAPBase_UI/res/wxEAP_UI.fbp

@@ -3116,446 +3116,6 @@
                 </object>
             </object>
         </object>
-        <object class="Panel" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">wxIdentityCredentialsPanelBase</property>
-            <property name="pos"></property>
-            <property name="size">500,-1</property>
-            <property name="subclass">wxEAPCredentialsPanelBase; ../include/wxEAP_UIBase.h</property>
-            <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
-            <object class="wxStaticBoxSizer" expanded="1">
-                <property name="id">wxID_ANY</property>
-                <property name="label">User ID</property>
-                <property name="minimum_size"></property>
-                <property name="name">m_sb_credentials</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">protected</property>
-                <event name="OnUpdateUI"></event>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">sb_credentials_horiz</property>
-                        <property name="orient">wxHORIZONTAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticBitmap" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="bitmap">Load From Icon Resource; ; [32; 32]</property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_credentials_icon</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="1">
-                                <property name="minimum_size"></property>
-                                <property name="name">m_sb_credentials_vert</property>
-                                <property name="orient">wxVERTICAL</property>
-                                <property name="permission">protected</property>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxStaticText" expanded="1">
-                                        <property name="BottomDockable">1</property>
-                                        <property name="LeftDockable">1</property>
-                                        <property name="RightDockable">1</property>
-                                        <property name="TopDockable">1</property>
-                                        <property name="aui_layer"></property>
-                                        <property name="aui_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</property>
-                                        <property name="center_pane">0</property>
-                                        <property name="close_button">1</property>
-                                        <property name="context_help"></property>
-                                        <property name="context_menu">1</property>
-                                        <property name="default_pane">0</property>
-                                        <property name="dock">Dock</property>
-                                        <property name="dock_fixed">0</property>
-                                        <property name="docking">Left</property>
-                                        <property name="enabled">1</property>
-                                        <property name="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="label">Please provide your user ID.</property>
-                                        <property name="max_size"></property>
-                                        <property name="maximize_button">0</property>
-                                        <property name="maximum_size"></property>
-                                        <property name="min_size"></property>
-                                        <property name="minimize_button">0</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_credentials_label</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style"></property>
-                                        <property name="subclass"></property>
-                                        <property name="toolbar_pane">0</property>
-                                        <property name="tooltip"></property>
-                                        <property name="window_extra_style"></property>
-                                        <property name="window_name"></property>
-                                        <property name="window_style"></property>
-                                        <property name="wrap">440</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND|wxALL</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxFlexGridSizer" expanded="1">
-                                        <property name="cols">2</property>
-                                        <property name="flexible_direction">wxBOTH</property>
-                                        <property name="growablecols">1</property>
-                                        <property name="growablerows"></property>
-                                        <property name="hgap">5</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="name">sb_credentials_tbl</property>
-                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                        <property name="permission">none</property>
-                                        <property name="rows">0</property>
-                                        <property name="vgap">5</property>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="label">User ID:</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_identity_label</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
-                                            <property name="proportion">2</property>
-                                            <object class="wxTextCtrl" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="maxlength"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_identity</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip">Enter your user name here (user@domain.org, DOMAIN\User, etc.)</property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
-                                                <property name="value"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnText"></event>
-                                                <event name="OnTextEnter"></event>
-                                                <event name="OnTextMaxLen"></event>
-                                                <event name="OnTextURL"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
         <object class="Panel" expanded="1">
             <property name="aui_managed">0</property>
             <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>

lib/EAPBase_UI/res/wxEAP_UI.h

@@ -222,28 +222,6 @@ class wxPasswordCredentialsPanelBase : public wxEAPCredentialsPanelBase
 	
 };
 
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxIdentityCredentialsPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxIdentityCredentialsPanelBase : public wxEAPCredentialsPanelBase
-{
-	private:
-	
-	protected:
-		wxStaticBoxSizer* m_sb_credentials;
-		wxStaticBitmap* m_credentials_icon;
-		wxBoxSizer* m_sb_credentials_vert;
-		wxStaticText* m_credentials_label;
-		wxStaticText* m_identity_label;
-		wxTextCtrl* m_identity;
-	
-	public:
-		
-		wxIdentityCredentialsPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxIdentityCredentialsPanelBase();
-	
-};
-
 ///////////////////////////////////////////////////////////////////////////////
 /// Class wxEAPProviderContactInfoPanelBase
 ///////////////////////////////////////////////////////////////////////////////

lib/GTC/build/.gitignore

@@ -1,2 +0,0 @@
-/temp
-/*.user

lib/GTC/build/GTC.props

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

lib/GTC/build/GTC.vcxproj

@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{114A70BB-8698-4A0C-8C90-58F22EDD8129}</ProjectGuid>
-    <RootNamespace>GTC</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Debug.props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Debug.props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Release.props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Release.props" />
-    <Import Project="GTC.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemGroup>
-    <ClInclude Include="..\include\Config.h" />
-    <ClInclude Include="..\include\Method.h" />
-    <ClInclude Include="..\src\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\Config.cpp" />
-    <ClCompile Include="..\src\Method.cpp" />
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
-      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

lib/GTC/build/GTC.vcxproj.filters

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\Config.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\Method.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Config.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\Method.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>

lib/GTC/include/Config.h

@@ -1,175 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include <sal.h>
-
-namespace eap
-{
-    class config_method_eapgtc;
-}
-
-#pragma once
-
-#include "../../EAPBase/include/Config.h"
-
-#include <Windows.h>
-#include <sal.h>
-#include <tchar.h>
-
-
-namespace eap
-{
-    /// \addtogroup EAPBaseConfig
-    /// @{
-
-    ///
-    /// EAP-GTC configuration
-    ///
-    class config_method_eapgtc : public config_method_with_cred
-    {
-    public:
-        ///
-        /// Authentication mode
-        ///
-        enum auth_mode_t {
-            auth_mode_response = 0, ///< Challenge/Response
-            auth_mode_password,     ///< Password
-        };
-
-    public:
-        ///
-        /// Constructs configuration
-        ///
-        /// \param[in] mod    EAP module to use for global services
-        /// \param[in] level  Config level (0=outer, 1=inner, 2=inner-inner...)
-        ///
-        config_method_eapgtc(_In_ module &mod, _In_ unsigned int level);
-
-        ///
-        /// Copies configuration
-        ///
-        /// \param[in] other  Configuration to copy from
-        ///
-        config_method_eapgtc(_In_ const config_method_eapgtc &other);
-
-        ///
-        /// Moves configuration
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        config_method_eapgtc(_Inout_ config_method_eapgtc &&other);
-
-        ///
-        /// Copies configuration
-        ///
-        /// \param[in] other  Configuration to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        config_method_eapgtc& operator=(_In_ const config_method_eapgtc &other);
-
-        ///
-        /// Moves configuration
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        config_method_eapgtc& operator=(_Inout_ config_method_eapgtc &&other);
-
-        virtual config* clone() const;
-
-        /// \name XML management
-        /// @{
-        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-        /// @}
-
-        /// \name BLOB management
-        /// @{
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-        virtual size_t get_pk_size() const;
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-        /// @}
-
-        ///
-        /// @copydoc eap::config_method::get_method_id()
-        /// \returns This implementation always returns `winstd::eap_type_gtc`
-        ///
-        virtual winstd::eap_type_t get_method_id() const;
-
-        ///
-        /// @copydoc eap::config_method::get_method_str()
-        /// \returns This implementation always returns `L"EAP-GTC"`
-        ///
-        virtual const wchar_t* get_method_str() const;
-
-        ///
-        /// @copydoc eap::config_method::make_credentials()
-        /// \returns This implementation returns `eap::credentials_identity` or `eap::credentials_pass` type of credentials, depending on authentication mode.
-        ///
-        virtual credentials* make_credentials() const;
-    };
-
-    /// @}
-}
-
-
-/// \addtogroup EAPBaseStream
-/// @{
-
-///
-/// Packs an EAP-GTC method authentication mode
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[in]    val     Authentication mode to pack
-///
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config_method_eapgtc::auth_mode_t &val)
-{
-    cursor << (unsigned char)val;
-}
-
-
-///
-/// Returns packed size of an EAP-GTC method authentication mode
-///
-/// \param[in] val  Authentication mode to pack
-///
-/// \returns Size of data when packed (in bytes)
-///
-inline size_t pksizeof(_In_ const eap::config_method_eapgtc::auth_mode_t &val)
-{
-    return pksizeof((unsigned char)val);
-}
-
-
-///
-/// Unpacks an EAP-GTC method authentication mode
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[out]   val     Authentication mode to unpack to
-///
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config_method_eapgtc::auth_mode_t &val)
-{
-    val = (eap::config_method_eapgtc::auth_mode_t)0; // Reset higher bytes to zero before reading to lower byte.
-    cursor >> (unsigned char&)val;
-}
-
-/// @}

lib/GTC/include/Method.h

@@ -1,118 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace eap
-{
-    class method_gtc;
-}
-
-#pragma once
-
-#include "Config.h"
-
-#include "../../EAPBase/include/Method.h"
-
-
-namespace eap
-{
-    /// \addtogroup EAPBaseMethod
-    /// @{
-
-    ///
-    /// GTC method
-    ///
-    class method_gtc : public method
-    {
-        WINSTD_NONCOPYABLE(method_gtc)
-
-    public:
-        ///
-        /// Constructs a GTC method
-        ///
-        /// \param[in] mod   GTC module to use for global services
-        /// \param[in] cfg   Method configuration
-        /// \param[in] cred  User credentials
-        ///
-        method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred);
-
-        ///
-        /// Moves a GTC method
-        ///
-        /// \param[in] other  GTC method to move from
-        ///
-        method_gtc(_Inout_ method_gtc &&other);
-
-        ///
-        /// Moves a GTC method
-        ///
-        /// \param[in] other  GTC method to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        method_gtc& operator=(_Inout_ method_gtc &&other);
-
-        /// \name Session management
-        /// @{
-
-        virtual void begin_session(
-            _In_        DWORD         dwFlags,
-            _In_  const EapAttributes *pAttributeArray,
-            _In_        HANDLE        hTokenImpersonateUser,
-            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
-
-        /// @}
-
-        /// \name Packet processing
-        /// @{
-
-        virtual EapPeerMethodResponseAction process_request_packet(
-            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
-            _In_                                       DWORD dwReceivedPacketSize);
-
-        virtual void get_response_packet(
-            _Out_    sanitizing_blob &packet,
-            _In_opt_ DWORD           size_max = MAXDWORD);
-
-        /// @}
-
-        virtual void get_result(
-            _In_  EapPeerMethodResultReason reason,
-            _Out_ EapPeerMethodResult       *pResult);
-
-        /// \name User Interaction
-        /// @{
-
-        virtual void get_ui_context(_Out_ sanitizing_blob &context_data);
-
-        virtual EapPeerMethodResponseAction set_ui_context(
-            _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
-            _In_                                  DWORD dwUIContextDataSize);
-
-        /// @}
-
-    protected:
-        config_method_eapgtc &m_cfg;            ///< Method configuration
-        credentials &m_cred;                    ///< Method user credentials
-        winstd::sanitizing_wstring m_challenge; ///< GTC challenge
-        winstd::sanitizing_wstring m_response;  ///< GTC response
-    };
-
-    /// @}
-}

lib/GTC/src/Config.cpp

@@ -1,183 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::config_method_eapgtc
-//////////////////////////////////////////////////////////////////////
-
-eap::config_method_eapgtc::config_method_eapgtc(_In_ module &mod, _In_ unsigned int level) : config_method_with_cred(mod, level)
-{
-    // Default to Challenge/Response authentication mode.
-    m_cred.reset(new credentials_identity(mod));
-}
-
-
-eap::config_method_eapgtc::config_method_eapgtc(_In_ const config_method_eapgtc &other) :
-    config_method_with_cred(other)
-{
-}
-
-
-eap::config_method_eapgtc::config_method_eapgtc(_Inout_ config_method_eapgtc &&other) :
-    config_method_with_cred(std::move(other))
-{
-}
-
-
-eap::config_method_eapgtc& eap::config_method_eapgtc::operator=(_In_ const config_method_eapgtc &other)
-{
-    if (this != &other)
-        (config_method_with_cred&)*this = other;
-
-    return *this;
-}
-
-
-eap::config_method_eapgtc& eap::config_method_eapgtc::operator=(_Inout_ config_method_eapgtc &&other)
-{
-    if (this != &other)
-        (config_method_with_cred&&)*this = std::move(other);
-
-    return *this;
-}
-
-
-eap::config* eap::config_method_eapgtc::clone() const
-{
-    return new config_method_eapgtc(*this);
-}
-
-
-void eap::config_method_eapgtc::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
-{
-    assert(pDoc);
-    assert(pConfigRoot);
-
-    config_method_with_cred::save(pDoc, pConfigRoot);
-
-    HRESULT hr;
-
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"AuthMode"), namespace_eapmetadata, bstr(L"Challenge/Response"));
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"AuthMode"), namespace_eapmetadata, bstr(L"Password"));
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-    if (FAILED(hr))
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <AuthMode> element.");
-}
-
-
-void eap::config_method_eapgtc::load(_In_ IXMLDOMNode *pConfigRoot)
-{
-    assert(pConfigRoot);
-    HRESULT hr;
-    wstring xpath(eapxml::get_xpath(pConfigRoot));
-
-    // Load authentication mode first, then (re)create credentials to match the authentication mode.
-    bstr auth_mode;
-    if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:AuthMode"), auth_mode)) ||
-        CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, auth_mode, auth_mode.length(), _L("Challenge/Response"), -1, NULL, NULL, 0) == CSTR_EQUAL)
-    {
-        m_cred.reset(new eap::credentials_identity(m_module));
-    } else if (CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, auth_mode, auth_mode.length(), _L("Password"), -1, NULL, NULL, 0) == CSTR_EQUAL) {
-        m_cred.reset(new eap::credentials_pass(m_module));
-    } else
-        throw invalid_argument(string_printf(__FUNCTION__ " Unsupported authentication mode (%ls).", (BSTR)auth_mode));
-
-    m_module.log_config((xpath + L"/AuthMode").c_str(), (BSTR)auth_mode);
-
-    // Load method configuration.
-    config_method_with_cred::load(pConfigRoot);
-}
-
-
-void eap::config_method_eapgtc::operator<<(_Inout_ cursor_out &cursor) const
-{
-    // Save authentication mode first, as credential loading will require this information.
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        cursor << auth_mode_response;
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        cursor << auth_mode_password;
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-
-    config_method_with_cred::operator<<(cursor);
-}
-
-
-size_t eap::config_method_eapgtc::get_pk_size() const
-{
-    auth_mode_t auth_mode;
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        auth_mode = auth_mode_response;
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        auth_mode = auth_mode_password;
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-
-    return
-        pksizeof(auth_mode) +
-        config_method_with_cred::get_pk_size();
-}
-
-
-void eap::config_method_eapgtc::operator>>(_Inout_ cursor_in &cursor)
-{
-    // (Re)create credentials to match the authentication mode.
-    auth_mode_t auth_mode;
-    cursor >> auth_mode;
-    switch (auth_mode) {
-    case auth_mode_response: m_cred.reset(new eap::credentials_identity(m_module)); break;
-    case auth_mode_password: m_cred.reset(new eap::credentials_pass    (m_module)); break;
-    default                : throw invalid_argument(string_printf(__FUNCTION__ " Unsupported authentication mode (%u).", auth_mode));
-    }
-
-    config_method_with_cred::operator>>(cursor);
-}
-
-
-eap_type_t eap::config_method_eapgtc::get_method_id() const
-{
-    return eap_type_gtc;
-}
-
-
-const wchar_t* eap::config_method_eapgtc::get_method_str() const
-{
-    return L"EAP-GTC";
-}
-
-
-eap::credentials* eap::config_method_eapgtc::make_credentials() const
-{
-    if (dynamic_cast<credentials_identity*>(m_cred.get()))
-        return new eap::credentials_identity(m_module);
-    else if (dynamic_cast<credentials_pass*>(m_cred.get()))
-        return new eap::credentials_pass    (m_module);
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-}

lib/GTC/src/Method.cpp

@@ -1,163 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::method_gtc
-//////////////////////////////////////////////////////////////////////
-
-eap::method_gtc::method_gtc(_In_ module &mod, _In_ config_method_eapgtc &cfg, _In_ credentials &cred) :
-    m_cfg(cfg),
-    m_cred(cred),
-    method(mod)
-{
-}
-
-
-eap::method_gtc::method_gtc(_Inout_ method_gtc &&other) :
-    m_cfg      (          other.m_cfg       ),
-    m_cred     (          other.m_cred      ),
-    m_challenge(std::move(other.m_challenge)),
-    m_response (std::move(other.m_response )),
-    method     (std::move(other            ))
-{
-}
-
-
-eap::method_gtc& eap::method_gtc::operator=(_Inout_ method_gtc &&other)
-{
-    if (this != std::addressof(other)) {
-        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move method within same configuration only!
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move method within same credentials only!
-        (method&)*this = std::move(other            );
-        m_challenge    = std::move(other.m_challenge);
-        m_response     = std::move(other.m_response );
-    }
-
-    return *this;
-}
-
-
-void eap::method_gtc::begin_session(
-    _In_        DWORD         dwFlags,
-    _In_  const EapAttributes *pAttributeArray,
-    _In_        HANDLE        hTokenImpersonateUser,
-    _In_opt_    DWORD         dwMaxSendPacketSize)
-{
-    method::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
-
-    // Presume authentication will fail with generic protocol failure. (Pesimist!!!)
-    // We will reset once we get get_result(Success) call.
-    m_cfg.m_last_status = config_method::status_auth_failed;
-    m_cfg.m_last_msg.clear();
-}
-
-
-EapPeerMethodResponseAction eap::method_gtc::process_request_packet(
-    _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
-    _In_                                       DWORD dwReceivedPacketSize)
-{
-    assert(pReceivedPacket || dwReceivedPacketSize == 0);
-
-    m_module.log_event(&EAPMETHOD_METHOD_HANDSHAKE_START2, event_data((unsigned int)eap_type_gtc), event_data::blank);
-
-    credentials_pass *cred_pass;
-    if (dynamic_cast<credentials_identity*>(&m_cred)) {
-        // Read authenticator challenge as UTF-8 encoded string.
-        MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)pReceivedPacket, dwReceivedPacketSize, m_challenge);
-
-        m_module.log_event(&EAPMETHOD_GTC_RESPONSE_REQ, event_data((unsigned int)eap_type_gtc), event_data::blank);
-
-        // User must respond to the challenge.
-        return EapPeerMethodResponseActionInvokeUI;
-    } else if ((cred_pass = dynamic_cast<credentials_pass*>(&m_cred)) != NULL) {
-        // Ignore authenticator challenge and save password as GTC response.
-        m_response = cred_pass->m_password;
-
-        // Send the response.
-        m_cfg.m_last_status = config_method::status_cred_invalid; // Blame "credentials" if we fail beyond this point.
-        return EapPeerMethodResponseActionSend;
-    } else
-        throw invalid_argument(__FUNCTION__ " Unsupported authentication mode.");
-}
-
-
-void eap::method_gtc::get_response_packet(
-    _Out_    sanitizing_blob &packet,
-    _In_opt_ DWORD           size_max)
-{
-    // Encode GTC response as UTF-8.
-    sanitizing_string response_utf8;
-    WideCharToMultiByte(CP_UTF8, 0, m_response, response_utf8, NULL, NULL);
-
-    if (sizeof(sanitizing_string::value_type)*response_utf8.length() > size_max)
-        throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", sizeof(sanitizing_string::value_type)*response_utf8.length(), size_max));
-
-    packet.assign(response_utf8.begin(), response_utf8.end());
-}
-
-
-void eap::method_gtc::get_result(
-    _In_    EapPeerMethodResultReason reason,
-    _Inout_ EapPeerMethodResult       *pResult)
-{
-    assert(pResult);
-
-    method::get_result(reason, pResult);
-
-    if (reason == EapPeerMethodResultSuccess)
-        m_cfg.m_last_status = config_method::status_success;
-
-    // Always ask EAP host to save the connection data. And it will save it *only* when we report "success".
-    // Don't worry. EapHost is well aware of failed authentication condition.
-    pResult->fSaveConnectionData = TRUE;
-    pResult->fIsSuccess          = TRUE;
-}
-
-
-void eap::method_gtc::get_ui_context(_Out_ sanitizing_blob &context_data)
-{
-    // Return authenticator string.
-    context_data.assign(
-        reinterpret_cast<sanitizing_blob::const_pointer>(m_challenge.data()                       ),
-        reinterpret_cast<sanitizing_blob::const_pointer>(m_challenge.data() + m_challenge.length()));
-}
-
-
-EapPeerMethodResponseAction eap::method_gtc::set_ui_context(
-    _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
-    _In_                                  DWORD dwUIContextDataSize)
-{
-    m_module.log_event(&EAPMETHOD_GTC_RESPONSE, event_data((unsigned int)eap_type_gtc), event_data::blank);
-
-    // Save GTC response.
-    m_response.assign(
-        reinterpret_cast<sanitizing_wstring::const_pointer>(pUIContextData                      ),
-        reinterpret_cast<sanitizing_wstring::const_pointer>(pUIContextData + dwUIContextDataSize));
-
-    // Send the response.
-    m_cfg.m_last_status = config_method::status_cred_invalid; // Blame "credentials" if we fail beyond this point.
-    return EapPeerMethodResponseActionSend;
-}

lib/GTC/src/StdAfx.cpp

@@ -1,21 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"

lib/GTC/src/StdAfx.h

@@ -1,30 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#include "../include/Config.h"
-#include "../include/Method.h"
-
-#include <WinStd/Hex.h>
-
-#include <Windows.h>
-#include <EapHostError.h> // include after Windows.h
-#include <RasError.h>

lib/GTC_UI/build/.gitignore

@@ -1,2 +0,0 @@
-/temp
-/*.user

lib/GTC_UI/build/GTC_UI.props

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ImportGroup Label="PropertySheets" />
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\..\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

lib/GTC_UI/build/GTC_UI.vcxproj

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{34680813-3A52-46FB-B5A8-1E4BBF770855}</ProjectGuid>
-    <RootNamespace>GTC_UI</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Debug.props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Debug.props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\Win32.props" />
-    <Import Project="..\..\..\include\Release.props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\x64.props" />
-    <Import Project="..\..\..\include\Release.props" />
-    <Import Project="GTC_UI.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <ItemGroup>
-    <ClInclude Include="..\include\GTC_UI.h" />
-    <ClInclude Include="..\res\wxGTC_UI.h" />
-    <ClInclude Include="..\src\StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\res\wxGTC_UI.cpp" />
-    <ClCompile Include="..\src\GTC_UI.cpp" />
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
-      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\res\wxGTC_UI.fbp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

lib/GTC_UI/build/GTC_UI.vcxproj.filters

@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\src\StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\GTC_UI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\res\wxGTC_UI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\src\StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\GTC_UI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\res\wxGTC_UI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\res\wxGTC_UI.fbp">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

lib/GTC_UI/include/GTC_UI.h

@@ -1,140 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "../../EAPBase_UI/include/EAP_UI.h"
-#include "../../GTC/include/Config.h"
-
-class wxGTCConfigPanel;
-class wxGTCResponseDialog;
-class wxGTCResponsePanel;
-
-/// \addtogroup EAPBaseGUI
-/// @{
-
-///
-/// GTC challenge/response credential entry panel
-///
-typedef wxIdentityCredentialsPanel<eap::credentials_identity, wxIdentityCredentialsPanelBase> wxGTCResponseCredentialsPanel;
-
-///
-/// GTC challenge/response credential configuration panel
-///
-typedef wxEAPCredentialsConfigPanel<eap::credentials_identity, wxGTCResponseCredentialsPanel> wxGTCResponseCredentialsConfigPanel;
-
-///
-/// GTC password credential entry panel
-///
-typedef wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> wxGTCPasswordCredentialsPanel;
-
-///
-/// GTC password credential configuration panel
-///
-typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxGTCPasswordCredentialsPanel> wxGTCPasswordCredentialsConfigPanel;
-
-/// @}
-
-#pragma once
-
-#include "../res/wxGTC_UI.h"
-
-#include <Windows.h>
-
-
-/// \addtogroup EAPBaseGUI
-/// @{
-
-///
-/// GTC configuration panel
-///
-class wxGTCConfigPanel : public wxGTCConfigPanelBase
-{
-public:
-    ///
-    /// Constructs a configuration panel
-    ///
-    wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent);
-
-protected:
-    /// \cond internal
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-    virtual void OnUpdateUI(wxUpdateUIEvent& event);
-    /// \endcond
-
-protected:
-    const eap::config_provider &m_prov;                         ///< EAP provider
-    eap::config_method_eapgtc &m_cfg;                           ///< EAP-GTC configuration
-
-    wxGTCResponseCredentialsConfigPanel *m_credentials_resp;    ///< Challenge/response credentials configuration panel
-    wxGTCPasswordCredentialsConfigPanel *m_credentials_pass;    ///< Password credentials configuration panel
-
-    // Temporary configurations to hold data until applied
-    eap::config_method_eapgtc m_cfg_resp;                       ///< Method configuration for challenge/response mode
-    eap::config_method_eapgtc m_cfg_pass;                       ///< Method configuration for password mode
-};
-
-
-///
-/// GTC challenge/response dialog
-///
-class wxGTCResponseDialog : public wxEAPGeneralDialog
-{
-public:
-    ///
-    /// Constructs a credential dialog
-    ///
-    /// \param[in] prov    Provider configuration data
-    /// \param[in] parent  Parent window
-    /// \param[in] id      An identifier for the dialog. A value of -1 is taken to mean a default.
-    /// \param[in] title   The title of the dialog
-    /// \param[in] pos     The dialog position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] size    The dialog size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
-    /// \param[in] style   The window style
-    ///
-    wxGTCResponseDialog(const eap::config_provider &prov, wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = _("GTC Challenge"), const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
-};
-
-
-///
-/// GTC challenge/response panel
-///
-class wxGTCResponsePanel : public wxGTCResponsePanelBase
-{
-public:
-    ///
-    /// Constructs a panel
-    ///
-    /// \param[inout] response   GTC response
-    /// \param[in   ] challenge  GTC challenge
-    /// \param[in   ] parent     Parent window
-    ///
-    wxGTCResponsePanel(winstd::sanitizing_wstring &response, const wchar_t *challenge, wxWindow* parent);
-
-protected:
-    /// \cond internal
-    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
-    /// \endcond
-
-protected:
-    winstd::sanitizing_wstring &m_response_value;   ///< GTC response
-};
-
-/// @}

lib/GTC_UI/res/wxGTC_UI.cpp

@@ -1,92 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#include <StdAfx.h>
-
-#include "wxGTC_UI.h"
-
-///////////////////////////////////////////////////////////////////////////
-
-wxGTCResponsePanelBase::wxGTCResponsePanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
-{
-	m_sb_response = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("GTC Challenge") ), wxVERTICAL );
-	
-	wxBoxSizer* sb_response_horiz;
-	sb_response_horiz = new wxBoxSizer( wxHORIZONTAL );
-	
-	m_response_icon = new wxStaticBitmap( m_sb_response->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	sb_response_horiz->Add( m_response_icon, 0, wxALL, 5 );
-	
-	m_sb_response_vert = new wxBoxSizer( wxVERTICAL );
-	
-	m_response_label = new wxStaticText( m_sb_response->GetStaticBox(), wxID_ANY, _("Please provide your response."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_response_label->Wrap( 440 );
-	m_sb_response_vert->Add( m_response_label, 0, wxALL|wxEXPAND, 5 );
-	
-	wxFlexGridSizer* sb_response_tbl;
-	sb_response_tbl = new wxFlexGridSizer( 0, 2, 5, 5 );
-	sb_response_tbl->AddGrowableCol( 1 );
-	sb_response_tbl->SetFlexibleDirection( wxBOTH );
-	sb_response_tbl->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_challenge = new wxStaticText( m_sb_response->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_challenge->Wrap( -1 );
-	m_challenge->SetToolTip( _("Server challenge") );
-	
-	sb_response_tbl->Add( m_challenge, 0, wxALIGN_CENTER_VERTICAL, 5 );
-	
-	m_response = new wxTextCtrl( m_sb_response->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_response->SetToolTip( _("Enter your response here") );
-	
-	sb_response_tbl->Add( m_response, 2, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 );
-	
-	
-	m_sb_response_vert->Add( sb_response_tbl, 0, wxEXPAND|wxALL, 5 );
-	
-	
-	sb_response_horiz->Add( m_sb_response_vert, 1, wxEXPAND, 5 );
-	
-	
-	m_sb_response->Add( sb_response_horiz, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( m_sb_response );
-	this->Layout();
-}
-
-wxGTCResponsePanelBase::~wxGTCResponsePanelBase()
-{
-}
-
-wxGTCConfigPanelBase::wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
-{
-	wxBoxSizer* sb_vertical;
-	sb_vertical = new wxBoxSizer( wxVERTICAL );
-	
-	m_auth_mode_label = new wxStaticText( this, wxID_ANY, _("EAP-GTC authentication &mode:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_auth_mode_label->Wrap( -1 );
-	sb_vertical->Add( m_auth_mode_label, 0, wxBOTTOM, 5 );
-	
-	m_auth_mode = new wxChoicebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCHB_DEFAULT );
-	m_auth_mode->SetToolTip( _("Select EAP-GTC authentication mode from the list") );
-	
-	sb_vertical->Add( m_auth_mode, 1, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( sb_vertical );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) );
-}
-
-wxGTCConfigPanelBase::~wxGTCConfigPanelBase()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxGTCConfigPanelBase::OnUpdateUI ) );
-	
-}

lib/GTC_UI/res/wxGTC_UI.fbp

@@ -1,695 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<wxFormBuilder_Project>
-    <FileVersion major="1" minor="13" />
-    <object class="Project" expanded="1">
-        <property name="class_decoration">; </property>
-        <property name="code_generation">C++</property>
-        <property name="disconnect_events">1</property>
-        <property name="disconnect_mode">source_name</property>
-        <property name="disconnect_php_events">0</property>
-        <property name="disconnect_python_events">0</property>
-        <property name="embedded_files_path">.</property>
-        <property name="encoding">UTF-8</property>
-        <property name="event_generation">connect</property>
-        <property name="file">wxGTC_UI</property>
-        <property name="first_id">1000</property>
-        <property name="help_provider">none</property>
-        <property name="internationalize">1</property>
-        <property name="name">wxGTC_UI</property>
-        <property name="namespace"></property>
-        <property name="path">.</property>
-        <property name="precompiled_header">#include &lt;StdAfx.h&gt;</property>
-        <property name="relative_path">1</property>
-        <property name="skip_lua_events">1</property>
-        <property name="skip_php_events">1</property>
-        <property name="skip_python_events">1</property>
-        <property name="ui_table">UI</property>
-        <property name="use_enum">1</property>
-        <property name="use_microsoft_bom">1</property>
-        <object class="Panel" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">wxGTCResponsePanelBase</property>
-            <property name="pos"></property>
-            <property name="size">500,-1</property>
-            <property name="subclass">; </property>
-            <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
-            <object class="wxStaticBoxSizer" expanded="1">
-                <property name="id">wxID_ANY</property>
-                <property name="label">GTC Challenge</property>
-                <property name="minimum_size"></property>
-                <property name="name">m_sb_response</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">protected</property>
-                <event name="OnUpdateUI"></event>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">0</property>
-                    <object class="wxBoxSizer" expanded="1">
-                        <property name="minimum_size"></property>
-                        <property name="name">sb_response_horiz</property>
-                        <property name="orient">wxHORIZONTAL</property>
-                        <property name="permission">none</property>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxALL</property>
-                            <property name="proportion">0</property>
-                            <object class="wxStaticBitmap" expanded="1">
-                                <property name="BottomDockable">1</property>
-                                <property name="LeftDockable">1</property>
-                                <property name="RightDockable">1</property>
-                                <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
-                                <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></property>
-                                <property name="best_size"></property>
-                                <property name="bg"></property>
-                                <property name="bitmap">Load From Icon Resource; ; [32; 32]</property>
-                                <property name="caption"></property>
-                                <property name="caption_visible">1</property>
-                                <property name="center_pane">0</property>
-                                <property name="close_button">1</property>
-                                <property name="context_help"></property>
-                                <property name="context_menu">1</property>
-                                <property name="default_pane">0</property>
-                                <property name="dock">Dock</property>
-                                <property name="dock_fixed">0</property>
-                                <property name="docking">Left</property>
-                                <property name="enabled">1</property>
-                                <property name="fg"></property>
-                                <property name="floatable">1</property>
-                                <property name="font"></property>
-                                <property name="gripper">0</property>
-                                <property name="hidden">0</property>
-                                <property name="id">wxID_ANY</property>
-                                <property name="max_size"></property>
-                                <property name="maximize_button">0</property>
-                                <property name="maximum_size"></property>
-                                <property name="min_size"></property>
-                                <property name="minimize_button">0</property>
-                                <property name="minimum_size"></property>
-                                <property name="moveable">1</property>
-                                <property name="name">m_response_icon</property>
-                                <property name="pane_border">1</property>
-                                <property name="pane_position"></property>
-                                <property name="pane_size"></property>
-                                <property name="permission">protected</property>
-                                <property name="pin_button">1</property>
-                                <property name="pos"></property>
-                                <property name="resize">Resizable</property>
-                                <property name="show">1</property>
-                                <property name="size"></property>
-                                <property name="subclass"></property>
-                                <property name="toolbar_pane">0</property>
-                                <property name="tooltip"></property>
-                                <property name="window_extra_style"></property>
-                                <property name="window_name"></property>
-                                <property name="window_style"></property>
-                                <event name="OnChar"></event>
-                                <event name="OnEnterWindow"></event>
-                                <event name="OnEraseBackground"></event>
-                                <event name="OnKeyDown"></event>
-                                <event name="OnKeyUp"></event>
-                                <event name="OnKillFocus"></event>
-                                <event name="OnLeaveWindow"></event>
-                                <event name="OnLeftDClick"></event>
-                                <event name="OnLeftDown"></event>
-                                <event name="OnLeftUp"></event>
-                                <event name="OnMiddleDClick"></event>
-                                <event name="OnMiddleDown"></event>
-                                <event name="OnMiddleUp"></event>
-                                <event name="OnMotion"></event>
-                                <event name="OnMouseEvents"></event>
-                                <event name="OnMouseWheel"></event>
-                                <event name="OnPaint"></event>
-                                <event name="OnRightDClick"></event>
-                                <event name="OnRightDown"></event>
-                                <event name="OnRightUp"></event>
-                                <event name="OnSetFocus"></event>
-                                <event name="OnSize"></event>
-                                <event name="OnUpdateUI"></event>
-                            </object>
-                        </object>
-                        <object class="sizeritem" expanded="1">
-                            <property name="border">5</property>
-                            <property name="flag">wxEXPAND</property>
-                            <property name="proportion">1</property>
-                            <object class="wxBoxSizer" expanded="1">
-                                <property name="minimum_size"></property>
-                                <property name="name">m_sb_response_vert</property>
-                                <property name="orient">wxVERTICAL</property>
-                                <property name="permission">protected</property>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxALL|wxEXPAND</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxStaticText" expanded="1">
-                                        <property name="BottomDockable">1</property>
-                                        <property name="LeftDockable">1</property>
-                                        <property name="RightDockable">1</property>
-                                        <property name="TopDockable">1</property>
-                                        <property name="aui_layer"></property>
-                                        <property name="aui_name"></property>
-                                        <property name="aui_position"></property>
-                                        <property name="aui_row"></property>
-                                        <property name="best_size"></property>
-                                        <property name="bg"></property>
-                                        <property name="caption"></property>
-                                        <property name="caption_visible">1</property>
-                                        <property name="center_pane">0</property>
-                                        <property name="close_button">1</property>
-                                        <property name="context_help"></property>
-                                        <property name="context_menu">1</property>
-                                        <property name="default_pane">0</property>
-                                        <property name="dock">Dock</property>
-                                        <property name="dock_fixed">0</property>
-                                        <property name="docking">Left</property>
-                                        <property name="enabled">1</property>
-                                        <property name="fg"></property>
-                                        <property name="floatable">1</property>
-                                        <property name="font"></property>
-                                        <property name="gripper">0</property>
-                                        <property name="hidden">0</property>
-                                        <property name="id">wxID_ANY</property>
-                                        <property name="label">Please provide your response.</property>
-                                        <property name="max_size"></property>
-                                        <property name="maximize_button">0</property>
-                                        <property name="maximum_size"></property>
-                                        <property name="min_size"></property>
-                                        <property name="minimize_button">0</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="moveable">1</property>
-                                        <property name="name">m_response_label</property>
-                                        <property name="pane_border">1</property>
-                                        <property name="pane_position"></property>
-                                        <property name="pane_size"></property>
-                                        <property name="permission">protected</property>
-                                        <property name="pin_button">1</property>
-                                        <property name="pos"></property>
-                                        <property name="resize">Resizable</property>
-                                        <property name="show">1</property>
-                                        <property name="size"></property>
-                                        <property name="style"></property>
-                                        <property name="subclass"></property>
-                                        <property name="toolbar_pane">0</property>
-                                        <property name="tooltip"></property>
-                                        <property name="window_extra_style"></property>
-                                        <property name="window_name"></property>
-                                        <property name="window_style"></property>
-                                        <property name="wrap">440</property>
-                                        <event name="OnChar"></event>
-                                        <event name="OnEnterWindow"></event>
-                                        <event name="OnEraseBackground"></event>
-                                        <event name="OnKeyDown"></event>
-                                        <event name="OnKeyUp"></event>
-                                        <event name="OnKillFocus"></event>
-                                        <event name="OnLeaveWindow"></event>
-                                        <event name="OnLeftDClick"></event>
-                                        <event name="OnLeftDown"></event>
-                                        <event name="OnLeftUp"></event>
-                                        <event name="OnMiddleDClick"></event>
-                                        <event name="OnMiddleDown"></event>
-                                        <event name="OnMiddleUp"></event>
-                                        <event name="OnMotion"></event>
-                                        <event name="OnMouseEvents"></event>
-                                        <event name="OnMouseWheel"></event>
-                                        <event name="OnPaint"></event>
-                                        <event name="OnRightDClick"></event>
-                                        <event name="OnRightDown"></event>
-                                        <event name="OnRightUp"></event>
-                                        <event name="OnSetFocus"></event>
-                                        <event name="OnSize"></event>
-                                        <event name="OnUpdateUI"></event>
-                                    </object>
-                                </object>
-                                <object class="sizeritem" expanded="1">
-                                    <property name="border">5</property>
-                                    <property name="flag">wxEXPAND|wxALL</property>
-                                    <property name="proportion">0</property>
-                                    <object class="wxFlexGridSizer" expanded="1">
-                                        <property name="cols">2</property>
-                                        <property name="flexible_direction">wxBOTH</property>
-                                        <property name="growablecols">1</property>
-                                        <property name="growablerows"></property>
-                                        <property name="hgap">5</property>
-                                        <property name="minimum_size"></property>
-                                        <property name="name">sb_response_tbl</property>
-                                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
-                                        <property name="permission">none</property>
-                                        <property name="rows">0</property>
-                                        <property name="vgap">5</property>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxALIGN_CENTER_VERTICAL</property>
-                                            <property name="proportion">0</property>
-                                            <object class="wxStaticText" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="label"></property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_challenge</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip">Server challenge</property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <property name="wrap">-1</property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                        <object class="sizeritem" expanded="1">
-                                            <property name="border">5</property>
-                                            <property name="flag">wxEXPAND|wxALIGN_CENTER_VERTICAL</property>
-                                            <property name="proportion">2</property>
-                                            <object class="wxTextCtrl" expanded="1">
-                                                <property name="BottomDockable">1</property>
-                                                <property name="LeftDockable">1</property>
-                                                <property name="RightDockable">1</property>
-                                                <property name="TopDockable">1</property>
-                                                <property name="aui_layer"></property>
-                                                <property name="aui_name"></property>
-                                                <property name="aui_position"></property>
-                                                <property name="aui_row"></property>
-                                                <property name="best_size"></property>
-                                                <property name="bg"></property>
-                                                <property name="caption"></property>
-                                                <property name="caption_visible">1</property>
-                                                <property name="center_pane">0</property>
-                                                <property name="close_button">1</property>
-                                                <property name="context_help"></property>
-                                                <property name="context_menu">1</property>
-                                                <property name="default_pane">0</property>
-                                                <property name="dock">Dock</property>
-                                                <property name="dock_fixed">0</property>
-                                                <property name="docking">Left</property>
-                                                <property name="enabled">1</property>
-                                                <property name="fg"></property>
-                                                <property name="floatable">1</property>
-                                                <property name="font"></property>
-                                                <property name="gripper">0</property>
-                                                <property name="hidden">0</property>
-                                                <property name="id">wxID_ANY</property>
-                                                <property name="max_size"></property>
-                                                <property name="maximize_button">0</property>
-                                                <property name="maximum_size"></property>
-                                                <property name="maxlength"></property>
-                                                <property name="min_size"></property>
-                                                <property name="minimize_button">0</property>
-                                                <property name="minimum_size"></property>
-                                                <property name="moveable">1</property>
-                                                <property name="name">m_response</property>
-                                                <property name="pane_border">1</property>
-                                                <property name="pane_position"></property>
-                                                <property name="pane_size"></property>
-                                                <property name="permission">protected</property>
-                                                <property name="pin_button">1</property>
-                                                <property name="pos"></property>
-                                                <property name="resize">Resizable</property>
-                                                <property name="show">1</property>
-                                                <property name="size"></property>
-                                                <property name="style"></property>
-                                                <property name="subclass"></property>
-                                                <property name="toolbar_pane">0</property>
-                                                <property name="tooltip">Enter your response here</property>
-                                                <property name="validator_data_type"></property>
-                                                <property name="validator_style">wxFILTER_NONE</property>
-                                                <property name="validator_type">wxDefaultValidator</property>
-                                                <property name="validator_variable"></property>
-                                                <property name="value"></property>
-                                                <property name="window_extra_style"></property>
-                                                <property name="window_name"></property>
-                                                <property name="window_style"></property>
-                                                <event name="OnChar"></event>
-                                                <event name="OnEnterWindow"></event>
-                                                <event name="OnEraseBackground"></event>
-                                                <event name="OnKeyDown"></event>
-                                                <event name="OnKeyUp"></event>
-                                                <event name="OnKillFocus"></event>
-                                                <event name="OnLeaveWindow"></event>
-                                                <event name="OnLeftDClick"></event>
-                                                <event name="OnLeftDown"></event>
-                                                <event name="OnLeftUp"></event>
-                                                <event name="OnMiddleDClick"></event>
-                                                <event name="OnMiddleDown"></event>
-                                                <event name="OnMiddleUp"></event>
-                                                <event name="OnMotion"></event>
-                                                <event name="OnMouseEvents"></event>
-                                                <event name="OnMouseWheel"></event>
-                                                <event name="OnPaint"></event>
-                                                <event name="OnRightDClick"></event>
-                                                <event name="OnRightDown"></event>
-                                                <event name="OnRightUp"></event>
-                                                <event name="OnSetFocus"></event>
-                                                <event name="OnSize"></event>
-                                                <event name="OnText"></event>
-                                                <event name="OnTextEnter"></event>
-                                                <event name="OnTextMaxLen"></event>
-                                                <event name="OnTextURL"></event>
-                                                <event name="OnUpdateUI"></event>
-                                            </object>
-                                        </object>
-                                    </object>
-                                </object>
-                            </object>
-                        </object>
-                    </object>
-                </object>
-            </object>
-        </object>
-        <object class="Panel" expanded="1">
-            <property name="aui_managed">0</property>
-            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
-            <property name="bg"></property>
-            <property name="context_help"></property>
-            <property name="context_menu">1</property>
-            <property name="enabled">1</property>
-            <property name="event_handler">impl_virtual</property>
-            <property name="fg"></property>
-            <property name="font"></property>
-            <property name="hidden">0</property>
-            <property name="id">wxID_ANY</property>
-            <property name="maximum_size"></property>
-            <property name="minimum_size"></property>
-            <property name="name">wxGTCConfigPanelBase</property>
-            <property name="pos"></property>
-            <property name="size">500,-1</property>
-            <property name="subclass"></property>
-            <property name="tooltip"></property>
-            <property name="window_extra_style"></property>
-            <property name="window_name"></property>
-            <property name="window_style">wxTAB_TRAVERSAL</property>
-            <event name="OnAuiFindManager"></event>
-            <event name="OnAuiPaneButton"></event>
-            <event name="OnAuiPaneClose"></event>
-            <event name="OnAuiPaneMaximize"></event>
-            <event name="OnAuiPaneRestore"></event>
-            <event name="OnAuiRender"></event>
-            <event name="OnChar"></event>
-            <event name="OnEnterWindow"></event>
-            <event name="OnEraseBackground"></event>
-            <event name="OnInitDialog"></event>
-            <event name="OnKeyDown"></event>
-            <event name="OnKeyUp"></event>
-            <event name="OnKillFocus"></event>
-            <event name="OnLeaveWindow"></event>
-            <event name="OnLeftDClick"></event>
-            <event name="OnLeftDown"></event>
-            <event name="OnLeftUp"></event>
-            <event name="OnMiddleDClick"></event>
-            <event name="OnMiddleDown"></event>
-            <event name="OnMiddleUp"></event>
-            <event name="OnMotion"></event>
-            <event name="OnMouseEvents"></event>
-            <event name="OnMouseWheel"></event>
-            <event name="OnPaint"></event>
-            <event name="OnRightDClick"></event>
-            <event name="OnRightDown"></event>
-            <event name="OnRightUp"></event>
-            <event name="OnSetFocus"></event>
-            <event name="OnSize"></event>
-            <event name="OnUpdateUI">OnUpdateUI</event>
-            <object class="wxBoxSizer" expanded="1">
-                <property name="minimum_size"></property>
-                <property name="name">sb_vertical</property>
-                <property name="orient">wxVERTICAL</property>
-                <property name="permission">none</property>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxBOTTOM</property>
-                    <property name="proportion">0</property>
-                    <object class="wxStaticText" expanded="1">
-                        <property name="BottomDockable">1</property>
-                        <property name="LeftDockable">1</property>
-                        <property name="RightDockable">1</property>
-                        <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
-                        <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</property>
-                        <property name="center_pane">0</property>
-                        <property name="close_button">1</property>
-                        <property name="context_help"></property>
-                        <property name="context_menu">1</property>
-                        <property name="default_pane">0</property>
-                        <property name="dock">Dock</property>
-                        <property name="dock_fixed">0</property>
-                        <property name="docking">Left</property>
-                        <property name="enabled">1</property>
-                        <property name="fg"></property>
-                        <property name="floatable">1</property>
-                        <property name="font"></property>
-                        <property name="gripper">0</property>
-                        <property name="hidden">0</property>
-                        <property name="id">wxID_ANY</property>
-                        <property name="label">EAP-GTC authentication &amp;mode:</property>
-                        <property name="max_size"></property>
-                        <property name="maximize_button">0</property>
-                        <property name="maximum_size"></property>
-                        <property name="min_size"></property>
-                        <property name="minimize_button">0</property>
-                        <property name="minimum_size"></property>
-                        <property name="moveable">1</property>
-                        <property name="name">m_auth_mode_label</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style"></property>
-                        <property name="subclass"></property>
-                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip"></property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
-                        <property name="window_style"></property>
-                        <property name="wrap">-1</property>
-                        <event name="OnChar"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
-                    </object>
-                </object>
-                <object class="sizeritem" expanded="1">
-                    <property name="border">5</property>
-                    <property name="flag">wxEXPAND</property>
-                    <property name="proportion">1</property>
-                    <object class="wxChoicebook" expanded="1">
-                        <property name="BottomDockable">1</property>
-                        <property name="LeftDockable">1</property>
-                        <property name="RightDockable">1</property>
-                        <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
-                        <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></property>
-                        <property name="best_size"></property>
-                        <property name="bg"></property>
-                        <property name="caption"></property>
-                        <property name="caption_visible">1</property>
-                        <property name="center_pane">0</property>
-                        <property name="close_button">1</property>
-                        <property name="context_help"></property>
-                        <property name="context_menu">1</property>
-                        <property name="default_pane">0</property>
-                        <property name="dock">Dock</property>
-                        <property name="dock_fixed">0</property>
-                        <property name="docking">Left</property>
-                        <property name="enabled">1</property>
-                        <property name="fg"></property>
-                        <property name="floatable">1</property>
-                        <property name="font"></property>
-                        <property name="gripper">0</property>
-                        <property name="hidden">0</property>
-                        <property name="id">wxID_ANY</property>
-                        <property name="max_size"></property>
-                        <property name="maximize_button">0</property>
-                        <property name="maximum_size"></property>
-                        <property name="min_size"></property>
-                        <property name="minimize_button">0</property>
-                        <property name="minimum_size"></property>
-                        <property name="moveable">1</property>
-                        <property name="name">m_auth_mode</property>
-                        <property name="pane_border">1</property>
-                        <property name="pane_position"></property>
-                        <property name="pane_size"></property>
-                        <property name="permission">protected</property>
-                        <property name="pin_button">1</property>
-                        <property name="pos"></property>
-                        <property name="resize">Resizable</property>
-                        <property name="show">1</property>
-                        <property name="size"></property>
-                        <property name="style">wxCHB_DEFAULT</property>
-                        <property name="subclass"></property>
-                        <property name="toolbar_pane">0</property>
-                        <property name="tooltip">Select EAP-GTC authentication mode from the list</property>
-                        <property name="window_extra_style"></property>
-                        <property name="window_name"></property>
-                        <property name="window_style"></property>
-                        <event name="OnChar"></event>
-                        <event name="OnChoicebookPageChanged"></event>
-                        <event name="OnChoicebookPageChanging"></event>
-                        <event name="OnEnterWindow"></event>
-                        <event name="OnEraseBackground"></event>
-                        <event name="OnKeyDown"></event>
-                        <event name="OnKeyUp"></event>
-                        <event name="OnKillFocus"></event>
-                        <event name="OnLeaveWindow"></event>
-                        <event name="OnLeftDClick"></event>
-                        <event name="OnLeftDown"></event>
-                        <event name="OnLeftUp"></event>
-                        <event name="OnMiddleDClick"></event>
-                        <event name="OnMiddleDown"></event>
-                        <event name="OnMiddleUp"></event>
-                        <event name="OnMotion"></event>
-                        <event name="OnMouseEvents"></event>
-                        <event name="OnMouseWheel"></event>
-                        <event name="OnPaint"></event>
-                        <event name="OnRightDClick"></event>
-                        <event name="OnRightDown"></event>
-                        <event name="OnRightUp"></event>
-                        <event name="OnSetFocus"></event>
-                        <event name="OnSize"></event>
-                        <event name="OnUpdateUI"></event>
-                    </object>
-                </object>
-            </object>
-        </object>
-    </object>
-</wxFormBuilder_Project>

lib/GTC_UI/res/wxGTC_UI.h

@@ -1,76 +0,0 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __WXGTC_UI_H__
-#define __WXGTC_UI_H__
-
-#include <wx/artprov.h>
-#include <wx/xrc/xmlres.h>
-#include <wx/intl.h>
-#include <wx/bitmap.h>
-#include <wx/image.h>
-#include <wx/icon.h>
-#include <wx/statbmp.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/textctrl.h>
-#include <wx/sizer.h>
-#include <wx/statbox.h>
-#include <wx/panel.h>
-#include <wx/choicebk.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxGTCResponsePanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxGTCResponsePanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticBoxSizer* m_sb_response;
-		wxStaticBitmap* m_response_icon;
-		wxBoxSizer* m_sb_response_vert;
-		wxStaticText* m_response_label;
-		wxStaticText* m_challenge;
-		wxTextCtrl* m_response;
-	
-	public:
-		
-		wxGTCResponsePanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxGTCResponsePanelBase();
-	
-};
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class wxGTCConfigPanelBase
-///////////////////////////////////////////////////////////////////////////////
-class wxGTCConfigPanelBase : public wxPanel 
-{
-	private:
-	
-	protected:
-		wxStaticText* m_auth_mode_label;
-		wxChoicebook* m_auth_mode;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		wxGTCConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
-		~wxGTCConfigPanelBase();
-	
-};
-
-#endif //__WXGTC_UI_H__

lib/GTC_UI/src/GTC_UI.cpp

@@ -1,163 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-
-//////////////////////////////////////////////////////////////////////
-// wxGTCConfigPanel
-//////////////////////////////////////////////////////////////////////
-
-wxGTCConfigPanel::wxGTCConfigPanel(const eap::config_provider &prov, eap::config_method_eapgtc &cfg, wxWindow* parent) :
-    m_prov    (prov                     ),
-    m_cfg     (cfg                      ),
-    m_cfg_resp(cfg.m_module, cfg.m_level),
-    m_cfg_pass(cfg.m_module, cfg.m_level),
-    wxGTCConfigPanelBase(parent)
-{
-    // Initialize Password authentication mode properly. Challenge/Response mode does not require initialization, since it is initialized so by default.
-    m_cfg_pass.m_cred.reset(new eap::credentials_pass(m_cfg.m_module));
-
-    m_credentials_resp = new wxGTCResponseCredentialsConfigPanel(m_prov, m_cfg_resp, m_auth_mode);
-    m_auth_mode->AddPage(m_credentials_resp, _("Challenge/Response"));
-    m_credentials_pass = new wxGTCPasswordCredentialsConfigPanel(m_prov, m_cfg_pass, m_auth_mode);
-    m_auth_mode->AddPage(m_credentials_pass, _("Password"));
-}
-
-
-/// \cond internal
-
-bool wxGTCConfigPanel::TransferDataToWindow()
-{
-    eap::credentials_identity *cred_resp;
-    eap::credentials_pass     *cred_pass;
-
-    if ((cred_resp = dynamic_cast<eap::credentials_identity*>(m_cfg.m_cred.get())) != NULL) {
-        m_cfg_resp = m_cfg;
-        m_auth_mode->SetSelection(0); // 0=Challenge/Response
-    } else if ((cred_pass = dynamic_cast<eap::credentials_pass*>(m_cfg.m_cred.get())) != NULL) {
-        m_cfg_pass = m_cfg;
-        m_auth_mode->SetSelection(1); // 1=Password
-    } else
-        wxFAIL_MSG(wxT("Unsupported authentication mode."));
-
-    return wxGTCConfigPanelBase::TransferDataToWindow();
-}
-
-
-bool wxGTCConfigPanel::TransferDataFromWindow()
-{
-    wxCHECK(wxGTCConfigPanelBase::TransferDataFromWindow(), false);
-
-    if (!m_prov.m_read_only) {
-        // This is not a provider-locked configuration. Save the data.
-        switch (m_auth_mode->GetSelection()) {
-        case 0: // 0=Challenge/Response
-            m_cfg = m_cfg_resp;
-            break;
-
-        case 1: // 1=Password
-            m_cfg = m_cfg_pass;
-            break;
-
-        default:
-            wxFAIL_MSG(wxT("Unsupported authentication mode."));
-        }
-    }
-
-    return true;
-}
-
-
-void wxGTCConfigPanel::OnUpdateUI(wxUpdateUIEvent& event)
-{
-    UNREFERENCED_PARAMETER(event);
-
-    if (m_prov.m_read_only) {
-        // This is provider-locked configuration. Disable controls.
-        m_auth_mode_label ->Enable(false);
-        m_auth_mode       ->Enable(false);
-        m_credentials_resp->Enable(false);
-        m_credentials_pass->Enable(false);
-    } else {
-        // This is not a provider-locked configuration. Enable controls.
-        m_auth_mode_label ->Enable(true);
-        m_auth_mode       ->Enable(true);
-        m_credentials_resp->Enable(true);
-        m_credentials_pass ->Enable(true);
-    }
-}
-
-/// \endcond
-
-
-//////////////////////////////////////////////////////////////////////
-// wxGTCResponseDialog
-//////////////////////////////////////////////////////////////////////
-
-wxGTCResponseDialog::wxGTCResponseDialog(const eap::config_provider &prov, wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style) :
-    wxEAPGeneralDialog(parent, id, title, pos, size, style)
-{
-    // Set banner title.
-    m_banner->m_title->SetLabel(wxString::Format(_("%s Challenge"), wxEAPGetProviderName(prov.m_name)));
-}
-
-
-//////////////////////////////////////////////////////////////////////
-// wxGTCResponsePanel
-//////////////////////////////////////////////////////////////////////
-
-wxGTCResponsePanel::wxGTCResponsePanel(winstd::sanitizing_wstring &response, const wchar_t *challenge, wxWindow* parent) :
-    wxGTCResponsePanelBase(parent),
-    m_response_value(response)
-{
-    // 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_response_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(24)));
-
-    // Set challenge label.
-    m_challenge->SetLabelText(challenge);
-    m_challenge->Wrap(200);
-
-    this->Layout();
-}
-
-
-/// \cond internal
-
-bool wxGTCResponsePanel::TransferDataToWindow()
-{
-    m_response->SetValue(m_response_value.c_str());
-
-    return wxGTCResponsePanelBase::TransferDataToWindow();
-}
-
-
-bool wxGTCResponsePanel::TransferDataFromWindow()
-{
-    wxCHECK(wxGTCResponsePanelBase::TransferDataFromWindow(), false);
-
-    m_response_value = m_response->GetValue();
-
-    return true;
-}
-
-/// \endcond

lib/GTC_UI/src/StdAfx.cpp

@@ -1,21 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"

lib/GTC_UI/src/StdAfx.h

@@ -1,25 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#pragma once
-
-#define _CRT_SECURE_NO_WARNINGS // Prevent warnings from wxWidgets headers
-
-#include "../include/GTC_UI.h"

lib/TLS_UI/res/wxTLS_UI.cpp

@@ -55,6 +55,7 @@ wxTLSServerTrustPanelBase::wxTLSServerTrustPanelBase( wxWindow* parent, wxWindow
 	sb_root_ca_btn->Add( m_root_ca_add_file, 0, wxRIGHT|wxLEFT, 5 );
 	
 	m_root_ca_remove = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_root_ca_remove->Enable( false );
 	m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") );
 	
 	sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, 5 );

lib/TLS_UI/res/wxTLS_UI.fbp

@@ -659,7 +659,7 @@
                                                         <property name="dock">Dock</property>
                                                         <property name="dock_fixed">0</property>
                                                         <property name="docking">Left</property>
-                                                        <property name="enabled">1</property>
+                                                        <property name="enabled">0</property>
                                                         <property name="fg"></property>
                                                         <property name="floatable">1</property>
                                                         <property name="font"></property>

lib/TTLS/build/TTLS.vcxproj

@@ -84,7 +84,6 @@
     <ClInclude Include="..\include\Method.h" />
     <ClInclude Include="..\include\Module.h" />
     <ClInclude Include="..\include\TTLS.h" />
-    <ClInclude Include="..\include\UIContext.h" />
     <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
@@ -98,7 +97,6 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Events\build\Events.vcxproj">

lib/TTLS/build/TTLS.vcxproj.filters

@@ -26,9 +26,6 @@
     <ClInclude Include="..\include\Module.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\UIContext.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\TTLS.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -49,8 +46,5 @@
     <ClCompile Include="..\src\Module.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\UIContext.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
 </Project>

lib/TTLS/include/TTLS.h

@@ -18,6 +18,8 @@
     along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#pragma once
+
 /// \addtogroup EAPBaseMethod
 /// @{
 #ifndef EAP_INNER_EAPHOST

lib/TTLS/include/UIContext.h

@@ -1,96 +0,0 @@
-/*
-    Copyright 2015-2017 Amebis
-    Copyright 2016-2017 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-namespace eap
-{
-    class ui_context_ttls;
-}
-
-#pragma once
-
-#include "TTLS.h"
-
-#include "../../EAPBase/include/UIContext.h"
-
-
-namespace eap
-{
-    /// \addtogroup EAPBaseUICtx
-    /// @{
-
-    ///
-    /// EAP-TTLS UI context
-    ///
-    class ui_context_ttls : public ui_context
-    {
-    public:
-        ///
-        /// Constructs context
-        ///
-        /// \param[in] cfg   Connection configuration
-        /// \param[in] cred  Connection credentials
-        ///
-        ui_context_ttls(_In_ config_connection &cfg, _In_ credentials_connection &cred);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        ui_context_ttls(_In_ const ui_context_ttls &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Credentials to move from
-        ///
-        ui_context_ttls(_Inout_ ui_context_ttls &&other);
-
-        ///
-        /// Copies context
-        ///
-        /// \param[in] other  Credentials to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context_ttls& operator=(_In_ const ui_context_ttls &other);
-
-        ///
-        /// Moves context
-        ///
-        /// \param[in] other  Configuration to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        ui_context_ttls& operator=(_Inout_ ui_context_ttls &&other);
-
-        /// \name BLOB management
-        /// @{
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-        virtual size_t get_pk_size() const;
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-        /// @}
-
-    public:
-        sanitizing_blob m_data;         ///< Context data
-    };
-
-    /// @}
-}

lib/TTLS/src/Config.cpp

@@ -268,7 +268,6 @@ eap::config_method* eap::config_method_ttls::make_config_method(_In_ winstd::eap
     case eap_type_legacy_pap     : return new config_method_pap        (m_module, m_level + 1);
     case eap_type_legacy_mschapv2: return new config_method_mschapv2   (m_module, m_level + 1);
     case eap_type_mschapv2       : return new config_method_eapmschapv2(m_module, m_level + 1);
-    case eap_type_gtc            : return new config_method_eapgtc     (m_module, m_level + 1);
 #if EAP_INNER_EAPHOST
     default                      : return new config_method_eaphost    (m_module, m_level + 1); // EapHost peer method handles all other method types
 #else
@@ -283,7 +282,6 @@ eap::config_method* eap::config_method_ttls::make_config_method(_In_ const wchar
          if (_wcsicmp(eap_type, L"PAP"         ) == 0) return new config_method_pap        (m_module, m_level + 1);
     else if (_wcsicmp(eap_type, L"MSCHAPv2"    ) == 0) return new config_method_mschapv2   (m_module, m_level + 1);
     else if (_wcsicmp(eap_type, L"EAP-MSCHAPv2") == 0) return new config_method_eapmschapv2(m_module, m_level + 1);
-    else if (_wcsicmp(eap_type, L"EAP-GTC"     ) == 0) return new config_method_eapgtc     (m_module, m_level + 1);
 #if EAP_INNER_EAPHOST
     else if (_wcsicmp(eap_type, L"EapHost"     ) == 0) return new config_method_eaphost    (m_module, m_level + 1);
 #endif

lib/TTLS/src/Module.cpp

@@ -256,10 +256,6 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session(
                                            new method_eapmsg  (*this, cred_inner->get_identity().c_str(),
                                            new method_eap     (*this, eap_type_mschapv2,
                                            new method_mschapv2(*this, dynamic_cast<config_method_mschapv2&>(*cfg_inner), dynamic_cast<credentials_pass&>(*cred_inner))))); break;
-        case eap_type_gtc            : meth_inner.reset(
-                                           new method_eapmsg  (*this, cred_inner->get_identity().c_str(),
-                                           new method_eap     (*this, eap_type_gtc,
-                                           new method_gtc     (*this, dynamic_cast<config_method_eapgtc&>(*cfg_inner), dynamic_cast<credentials&>(*cred_inner))))); break;
         default: throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method.");
         }
     }
@@ -367,11 +363,11 @@ void eap::peer_ttls::get_ui_context(
     auto s = static_cast<session*>(hSession);
 
     // Get context data from method.
-    ui_context_ttls ctx(s->m_cfg, s->m_cred);
+    sanitizing_blob context_data;
-    s->m_method->get_ui_context(ctx.m_data);
+    s->m_method->get_ui_context(context_data);
 
-    // Pack context data.
+    // Pack data.
-    pack(ctx, ppUIContextData, pdwUIContextDataSize);
+    pack(context_data, ppUIContextData, pdwUIContextDataSize);
     if (s->m_blob_ui_ctx)
         free_memory(s->m_blob_ui_ctx);
     s->m_blob_ui_ctx = *ppUIContextData;

lib/TTLS/src/StdAfx.h

@@ -26,7 +26,6 @@
 #include "../include/Credentials.h"
 #include "../include/Method.h"
 #include "../include/Module.h"
-#include "../include/UIContext.h"
 
 #include "../../PAP/include/Config.h"
 #include "../../PAP/include/Method.h"
@@ -35,9 +34,6 @@
 #include "../../MSCHAPv2/include/Method.h"
 #include "../../MSCHAPv2/include/MSCHAPv2.h"
 
-#include "../../GTC/include/Config.h"
-#include "../../GTC/include/Method.h"
-
 #include "../../EapHost/include/Config.h"
 #include "../../EapHost/include/Method.h"
 

lib/TTLS/src/UIContext.cpp

@@ -1,92 +0,0 @@
-/*
-    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
-
-    This file is part of GÉANTLink.
-
-    GÉANTLink is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "StdAfx.h"
-
-using namespace std;
-using namespace winstd;
-
-
-//////////////////////////////////////////////////////////////////////
-// eap::ui_context_ttls
-//////////////////////////////////////////////////////////////////////
-
-eap::ui_context_ttls::ui_context_ttls(_In_ config_connection &cfg, _In_ credentials_connection &cred) :
-    ui_context(cfg, cred)
-{
-}
-
-
-eap::ui_context_ttls::ui_context_ttls(_In_ const ui_context_ttls &other) :
-    m_data    (other.m_data),
-    ui_context(other       )
-{
-}
-
-
-eap::ui_context_ttls::ui_context_ttls(_Inout_ ui_context_ttls &&other) :
-    m_data    (std::move(other.m_data)),
-    ui_context(std::move(other       ))
-{
-}
-
-
-eap::ui_context_ttls& eap::ui_context_ttls::operator=(_In_ const ui_context_ttls &other)
-{
-    if (this != &other) {
-        (ui_context&)*this = other;
-        m_data             = other.m_data;
-    }
-
-    return *this;
-}
-
-
-eap::ui_context_ttls& eap::ui_context_ttls::operator=(_Inout_ ui_context_ttls &&other)
-{
-    if (this != &other) {
-        (ui_context&)*this = std::move(other       );
-        m_data             = std::move(other.m_data);
-    }
-
-    return *this;
-}
-
-
-void eap::ui_context_ttls::operator<<(_Inout_ cursor_out &cursor) const
-{
-    ui_context::operator<<(cursor);
-    cursor << m_data;
-}
-
-
-size_t eap::ui_context_ttls::get_pk_size() const
-{
-    return
-        ui_context::get_pk_size() +
-        pksizeof(m_data);
-}
-
-
-void eap::ui_context_ttls::operator>>(_Inout_ cursor_in &cursor)
-{
-    ui_context::operator>>(cursor);
-    cursor >> m_data;
-}

lib/TTLS_UI/include/TTLS_UI.h

@@ -31,7 +31,6 @@ class wxTTLSConfigWindow;
 #include "../../EapHost/include/Config.h"
 #include "../../PAP/include/Config.h"
 #include "../../MSCHAPv2/include/Config.h"
-#include "../../GTC/include/Config.h"
 
 #include <WinStd/Win.h>
 
@@ -108,7 +107,6 @@ protected:
     eap::config_method_pap         m_cfg_pap;           ///< PAP configuration
     eap::config_method_mschapv2    m_cfg_mschapv2;      ///< MSCHAPv2 configuration
     eap::config_method_eapmschapv2 m_cfg_eapmschapv2;   ///< EAP-MSCHAPv2 configuration
-    eap::config_method_eapgtc      m_cfg_eapgtc;        ///< EAP-GTC configuration
 #if EAP_INNER_EAPHOST
     eap::config_method_eaphost     m_cfg_eaphost;       ///< Inner EAP configuration
 #endif

lib/TTLS_UI/src/Module.cpp

@@ -43,7 +43,7 @@ public:
 protected:
     static wxCriticalSection s_lock;        ///< Initialization lock
     static unsigned long s_init_ref_count;  ///< Initialization reference counter
-    static wxLocale *s_locale;              ///< Locale
+    static wxLocale s_locale;               ///< Locale
 };
 
 
@@ -118,27 +118,19 @@ void eap::peer_ttls_ui::invoke_config_ui(
         // Initialize application.
         wxInitializerPeer init(m_instance);
 
-        wxWindow *parent;
+        {
-        if (hwndParent) {
             // Create wxWidget-approved parent window.
-            parent = new wxWindow;
+            wxWindow parent;
-            parent->SetHWND((WXHWND)hwndParent);
+            parent.SetHWND((WXHWND)(hwndParent ? hwndParent : GetForegroundWindow()));
-            parent->AdoptAttributesFromHWND();
+            parent.AdoptAttributesFromHWND();
-            wxTopLevelWindows.Append(parent);
+            wxTopLevelWindows.Append(&parent);
-        } else
-            parent = NULL;
 
-        // Create and launch configuration dialog.
+            // Create and launch configuration dialog.
-        wxEAPConfigDialog<wxTTLSConfigWindow> dlg(cfg, parent);
+            wxEAPConfigDialog<wxTTLSConfigWindow> dlg(cfg, &parent);
-        if (!parent) {
+            result = dlg.ShowModal();
-            FLASHWINFO fwi = { sizeof(FLASHWINFO), dlg.GetHWND(), FLASHW_ALL | FLASHW_TIMERNOFG };
-            ::FlashWindowEx(&fwi);
-        }
-        result = dlg.ShowModal();
 
-        if (parent) {
+            wxTopLevelWindows.DeleteObject(&parent);
-            wxTopLevelWindows.DeleteObject(parent);
+            parent.SetHWND((WXHWND)NULL);
-            parent->SetHWND((WXHWND)NULL);
         }
     }
 
@@ -161,9 +153,6 @@ void eap::peer_ttls_ui::invoke_identity_ui(
     _Out_                                  DWORD  *pdwUserDataOutSize,
     _Out_                                  LPWSTR *ppwszIdentity)
 {
-#ifdef _DEBUG
-    //::Sleep(10000);
-#endif
     assert(ppwszIdentity);
 
     // Unpack configuration.
@@ -189,220 +178,192 @@ void eap::peer_ttls_ui::invoke_identity_ui(
         // Initialize application.
         wxInitializerPeer init(m_instance);
 
-        wxWindow *parent;
+        {
-        if (hwndParent) {
             // Create wxWidget-approved parent window.
-            parent = new wxWindow;
+            wxWindow parent;
-            parent->SetHWND((WXHWND)hwndParent);
+            parent.SetHWND((WXHWND)(hwndParent ? hwndParent : GetForegroundWindow()));
-            parent->AdoptAttributesFromHWND();
+            parent.AdoptAttributesFromHWND();
-            wxTopLevelWindows.Append(parent);
+            wxTopLevelWindows.Append(&parent);
-        } else
-            parent = NULL;
 
-        if (cfg.m_providers.size() > 1) {
+            if (cfg.m_providers.size() > 1) {
-            // Multiple identity providers: User has to select one first.
+                // Multiple identity providers: User has to select one first.
-            wxEAPProviderSelectDialog dlg(cfg, parent);
+                wxEAPProviderSelectDialog dlg(cfg, &parent);
-
-            // Centre and display dialog.
-            dlg.Centre(wxBOTH);
-            if (!parent) {
-                FLASHWINFO fwi = { sizeof(FLASHWINFO), dlg.GetHWND(), FLASHW_ALL | FLASHW_TIMERNOFG };
-                ::FlashWindowEx(&fwi);
-            }
-            if ((result = dlg.ShowModal()) == wxID_OK) {
-                cfg_prov = dlg.GetSelection();
-                assert(cfg_prov);
-            }
-        } else if (!cfg.m_providers.empty()) {
-            // Single identity provider. No need to ask user to select one.
-            result = wxID_OK;
-            cfg_prov = &cfg.m_providers.front();
-        } else {
-            // No identity provider. Bail out.
-            result = wxID_CANCEL;
-        }
-
-        if (cfg_prov) {
-            // The identity provider is selected.
-            cfg_method = dynamic_cast<config_method_ttls*>(cfg_prov->m_methods.front().get());
-            assert(cfg_method);
-
-            // Configure output credentials.
-            cred_out.m_namespace = cfg_prov->m_namespace;
-            cred_out.m_id        = cfg_prov->m_id;
-            auto cred = dynamic_cast<credentials_ttls*>(cfg_method->make_credentials());
-            cred_out.m_cred.reset(cred);
-#if EAP_USE_NATIVE_CREDENTIAL_CACHE
-            bool has_cached = cred_in.m_cred && cred_in.match(*cfg_prov);
-#endif
-
-            if (dwFlags & EAP_FLAG_GUEST_ACCESS) {
-                // Disable credential saving for guests.
-                cfg_method->         m_allow_save = false;
-                cfg_method->m_inner->m_allow_save = false;
-            }
-
-            // Combine outer credentials.
-            wstring target_name(std::move(cfg_prov->get_id()));
-            eap::credentials::source_t src_outer = cred->credentials_tls::combine(
-                dwFlags,
-                NULL,
-#if EAP_USE_NATIVE_CREDENTIAL_CACHE
-                has_cached ? cred_in.m_cred.get() : NULL,
-#else
-                NULL,
-#endif
-                *cfg_method,
-                cfg_method->m_allow_save ? target_name.c_str() : NULL);
-            if (src_outer == eap::credentials::source_unknown ||
-                src_outer != eap::credentials::source_config && eap::config_method::status_cred_begin <= cfg_method->m_last_status && cfg_method->m_last_status < eap::config_method::status_cred_end)
-            {
-                // Build dialog to prompt for outer credentials.
-                wxEAPCredentialsDialog dlg(*cfg_prov, parent);
-                if (eap::config_method::status_cred_begin <= cfg_method->m_last_status && cfg_method->m_last_status < eap::config_method::status_cred_end)
-                    dlg.AddContent(new wxEAPCredentialWarningPanel(*cfg_prov, cfg_method->m_last_status, &dlg));
-                auto panel = new wxTLSCredentialsPanel(*cfg_prov, *cfg_method, *cred, &dlg, false);
-                panel->SetRemember(src_outer == eap::credentials::source_storage);
-                dlg.AddContent(panel);
-
-                // Update dialog layout.
-                dlg.Layout();
-                dlg.GetSizer()->Fit(&dlg);
 
                 // Centre and display dialog.
                 dlg.Centre(wxBOTH);
-                if (!parent) {
-                    FLASHWINFO fwi = { sizeof(FLASHWINFO), dlg.GetHWND(), FLASHW_ALL | FLASHW_TIMERNOFG };
-                    ::FlashWindowEx(&fwi);
-                }
                 if ((result = dlg.ShowModal()) == wxID_OK) {
-                    // Write credentials to credential manager.
+                    cfg_prov = dlg.GetSelection();
-                    if (panel->GetRemember()) {
+                    assert(cfg_prov);
-                        try {
-                            cred->credentials_tls::store(target_name.c_str(), 0);
-                        } catch (winstd::win_runtime_error &err) {
-                            wxLogError(winstd::tstring_printf(_("Error writing credentials to Credential Manager: %hs (error %u)"), err.what(), err.number()).c_str());
-                        } catch (...) {
-                            wxLogError(_("Writing credentials failed."));
-                        }
-                    }
                 }
-            } else
+            } else if (!cfg.m_providers.empty()) {
+                // Single identity provider. No need to ask user to select one.
                 result = wxID_OK;
+                cfg_prov = &cfg.m_providers.front();
+            } else {
+                // No identity provider. Bail out.
+                result = wxID_CANCEL;
+            }
 
-            if (result == wxID_OK) {
+            if (cfg_prov) {
-                // Combine inner credentials.
+                // The identity provider is selected.
-                eap::credentials::source_t src_inner = cred->m_inner->combine(
+                cfg_method = dynamic_cast<config_method_ttls*>(cfg_prov->m_methods.front().get());
+                assert(cfg_method);
+
+                // Configure output credentials.
+                cred_out.m_namespace = cfg_prov->m_namespace;
+                cred_out.m_id        = cfg_prov->m_id;
+                auto cred = dynamic_cast<credentials_ttls*>(cfg_method->make_credentials());
+                cred_out.m_cred.reset(cred);
+#if EAP_USE_NATIVE_CREDENTIAL_CACHE
+                bool has_cached = cred_in.m_cred && cred_in.match(*cfg_prov);
+#endif
+
+                if (dwFlags & EAP_FLAG_GUEST_ACCESS) {
+                    // Disable credential saving for guests.
+                    cfg_method->         m_allow_save = false;
+                    cfg_method->m_inner->m_allow_save = false;
+                }
+
+                // Combine outer credentials.
+                wstring target_name(std::move(cfg_prov->get_id()));
+                eap::credentials::source_t src_outer = cred->credentials_tls::combine(
                     dwFlags,
                     NULL,
 #if EAP_USE_NATIVE_CREDENTIAL_CACHE
-                    has_cached ? dynamic_cast<credentials_ttls*>(cred_in.m_cred.get())->m_inner.get() : NULL,
+                    has_cached ? cred_in.m_cred.get() : NULL,
 #else
                     NULL,
 #endif
-                    *cfg_method->m_inner,
+                    *cfg_method,
-                    cfg_method->m_inner->m_allow_save ? target_name.c_str() : NULL);
+                    cfg_method->m_allow_save ? target_name.c_str() : NULL);
-                if (src_inner == eap::credentials::source_unknown ||
+                if (src_outer == eap::credentials::source_unknown ||
-                    src_inner != eap::credentials::source_config && eap::config_method::status_cred_begin <= cfg_method->m_inner->m_last_status && cfg_method->m_inner->m_last_status < eap::config_method::status_cred_end)
+                    src_outer != eap::credentials::source_config && eap::config_method::status_cred_begin <= cfg_method->m_last_status && cfg_method->m_last_status < eap::config_method::status_cred_end)
                 {
-                    // Prompt for inner credentials.
+                    // Build dialog to prompt for outer credentials.
-#if EAP_INNER_EAPHOST
+                    wxEAPCredentialsDialog dlg(*cfg_prov, &parent);
-                    auto cfg_inner_eaphost = dynamic_cast<config_method_eaphost*>(cfg_method->m_inner.get());
+                    if (eap::config_method::status_cred_begin <= cfg_method->m_last_status && cfg_method->m_last_status < eap::config_method::status_cred_end)
-                    if (!cfg_inner_eaphost)
+                        dlg.AddContent(new wxEAPCredentialWarningPanel(*cfg_prov, cfg_method->m_last_status, &dlg));
-#endif
+                    auto panel = new wxTLSCredentialsPanel(*cfg_prov, *cfg_method, *cred, &dlg, false);
-                    {
+                    panel->SetRemember(src_outer == eap::credentials::source_storage);
-                        // Native inner methods. Build dialog to prompt for inner credentials.
+                    dlg.AddContent(panel);
-                        wxEAPCredentialsDialog dlg(*cfg_prov, parent);
+
-                        if (eap::config_method::status_cred_begin <= cfg_method->m_inner->m_last_status && cfg_method->m_inner->m_last_status < eap::config_method::status_cred_end)
+                    // Update dialog layout.
-                            dlg.AddContent(new wxEAPCredentialWarningPanel(*cfg_prov, cfg_method->m_inner->m_last_status, &dlg));
+                    dlg.Layout();
-                        wxEAPCredentialsPanelBase *panel = NULL;
+                    dlg.GetSizer()->Fit(&dlg);
-                        switch (cfg_method->m_inner->get_method_id()) {
+
-                            case eap_type_legacy_pap     : panel = new wxPAPCredentialsPanel     (*cfg_prov, *dynamic_cast<const eap::config_method_pap        *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass    *>(cred->m_inner.get()), &dlg, false); break;
+                    // Centre and display dialog.
-                            case eap_type_legacy_mschapv2: panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_mschapv2   *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass    *>(cred->m_inner.get()), &dlg, false); break;
+                    dlg.Centre(wxBOTH);
-                            case eap_type_mschapv2       : panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapmschapv2*>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass    *>(cred->m_inner.get()), &dlg, false); break;
+                    if ((result = dlg.ShowModal()) == wxID_OK) {
-                            case eap_type_gtc            : {
+                        // Write credentials to credential manager.
-                                // EAP-GTC credential prompt differes for "Challenge/Response" and "Password" authentication modes.
+                        if (panel->GetRemember()) {
-                                eap::credentials_identity *cred_resp;
+                            try {
-                                eap::credentials_pass     *cred_pass;
+                                cred->credentials_tls::store(target_name.c_str(), 0);
-                                if ((cred_resp = dynamic_cast<eap::credentials_identity*>(cred->m_inner.get())) != NULL)
+                            } catch (winstd::win_runtime_error &err) {
-                                    panel = new wxGTCResponseCredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapgtc*>(cfg_method->m_inner.get()), *cred_resp, &dlg, false);
+                                wxLogError(winstd::tstring_printf(_("Error writing credentials to Credential Manager: %hs (error %u)"), err.what(), err.number()).c_str());
-                                else if ((cred_pass = dynamic_cast<eap::credentials_pass*>(cred->m_inner.get())) != NULL)
+                            } catch (...) {
-                                    panel = new wxGTCPasswordCredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapgtc*>(cfg_method->m_inner.get()), *cred_pass, &dlg, false);
+                                wxLogError(_("Writing credentials failed."));
-                                else
-                                    wxLogError("Unsupported authentication mode.");
-                                break;
                             }
-                            default                      : wxLogError("Unsupported inner authentication method.");
                         }
-                        panel->SetRemember(src_inner == eap::credentials::source_storage);
+                    }
-                        dlg.AddContent(panel);
+                } else
+                    result = wxID_OK;
 
-                        // Update dialog layout.
+                if (result == wxID_OK) {
-                        dlg.Layout();
+                    // Combine inner credentials.
-                        dlg.GetSizer()->Fit(&dlg);
+                    eap::credentials::source_t src_inner = cred->m_inner->combine(
+                        dwFlags,
+                        NULL,
+#if EAP_USE_NATIVE_CREDENTIAL_CACHE
+                        has_cached ? dynamic_cast<credentials_ttls*>(cred_in.m_cred.get())->m_inner.get() : NULL,
+#else
+                        NULL,
+#endif
+                        *cfg_method->m_inner,
+                        cfg_method->m_inner->m_allow_save ? target_name.c_str() : NULL);
+                    if (src_inner == eap::credentials::source_unknown ||
+                        src_inner != eap::credentials::source_config && eap::config_method::status_cred_begin <= cfg_method->m_inner->m_last_status && cfg_method->m_inner->m_last_status < eap::config_method::status_cred_end)
+                    {
+                        // Prompt for inner credentials.
+#if EAP_INNER_EAPHOST
+                        auto cfg_inner_eaphost = dynamic_cast<config_method_eaphost*>(cfg_method->m_inner.get());
+                        if (!cfg_inner_eaphost)
+#endif
+                        {
+                            // Native inner methods. Build dialog to prompt for inner credentials.
+                            wxEAPCredentialsDialog dlg(*cfg_prov, &parent);
+                            if (eap::config_method::status_cred_begin <= cfg_method->m_inner->m_last_status && cfg_method->m_inner->m_last_status < eap::config_method::status_cred_end)
+                                dlg.AddContent(new wxEAPCredentialWarningPanel(*cfg_prov, cfg_method->m_inner->m_last_status, &dlg));
+                            wxEAPCredentialsPanelBase *panel = NULL;
+                            switch (cfg_method->m_inner->get_method_id()) {
+                                case eap_type_legacy_pap     : panel = new wxPAPCredentialsPanel     (*cfg_prov, *dynamic_cast<const eap::config_method_pap        *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass*>(cred->m_inner.get()), &dlg, false); break;
+                                case eap_type_legacy_mschapv2: panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_mschapv2   *>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass*>(cred->m_inner.get()), &dlg, false); break;
+                                case eap_type_mschapv2       : panel = new wxMSCHAPv2CredentialsPanel(*cfg_prov, *dynamic_cast<const eap::config_method_eapmschapv2*>(cfg_method->m_inner.get()), *dynamic_cast<eap::credentials_pass*>(cred->m_inner.get()), &dlg, false); break;
+                                default                      : wxLogError("Unsupported inner authentication method.");
+                            }
+                            panel->SetRemember(src_inner == eap::credentials::source_storage);
+                            dlg.AddContent(panel);
 
-                        // Centre and display dialog.
+                            // Update dialog layout.
-                        dlg.Centre(wxBOTH);
+                            dlg.Layout();
-                        if (!parent) {
+                            dlg.GetSizer()->Fit(&dlg);
-                            FLASHWINFO fwi = { sizeof(FLASHWINFO), dlg.GetHWND(), FLASHW_ALL | FLASHW_TIMERNOFG };
+
-                            ::FlashWindowEx(&fwi);
+                            // Centre and display dialog.
-                        }
+                            dlg.Centre(wxBOTH);
-                        if ((result = dlg.ShowModal()) == wxID_OK) {
+                            if ((result = dlg.ShowModal()) == wxID_OK) {
-                            // Write credentials to credential manager.
+                                // Write credentials to credential manager.
-                            if (panel->GetRemember()) {
+                                if (panel->GetRemember()) {
-                                try {
+                                    try {
-                                    cred->m_inner->store(target_name.c_str(), 1);
+                                        cred->m_inner->store(target_name.c_str(), 1);
-                                } catch (winstd::win_runtime_error &err) {
+                                    } catch (winstd::win_runtime_error &err) {
-                                    wxLogError(winstd::tstring_printf(_("Error writing credentials to Credential Manager: %hs (error %u)"), err.what(), err.number()).c_str());
+                                        wxLogError(winstd::tstring_printf(_("Error writing credentials to Credential Manager: %hs (error %u)"), err.what(), err.number()).c_str());
-                                } catch (...) {
+                                    } catch (...) {
-                                    wxLogError(_("Writing credentials failed."));
+                                        wxLogError(_("Writing credentials failed."));
+                                    }
                                 }
                             }
                         }
-                    }
 #if EAP_INNER_EAPHOST
-                    else {
+                        else {
-                        // EapHost inner method
+                            // EapHost inner method
-                        auto cred_inner = dynamic_cast<eap::credentials_eaphost*>(cred->m_inner.get());
+                            auto cred_inner = dynamic_cast<eap::credentials_eaphost*>(cred->m_inner.get());
-                        DWORD cred_data_size = 0;
+                            DWORD cred_data_size = 0;
-                        winstd::eap_blob cred_data;
+                            winstd::eap_blob cred_data;
-                        unique_ptr<WCHAR[], EapHostPeerFreeMemory_delete> identity;
+                            unique_ptr<WCHAR[], EapHostPeerFreeMemory_delete> identity;
-                        winstd::eap_error error;
+                            winstd::eap_error error;
-                        DWORD dwResult = EapHostPeerInvokeIdentityUI(
+                            DWORD dwResult = EapHostPeerInvokeIdentityUI(
-                            0,
+                                0,
-                            cfg_inner_eaphost->get_type(),
+                                cfg_inner_eaphost->get_type(),
-                            dwFlags,
+                                dwFlags,
-                            hwndParent,
+                                hwndParent,
-                            (DWORD)cfg_inner_eaphost->m_cfg_blob.size(), cfg_inner_eaphost->m_cfg_blob.data(),
+                                (DWORD)cfg_inner_eaphost->m_cfg_blob.size(), cfg_inner_eaphost->m_cfg_blob.data(),
-                            (DWORD)cred_inner->m_cred_blob.size(), cred_inner->m_cred_blob.data(),
+                                (DWORD)cred_inner->m_cred_blob.size(), cred_inner->m_cred_blob.data(),
-                            &cred_data_size, &cred_data._Myptr,
+                                &cred_data_size, &cred_data._Myptr,
-                            &identity._Myptr,
+                                &identity._Myptr,
-                            &error._Myptr,
+                                &error._Myptr,
-                            NULL);
+                                NULL);
-                        result = dwResult == ERROR_SUCCESS ? wxID_OK : wxID_CANCEL;
+                            result = dwResult == ERROR_SUCCESS ? wxID_OK : wxID_CANCEL;
-                        if (dwResult == ERROR_SUCCESS) {
+                            if (dwResult == ERROR_SUCCESS) {
-                            // Inner EAP method provided credentials.
+                                // Inner EAP method provided credentials.
-                            cred_inner->m_identity = identity.get();
+                                cred_inner->m_identity = identity.get();
-                            cred_inner->m_cred_blob.assign(cred_data.get(), cred_data.get() + cred_data_size);
+                                cred_inner->m_cred_blob.assign(cred_data.get(), cred_data.get() + cred_data_size);
-                            SecureZeroMemory(cred_data.get(), cred_data_size);
+                                SecureZeroMemory(cred_data.get(), cred_data_size);
 
-                            // TODO: If we ever choose to store EapHost credentials to Windows Credential Manager, add a "Save credentials? Yes/No" prompt here and write them to Credential Manager.
+                                // TODO: If we ever choose to store EapHost credentials to Windows Credential Manager, add a "Save credentials? Yes/No" prompt here and write them to Credential Manager.
-                        } else if (dwResult == ERROR_CANCELLED) {
+                            } else if (dwResult == ERROR_CANCELLED) {
-                            // Not really an error.
+                                // Not really an error.
-                        } else if (error)
+                            } else if (error)
-                            wxLogError(_("Invoking EAP identity UI failed (error %u, %s, %s)."), error->dwWinError, error->pRootCauseString, error->pRepairString);
+                                wxLogError(_("Invoking EAP identity UI failed (error %u, %s, %s)."), error->dwWinError, error->pRootCauseString, error->pRepairString);
-                        else
+                            else
-                            wxLogError(_("Invoking EAP identity UI failed (error %u)."), dwResult);
+                                wxLogError(_("Invoking EAP identity UI failed (error %u)."), dwResult);
-                    }
+                        }
 #endif
-                } else
+                    } else
-                    result = wxID_OK;
+                        result = wxID_OK;
+                }
             }
-        }
 
-        if (parent) {
+            wxTopLevelWindows.DeleteObject(&parent);
-            wxTopLevelWindows.DeleteObject(parent);
+            parent.SetHWND((WXHWND)NULL);
-            parent->SetHWND((WXHWND)NULL);
         }
     }
 
@@ -428,117 +389,13 @@ void eap::peer_ttls_ui::invoke_interactive_ui(
     _Inout_                               BYTE  **ppDataFromInteractiveUI,
     _Inout_                               DWORD *pdwDataFromInteractiveUISize)
 {
-    // Unpack context data.
+    UNREFERENCED_PARAMETER(pUIContextData);
-    config_connection cfg(*this);
+    UNREFERENCED_PARAMETER(dwUIContextDataSize);
-    credentials_connection cred(*this, cfg);
+    UNREFERENCED_PARAMETER(ppDataFromInteractiveUI);
-    ui_context_ttls ctx(cfg, cred);
+    UNREFERENCED_PARAMETER(pdwDataFromInteractiveUISize);
-    unpack(ctx, pUIContextData, dwUIContextDataSize);
 
-    // Look-up the provider.
+    InitCommonControls();
-    config_provider *cfg_prov;
+    MessageBox(hwndParent, _T(PRODUCT_NAME_STR) _T(" interactive UI goes here!"), _T(PRODUCT_NAME_STR) _T(" Prompt"), MB_OK);
-    config_method_ttls *cfg_method;
-    for (auto _cfg_prov = cfg.m_providers.begin(), cfg_prov_end = cfg.m_providers.end();; ++_cfg_prov) {
-        if (_cfg_prov != cfg_prov_end) {
-            if (cred.match(*_cfg_prov)) {
-                // Matching provider found.
-                if (_cfg_prov->m_methods.empty())
-                    throw invalid_argument(string_printf(__FUNCTION__ " %ls provider has no methods.", _cfg_prov->get_id().c_str()));
-                cfg_prov   = &*_cfg_prov;
-                cfg_method = dynamic_cast<config_method_ttls*>(_cfg_prov->m_methods.front().get());
-                break;
-            }
-        } else
-            throw invalid_argument(string_printf(__FUNCTION__ " Credentials do not match to any provider within this connection configuration (provider: %ls).", cred.get_id().c_str()));
-    }
-
-#if EAP_INNER_EAPHOST
-    auto cfg_inner_eaphost = dynamic_cast<config_method_eaphost*>(cfg_method->m_inner.get());
-    if (!cfg_inner_eaphost)
-#endif
-    {
-        int result;
-        {
-            // Initialize application.
-            wxInitializerPeer init(m_instance);
-
-            wxWindow *parent;
-            if (hwndParent) {
-                // Create wxWidget-approved parent window.
-                parent = new wxWindow;
-                parent->SetHWND((WXHWND)hwndParent);
-                parent->AdoptAttributesFromHWND();
-                wxTopLevelWindows.Append(parent);
-            } else
-                parent = NULL;
-
-            {
-                sanitizing_wstring
-                    challenge(reinterpret_cast<sanitizing_wstring::const_pointer>(ctx.m_data.data()), ctx.m_data.size()/sizeof(sanitizing_wstring::value_type)),
-                    response;
-
-                // Build dialog to prompt for response.
-                wxGTCResponseDialog dlg(*cfg_prov, parent);
-                auto panel = new wxGTCResponsePanel(response, challenge.c_str(), &dlg);
-                dlg.AddContent(panel);
-
-                // Update dialog layout.
-                dlg.Layout();
-                dlg.GetSizer()->Fit(&dlg);
-
-                // Centre and display dialog.
-                dlg.Centre(wxBOTH);
-                if (!parent) {
-                    FLASHWINFO fwi = { sizeof(FLASHWINFO), dlg.GetHWND(), FLASHW_ALL | FLASHW_TIMERNOFG };
-                    ::FlashWindowEx(&fwi);
-                }
-                if ((result = dlg.ShowModal()) == wxID_OK) {
-                    // Save response.
-                    ctx.m_data.assign(
-                        reinterpret_cast<sanitizing_blob::const_pointer>(response.data()                    ),
-                        reinterpret_cast<sanitizing_blob::const_pointer>(response.data() + response.length()));
-                }
-            }
-
-            if (parent) {
-                wxTopLevelWindows.DeleteObject(parent);
-                parent->SetHWND((WXHWND)NULL);
-            }
-        }
-
-        if (result != wxID_OK)
-            throw win_runtime_error(ERROR_CANCELLED, __FUNCTION__ " Cancelled.");
-    }
-#if EAP_INNER_EAPHOST
-    else {
-        // EapHost inner method
-        DWORD dwSizeofDataFromInteractiveUI;
-        BYTE *pDataFromInteractiveUI;
-        winstd::eap_error error;
-        DWORD dwResult = EapHostPeerInvokeInteractiveUI(
-            hwndParent,
-            (DWORD)ctx.m_data.size(),
-            ctx.m_data.data(),
-            &dwSizeofDataFromInteractiveUI,
-            &pDataFromInteractiveUI,
-            &error._Myptr);
-        if (dwResult == ERROR_SUCCESS) {
-            // Inner EAP method provided response.
-            ctx.m_data.assign(pDataFromInteractiveUI, pDataFromInteractiveUI + dwSizeofDataFromInteractiveUI);
-        } else if (dwResult == ERROR_CANCELLED) {
-            // Not really an error.
-            throw win_runtime_error(ERROR_CANCELLED, __FUNCTION__ " Cancelled.");
-        } else if (error) {
-            wxLogError(_("Invoking EAP interactive UI failed (error %u, %s, %s)."), error->dwWinError, error->pRootCauseString, error->pRepairString);
-            throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerInvokeInteractiveUI failed.");
-        } else {
-            wxLogError(_("Invoking EAP interactive UI failed (error %u)."), dwResult);
-            throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerInvokeInteractiveUI failed.");
-        }
-    }
-#endif
-
-    // Pack output data.
-    pack(ctx.m_data, ppDataFromInteractiveUI, pdwDataFromInteractiveUISize);
 }
 
 
@@ -558,10 +415,9 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance)
 
     // Do our wxWidgets configuration and localization initialization.
     wxInitializeConfig();
-    s_locale = new wxLocale;
+    if (wxInitializeLocale(s_locale)) {
-    if (wxInitializeLocale(*s_locale)) {
+        s_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion));
-        s_locale->AddCatalog(wxT("wxExtend") wxT(wxExtendVersion));
+        s_locale.AddCatalog(wxT("EAPTTLSUI"));
-        s_locale->AddCatalog(wxT("EAPTTLSUI"));
     }
 }
 
@@ -573,14 +429,9 @@ wxInitializerPeer::~wxInitializerPeer()
         return;
 
     wxEntryCleanup();
-
-    if (s_locale) {
-        delete s_locale;
-        s_locale = NULL;
-    }
 }
 
 
 wxCriticalSection wxInitializerPeer::s_lock;
 unsigned long wxInitializerPeer::s_init_ref_count = 0;
-wxLocale *wxInitializerPeer::s_locale = NULL;
+wxLocale wxInitializerPeer::s_locale;

lib/TTLS_UI/src/StdAfx.h

@@ -28,10 +28,8 @@
 #include "../../EapHost_UI/include/EapHost_UI.h"
 #include "../../PAP_UI/include/PAP_UI.h"
 #include "../../MSCHAPv2_UI/include/MSCHAPv2_UI.h"
-#include "../../GTC_UI/include/GTC_UI.h"
 
 #include "../../EapHost/include/Credentials.h"
-#include "../../TTLS/include/UIContext.h"
 
 #include <wxex/common.h>
 

lib/TTLS_UI/src/TTLS_UI.cpp

@@ -103,7 +103,6 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m
     m_cfg_pap        (cfg.m_module, cfg.m_level + 1),
     m_cfg_mschapv2   (cfg.m_module, cfg.m_level + 1),
     m_cfg_eapmschapv2(cfg.m_module, cfg.m_level + 1),
-    m_cfg_eapgtc     (cfg.m_module, cfg.m_level + 1),
 #if EAP_INNER_EAPHOST
     m_cfg_eaphost    (cfg.m_module, cfg.m_level + 1),
 #endif
@@ -128,8 +127,6 @@ wxTTLSConfigWindow::wxTTLSConfigWindow(eap::config_provider &prov, eap::config_m
     m_inner_type->AddPage(panel_mschapv2, _("MSCHAPv2"));
     wxMSCHAPv2ConfigPanel *panel_eapmschapv2 = new wxMSCHAPv2ConfigPanel(m_prov, m_cfg_eapmschapv2, m_inner_type);
     m_inner_type->AddPage(panel_eapmschapv2, _("EAP-MSCHAPv2"));
-    wxGTCConfigPanel *panel_eapgtc = new wxGTCConfigPanel(m_prov, m_cfg_eapgtc, m_inner_type);
-    m_inner_type->AddPage(panel_eapgtc, _("EAP-GTC"));
 #if EAP_INNER_EAPHOST
     wxEapHostConfigPanel *panel_eaphost = new wxEapHostConfigPanel(m_prov, m_cfg_eaphost, m_inner_type);
     m_inner_type->AddPage(panel_eaphost, _("Other EAP methods..."));
@@ -201,11 +198,6 @@ bool wxTTLSConfigWindow::TransferDataToWindow()
             m_inner_type->SetSelection(2); // 2=EAP-MSCHAPv2
             break;
 
-        case winstd::eap_type_gtc:
-            m_cfg_eapgtc = dynamic_cast<eap::config_method_eapgtc&>(*cfg_ttls.m_inner);
-            m_inner_type->SetSelection(3); // 3=EAP-GTC
-            break;
-
         default:
             wxFAIL_MSG(wxT("Unsupported inner authentication method type."));
         }
@@ -214,7 +206,7 @@ bool wxTTLSConfigWindow::TransferDataToWindow()
     else {
         // EapHost inner method
         m_cfg_eaphost = *cfg_inner_eaphost;
-        m_inner_type->SetSelection(4); // 4=EapHost
+        m_inner_type->SetSelection(3); // 3=EapHost
     }
 #endif
 
@@ -245,12 +237,8 @@ bool wxTTLSConfigWindow::TransferDataFromWindow()
             cfg_ttls.m_inner.reset(new eap::config_method_eapmschapv2(m_cfg_eapmschapv2));
             break;
 
-        case 3: // 3=EAP-GTC
-            cfg_ttls.m_inner.reset(new eap::config_method_eapgtc(m_cfg_eapgtc));
-            break;
-
 #if EAP_INNER_EAPHOST
-        case 4: // 4=EapHost
+        case 3: // 3=EapHost
             cfg_ttls.m_inner.reset(new eap::config_method_eaphost(m_cfg_eaphost));
             break;
 #endif