Version set to 1.0-alpha10-owntls

EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj

@@ -127,13 +127,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="..\build\EAPMethodUI.def" />
-    <None Include="..\locale\EAPMethods.pot" />
-  </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="..\locale\sl_SI.po" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\..\include\xgettext.targets" />
   </ImportGroup>
 </Project>

EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj.filters

@@ -13,10 +13,6 @@
       <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>
-    <Filter Include="Resource Files\Localization">
-      <UniqueIdentifier>{e43059ae-37ac-4b28-84fb-18d1b3972b30}</UniqueIdentifier>
-      <Extensions>po;pot</Extensions>
-    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="StdAfx.h">
@@ -40,13 +36,5 @@
     <None Include="..\build\EAPMethodUI.def">
       <Filter>Source Files</Filter>
     </None>
-    <None Include="..\locale\EAPMethods.pot">
-      <Filter>Resource Files\Localization</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="..\locale\sl_SI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
   </ItemGroup>
 </Project>

EAPMethods/locale/.gitignore

@@ -1 +0,0 @@
-/*.mo

EAPMethods/locale/EAPMethods.pot

@@ -2,7 +2,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2016-08-25 10:43+0200\n"
+"POT-Creation-Date: 2016-06-10 12:06+0200\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"
@@ -11,6 +11,8 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Poedit 1.8.8\n"
 "X-Poedit-Basepath: ../..\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Language: en_US\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
@@ -19,203 +21,70 @@ msgstr ""
 "X-Poedit-SearchPath-3: lib/TTLS_UI\n"
 "X-Poedit-SearchPath-4: EAPMethods\n"
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:123 lib/EAPBase_UI/res/wxEAP_UI.cpp:200
-msgid "Advanced..."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
-msgid "Opens dialog with provider settings"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:174 lib/EAPBase_UI/res/wxEAP_UI.cpp:296
 msgid "Client Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:185
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:134
-msgid "Manage credentials used to connect."
+msgid "Manage your credentials stored in Windows Credential Manager."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:198
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:144
-msgid "Use &own credentials:"
+msgid "Identity:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:199
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:149
-msgid "Select this option if you have your unique credentials to connect"
+msgid "Enter your user name here (user@domain.org, DOMAINUser, etc.)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:204
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:159
-msgid "Your credentials loaded from Windows Credential Manager"
+msgid "&Set Credentials..."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:214
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:160
+msgid "Click here to set or modify your credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:164
 msgid "&Clear Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:215
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:165
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:219 lib/EAPBase_UI/res/wxEAP_UI.cpp:252
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:211
-msgid "&Set Credentials..."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:220 lib/EAPBase_UI/res/wxEAP_UI.cpp:253
-msgid "Click here to set or modify your credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:236
-msgid "Use &pre-shared credentials:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:237
-msgid "Select this options if all clients connect using the same credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:242
-msgid "Common (pre-shared) credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:307
 msgid "Please provide your user ID and password."
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:317
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:221
 msgid "User ID:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:322
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:226
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:326
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:230
 msgid "Password:"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:331
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:235
 msgid "Enter your password here"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:338 lib/TLS_UI/res/wxTLS_UI.cpp:183
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:242 lib/TLS_UI/res/wxTLS_UI.cpp:164
 msgid "&Remember"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:339
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:243
 msgid "Check if you would like to save username and password"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:361
+#: lib/PAP_UI/src/PAP_UI.cpp:41
-msgid "Your Organization"
+msgid "This method requires no additional settings."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:372
-msgid "Describe your organization to customize user prompts.  When organization is introduced, end-users find program messages easier to understand and act."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379
-msgid "Your organization &name:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384
-msgid "Your organization name as it will appear on helpdesk contact notifications"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
-msgid "(Keep it short, please)"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398
-msgid "Helpdesk contact &information:"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:408
-msgid "¶"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:415
-msgid "Your helpdesk website address"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:419
-msgid "*"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:426
-msgid "Your helpdesk e-mail address"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:430
-msgid ")"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
-msgid "Your helpdesk phone number"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:471
-msgid "Configuration Lock"
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:482
-msgid "Your configuration can be locked to prevent accidental modification by end-users. Users will only be allowed to enter credentials."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489
-msgid "&Lock this configuration and prevent any further modification via user interface."
-msgstr ""
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:492
-msgid "(Warning: Once locked, you can not revert using this dialog!)"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:88
-#, c-format
-msgid "%s Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:118
-#, c-format
-msgid "For additional help and instructions, please contact %s at:"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:120
-#, c-format
-msgid "your %ls provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:120
-msgid "your provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
-msgid "Open the default web browser"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:150
-msgid "Open your e-mail program"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:161
-msgid "Dial the phone number"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:180
-#, c-format
-msgid "%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:182
-#, c-format
-msgid "Your %ls provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:182
-msgid "Your provider"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:201
-msgid "Previous attempt to connect failed. Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
@@ -263,11 +132,11 @@ msgid "Acceptable server &names:"
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:77
-msgid "A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed"
+msgid "A semicolon delimited list of acceptable server FQDN names; blank to skip name check; \"*\" wildchar allowed"
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:81
-msgid "(Example: foo.bar.com;server2.bar.com)"
+msgid "(Example: foo.bar.com;*.domain.org)"
 msgstr ""
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:120
@@ -298,59 +167,48 @@ msgstr ""
 msgid "Client certificate to use for authentication"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:167
+#: lib/TLS_UI/res/wxTLS_UI.cpp:165
-msgid "Custom &identity:"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:172
-msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:176
-msgid "(Example: user@contoso.com)"
-msgstr ""
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:184
 msgid "Check if you would like to save certificate selection"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:118
+#: lib/TLS_UI/src/TLS_UI.cpp:199
 #, c-format
 msgid "Invalid character in host name found: %c"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:118
+#: lib/TLS_UI/src/TLS_UI.cpp:199
 msgid "Validation conflict"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:514
+#: lib/TLS_UI/src/TLS_UI.cpp:551
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:515
+#: lib/TLS_UI/src/TLS_UI.cpp:552
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:516
+#: lib/TLS_UI/src/TLS_UI.cpp:553
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:517
+#: lib/TLS_UI/src/TLS_UI.cpp:554
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:518
+#: lib/TLS_UI/src/TLS_UI.cpp:555
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:534
+#: lib/TLS_UI/src/TLS_UI.cpp:571
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:534
+#: lib/TLS_UI/src/TLS_UI.cpp:571
+#, fuzzy
 msgid "Error"
-msgstr ""
+msgstr "Napaka pri nalaganju knjižnice MSI.DLL (%1!ld!)."
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
 msgid "Outer Identity"
@@ -361,7 +219,7 @@ msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
-msgid "&True identity"
+msgid "&Same as inner identity"
 msgstr ""
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
@@ -388,93 +246,96 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:231 lib/TTLS_UI/src/Module.cpp:241
+#: lib/TTLS_UI/src/TTLS_UI.cpp:92
-#: lib/EAPBase_UI/include/EAP_UI.h:582
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-
-#: lib/TTLS_UI/src/Module.cpp:233 lib/TTLS_UI/src/Module.cpp:243
-#: lib/EAPBase_UI/include/EAP_UI.h:584
-msgid "Writing credentials failed."
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:215
-msgid "Inner Authentication"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:114
-msgid "Select inner authentication method from the list"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:116
-msgid "PAP"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:121 lib/TTLS_UI/src/TTLS_UI.cpp:236
 msgid "Outer Authentication"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:253
+#: lib/TTLS_UI/src/TTLS_UI.cpp:105
-msgid "EAP Credentials"
+msgid "Inner Authentication"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:422
+#: lib/TTLS_UI/src/TTLS_UI.cpp:111
-msgid "Provider Settings"
+msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:502 lib/EAPBase_UI/include/EAP_UI.h:529
+#: lib/TTLS_UI/src/TTLS_UI.cpp:112
+msgid "PAP"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:217
 msgid "<blank>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:508
+#: lib/EAPBase_UI/include/EAP_UI.h:223
 #, c-format
 msgid "<error %u>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:568
+#: lib/EAPBase_UI/include/EAP_UI.h:246
-#, c-format
-msgid "Error reading credentials from Credential Manager: %hs (error %u)"
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:570
-msgid "Reading credentials failed."
-msgstr ""
-
-#: lib/EAPBase_UI/include/EAP_UI.h:595
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:817
+#: lib/EAPBase_UI/include/EAP_UI.h:300
-msgid "<Your Organization>"
+#, c-format
+msgid "Error reading credentials from Credential Manager: %ls (error %u)"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.h:60
+#: lib/EAPBase_UI/include/EAP_UI.h:303
+#, c-format
+msgid "Reading credentials failed (error %u)."
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:318
+#, c-format
+msgid "Error writing credentials to Credential Manager: %ls (error %u)"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:321
+#, c-format
+msgid "Writing credentials failed (error %u)."
+msgstr ""
+
+#: lib/EAPBase_UI/res/wxEAP_UI.h:56
 msgid "EAP Method Configuration"
 msgstr ""
 
+#: lib/EAPBase_UI/res/wxEAP_UI.h:81
+msgid "EAP Credentials"
+msgstr ""
+
+#: EAPMethods/MSIBuild/En.Win32.Debug.Feature-2.idtx:3
 #: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3
+#: EAPMethods/MSIBuild/En.x64.Debug.Feature-2.idtx:3
 #: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3
+#, fuzzy
 msgid "1252"
-msgstr ""
+msgstr "1250"
 
+#: EAPMethods/MSIBuild/En.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/En.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid "EAP Methods"
+msgid "EAP Peer Methods"
 msgstr ""
 
+#: EAPMethods/MSIBuild/En.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4
+#: EAPMethods/MSIBuild/En.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
 msgstr ""
 
+#: EAPMethods/MSIBuild/En.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/En.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
 msgstr ""
 
+#: EAPMethods/MSIBuild/En.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5
+#: EAPMethods/MSIBuild/En.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
 msgstr ""

EAPMethods/locale/sl_SI.po

@@ -1,532 +0,0 @@
-# 
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2016-08-25 10:43+0200\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
-"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ../..\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/PAP_UI\n"
-"X-Poedit-SearchPath-2: lib/TLS_UI\n"
-"X-Poedit-SearchPath-3: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-4: EAPMethods\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
-msgid "Advanced..."
-msgstr "Napredno ..."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
-msgid "Opens dialog with provider settings"
-msgstr "Odpre dialog z nastavitvami ponudnika"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:174 lib/EAPBase_UI/res/wxEAP_UI.cpp:296
-msgid "Client Credentials"
-msgstr "Odjemalčeve poverilnice"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:185
-msgid "Manage credentials used to connect."
-msgstr "Upravljajte s poverilnicami za povezovanje."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:198
-msgid "Use &own credentials:"
-msgstr "Uporabi sv&oje poverilnice:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:199
-msgid "Select this option if you have your unique credentials to connect"
-msgstr "Izberite to možnost, če imate svoje lastne poverilnice za povezovanje"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:204
-msgid "Your credentials loaded from Windows Credential Manager"
-msgstr "Vaše poverilnice naložene iz upravitelja poverilnic Windows"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:214
-msgid "&Clear Credentials"
-msgstr "Počisti poverilni&ce"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:215
-msgid ""
-"Click to clear your credentials from Credential Manager.\n"
-"Note: You will be prompted to enter credentials when connecting."
-msgstr ""
-"Kliknite, da počistite svoje poverilnice iz upravitelja poverilnic.\n"
-"Opomba: Za vnos poverilnic boste pozvani ob povezovanju."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:219 lib/EAPBase_UI/res/wxEAP_UI.cpp:252
-msgid "&Set Credentials..."
-msgstr "Na&stavi poverilnice ..."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:220 lib/EAPBase_UI/res/wxEAP_UI.cpp:253
-msgid "Click here to set or modify your credentials"
-msgstr "Kliknite tukaj, da nastavite ali spremenite svoje poverilnice"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:236
-msgid "Use &pre-shared credentials:"
-msgstr "Uporabi sku&pne poverilnice:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:237
-msgid "Select this options if all clients connect using the same credentials"
-msgstr ""
-"Izberite to možnost, kadar se vsi odjemalci povezujejo z istimi "
-"poverilnicami"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:242
-msgid "Common (pre-shared) credentials"
-msgstr "Skupne (deljene) poverilnice"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:307
-msgid "Please provide your user ID and password."
-msgstr "Vnesite svoj uporabniški ID in geslo."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:317
-msgid "User ID:"
-msgstr "Uporabniški ID:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:322
-msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
-msgstr "Tukaj vnesite svoje up. ime (up. ime@domena.si, DOMENA\\Uporabnik ipd.)"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:326
-msgid "Password:"
-msgstr "Geslo:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:331
-msgid "Enter your password here"
-msgstr "Tukaj vnesite svoje geslo"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:338 lib/TLS_UI/res/wxTLS_UI.cpp:183
-msgid "&Remember"
-msgstr "Za&pomni si"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:339
-msgid "Check if you would like to save username and password"
-msgstr "Odkljukajte, če želite shraniti up. ime in geslo"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:361
-msgid "Your Organization"
-msgstr "Vaša organizacija"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:372
-msgid ""
-"Describe your organization to customize user prompts.  When organization is "
-"introduced, end-users find program messages easier to understand and act."
-msgstr ""
-"Opišite svojo organizacijo za up. pozive po meri. Kadar se organizacija "
-"predstavi, uporabniki lažje razumejo sporočila programa in ustrezneje "
-"reagirajo."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:379
-msgid "Your organization &name:"
-msgstr "Ime vaše orga&nizacije:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:384
-msgid ""
-"Your organization name as it will appear on helpdesk contact notifications"
-msgstr ""
-"Ime vaše organizacije, kot bo nastopalo na obvestilih s stikom na center za "
-"pomoč"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:388
-msgid "(Keep it short, please)"
-msgstr "(Naj bo kratko, prosim)"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:398
-msgid "Helpdesk contact &information:"
-msgstr "Podatk&i centra za pomoč:"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:408
-msgid "¶"
-msgstr "¶"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:415
-msgid "Your helpdesk website address"
-msgstr "Naslov spletne strani vašega centra za pomoč"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:419
-msgid "*"
-msgstr "*"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:426
-msgid "Your helpdesk e-mail address"
-msgstr "E-poštni naslov vašega centra za pomoč"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:430
-msgid ")"
-msgstr ")"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
-msgid "Your helpdesk phone number"
-msgstr "Telefonska številka vašega centra za pomoč"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:471
-msgid "Configuration Lock"
-msgstr "Zaklep konfiguracije"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:482
-msgid ""
-"Your configuration can be locked to prevent accidental modification by end-"
-"users. Users will only be allowed to enter credentials."
-msgstr ""
-"Svojo konfiguracijo lahko zaklenete in preprečite končnim uporabnikom "
-"nenamerno spreminjanje. Uporabniki bodo lahko vnašali samo poverilnice."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:489
-msgid ""
-"&Lock this configuration and prevent any further modification via user "
-"interface."
-msgstr ""
-"Zak&leni to konfiguracijo in prepreči vse nadaljnje spremembe preko up. "
-"vmesnika."
-
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:492
-msgid "(Warning: Once locked, you can not revert using this dialog!)"
-msgstr "(Pozor: Ko zaklenete, vrnitev ne bo več možna preko tega dialoga!)"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:88
-#, c-format
-msgid "%s Credentials"
-msgstr "Poverilnice za %s"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:118
-#, c-format
-msgid "For additional help and instructions, please contact %s at:"
-msgstr "Za dodtano pomoč ali navodila se obrnite na %s na:"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:120
-#, c-format
-msgid "your %ls provider"
-msgstr "vaš ponudnik %ls"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:120
-msgid "your provider"
-msgstr "vaš ponudnik"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:139
-msgid "Open the default web browser"
-msgstr "Odpre privzeto nastavljen spletni brskalnik"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:150
-msgid "Open your e-mail program"
-msgstr "Odpre vaš program za e-pošto"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:161
-msgid "Dial the phone number"
-msgstr "Pokliče telefonsko številko"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:180
-#, c-format
-msgid ""
-"%s has pre-set parts of this configuration. Those parts are locked to "
-"prevent accidental modification."
-msgstr ""
-"%s je prednastavil dele te konfiguracije. Ti deli so zaklenjeni zaradi "
-"preprečevanja nenamernih sprememb."
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:182
-#, c-format
-msgid "Your %ls provider"
-msgstr "Vaš ponudnik %ls"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:182
-msgid "Your provider"
-msgstr "Vaš ponudnik"
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:201
-msgid ""
-"Previous attempt to connect failed. Please, make sure your credentials are "
-"correct, or try again later."
-msgstr ""
-"Prejšnji poskus povezave ni uspel. Preverite, ali so vaše poverilnice "
-"pravilne ali poskusite kasneje."
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:17
-msgid "Server Trust"
-msgstr "Zaupanje strežniku"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:28
-msgid ""
-"Describe the servers you trust to prevent credential interception in case of"
-" man-in-the-middle attacks."
-msgstr ""
-"Opišite strežnike, ki jim zaupate in preprečite prestrezanje poverilnic v "
-"primeru napada \"vmesnega člena\"."
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:35
-msgid "Acceptable Certificate Authorities:"
-msgstr "Sprejemljivi izdajatelji potrdil:"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:40
-msgid "List of certificate authorities server's certificate must be issued by"
-msgstr ""
-"Seznam izdajateljev potrdil, od katerih mora biti izdano strežnikovo "
-"potrdilo"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:47
-msgid "Add CA from Store..."
-msgstr "Dodaj CA iz shrambe ..."
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:48
-msgid ""
-"Adds a new certificate authority from the certificate store to the list"
-msgstr "Doda novega izdajatelja potrdil iz shrambe potrdil na seznam"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:52
-msgid "Add CA from File..."
-msgstr "Dodaj CA iz datoteke ..."
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:53
-msgid "Adds a new certificate authority from the file to the list"
-msgstr "Doda novega izdajatelja potrdil iz datoteke na seznam"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:57
-msgid "&Remove CA"
-msgstr "Odst&rani CA"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:59
-msgid "Removes selected certificate authorities from the list"
-msgstr "Odstrani izbrane izdajatelje potrdil s seznama"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:72
-msgid "Acceptable server &names:"
-msgstr "Sprejemljiva ime&na strežnika:"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:77
-msgid ""
-"A semicolon delimited list of acceptable server FQDN names; blank to skip "
-"name check; Unicode characters allowed"
-msgstr ""
-"S podpičji ločen seznam sprejemljivih strežnikovih imen FQDN; prazno, da "
-"izpusti preverjanje imena; znaki Unicode dovoljeni"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:81
-msgid "(Example: foo.bar.com;server2.bar.com)"
-msgstr "(Primer: vzo.rec.si;streznik2.rec.si)"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:120
-msgid "TLS Client Certificate"
-msgstr "Odjemalčevo potrdilo TLS"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:131
-msgid "Please select your client certificate to use for authentication."
-msgstr "Izberite svoje odjemalčevo potrdilo za uporabo med overovljanjem."
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:138
-msgid "Co&nnect without providing a client certificate"
-msgstr "Poveži brez dostave &odjemalčevega potrdila"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:139
-msgid ""
-"Select if your server does not require you to provide a client certificate"
-msgstr ""
-"Izberite, če vaš strežnik ne zahteva, da mu dostavite odjemalčevo potrdilo"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:146
-msgid "Use the following &certificate:"
-msgstr "Uporabi naslednje &potrdilo:"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:147
-msgid "Select if you need to provide a client certificate when connecting"
-msgstr "Izberite, če morate dostaviti odjemalčevo potrdilo ob povezavi"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:154
-msgid "Client certificate to use for authentication"
-msgstr "Odjemalčevo potrdilo za overovljanje"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:167
-msgid "Custom &identity:"
-msgstr "&Identiteta po meri:"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:172
-msgid ""
-"Your identity (username@domain) to override one from certificate; or blank "
-"to use one provided in certificate"
-msgstr ""
-"Vaša identiteta (up. ime@domena), ki bo nadomestila tisto s potrdila; ali "
-"prazno, če želite uporabiti tisto s potrdila"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:176
-msgid "(Example: user@contoso.com)"
-msgstr "(Primer: uporabnik@vzorec.si)"
-
-#: lib/TLS_UI/res/wxTLS_UI.cpp:184
-msgid "Check if you would like to save certificate selection"
-msgstr "Odkljukajte, če želite shraniti izbor potrdila"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:118
-#, c-format
-msgid "Invalid character in host name found: %c"
-msgstr "Napačen znak v imenu gostitelja: %c"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:118
-msgid "Validation conflict"
-msgstr "Nesoglasje pri preverjanju"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:514
-msgid "Add Certificate"
-msgstr "Dodaj potrdilo"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:515
-msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
-msgstr "Datoteke s potrdili (*.cer;*.crt;*.der;*.p7b;*.pem)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:516
-msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
-msgstr "Datoteke s potrdili X.509 (*.cer;*.crt;*.der;*.pem)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:517
-msgid "PKCS #7 Certificate Files (*.p7b)"
-msgstr "Datoteke s potrdili PKCS #7 (*.p7b)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:518
-msgid "All Files (*.*)"
-msgstr "Vse datoteke (*.*)"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:534
-#, c-format
-msgid "Invalid or unsupported certificate file %s"
-msgstr "Napačna ali nepodprta datoteka s potrdilom %s"
-
-#: lib/TLS_UI/src/TLS_UI.cpp:534
-msgid "Error"
-msgstr "Napaka"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
-msgid "Outer Identity"
-msgstr "Zunanja identiteta"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
-msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
-"Izberite uporabniško identiteto, s katerim se prosilec predstavi "
-"overovitelju:"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
-msgid "&True identity"
-msgstr "Prava iden&titeta"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
-msgid "Use my true user name"
-msgstr "Uporabi moje pravo uporabniško ime"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
-msgid "Use &empty outer identity (RFC 4822)"
-msgstr "Uporabi prazno zunanjo id&entiteto (RFC 4822)"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
-msgid "Ommit my user name and use @mydomain.org only"
-msgstr "Izpusti moje uporabniško ime in uporabi samo @mojadomena.si"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
-msgid "&Custom outer identity:"
-msgstr "Zunanja identiteta po &meri:"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
-msgid "Specify custom outer identity"
-msgstr "Navedite zunanjo identiteto po meri"
-
-#: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
-msgid "Custom outer identity to use"
-msgstr "Zunanja identiteta po meri za uporabo"
-
-#: lib/TTLS_UI/src/Module.cpp:231 lib/TTLS_UI/src/Module.cpp:241
-#: lib/EAPBase_UI/include/EAP_UI.h:582
-#, c-format
-msgid "Error writing credentials to Credential Manager: %hs (error %u)"
-msgstr ""
-"Napaka pri zapisovanju poverilnic v upravitelja poverilnic: %hs (napaka %u)"
-
-#: lib/TTLS_UI/src/Module.cpp:233 lib/TTLS_UI/src/Module.cpp:243
-#: lib/EAPBase_UI/include/EAP_UI.h:584
-msgid "Writing credentials failed."
-msgstr "Zapisovanje poverilnic ni uspelo."
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:108 lib/TTLS_UI/src/TTLS_UI.cpp:215
-msgid "Inner Authentication"
-msgstr "Notranje overovljanje"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:114
-msgid "Select inner authentication method from the list"
-msgstr "Izberite postopek notranjega overovljanja s seznama"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:116
-msgid "PAP"
-msgstr "PAP"
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:121 lib/TTLS_UI/src/TTLS_UI.cpp:236
-msgid "Outer Authentication"
-msgstr "Zunanje overovljanje"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:253
-msgid "EAP Credentials"
-msgstr "Poverilnice EAP"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:422
-msgid "Provider Settings"
-msgstr "Nastavitve ponudnika"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:502 lib/EAPBase_UI/include/EAP_UI.h:529
-msgid "<blank>"
-msgstr "<prazno>"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:508
-#, c-format
-msgid "<error %u>"
-msgstr "<napaka %u>"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:568
-#, c-format
-msgid "Error reading credentials from Credential Manager: %hs (error %u)"
-msgstr ""
-"Napaka pri branju poverilnic iz upravitelja poverilnic: %hs (napaka %u)"
-
-#: lib/EAPBase_UI/include/EAP_UI.h:570
-msgid "Reading credentials failed."
-msgstr "Branje poverilnic ni uspelo."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:595
-#, c-format
-msgid "Deleting credentials failed (error %u)."
-msgstr "Izbris poverilnic ni uspel (napaka %u)."
-
-#: lib/EAPBase_UI/include/EAP_UI.h:817
-msgid "<Your Organization>"
-msgstr "<vaša organizacija>"
-
-#: lib/EAPBase_UI/res/wxEAP_UI.h:60
-msgid "EAP Method Configuration"
-msgstr "Konfiguracija postopka EAP"
-
-#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:3
-msgid "1252"
-msgstr "1250"
-
-#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid "EAP Methods"
-msgstr "Postopki EAP"
-
-#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid "Modules to support individual EAP methods"
-msgstr "Moduli, ki omogočajo posamezne postopke EAP"
-
-#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5
-msgid "TTLS"
-msgstr "TTLS"
-
-#: EAPMethods/MSIBuild/En.Win32.Release.Feature-2.idtx:5
-#: EAPMethods/MSIBuild/En.x64.Release.Feature-2.idtx:5
-msgid "Tunneled Transport Layer Security"
-msgstr "Tunneled Transport Layer Security"

EAPMethods/src/Main.cpp

@@ -84,7 +84,7 @@ VOID WINAPI EapPeerFreeErrorMemory(_In_ EAP_ERROR *ppEapError)
 
 
 ///
-/// Obtains a set of function pointers for an implementation of the EAP peer method currently loaded on the EapHost service.
+/// Obtains a set of function pointers for an implementation of the EAP peer method currently loaded on the EAPHost service.
 ///
 /// \sa [EapPeerGetInfo function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363608.aspx)
 ///
@@ -135,7 +135,7 @@ DWORD WINAPI EapPeerGetInfo(_In_ EAP_TYPE* pEapType, _Out_ EAP_PEER_METHOD_ROUTI
 #pragma warning(disable: 4702) // Compiler is smart enough to find out the initialize() method is empty => never throws an exception.
 
 ///
-/// Initializes an EAP peer method for EapHost.
+/// Initializes an EAP peer method for EAPHost.
 ///
 /// \sa [EapPeerGetInfo function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363613.aspx)
 ///
@@ -206,7 +206,7 @@ DWORD APIENTRY EapPeerShutdown(_Out_ EAP_ERROR **ppEapError)
 
 
 ///
-/// Returns the user data and user identity after being called by EapHost.
+/// Returns the user data and user identity after being called by EAPHost.
 ///
 /// \sa [EapPeerGetIdentity function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363607.aspx)
 ///
@@ -263,7 +263,7 @@ DWORD APIENTRY EapPeerGetIdentity(
 
 
 ///
-/// Starts an EAP authentication session on the peer EapHost using the EAP method.
+/// Starts an EAP authentication session on the peer EAPHost using the EAP method.
 ///
 /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
 ///
@@ -351,7 +351,7 @@ DWORD APIENTRY EapPeerEndSession(
 
 
 ///
-/// Processes a packet received by EapHost from a supplicant.
+/// Processes a packet received by EAPHost from a supplicant.
 ///
 /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
 ///
@@ -930,7 +930,7 @@ DWORD WINAPI EapPeerQueryInteractiveUIInputFields(
 
 
 ///
-/// Converts user information into a user BLOB that can be consumed by EapHost run-time functions.
+/// Converts user information into a user BLOB that can be consumed by EAPHost run-time functions.
 ///
 /// \sa [EapPeerQueryUIBlobFromInteractiveUIInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb204696.aspx)
 ///

EventMonitor/App.cpp

@@ -46,31 +46,39 @@ bool wxEventMonitorApp::OnInit()
         ::MsiUseFeature(_T(PRODUCT_VERSION_GUID), _T("featEventMonitor"));
 #endif
 
-    wxInitializeConfig();
+    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT("EventMonitor"), wxT(PRODUCT_NAME_STR)));
+    if (cfgPrev) wxDELETE(cfgPrev);
 
     if (!wxApp::OnInit())
         return false;
 
-    if (wxInitializeLocale(m_locale)) {
+    // Set desired locale.
-        //wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
+    wxLanguage language = (wxLanguage)wxConfigBase::Get()->Read(wxT("Language"), wxLANGUAGE_DEFAULT);
-        wxVERIFY(m_locale.AddCatalog(wxT("EventMonitor")));
+    if (wxLocale::IsAvailable(language)) {
+        wxString sPath;
+        if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath))
+            m_locale.AddCatalogLookupPathPrefix(sPath);
+        if (m_locale.Init(language)) {
+            wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
+            wxVERIFY(m_locale.AddCatalog(wxT("EventMonitor")));
+        }
     }
 
 #ifdef __WXMSW__
     // Find EventMonitor window if already running.
-    HWND hWnd = ::FindWindow(_T("wxWindowNR"), _("Event Monitor"));
+    HWND okno = ::FindWindow(_T("wxWindowNR"), _("Event Monitor"));
-    if (hWnd) {
+    if (okno) {
-        if (::IsIconic(hWnd))
+        if (::IsIconic(okno))
-            ::SendMessage(hWnd, WM_SYSCOMMAND, SC_RESTORE, 0);
+            ::SendMessage(okno, WM_SYSCOMMAND, SC_RESTORE, 0);
-        ::SetActiveWindow(hWnd);
+        ::SetActiveWindow(okno);
-        ::SetForegroundWindow(hWnd);
+        ::SetForegroundWindow(okno);
 
         // Not an error condition actually; Just nothing else to do...
         return false;
     }
 #endif
 
-    m_mainWnd = new wxEventMonitorFrame(NULL);
+    m_mainWnd = new wxEventMonitorFrame();
     wxPersistentRegisterAndRestore<wxEventMonitorFrame>(m_mainWnd);
     m_mainWnd->Show();
 

EventMonitor/ETWLog.cpp

@@ -48,6 +48,8 @@ wxETWEvent::wxETWEvent(wxEventType type, const EVENT_RECORD &record) :
     m_record(record),
     wxEvent(0, type)
 {
+    DoSetExtendedData(record.ExtendedDataCount, record.ExtendedData);
+    DoSetUserData(record.UserDataLength, record.UserData);
 }
 
 
@@ -55,6 +57,92 @@ wxETWEvent::wxETWEvent(const wxETWEvent& event) :
     m_record(event.m_record),
     wxEvent(event)
 {
+    DoSetExtendedData(event.m_record.ExtendedDataCount, event.m_record.ExtendedData);
+    DoSetUserData(event.m_record.UserDataLength, event.m_record.UserData);
+}
+
+
+wxETWEvent::~wxETWEvent()
+{
+    if (m_record.ExtendedData)
+        delete (unsigned char*)m_record.ExtendedData;
+
+    if (m_record.UserData)
+        delete (unsigned char*)m_record.UserData;
+}
+
+
+bool wxETWEvent::SetExtendedData(size_t extended_data_count, const EVENT_HEADER_EXTENDED_DATA_ITEM *extended_data)
+{
+    if (m_record.ExtendedData)
+        delete (unsigned char*)m_record.ExtendedData;
+
+    return DoSetExtendedData(extended_data_count, extended_data);
+}
+
+
+bool wxETWEvent::SetUserData(size_t user_data_length, const void *user_data)
+{
+    if (m_record.UserData)
+        delete (unsigned char*)m_record.UserData;
+
+    return DoSetUserData(user_data_length, user_data);
+}
+
+
+bool wxETWEvent::DoSetExtendedData(size_t extended_data_count, const EVENT_HEADER_EXTENDED_DATA_ITEM *extended_data)
+{
+    if (extended_data_count) {
+        wxASSERT_MSG(extended_data, wxT("extended data is NULL"));
+
+        // Count the total required memory.
+        size_t data_size = 0;
+        for (size_t i = 0; i < extended_data_count; i++)
+            data_size += extended_data[i].DataSize;
+
+        // Allocate memory for extended data.
+        m_record.ExtendedData = (EVENT_HEADER_EXTENDED_DATA_ITEM*)(new unsigned char[sizeof(EVENT_HEADER_EXTENDED_DATA_ITEM)*extended_data_count + data_size]);
+        wxCHECK_MSG(m_record.ExtendedData, false, wxT("extended data memory allocation failed"));
+
+        // Bulk-copy extended data descriptors.
+        memcpy(m_record.ExtendedData, extended_data, sizeof(EVENT_HEADER_EXTENDED_DATA_ITEM) * extended_data_count);
+
+        // Copy the data.
+        unsigned char *ptr = (unsigned char*)(m_record.ExtendedData + extended_data_count);
+        for (size_t i = 0; i < extended_data_count; i++) {
+            if (extended_data[i].DataSize) {
+                memcpy(ptr, (void*)(extended_data[i].DataPtr), extended_data[i].DataSize);
+                m_record.ExtendedData[i].DataPtr = (ULONGLONG)ptr;
+                ptr += extended_data[i].DataSize;
+            } else
+                m_record.ExtendedData[i].DataPtr = NULL;
+        }
+    } else
+        m_record.ExtendedData = NULL;
+
+    m_record.ExtendedDataCount = extended_data_count;
+
+    return true;
+}
+
+
+bool wxETWEvent::DoSetUserData(size_t user_data_length, const void *user_data)
+{
+    if (user_data_length) {
+        wxASSERT_MSG(user_data, wxT("user data is NULL"));
+
+        // Allocate memory for user data.
+        m_record.UserData = new unsigned char[user_data_length];
+        wxCHECK_MSG(m_record.UserData, false, wxT("user data memory allocation failed"));
+
+        // Copy user data.
+        memcpy(m_record.UserData, user_data, user_data_length);
+    } else
+        m_record.UserData = NULL;
+
+    m_record.UserDataLength = user_data_length;
+
+    return true;
 }
 
 
@@ -150,51 +238,19 @@ END_EVENT_TABLE()
 
 
 // {6EB8DB94-FE96-443F-A366-5FE0CEE7FB1C}
-const GUID wxETWListCtrl::s_provider_eaphost = { 0x6EB8DB94, 0xFE96, 0x443F, { 0xA3, 0x66, 0x5F, 0xE0, 0xCE, 0xE7, 0xFB, 0x1C } };
+const GUID wxETWListCtrl::s_provider_eaphost = { 0X6EB8DB94, 0XFE96, 0X443F, { 0XA3, 0X66, 0X5F, 0XE0, 0XCE, 0XE7, 0XFB, 0X1C } };
-
-// {1F678132-5938-4686-9FDC-C8FF68F15C85}
-const GUID wxETWListCtrl::s_provider_schannel = { 0x1F678132, 0x5938, 0x4686, { 0x9F, 0xDC, 0xC8, 0xFF, 0x68, 0xF1, 0x5C, 0x85 } };
 
 
 wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxValidator& validator, const wxString& name) :
     m_proc(NULL),
-    m_scroll_auto(true),
+    m_item_id(0),
-    m_level(TRACE_LEVEL_INFORMATION),
-    m_rec_db(wxETWEVENT_RECORDS_MAX),
-    m_rec_idx(wxETWEVENT_RECORDS_MAX),
     wxListCtrl(parent, id, pos, size, style, validator, name)
 {
-    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, 160);
+    this->AppendColumn(_("Time"  ), wxLIST_FORMAT_LEFT, 100);
-    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("PID"   ), wxLIST_FORMAT_LEFT, 50 );
-    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT,  50);
+    this->AppendColumn(_("TID"   ), wxLIST_FORMAT_LEFT, 50 );
-    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT,  80);
+    this->AppendColumn(_("Source"), wxLIST_FORMAT_LEFT, 100);
-    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, 350);
+    this->AppendColumn(_("Event" ), wxLIST_FORMAT_LEFT, wxLIST_AUTOSIZE_USEHEADER);
-
-    // Maximum expected column widths for pre-formatted row display
-    m_col_format_width[0] = 26;
-    m_col_format_width[1] = 5;
-    m_col_format_width[2] = 5;
-    m_col_format_width[3] = std::max<int>(std::max<int>(_countof("EapHost"), _countof("Schannel")), _countof(PRODUCT_NAME_STR)) - 1;
-    m_col_format_width[4] = 0;
-
-    // Prepare all possible item attributes.
-    wxColour col_bg((unsigned long)0xffffff);
-    m_item_attr[0][0].SetBackgroundColour(col_bg                 );
-    m_item_attr[0][0].SetTextColour      ((unsigned long)0x666666);
-    m_item_attr[0][1].SetBackgroundColour(col_bg                 );
-    m_item_attr[0][1].SetTextColour      ((unsigned long)0x000000);
-    m_item_attr[0][2].SetBackgroundColour(col_bg                 );
-    m_item_attr[0][2].SetTextColour      ((unsigned long)0x00aacc);
-    m_item_attr[0][3].SetBackgroundColour(col_bg                 );
-    m_item_attr[0][3].SetTextColour      ((unsigned long)0x0000ff);
-    m_item_attr[1][0].SetBackgroundColour(col_bg                 );
-    m_item_attr[1][0].SetTextColour      ((unsigned long)0xcccccc);
-    m_item_attr[1][1].SetBackgroundColour(col_bg                 );
-    m_item_attr[1][1].SetTextColour      ((unsigned long)0xaaaaaa);
-    m_item_attr[1][2].SetBackgroundColour(col_bg                 );
-    m_item_attr[1][2].SetTextColour      ((unsigned long)0xaaeeee);
-    m_item_attr[1][3].SetBackgroundColour(col_bg                 );
-    m_item_attr[1][3].SetTextColour      ((unsigned long)0xaaaaff);
 
     // Start a new session.
     ULONG ulResult;
@@ -248,11 +304,9 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
         0,
         NULL)) != ERROR_SUCCESS)
     {
-        wxLogDebug(wxString::Format(_("Error enabling %s event provider (error %u)."), wxT(PRODUCT_NAME_STR)), ulResult);
+        wxLogError(_("Error enabling event provider (error %u)."), ulResult);
         return;
     }
-    m_sources.insert(EAPMETHOD_TRACE_EVENT_PROVIDER);
-
     if ((ulResult = EnableTraceEx(
         &s_provider_eaphost,
         &((const EVENT_TRACE_PROPERTIES*)m_session)->Wnode.Guid,
@@ -263,28 +317,14 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
         0,
         NULL)) != ERROR_SUCCESS)
     {
-        // If the EapHost trace provider failed to enable, do not despair.
+        // If the EAPHost trace provider failed to enable, do not despair.
-        wxLogDebug(wxString::Format(_("Error enabling %s event provider (error %u)."), wxT("EapHost")), ulResult);
+        wxLogDebug(_("Error enabling EAPHost event provider (error %u)."), ulResult);
-    }
-
-    if ((ulResult = EnableTraceEx(
-        &s_provider_schannel,
-        &((const EVENT_TRACE_PROPERTIES*)m_session)->Wnode.Guid,
-        m_session,
-        EVENT_CONTROL_CODE_ENABLE_PROVIDER,
-        TRACE_LEVEL_VERBOSE,
-        0, 0,
-        0,
-        NULL)) != ERROR_SUCCESS)
-    {
-        // If the Schannel trace provider failed to enable, do not despair.
-        wxLogDebug(wxString::Format(_("Error enabling %s event provider (error %u)."), wxT("Schannel")), ulResult);
     }
 
     // Process events in separate thread, not to block wxWidgets' message pump.
     wxArrayString sessions;
     sessions.Add(m_session.name());
-    m_proc = new wxEventTraceProcessorThread(GetEventHandler(), sessions);
+    m_proc = new wxEventTraceProcessorThread(this->GetEventHandler(), sessions);
     wxASSERT_MSG(m_proc, wxT("error allocating thread memory"));
     if (m_proc->Run() != wxTHREAD_NO_ERROR) {
         wxFAIL_MSG("Can't create the thread!");
@@ -304,16 +344,6 @@ wxETWListCtrl::~wxETWListCtrl()
         }
 
         // Disable event providers.
-        EnableTraceEx(
-                &s_provider_schannel,
-                &((const EVENT_TRACE_PROPERTIES*)m_session)->Wnode.Guid,
-                m_session,
-                EVENT_CONTROL_CODE_DISABLE_PROVIDER,
-                TRACE_LEVEL_VERBOSE,
-                0, 0,
-                0,
-                NULL);
-
         EnableTraceEx(
                 &s_provider_eaphost,
                 &((const EVENT_TRACE_PROPERTIES*)m_session)->Wnode.Guid,
@@ -337,238 +367,27 @@ wxETWListCtrl::~wxETWListCtrl()
 }
 
 
-void wxETWListCtrl::CopySelected() const
+void wxETWListCtrl::OnETWEvent(wxETWEvent& event)
 {
-    // Prepare text in ANSI and Unicode flavours.
+    EVENT_RECORD &rec = event.GetRecord();
-    string dataA, rowA;
-    wstring dataW, rowW;
-    for (long item = -1; (item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1;) {
-        FormatRow(m_rec_db.at_abs(m_rec_idx.at(item)), rowA, rowW);
-        rowA +=  "\r\n"; dataA += rowA;
-        rowW += L"\r\n"; dataW += rowW;
-    }
-
-    // Put text to clipboard.
-    CopyToClipboard(dataA, dataW);
-}
-
-
-void wxETWListCtrl::CopyAll() const
-{
-    // Prepare text in ANSI and Unicode flavours.
-    string dataA, rowA;
-    wstring dataW, rowW;
-    for (size_t i = 0, n = m_rec_db.size(); i < n; i++) {
-        FormatRow(m_rec_db[i], rowA, rowW);
-        rowA +=  "\r\n"; dataA += rowA;
-        rowW += L"\r\n"; dataW += rowW;
-    }
-
-    // Put text to clipboard.
-    CopyToClipboard(dataA, dataW);
-
-}
-
-
-void wxETWListCtrl::ClearAll()
-{
-    m_rec_idx.clear();
-    m_rec_db.clear();
-    if (GetItemCount())
-        SetItemCount(0);
-}
-
-
-void wxETWListCtrl::SelectAll()
-{
-    for (long item = 0, count = GetItemCount(); item < count; item++)
-        SetItemState(item, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-}
-
-
-void wxETWListCtrl::SelectNone()
-{
-    for (long item = -1; (item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1;)
-        SetItemState(item, 0, wxLIST_STATE_SELECTED);
-}
-
-
-void wxETWListCtrl::RebuildItems()
-{
-    ChildrenRepositioningGuard child_reposition(this);
-
-    // Get current focus and selection.
-    set<size_t> focus, selection;
-    for (long item = -1; (item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_FOCUSED)) != -1;)
-        focus.insert(m_rec_idx[item]);
-    for (long item = -1; (item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1;)
-        selection.insert(m_rec_idx[item]);
-
-    // Get current view position (scrolling).
-    long
-        item_top        = GetTopItem(),
-        item_page_count = GetCountPerPage(),
-        item_center     = std::min<long>(
-            item_top + item_page_count / 2,     // Index of item in the centre of the view
-            (item_top + m_rec_idx.size()) / 2); // Index of the item in the centre between top viewed item and the last (when list is not overflowed)
-    size_t center = (size_t)item_center < m_rec_idx.size() ? m_rec_idx[item_center] : -1;
-
-    // Rebuild the index.
-    m_rec_idx.clear();
-    set<size_t>::const_iterator selection_end = selection.end(), focus_end = focus.end();
-    vector<long> selection_out, focus_out;
-    long center_out = -1;
-    for (size_t i = 0, n = m_rec_db.size(); i < n; i++) {
-        size_t i_abs = m_rec_db.abs(i);
-        if (i_abs == center)
-            center_out = m_rec_idx.size();
-        if (IsVisible(m_rec_db[i])) {
-            if (selection.find(i_abs) != selection_end)
-                selection_out.push_back(m_rec_idx.size());
-            if (focus.find(i_abs) != focus_end)
-                focus_out.push_back(m_rec_idx.size());
-            m_rec_idx.push_back(i_abs);
-        }
-    }
-
-    // Set new item count.
-    long item_count = (long)m_rec_idx.size();
-    if (GetItemCount() != item_count)
-        SetItemCount(item_count);
-
-    if (item_count) {
-        // Restore focus and selection.
-        for (size_t i = 0, n = focus_out.size(); i < n; i++)
-            SetItemState(focus_out[i], wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
-        SelectNone();
-        for (size_t i = 0, n = selection_out.size(); i < n; i++)
-            SetItemState(selection_out[i], wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
-
-        // Restore scrolling.
-        if (center_out != -1) {
-            wxRect pos1, pos2;
-            GetItemRect(GetTopItem(), pos1);
-            GetItemRect(std::max<long>(std::min<long>(center_out, item_count - 1) - item_page_count / 2, 0), pos2);
-            ScrollList(pos2.x - pos1.x, pos2.y - pos1.y);
-        } else
-            EnsureVisible(item_count - 1);
-
-        // Refresh items.
-        item_top = GetTopItem();
-        RefreshItems(item_top, std::min<long>(item_top + item_page_count, item_count));
-    }
-}
-
-
-bool wxETWListCtrl::IsVisible(const EVENT_RECORD &rec) const
-{
-    return
-        m_sources.find(rec.EventHeader.ProviderId) != m_sources.end() &&
-        rec.EventHeader.EventDescriptor.Level <= m_level;
-}
-
-
-void wxETWListCtrl::FormatRow(const event_rec &rec, std::string &rowA, std::wstring &rowW) const
-{
-    rowA.clear();
-    rowW.clear();
-
-    // Merge columns.
-    string colA;
-    wxString colW;
-    for (size_t i = 0; i < _countof(m_col_format_width); i++) {
-        // Get column text.
-        colW = OnGetItemText(rec, i);
-        size_t len = colW.Length();
-        if (len < m_col_format_width[i]) {
-            // Pad it to required length.
-            colW.Append(wxT(' '), m_col_format_width[i] - len);
-        } else if (m_col_format_width[i] && len > m_col_format_width[i]) {
-            // Truncate it and add horizontal ellipsis.
-            colW.Truncate(m_col_format_width[i] - 3);
-            colW.Append(wxT("..."));
-        }
-
-        // Convert to ACP.
-        WideCharToMultiByte(CP_ACP, 0, colW.c_str(), -1, colA, NULL, NULL);
-
-        // Append to output.
-        if (i) {
-            rowA +=  "  ";
-            rowW += L"  ";
-        }
-        rowA += colA;
-        rowW += colW;
-    }
-}
-
-
-bool wxETWListCtrl::CopyToClipboard(const std::string &dataA, const std::wstring &dataW) const
-{
-    if (OpenClipboard(GetHWND())) {
-        EmptyClipboard();
-
-        HGLOBAL h;
-        size_t size;
-
-        size = (dataA.length() + 1) * sizeof(CHAR);
-        h = GlobalAlloc(GMEM_MOVEABLE, size);
-        if (h) {
-            LPVOID d = GlobalLock(h);
-            if (d) {
-                memcpy(d, dataA.data(), size);
-                GlobalUnlock(h);
-                SetClipboardData(CF_TEXT, h);
-            }
-        }
-
-        size = (dataW.length() + 1) * sizeof(WCHAR);
-        h = GlobalAlloc(GMEM_MOVEABLE, size);
-        if (h) {
-            LPVOID d = GlobalLock(h);
-            if (d) {
-                memcpy(d, dataW.data(), size);
-                GlobalUnlock(h);
-                SetClipboardData(CF_UNICODETEXT, h);
-            }
-        }
-
-        CloseClipboard();
-
-        return true;
-    } else
-        return false;
-}
-
-
-wxListItemAttr *wxETWListCtrl::OnGetItemAttr(long item) const
-{
-    const event_rec &rec = m_rec_db.at_abs(m_rec_idx.at(item));
     bool is_ours = IsEqualGUID(rec.EventHeader.ProviderId, EAPMETHOD_TRACE_EVENT_PROVIDER) ? true : false;
+    int column = 0;
 
-    // Select appropriate attributes acording to race, colour, or creed...
+    // Prepare item to insert into the list.
-    return (wxListItemAttr*)(
+    wxListItem item;
-        ((const EVENT_RECORD&)rec).EventHeader.EventDescriptor.Level >= TRACE_LEVEL_VERBOSE     ? (is_ours ? &(m_item_attr[0][0]) : &(m_item_attr[1][0])) :
+    item.SetId(m_item_id++);
-        ((const EVENT_RECORD&)rec).EventHeader.EventDescriptor.Level >= TRACE_LEVEL_INFORMATION ? (is_ours ? &(m_item_attr[0][1]) : &(m_item_attr[1][1])) :
+    item.SetTextColour(
-        ((const EVENT_RECORD&)rec).EventHeader.EventDescriptor.Level >= TRACE_LEVEL_WARNING     ? (is_ours ? &(m_item_attr[0][2]) : &(m_item_attr[1][2])) :
+        rec.EventHeader.EventDescriptor.Level >= TRACE_LEVEL_VERBOSE     ? (is_ours ? 0x666666 : 0xcccccc) :
-                                                                                                  (is_ours ? &(m_item_attr[0][3]) : &(m_item_attr[1][3])));
+        rec.EventHeader.EventDescriptor.Level >= TRACE_LEVEL_INFORMATION ? (is_ours ? 0x000000 : 0xaaaaaa) :
-}
+        rec.EventHeader.EventDescriptor.Level >= TRACE_LEVEL_WARNING     ? (is_ours ? 0x00aacc : 0xaaeeee) :
+                                                                           (is_ours ? 0x0000ff : 0xaaaaff));
+    item.SetBackgroundColour(0xffffff);
 
-
+    {
-wxString wxETWListCtrl::OnGetItemText(long item, long column) const
+        // Output event time-stamp.
-{
-    return OnGetItemText(m_rec_db.at_abs(m_rec_idx.at(item)), column);
-}
-
-
-wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
-{
-    switch (column) {
-    case 0: {
-        // Get event time-stamp.
         FILETIME ft;
         ft.dwHighDateTime = rec.EventHeader.TimeStamp.HighPart;
-        ft.dwLowDateTime  = rec.EventHeader.TimeStamp.LowPart;
+        ft.dwLowDateTime = rec.EventHeader.TimeStamp.LowPart;
 
         SYSTEMTIME st, st_local;
         FileTimeToSystemTime(&ft, &st);
@@ -576,36 +395,39 @@ wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
 
         ULONGLONG
             ts = rec.EventHeader.TimeStamp.QuadPart,
-            microsec = (ts % 10000000) / 10;
+            nanosec = (ts % 10000000) * 100;
 
-        return tstring_printf(_T("%04d-%02d-%02d %02d:%02d:%02d.%06I64u"),
+        item.SetColumn(column++);
-            st_local.wYear, st_local.wMonth, st_local.wDay, st_local.wHour, st_local.wMinute, st_local.wSecond, microsec);
+        item.SetText(tstring_printf(_T("%04d-%02d-%02d %02d:%02d:%02d.%09I64u"),
+            st_local.wYear, st_local.wMonth, st_local.wDay, st_local.wHour, st_local.wMinute, st_local.wSecond, nanosec));
+        this->InsertItem(item);
     }
 
-    case 1:
+    // Output process ID.
-        // Get process ID.
+    item.SetColumn(column++);
-        return wxString::Format(wxT("%u"), rec.EventHeader.ProcessId);
+    item.SetText(wxString::Format(wxT("%u"), rec.EventHeader.ProcessId));
+    this->SetItem(item);
 
-    case 2:
+    // Output thread ID.
-        // Get thread ID.
+    item.SetColumn(column++);
-        return wxString::Format(wxT("%u"), rec.EventHeader.ThreadId);
+    item.SetText(wxString::Format(wxT("%u"), rec.EventHeader.ThreadId));
+    this->SetItem(item);
 
-    case 3:
+    // Output event source.
-        // Get event source.
+    item.SetColumn(column++);
-        return
+    item.SetText(is_ours ? wxT(PRODUCT_NAME_STR) : wxT("EAPHost"));
-            IsEqualGUID(rec.EventHeader.ProviderId, EAPMETHOD_TRACE_EVENT_PROVIDER) ? wxT(PRODUCT_NAME_STR) :
+    this->SetItem(item);
-            IsEqualGUID(rec.EventHeader.ProviderId, s_provider_eaphost            ) ? wxT("EapHost"       ) :
-            IsEqualGUID(rec.EventHeader.ProviderId, s_provider_schannel           ) ? wxT("Schannel"      ) : wxEmptyString;
 
-    case 4: {
+    item.SetColumn(column++);
+    {
         // Get event meta-info.
         unique_ptr<TRACE_EVENT_INFO> info;
         ULONG ulResult;
-        if ((ulResult = TdhGetEventInformation((PEVENT_RECORD)&rec, 0, NULL, info)) == ERROR_SUCCESS) {
+        if ((ulResult = TdhGetEventInformation(&rec, 0, NULL, info)) == ERROR_SUCCESS) {
             if (info->DecodingSource != DecodingSourceWPP) {
                 if (rec.EventHeader.Flags & EVENT_HEADER_FLAG_STRING_ONLY) {
                     // This is a string-only event. Print it.
-                    return (LPCWSTR)rec.UserData;
+                    item.SetText((LPCWSTR)rec.UserData);
                 } else {
                     // This is not a string-only event. Prepare parameters.
 
@@ -615,146 +437,25 @@ wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
                     props.reserve(info->TopLevelPropertyCount);
                     props_msg.reserve(info->TopLevelPropertyCount);
                     for (ULONG i = 0; i < info->TopLevelPropertyCount; i++) {
-                        props.push_back(std::move(PropertyToString((PEVENT_RECORD)&rec, info.get(), i, NULL, 0, nPtrSize)));
+                        props.push_back(std::move(PropertyToString(&rec, info.get(), i, NULL, 0, nPtrSize)));
                         props_msg.push_back((DWORD_PTR)props[i].c_str());
                     }
 
                     if (info->EventMessageOffset) {
                         // Format the message.
-                        return wstring_msg(0, (LPCTSTR)((LPCBYTE)info.get() + info->EventMessageOffset), props_msg.data()).c_str();
+                        item.SetText(wstring_msg(0, (LPCTSTR)((LPCBYTE)info.get() + info->EventMessageOffset), props_msg.data()).c_str());
                     }
                 }
             } else if (info->EventMessageOffset) {
                 // This is a WPP event.
-                return (LPCWSTR)((LPCBYTE)info.get() + info->EventMessageOffset);
+                item.SetText((LPCWSTR)((LPCBYTE)info.get() + info->EventMessageOffset));
             }
         }
     }
-    }
+    this->SetItem(item);
 
-    return wxEmptyString;
+    // Bring the record into view.
-}
+    this->EnsureVisible(item.GetId());
-
-
-void wxETWListCtrl::OnETWEvent(wxETWEvent& event)
-{
-    // Move event, since event handlers will have no use of it and destroy it in the end.
-    // This way we save memory allocation and copying.
-    event_rec rec(std::move(event.GetRecord()));
-
-    // Is event visible according to current view settings?
-    bool is_visible = IsVisible(rec);
-
-    // Move event to the end of the queue.
-    size_t pos = m_rec_db.push_back(std::move(rec));
-
-    bool has_moved;
-    if (!m_rec_idx.empty() && m_rec_idx.front() == pos) {
-        // This event overwrote previous head element in index.
-        m_rec_idx.pop_front();
-        has_moved = true;
-    } else
-        has_moved = false;
-
-    if (is_visible) {
-        // Push event absolute subscript to the index too.
-        m_rec_idx.push_back(pos);
-    }
-
-    long item_count = (long)m_rec_idx.size();
-    if (GetItemCount() != item_count)
-        SetItemCount(item_count);
-
-    if (item_count) {
-        if (m_scroll_auto) {
-            // Bring the record into view.
-            EnsureVisible(item_count - 1);
-        }
-
-        if (has_moved) {
-            long item_top  = GetTopItem();
-            RefreshItems(item_top, std::min<long>(item_top + GetCountPerPage(), item_count));
-        }
-    }
-}
-
-
-//////////////////////////////////////////////////////////////////////////
-// wxPersistentETWListCtrl
-//////////////////////////////////////////////////////////////////////////
-
-wxPersistentETWListCtrl::wxPersistentETWListCtrl(wxETWListCtrl *wnd) : wxPersistentWindow<wxETWListCtrl>(wnd)
-{
-}
-
-
-wxString wxPersistentETWListCtrl::GetKind() const
-{
-    return wxT(wxPERSIST_TLW_KIND);
-}
-
-
-void wxPersistentETWListCtrl::Save() const
-{
-    const wxETWListCtrl * const wnd = static_cast<const wxETWListCtrl*>(GetWindow());
-
-    // Save log's column widths.
-    wxListItem col;
-    col.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH);
-    for (int i = 0, n = wnd->GetColumnCount(); i < n; i++) {
-        wnd->GetColumn(i, col);
-        SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), col.GetWidth());
-    }
-
-    SaveValue(wxT("ScrollAuto"), wnd->m_scroll_auto);
-
-    wxString data_str;
-    for (wxETWListCtrl::guidset::const_iterator src = wnd->m_sources.cbegin(), src_end = wnd->m_sources.cend(); src != src_end; ++src)
-        data_str += tstring_guid(*src);
-    SaveValue(wxT("Sources"), data_str);
-
-    SaveValue(wxT("Level"), (int)wnd->m_level);
-}
-
-
-bool wxPersistentETWListCtrl::Restore()
-{
-    wxETWListCtrl * const wnd = static_cast<wxETWListCtrl*>(GetWindow());
-
-    // Restore log's column widths.
-    wxListItem col;
-    col.SetMask(wxLIST_MASK_TEXT);
-    for (int i = 0, n = wnd->GetColumnCount(); i < n; i++) {
-        wnd->GetColumn(i, col);
-
-        int width;
-        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), &width))
-            wnd->SetColumnWidth(i, width);
-    }
-
-    RestoreValue(wxT("ScrollAuto"), &(wnd->m_scroll_auto));
-
-    wnd->m_sources.clear();
-    wxString data_str;
-    if (RestoreValue(wxT("Sources"), &data_str)) {
-        for (size_t i = 0; (i = data_str.find(wxT('{'), i)) != std::string::npos;) {
-            GUID guid;
-            if (StringToGuid(data_str.data() + i, &guid)) {
-                wnd->m_sources.insert(guid);
-                i += 38;
-            } else
-                i++;
-        }
-    } else {
-        // Insert our provider by default.
-        wnd->m_sources.insert(EAPMETHOD_TRACE_EVENT_PROVIDER);
-    }
-
-    int data_int;
-    if (RestoreValue(wxT("Level"), &data_int))
-        wnd->m_level = (UCHAR)std::min<int>(std::max<int>(data_int, TRACE_LEVEL_ERROR), TRACE_LEVEL_VERBOSE);
-
-    return true;
 }
 
 

EventMonitor/ETWLog.h

@@ -20,11 +20,6 @@
 
 #include <wx/event.h>
 
-///
-/// Maximum number of event records kept
-///
-#define wxETWEVENT_RECORDS_MAX  1000000
-
 ///
 /// ETW event
 ///
@@ -33,32 +28,24 @@ wxDECLARE_EVENT(wxEVT_ETW_EVENT, wxETWEvent);
 #define wxETWEventHandler(func) wxEVENT_HANDLER_CAST(wxETWEventFunction, func)
 #define EVT_ETW_EVENT(func) wx__DECLARE_EVT0(wxEVT_ETW_EVENT, wxETWEventHandler(func))
 
-///
-/// Event trace processor
-///
-class wxEventTraceProcessorThread;
-
 ///
 /// Event list control
 ///
 class wxETWListCtrl;
 
 ///
-/// Supports saving/restoring wxETWListCtrl state
+/// Event trace processor
 ///
-class wxPersistentETWListCtrl;
+class wxEventTraceProcessorThread;
 
 #pragma once
 
 #include <wx/listctrl.h>
-#include <wx/persist/window.h>
 #include <wx/thread.h>
 
 #include <WinStd/ETW.h>
 
-#include <memory>
 #include <vector>
-#include <set>
 
 
 class wxETWEvent : public wxEvent
@@ -66,10 +53,23 @@ class wxETWEvent : public wxEvent
 public:
     wxETWEvent(wxEventType type = wxEVT_NULL, const EVENT_RECORD &record = s_record_null);
     wxETWEvent(const wxETWEvent& event);
+    virtual ~wxETWEvent();
     virtual wxEvent *Clone() const { return new wxETWEvent(*this); }
 
-    inline const winstd::event_rec&  GetRecord() const { return m_record; }
+    inline const EVENT_RECORD& GetRecord() const { return m_record; }
-    inline       winstd::event_rec&  GetRecord()       { return m_record; }
+    inline       EVENT_RECORD& GetRecord()       { return m_record; }
+
+    inline const EVENT_HEADER& GetHeader() const { return m_record.EventHeader; }
+
+    inline const ETW_BUFFER_CONTEXT& GetBufferContext() const { return m_record.BufferContext; }
+
+    bool SetExtendedData(size_t extended_data_count, const EVENT_HEADER_EXTENDED_DATA_ITEM *extended_data);
+    inline size_t GetExtendedDataCount() const { return m_record.ExtendedDataCount; }
+    inline const EVENT_HEADER_EXTENDED_DATA_ITEM& GetExtendedData(size_t index) const { wxASSERT(index < m_record.ExtendedDataCount); return m_record.ExtendedData[index]; }
+
+    bool SetUserData(size_t user_data_length, const void *user_data);
+    inline size_t GetUserDataLength() const { return m_record.UserDataLength; }
+    inline void *GetUserData() const { return m_record.UserData; }
 
 protected:
     bool DoSetExtendedData(size_t extended_data_count, const EVENT_HEADER_EXTENDED_DATA_ITEM *extended_data);
@@ -82,7 +82,7 @@ public:
     static const EVENT_RECORD s_record_null;
 
 protected:
-    winstd::event_rec m_record; ///< ETW event record
+    EVENT_RECORD m_record;  ///< ETW event record
 };
 
 
@@ -111,116 +111,26 @@ protected:
 
 class wxETWListCtrl : public wxListCtrl
 {
-protected:
-    ///
-    /// Functor for GUID comparison
-    ///
-    struct less_guid : public std::binary_function<GUID, GUID, bool>
-    {
-        bool operator()(const GUID &a, const GUID &b) const
-        {
-            if (a.Data1 < b.Data1) return true;
-            if (a.Data1 > b.Data1) return false;
-            if (a.Data2 < b.Data2) return true;
-            if (a.Data2 > b.Data2) return false;
-            if (a.Data3 < b.Data3) return true;
-            if (a.Data3 > b.Data3) return false;
-            if (memcmp(a.Data4, b.Data4, sizeof(a.Data4)) < 0) return true;
-            return false;
-        }
-    };
-
-    ///
-    /// A set of GUIDs
-    ///
-    typedef std::set<GUID, less_guid> guidset;
-
 public:
     wxETWListCtrl(
               wxWindow    *parent,
               wxWindowID  id         = wxID_ANY,
         const wxPoint     &pos       = wxDefaultPosition,
         const wxSize      &size      = wxDefaultSize,
-              long        style      = wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER,
+              long        style      = wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxNO_BORDER,
         const wxValidator &validator = wxDefaultValidator,
         const wxString    &name      = wxListCtrlNameStr);
     virtual ~wxETWListCtrl();
 
-    inline bool IsEmpty() const { return m_rec_db.empty(); }
-    void CopySelected() const;
-    void CopyAll() const;
-    void ClearAll();
-    void SelectAll();
-    void SelectNone();
-    void RebuildItems();
-
-    inline bool IsSourceEnabled(const GUID &guid) const
-    {
-        return m_sources.find(guid) != m_sources.end();
-    }
-
-    inline void EnableSource(const GUID &guid, bool enable = true)
-    {
-        guidset::iterator s = m_sources.find(guid);
-        if (enable) {
-            if (s == m_sources.end()) {
-                m_sources.insert(guid);
-                RebuildItems();
-            }
-        } else {
-            if (s != m_sources.end()) {
-                m_sources.erase(s);
-                RebuildItems();
-            }
-        }
-    }
-
-    friend class wxPersistentETWListCtrl;   // Allow saving/restoring window state.
-
 protected:
-    bool IsVisible(const EVENT_RECORD &rec) const;
-    void FormatRow(const winstd::event_rec &rec, std::string &rowA, std::wstring &rowW) const;
-    bool CopyToClipboard(const std::string &dataA, const std::wstring &dataW) const;
-
-    virtual wxListItemAttr *OnGetItemAttr(long item) const;
-    virtual wxString OnGetItemText(long item, long column) const;
-    virtual wxString OnGetItemText(const winstd::event_rec &rec, long column) const;
     void OnETWEvent(wxETWEvent& event);
     DECLARE_EVENT_TABLE()
 
 public:
-    bool m_scroll_auto;                                 ///< Is autoscrolling enabled?
+    static const GUID s_provider_eaphost;   ///< EAPHost event provider ID
-    UCHAR m_level;                                      ///< Shows messages up to this level of verboseness
-
-    static const GUID s_provider_eaphost;               ///< EapHost event provider ID
-    static const GUID s_provider_schannel;              ///< Schannel event provider ID
 
 protected:
-    winstd::event_session m_session;                    ///< Event session
+    winstd::event_session m_session;        ///< Event session
-    wxEventTraceProcessorThread *m_proc;                ///< Processor thread
+    wxEventTraceProcessorThread *m_proc;    ///< Processor thread
-
+    long m_item_id;                         ///< Next free list item ID
-    guidset m_sources;                                  ///< Set of enabled sources
-
-    wxListItemAttr m_item_attr[2][4];                   ///< Current item attributes
-    winstd::vector_queue<winstd::event_rec> m_rec_db;   ///< Event record database
-    winstd::vector_queue<size_t> m_rec_idx;             ///< Event record database indices of shown records
-
-    size_t m_col_format_width[5];                       ///< Column widths for pre-formatted row display (0 = unlimited)
 };
-
-
-class wxPersistentETWListCtrl : public wxPersistentWindow<wxETWListCtrl>
-{
-public:
-    wxPersistentETWListCtrl(wxETWListCtrl *wnd);
-
-    virtual wxString GetKind() const;
-    virtual void Save() const;
-    virtual bool Restore();
-};
-
-
-inline wxPersistentObject *wxCreatePersistentObject(wxETWListCtrl *wnd)
-{
-    return new wxPersistentETWListCtrl(wnd);
-}

EventMonitor/EventMonitor.vcxproj

@@ -122,11 +122,7 @@
     <None Include="res\EventMonitor.ico" />
     <None Include="wxEventMonitor_UI.fbp" />
   </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="locale\sl_SI.po" />
-  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
-    <Import Project="..\include\xgettext.targets" />
   </ImportGroup>
 </Project>

EventMonitor/EventMonitor.vcxproj.filters

@@ -74,9 +74,4 @@
       <Filter>Resource Files</Filter>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <POCompile Include="locale\sl_SI.po">
-      <Filter>Resource Files\Localization</Filter>
-    </POCompile>
-  </ItemGroup>
 </Project>

EventMonitor/Frame.cpp

@@ -25,239 +25,27 @@
 // wxEventMonitorFrame
 //////////////////////////////////////////////////////////////////////////
 
+wxBEGIN_EVENT_TABLE(wxEventMonitorFrame, wxEventMonitorFrameBase)
+    EVT_MENU(wxID_EXIT, wxEventMonitorFrame::OnExit)
+wxEND_EVENT_TABLE()
 
-wxEventMonitorFrame::wxEventMonitorFrame(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name) :
+
-    wxFrame(parent, id, title, pos, size, style, name)
+wxEventMonitorFrame::wxEventMonitorFrame() : wxEventMonitorFrameBase(NULL)
 {
-    this->SetSizeHints(wxSize(150,150), wxDefaultSize);
-    m_mgr.SetManagedWindow(this);
-    m_mgr.SetFlags(wxAUI_MGR_DEFAULT);
-
     // Load main window icons.
 #ifdef __WINDOWS__
+    wxIcon icon_small(wxT("00_EventMonitor.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON));
     wxIconBundle icons;
-    icons.AddIcon(wxIcon(wxT("00_EventMonitor.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON)));
+    icons.AddIcon(icon_small);
-    icons.AddIcon(wxIcon(wxT("00_EventMonitor.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXICON  ), ::GetSystemMetrics(SM_CYICON  )));
+    icons.AddIcon(wxIcon(wxT("00_EventMonitor.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXICON), ::GetSystemMetrics(SM_CYICON)));
-    this->SetIcons(icons);
+    SetIcons(icons);
 #else
-    this->SetIcon(wxIcon(wxICON(00_EventMonitor.ico)));
+    wxIcon icon_small(wxICON(00_EventMonitor.ico));
+    SetIcon(icon_small);
 #endif
 
-    wxString prod_name(wxT(PRODUCT_NAME_STR));
-    wxString prod_status_bar;
-    prod_status_bar.Printf(_("Toggles display of %s records"), wxT(PRODUCT_NAME_STR));
-
-    winstd::library lib_comres;
-    lib_comres.load(_T("comres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
-
-    winstd::library lib_ieframe;
-    lib_ieframe.load(_T("ieframe.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
-
-    winstd::library lib_shell32;
-    lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
-
-    wxSize size_menu(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON));
-    wxSize size_tool(size_menu);
-
-    m_menubar = new wxMenuBar(0);
-    m_menuProgram = new wxMenu();
-    wxMenuItem* m_menuItemExit;
-    m_menuItemExit = new wxMenuItem(m_menuProgram, wxID_EXIT, _("E&xit") + wxT('\t') + wxT("Alt+F4"), _("Quits this program"), wxITEM_NORMAL);
-    m_menuItemExit->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(240), size_menu));
-    m_menuProgram->Append(m_menuItemExit);
-
-    m_menubar->Append(m_menuProgram, _("&Program"));
-
-    m_menuEdit = new wxMenu();
-    wxMenuItem* m_menuEditCopy;
-    m_menuEditCopy = new wxMenuItem(m_menuEdit, wxID_COPY, wxEmptyString , wxEmptyString, wxITEM_NORMAL);
-    m_menuEditCopy->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(243), size_menu));
-    m_menuEdit->Append(m_menuEditCopy);
-
-    wxMenuItem* m_menuEditCopyAll;
-    m_menuEditCopyAll = new wxMenuItem(m_menuEdit, wxID_COPY_ALL, _("Copy A&ll") + wxT('\t') + wxT("Ctrl+Shift+C"), _("Copies all records to clipboard (including hidden)"), wxITEM_NORMAL);
-    m_menuEditCopyAll->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(133), size_menu));
-    m_menuEdit->Append(m_menuEditCopyAll);
-
-    wxMenuItem* m_menuEditClear;
-    m_menuEditClear = new wxMenuItem(m_menuEdit, wxID_CLEAR, _("Clear"), _("Clears all records from the log"), wxITEM_NORMAL);
-    m_menuEditClear->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(200), size_menu));
-    m_menuEdit->Append(m_menuEditClear);
-
-    m_menuEdit->AppendSeparator();
-
-    wxMenuItem* m_menuEditSelectAll;
-    m_menuEditSelectAll = new wxMenuItem(m_menuEdit, wxID_SELECT_ALL, _("Select &All") + wxT('\t') + wxT("Ctrl+A"), _("Selects all visible records"), wxITEM_NORMAL);
-    m_menuEdit->Append(m_menuEditSelectAll);
-
-    wxMenuItem* m_menuEditSelectNone;
-    m_menuEditSelectNone = new wxMenuItem(m_menuEdit, wxID_SELECT_NONE, _("Select &None") , _("Clears record selection"), wxITEM_NORMAL);
-    m_menuEdit->Append(m_menuEditSelectNone);
-
-    m_menubar->Append(m_menuEdit, _("&Edit"));
-
-    m_menuView = new wxMenu();
-    wxMenuItem* m_menuViewScrollAuto;
-    m_menuViewScrollAuto = new wxMenuItem(m_menuView, wxID_VIEW_SCROLL_AUTO, _("Auto &Scroll") + wxT('\t') + wxT("Ctrl+S"), _("Automatically scrolls to the most recent records as they come-in"), wxITEM_CHECK);
-    //m_menuViewScrollAuto->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(231), size_menu));
-    m_menuView->Append(m_menuViewScrollAuto);
-
-    m_menuView->AppendSeparator();
-
-    wxMenuItem* m_menuViewSourceEapHost;
-    m_menuViewSourceEapHost = new wxMenuItem(m_menuView, wxID_VIEW_SOURCE_EAPHOST, wxT("EapHost"), wxString::Format(_("Toggles display of %s records"), wxT("EapHost")), wxITEM_CHECK);
-    //m_menuViewSourceEapHost->SetBitmaps(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(273), size_menu));
-    m_menuView->Append(m_menuViewSourceEapHost);
-
-    wxMenuItem* m_menuViewSourceSchannel;
-    m_menuViewSourceSchannel = new wxMenuItem(m_menuView, wxID_VIEW_SOURCE_SCHANNEL, wxT("Schannel"), wxString::Format(_("Toggles display of %s records"), wxT("Schannel")), wxITEM_CHECK);
-    //m_menuViewSourceSchannel->SetBitmaps(wxLoadIconFromResource(lib_ieframe, MAKEINTRESOURCE(36870), size_menu));
-    m_menuView->Append(m_menuViewSourceSchannel);
-
-    m_menuViewSourceProduct = new wxMenuItem(m_menuView, wxID_VIEW_SOURCE_PRODUCT, prod_name , prod_status_bar, wxITEM_CHECK);
-    //m_menuViewSourceProduct->SetBitmaps(wxIcon(wxT("product.ico"), wxBITMAP_TYPE_ICO_RESOURCE, size_menu.GetWidth(), size_menu.GetHeight()));
-    m_menuView->Append(m_menuViewSourceProduct);
-
-    m_menuView->AppendSeparator();
-
-    m_menuViewLevelVerbose = new wxMenuItem(m_menuView, wxID_VIEW_LEVEL_VERBOSE, _("Verbose") + wxT('\t') + wxT("Ctrl+1"), _("Displays all levels of records"), wxITEM_RADIO);
-    //m_menuViewLevelVerbose->SetBitmaps(wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2863), size_menu));
-    m_menuView->Append(m_menuViewLevelVerbose);
-
-    m_menuViewLevelInformation = new wxMenuItem(m_menuView, wxID_VIEW_LEVEL_INFORMATION, _("Informational") + wxT('\t') + wxT("Ctrl+2"), _("Displays all records up to informational level"), wxITEM_RADIO);
-    //m_menuViewLevelInformation->SetBitmaps(wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2859), size_menu));
-    m_menuView->Append(m_menuViewLevelInformation);
-
-    m_menuViewLevelWarning = new wxMenuItem(m_menuView, wxID_VIEW_LEVEL_WARNING, _("Warning") + wxT('\t') + wxT("Ctrl+3"), _("Displays all records up to warning level"), wxITEM_RADIO);
-    //m_menuViewLevelWarning->SetBitmaps(wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2865), size_menu));
-    m_menuView->Append(m_menuViewLevelWarning);
-
-    m_menuViewLevelError = new wxMenuItem(m_menuView, wxID_VIEW_LEVEL_ERROR, _("Error") + wxT('\t') + wxT("Ctrl+4"), _("Displays error level records only"), wxITEM_RADIO);
-    //m_menuViewLevelError->SetBitmaps(wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2861), size_menu));
-    m_menuView->Append(m_menuViewLevelError);
-
-    m_menuView->AppendSeparator();
-
-    wxMenuItem* m_menuViewToolbarEdit;
-    m_menuViewToolbarEdit = new wxMenuItem(m_menuView, wxID_VIEW_TOOLBAR_EDIT, wxString::Format(_("%s toolbar"), _("&Edit")), wxString::Format(_("Toggles display of %s toolbar"), _("View")), wxITEM_CHECK);
-    m_menuView->Append(m_menuViewToolbarEdit);
-
-    wxMenuItem* m_menuViewToolbarView;
-    m_menuViewToolbarView = new wxMenuItem(m_menuView, wxID_VIEW_TOOLBAR_VIEW, wxString::Format(_("%s toolbar"), _("&View")), wxString::Format(_("Toggles display of %s toolbar"), _("View")), wxITEM_CHECK);
-    m_menuView->Append(m_menuViewToolbarView);
-
-    m_menubar->Append(m_menuView, _("&View"));
-
-    this->SetMenuBar(m_menubar);
-
-    m_toolbarEdit = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT);
-    m_toolEditCopy = m_toolbarEdit->AddTool(wxID_COPY, _("Copy"), wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(243), size_tool), _("Copies selected records to clipboard") + wxT(" (") + wxT("Ctrl+C") + wxT(")"), wxITEM_NORMAL);
-
-    m_toolEditCopyAll = m_toolbarEdit->AddTool(wxID_COPY_ALL, _("Copy All"), wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(133), size_tool), _("Copies all records to clipboard (including hidden)") + wxT(" (") + wxT("Ctrl+Shift+C") + wxT(")"), wxITEM_NORMAL);
-
-    m_toolEditClear = m_toolbarEdit->AddTool(wxID_CLEAR, _("Clear"), wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(200), size_tool), _("Clears all records from the log"), wxITEM_NORMAL);
-
-    m_toolbarEdit->Realize();
-    m_mgr.AddPane(m_toolbarEdit, wxAuiPaneInfo().Name(wxT("ToolbarEdit")).Top().Caption(_("Edit")).PinButton(true).Dock().Resizable().FloatingSize(wxDefaultSize).LeftDockable(false).RightDockable(false).Layer(1).ToolbarPane());
-
-    m_toolbarView = new wxAuiToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxAUI_TB_HORZ_LAYOUT);
-    m_toolViewScrollAuto = m_toolbarView->AddTool(wxID_VIEW_SCROLL_AUTO, _("Auto Scroll"), wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(231), size_tool), _("Automatically scrolls to the most recent records as they come-in") + wxT(" (") + wxT("Ctrl+S") + wxT(")"), wxITEM_CHECK);
-
-    m_toolbarView->AddSeparator();
-
-    m_toolViewSourceEapHost = m_toolbarView->AddTool(wxID_VIEW_SOURCE_EAPHOST, "EapHost", wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(273), size_tool), wxString::Format(_("Toggles display of %s records"), wxT("EapHost")), wxITEM_CHECK);
-
-    m_toolViewSourceSchannel = m_toolbarView->AddTool(wxID_VIEW_SOURCE_SCHANNEL, "Schannel", wxLoadIconFromResource(lib_ieframe, MAKEINTRESOURCE(36870), size_tool), wxString::Format(_("Toggles display of %s records"), wxT("Schannel")), wxITEM_CHECK);
-
-    m_toolViewSourceProduct = m_toolbarView->AddTool(wxID_VIEW_SOURCE_PRODUCT, prod_name, wxIcon(wxT("product.ico"), wxBITMAP_TYPE_ICO_RESOURCE, size_tool.GetWidth(), size_tool.GetHeight()), prod_status_bar, wxITEM_CHECK);
-
-    m_toolbarView->AddSeparator();
-
-    m_toolViewLevelVerbose = m_toolbarView->AddTool(wxID_VIEW_LEVEL_VERBOSE, _("Verbose"), wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2863), size_tool), _("Displays all levels of records") + wxT(" (") + wxT("Ctrl+1") + wxT(")"), wxITEM_RADIO);
-
-    m_toolViewLevelInformation = m_toolbarView->AddTool(wxID_VIEW_LEVEL_INFORMATION, _("Informational"), wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2859), size_tool), _("Displays all records up to informational level") + wxT(" (") + wxT("Ctrl+2") + wxT(")"), wxITEM_RADIO);
-
-    m_toolViewLevelWarning = m_toolbarView->AddTool(wxID_VIEW_LEVEL_WARNING, _("Warning"), wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2865), size_tool), _("Displays all records up to warning level") + wxT(" (") + wxT("Ctrl+3") + wxT(")"), wxITEM_RADIO);
-
-    m_toolViewLevelError = m_toolbarView->AddTool(wxID_VIEW_LEVEL_ERROR, _("Error"), wxLoadIconFromResource(lib_comres, MAKEINTRESOURCE(2861), size_tool), _("Displays error level records only") + wxT(" (") + wxT("Ctrl+4") + wxT(")"), wxITEM_RADIO);
-
-    m_toolbarView->Realize();
-    m_mgr.AddPane(m_toolbarView, wxAuiPaneInfo().Name(wxT("ToolbarView")).Top().Caption(_("View")).PinButton(true).Dock().Resizable().FloatingSize(wxDefaultSize).LeftDockable(false).RightDockable(false).Layer(1).ToolbarPane());
-
-    m_panel = new wxEventMonitorLogPanel(this);
-
-    m_mgr.AddPane(m_panel, wxAuiPaneInfo() .Name(wxT("LogPanel")).Center() .Caption(_("Trace Log")).CaptionVisible(false).CloseButton(false).PaneBorder(false).Dock().Resizable().FloatingSize(wxDefaultSize).Floatable(false));
-
-    m_statusBar = this->CreateStatusBar(1, wxST_SIZEGRIP, wxID_ANY);
-
-    m_mgr.Update();
-    this->Centre(wxBOTH);
-
     // Restore persistent state of wxAuiManager manually, since m_mgr is not on the heap.
     wxPersistentAuiManager(&m_mgr).Restore();
-
-    // Connect Events
-    this->Connect(wxID_EXIT                ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnExit                ));
-    this->Connect(wxID_COPY                ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyUpdate      ));
-    this->Connect(wxID_COPY                ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopy            ));
-    this->Connect(wxID_COPY_ALL            ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyAllUpdate   ));
-    this->Connect(wxID_COPY_ALL            ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopyAll         ));
-    this->Connect(wxID_CLEAR               ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditClearUpdate     ));
-    this->Connect(wxID_CLEAR               ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditClear           ));
-    this->Connect(wxID_SELECT_ALL          ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectAllUpdate ));
-    this->Connect(wxID_SELECT_ALL          ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectAll       ));
-    this->Connect(wxID_SELECT_NONE         ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectNoneUpdate));
-    this->Connect(wxID_SELECT_NONE         ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectNone      ));
-    this->Connect(wxID_VIEW_SCROLL_AUTO    ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewScrollUpdate    ));
-    this->Connect(wxID_VIEW_SCROLL_AUTO    ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewScroll          ));
-    this->Connect(wxID_VIEW_SOURCE_EAPHOST ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceUpdate    ), new wxObjectWithData<GUID>(wxETWListCtrl::s_provider_eaphost ));
-    this->Connect(wxID_VIEW_SOURCE_EAPHOST ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewSource          ), new wxObjectWithData<GUID>(wxETWListCtrl::s_provider_eaphost ));
-    this->Connect(wxID_VIEW_SOURCE_SCHANNEL,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceUpdate    ), new wxObjectWithData<GUID>(wxETWListCtrl::s_provider_schannel));
-    this->Connect(wxID_VIEW_SOURCE_SCHANNEL,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewSource          ), new wxObjectWithData<GUID>(wxETWListCtrl::s_provider_schannel));
-    this->Connect(wxID_VIEW_SOURCE_PRODUCT ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceUpdate    ), new wxObjectWithData<GUID>(EAPMETHOD_TRACE_EVENT_PROVIDER    ));
-    this->Connect(wxID_VIEW_SOURCE_PRODUCT ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewSource          ), new wxObjectWithData<GUID>(EAPMETHOD_TRACE_EVENT_PROVIDER    ));
-    this->Connect(wxID_VIEW_LEVEL_VERBOSE  , wxID_VIEW_LEVEL_ERROR, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewLevelUpdate     ));
-    this->Connect(wxID_VIEW_LEVEL_VERBOSE  , wxID_VIEW_LEVEL_ERROR, wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewLevel           ));
-    this->Connect(wxID_VIEW_TOOLBAR_EDIT   ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarUpdate   ), new wxObjectWithData<wxAuiPaneInfo*>(&m_mgr.GetPane(m_toolbarEdit)));
-    this->Connect(wxID_VIEW_TOOLBAR_EDIT   ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbar         ), new wxObjectWithData<wxAuiPaneInfo*>(&m_mgr.GetPane(m_toolbarEdit)));
-    this->Connect(wxID_VIEW_TOOLBAR_VIEW   ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarUpdate   ), new wxObjectWithData<wxAuiPaneInfo*>(&m_mgr.GetPane(m_toolbarView)));
-    this->Connect(wxID_VIEW_TOOLBAR_VIEW   ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbar         ), new wxObjectWithData<wxAuiPaneInfo*>(&m_mgr.GetPane(m_toolbarView)));
-}
-
-
-wxEventMonitorFrame::~wxEventMonitorFrame()
-{
-    // Disconnect Events
-    this->Disconnect(wxID_EXIT                ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnExit                ));
-    this->Disconnect(wxID_COPY                ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyUpdate      ));
-    this->Disconnect(wxID_COPY                ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopy            ));
-    this->Disconnect(wxID_COPY_ALL            ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditCopyAllUpdate   ));
-    this->Disconnect(wxID_COPY_ALL            ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditCopyAll         ));
-    this->Disconnect(wxID_CLEAR               ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditClearUpdate     ));
-    this->Disconnect(wxID_CLEAR               ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditClear           ));
-    this->Disconnect(wxID_SELECT_ALL          ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectAllUpdate ));
-    this->Disconnect(wxID_SELECT_ALL          ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectAll       ));
-    this->Disconnect(wxID_SELECT_NONE         ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnEditSelectNoneUpdate));
-    this->Disconnect(wxID_SELECT_NONE         ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnEditSelectNone      ));
-    this->Disconnect(wxID_VIEW_SCROLL_AUTO    ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewScrollUpdate    ));
-    this->Disconnect(wxID_VIEW_SCROLL_AUTO    ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewScroll          ));
-    this->Disconnect(wxID_VIEW_SOURCE_EAPHOST ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceUpdate    ));
-    this->Disconnect(wxID_VIEW_SOURCE_EAPHOST ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewSource          ));
-    this->Disconnect(wxID_VIEW_SOURCE_SCHANNEL,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceUpdate    ));
-    this->Disconnect(wxID_VIEW_SOURCE_SCHANNEL,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewSource          ));
-    this->Disconnect(wxID_VIEW_SOURCE_PRODUCT ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewSourceUpdate    ));
-    this->Disconnect(wxID_VIEW_SOURCE_PRODUCT ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewSource          ));
-    this->Disconnect(wxID_VIEW_LEVEL_VERBOSE  , wxID_VIEW_LEVEL_ERROR, wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewLevelUpdate     ));
-    this->Disconnect(wxID_VIEW_LEVEL_VERBOSE  , wxID_VIEW_LEVEL_ERROR, wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewLevel           ));
-    this->Disconnect(wxID_VIEW_TOOLBAR_EDIT   ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarUpdate   ));
-    this->Disconnect(wxID_VIEW_TOOLBAR_EDIT   ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbar         ));
-    this->Disconnect(wxID_VIEW_TOOLBAR_VIEW   ,                        wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEventMonitorFrame::OnViewToolbarUpdate   ));
-    this->Disconnect(wxID_VIEW_TOOLBAR_VIEW   ,                        wxEVT_MENU     , wxCommandEventHandler (wxEventMonitorFrame::OnViewToolbar         ));
-
-    // Save wxAuiManager's state.
-    wxPersistentAuiManager(&m_mgr).Save();
-
-    m_mgr.UnInit();
 }
 
 
@@ -267,147 +55,6 @@ void wxEventMonitorFrame::OnExit(wxCommandEvent& /*event*/)
 }
 
 
-void wxEventMonitorFrame::OnEditCopyUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable(m_panel->m_log->GetSelectedItemCount() != 0);
-}
-
-
-void wxEventMonitorFrame::OnEditCopy(wxCommandEvent& /*event*/)
-{
-    m_panel->m_log->CopySelected();
-}
-
-
-void wxEventMonitorFrame::OnEditCopyAllUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable(!m_panel->m_log->IsEmpty());
-}
-
-
-void wxEventMonitorFrame::OnEditCopyAll(wxCommandEvent& /*event*/)
-{
-    m_panel->m_log->CopyAll();
-}
-
-
-void wxEventMonitorFrame::OnEditClearUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable(!m_panel->m_log->IsEmpty());
-}
-
-
-void wxEventMonitorFrame::OnEditClear(wxCommandEvent& /*event*/)
-{
-    m_panel->m_log->ClearAll();
-}
-
-
-void wxEventMonitorFrame::OnEditSelectAllUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable(m_panel->m_log->GetSelectedItemCount() != m_panel->m_log->GetItemCount());
-}
-
-
-void wxEventMonitorFrame::OnEditSelectAll(wxCommandEvent& /*event*/)
-{
-    m_panel->m_log->SelectAll();
-}
-
-
-void wxEventMonitorFrame::OnEditSelectNoneUpdate(wxUpdateUIEvent& event)
-{
-    event.Enable(m_panel->m_log->GetSelectedItemCount() != 0);
-}
-
-
-void wxEventMonitorFrame::OnEditSelectNone(wxCommandEvent& /*event*/)
-{
-    m_panel->m_log->SelectNone();
-}
-
-
-void wxEventMonitorFrame::OnViewScrollUpdate(wxUpdateUIEvent& event)
-{
-    event.Check(m_panel->m_log->m_scroll_auto);
-}
-
-
-void wxEventMonitorFrame::OnViewScroll(wxCommandEvent& event)
-{
-    m_panel->m_log->m_scroll_auto = event.IsChecked();
-    if (m_panel->m_log->m_scroll_auto) {
-        // Scroll to the last record.
-        long count = m_panel->m_log->GetItemCount();
-        if (count)
-            m_panel->m_log->EnsureVisible(count - 1);
-    }
-}
-
-
-void wxEventMonitorFrame::OnViewSourceUpdate(wxUpdateUIEvent& event)
-{
-    wxObjectWithData<GUID> *source = dynamic_cast<wxObjectWithData<GUID>*>(event.m_callbackUserData);
-    if (source) {
-        // Update GUI control according to event source state.
-        event.Check(m_panel->m_log->IsSourceEnabled(source->m_data));
-        event.Enable(true);
-    } else
-        event.Enable(false);
-}
-
-
-void wxEventMonitorFrame::OnViewSource(wxCommandEvent& event)
-{
-    wxObjectWithData<GUID> *source = dynamic_cast<wxObjectWithData<GUID>*>(event.m_callbackUserData);
-    if (source) {
-        // Enable event source.
-        m_panel->m_log->EnableSource(source->m_data, event.IsChecked());
-    }
-}
-
-
-void wxEventMonitorFrame::OnViewLevelUpdate(wxUpdateUIEvent& event)
-{
-    // Update GUI control according to log level.
-    event.Check(TRACE_LEVEL_ERROR + wxID_VIEW_LEVEL_ERROR - event.GetId() == m_panel->m_log->m_level);
-}
-
-
-void wxEventMonitorFrame::OnViewLevel(wxCommandEvent& event)
-{
-    UCHAR state_new = TRACE_LEVEL_ERROR + wxID_VIEW_LEVEL_ERROR - event.GetId();
-    if (m_panel->m_log->m_level != state_new) {
-        // Set new log level.
-        m_panel->m_log->m_level = state_new;
-        m_panel->m_log->RebuildItems();
-    }
-}
-
-
-void wxEventMonitorFrame::OnViewToolbarUpdate(wxUpdateUIEvent& event)
-{
-    wxObjectWithData<wxAuiPaneInfo*> *source = dynamic_cast<wxObjectWithData<wxAuiPaneInfo*>*>(event.m_callbackUserData);
-    if (source && source->m_data) {
-        // Update GUI control according to toolbar/panel visibility.
-        event.Check(source->m_data->IsShown());
-        event.Enable(true);
-    } else
-        event.Enable(false);
-}
-
-
-void wxEventMonitorFrame::OnViewToolbar(wxCommandEvent& event)
-{
-    wxObjectWithData<wxAuiPaneInfo*> *source = dynamic_cast<wxObjectWithData<wxAuiPaneInfo*>*>(event.m_callbackUserData);
-    if (source && source->m_data) {
-        // Toggle toolbar/panel visibility.
-        source->m_data->Show(!source->m_data->IsShown());
-        m_mgr.Update();
-    }
-}
-
-
 //////////////////////////////////////////////////////////////////////////
 // wxPersistentEventMonitorFrame
 //////////////////////////////////////////////////////////////////////////

EventMonitor/Frame.h

@@ -30,92 +30,20 @@ class wxPersistentEventMonitorFrame;
 
 #pragma once;
 
-#include "LogPanel.h"
-
 #include "wxEventMonitor_UI.h"
-
-#include <wx/frame.h>
-#include <wx/menu.h>
-#include <wx/statusbr.h>
-#include <wx/aui/auibar.h>
-#include <wx/aui/framemanager.h>
 #include <wx/persist/toplevel.h>
 
-#include <WinStd/Win.h>
 
-
+class wxEventMonitorFrame : public wxEventMonitorFrameBase
-class wxEventMonitorFrame : public wxFrame
 {
-protected:
-    enum {
-        wxID_COPY_ALL = 1000,
-        wxID_SELECT_ALL,
-        wxID_SELECT_NONE,
-        wxID_VIEW_SCROLL_AUTO,
-        wxID_VIEW_SOURCE_EAPHOST,
-        wxID_VIEW_SOURCE_SCHANNEL,
-        wxID_VIEW_SOURCE_PRODUCT,
-        wxID_VIEW_LEVEL_VERBOSE,
-        wxID_VIEW_LEVEL_INFORMATION,
-        wxID_VIEW_LEVEL_WARNING,
-        wxID_VIEW_LEVEL_ERROR,
-        wxID_VIEW_TOOLBAR_EDIT,
-        wxID_VIEW_TOOLBAR_VIEW,
-    };
-
 public:
-    wxEventMonitorFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(600,400), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor"));
+    wxEventMonitorFrame();
-    ~wxEventMonitorFrame();
 
     friend class wxPersistentEventMonitorFrame;
 
 protected:
     void OnExit(wxCommandEvent& event);
-    void OnEditCopyUpdate(wxUpdateUIEvent& event);
+    wxDECLARE_EVENT_TABLE();
-    void OnEditCopy(wxCommandEvent& event);
-    void OnEditCopyAllUpdate(wxUpdateUIEvent& event);
-    void OnEditCopyAll(wxCommandEvent& event);
-    void OnEditClearUpdate(wxUpdateUIEvent& event);
-    void OnEditClear(wxCommandEvent& event);
-    void OnEditSelectAllUpdate(wxUpdateUIEvent& event);
-    void OnEditSelectAll(wxCommandEvent& event);
-    void OnEditSelectNoneUpdate(wxUpdateUIEvent& event);
-    void OnEditSelectNone(wxCommandEvent& event);
-    void OnViewScrollUpdate(wxUpdateUIEvent& event);
-    void OnViewScroll(wxCommandEvent& event);
-    void OnViewSourceUpdate(wxUpdateUIEvent& event);
-    void OnViewSource(wxCommandEvent& event);
-    void OnViewLevelUpdate(wxUpdateUIEvent& event);
-    void OnViewLevel(wxCommandEvent& event);
-    void OnViewToolbarUpdate(wxUpdateUIEvent& event);
-    void OnViewToolbar(wxCommandEvent& event);
-
-protected:
-    wxMenuBar* m_menubar;
-    wxMenu* m_menuProgram;
-    wxMenu* m_menuEdit;
-    wxMenu* m_menuView;
-    wxMenuItem* m_menuViewSourceProduct;
-    wxMenuItem* m_menuViewLevelVerbose;
-    wxMenuItem* m_menuViewLevelInformation;
-    wxMenuItem* m_menuViewLevelWarning;
-    wxMenuItem* m_menuViewLevelError;
-    wxAuiToolBar* m_toolbarEdit;
-    wxAuiToolBarItem* m_toolEditCopy;
-    wxAuiToolBarItem* m_toolEditCopyAll;
-    wxAuiToolBarItem* m_toolEditClear;
-    wxAuiToolBar* m_toolbarView;
-    wxAuiToolBarItem* m_toolViewScrollAuto;
-    wxAuiToolBarItem* m_toolViewSourceEapHost;
-    wxAuiToolBarItem* m_toolViewSourceSchannel;
-    wxAuiToolBarItem* m_toolViewSourceProduct;
-    wxAuiToolBarItem* m_toolViewLevelVerbose;
-    wxAuiToolBarItem* m_toolViewLevelInformation;
-    wxAuiToolBarItem* m_toolViewLevelWarning;
-    wxAuiToolBarItem* m_toolViewLevelError;
-    wxStatusBar* m_statusBar;
-    wxEventMonitorLogPanel* m_panel;
-    wxAuiManager m_mgr;
 };
 
 

EventMonitor/LogPanel.cpp

@@ -51,7 +51,13 @@ void wxPersistentEventMonitorLogPanel::Save() const
 {
     const wxEventMonitorLogPanel * const wnd = static_cast<const wxEventMonitorLogPanel*>(GetWindow());
 
-    wxPersistentETWListCtrl(wnd->m_log).Save();
+    // Save log's column widths.
+    wxListItem col;
+    col.SetMask(wxLIST_MASK_TEXT | wxLIST_MASK_WIDTH);
+    for (int i = 0, n = wnd->m_log->GetColumnCount(); i < n; i++) {
+        wnd->m_log->GetColumn(i, col);
+        SaveValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), col.GetWidth());
+    }
 }
 
 
@@ -59,7 +65,16 @@ bool wxPersistentEventMonitorLogPanel::Restore()
 {
     wxEventMonitorLogPanel * const wnd = static_cast<wxEventMonitorLogPanel*>(GetWindow());
 
-    wxPersistentETWListCtrl(wnd->m_log).Restore();
+    // Restore log's column widths.
+    wxListItem col;
+    col.SetMask(wxLIST_MASK_TEXT);
+    for (int i = 0, n = wnd->m_log->GetColumnCount(); i < n; i++) {
+        wnd->m_log->GetColumn(i, col);
+
+        int width;
+        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), &width))
+            wnd->m_log->SetColumnWidth(i, width);
+    }
 
     return true;
 }

EventMonitor/StdAfx.h

@@ -25,12 +25,9 @@
 #include "Frame.h"
 #include "LogPanel.h"
 
-#include "../lib/EAPBase_UI/include/EAP_UI.h"
-
 #include "../include/Version.h"
 
 #include <wxex/common.h>
-#include <wxex/object.h>
 #include <wxex/persist/auimanager.h>
 
 #include <WinStd/COM.h>
@@ -46,8 +43,6 @@
 #include <Sddl.h>
 #include <tchar.h>
 
-#include <utility>
 #include <vector>
-#include <set>
 
 #include <EventsETW.h> // Must include after <Windows.h>

EventMonitor/locale/.gitignore

@@ -1 +0,0 @@
-/*.mo

EventMonitor/locale/EventMonitor.pot

@@ -1,7 +1,8 @@
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2016-08-27 14:20+0200\n"
+"POT-Creation-Date: 2016-07-15 13:05+0200\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,205 +17,31 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: App.cpp:69 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4
+#: App.cpp:69 wxEventMonitor_UI.h:54
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
 
-#: ETWLog.cpp:83
+#: LogPanel.cpp:30
-#, c-format
-msgid "Error opening event trace (error %u)."
-msgstr ""
-
-#: ETWLog.cpp:167
 msgid "Time"
 msgstr ""
 
-#: ETWLog.cpp:168
+#: LogPanel.cpp:31
-msgid "PID"
-msgstr ""
-
-#: ETWLog.cpp:169
-msgid "TID"
-msgstr ""
-
-#: ETWLog.cpp:170
 msgid "Source"
 msgstr ""
 
-#: ETWLog.cpp:171
+#: wxEventMonitor_UI.cpp:23
-msgid "Event"
-msgstr ""
-
-#: ETWLog.cpp:228
-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 ""
-
-#: ETWLog.cpp:231
-#, c-format
-msgid "The %s event session already exists."
-msgstr ""
-
-#: ETWLog.cpp:235
-#, c-format
-msgid "Error creating event session (error %u)."
-msgstr ""
-
-#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
-#, c-format
-msgid "Error enabling %s event provider (error %u)."
-msgstr ""
-
-#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
-#, c-format
-msgid "Toggles display of %s records"
-msgstr ""
-
-#: Frame.cpp:65
 msgid "E&xit"
 msgstr ""
 
-#: Frame.cpp:65
+#: wxEventMonitor_UI.cpp:23
-msgid "Quits this program"
+msgid "Quit this program"
 msgstr ""
 
-#: Frame.cpp:69
+#: wxEventMonitor_UI.cpp:26
+#, fuzzy
 msgid "&Program"
-msgstr ""
+msgstr "You don't have %s subscription yet."
 
-#: Frame.cpp:78
+#: wxEventMonitor_UI.cpp:32
-msgid "Copy A&ll"
+msgid "Log Trace"
-msgstr ""
-
-#: Frame.cpp:78 Frame.cpp:156
-msgid "Copies all records to clipboard (including hidden)"
-msgstr ""
-
-#: Frame.cpp:83 Frame.cpp:158
-msgid "Clear"
-msgstr ""
-
-#: Frame.cpp:83 Frame.cpp:158
-msgid "Clears all records from the log"
-msgstr ""
-
-#: Frame.cpp:90
-msgid "Select &All"
-msgstr ""
-
-#: Frame.cpp:90
-msgid "Selects all visible records"
-msgstr ""
-
-#: Frame.cpp:94
-msgid "Select &None"
-msgstr ""
-
-#: Frame.cpp:94
-msgid "Clears record selection"
-msgstr ""
-
-#: Frame.cpp:97 Frame.cpp:142
-msgid "&Edit"
-msgstr ""
-
-#: Frame.cpp:101
-msgid "Auto &Scroll"
-msgstr ""
-
-#: Frame.cpp:101 Frame.cpp:164
-msgid "Automatically scrolls to the most recent records as they come-in"
-msgstr ""
-
-#: Frame.cpp:123 Frame.cpp:176
-msgid "Verbose"
-msgstr ""
-
-#: Frame.cpp:123 Frame.cpp:176
-msgid "Displays all levels of records"
-msgstr ""
-
-#: Frame.cpp:127 Frame.cpp:178
-msgid "Informational"
-msgstr ""
-
-#: Frame.cpp:127 Frame.cpp:178
-msgid "Displays all records up to informational level"
-msgstr ""
-
-#: Frame.cpp:131 Frame.cpp:180
-msgid "Warning"
-msgstr ""
-
-#: Frame.cpp:131 Frame.cpp:180
-msgid "Displays all records up to warning level"
-msgstr ""
-
-#: Frame.cpp:135 Frame.cpp:182
-msgid "Error"
-msgstr ""
-
-#: Frame.cpp:135 Frame.cpp:182
-msgid "Displays error level records only"
-msgstr ""
-
-#: Frame.cpp:142 Frame.cpp:146
-#, c-format
-msgid "%s toolbar"
-msgstr ""
-
-#: Frame.cpp:142 Frame.cpp:146
-#, c-format
-msgid "Toggles display of %s toolbar"
-msgstr ""
-
-#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
-msgid "View"
-msgstr ""
-
-#: Frame.cpp:146 Frame.cpp:149
-msgid "&View"
-msgstr ""
-
-#: Frame.cpp:154
-msgid "Copy"
-msgstr ""
-
-#: Frame.cpp:154
-msgid "Copies selected records to clipboard"
-msgstr ""
-
-#: Frame.cpp:156
-msgid "Copy All"
-msgstr ""
-
-#: Frame.cpp:161
-msgid "Edit"
-msgstr ""
-
-#: Frame.cpp:164
-msgid "Auto Scroll"
-msgstr ""
-
-#: Frame.cpp:189
-msgid "Trace Log"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Release.Feature-2.idtx:3
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
-msgid "1252"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
-msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
-msgid "Real-time display of internal events"
 msgstr ""

EventMonitor/locale/sl_SI.po

@@ -1,228 +0,0 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2016-08-27 14:20+0200\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
-"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ..\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: App.cpp:69 Frame.h:67 MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid "Event Monitor"
-msgstr "Nadzornik dogodkov"
-
-#: ETWLog.cpp:83
-#, c-format
-msgid "Error opening event trace (error %u)."
-msgstr "Napaka pri odpiranju sledenja dogodkom (napaka %u)."
-
-#: ETWLog.cpp:167
-msgid "Time"
-msgstr "Čas"
-
-#: ETWLog.cpp:168
-msgid "PID"
-msgstr "PID"
-
-#: ETWLog.cpp:169
-msgid "TID"
-msgstr "TID"
-
-#: ETWLog.cpp:170
-msgid "Source"
-msgstr "Vir"
-
-#: ETWLog.cpp:171
-msgid "Event"
-msgstr "Dogodek"
-
-#: ETWLog.cpp:228
-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 ""
-"Dostop pri ustvarjanju seje dogodkov zavrnjen: potrebujete skrbniške pravice"
-" (Zaženi kot skrbnik) ali biti član skupine »Performance Log Users« za zagon"
-" seje sledenja dogodkov."
-
-#: ETWLog.cpp:231
-#, c-format
-msgid "The %s event session already exists."
-msgstr "Seja dogodkov %s že obstaja."
-
-#: ETWLog.cpp:235
-#, c-format
-msgid "Error creating event session (error %u)."
-msgstr "Napaka pri ustvarjanju seje dogodkov (napaka %u)."
-
-#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
-#, c-format
-msgid "Error enabling %s event provider (error %u)."
-msgstr "Napaka pri omogočanju ponudnika dogodkov %s (napaka %u)."
-
-#: Frame.cpp:48 Frame.cpp:108 Frame.cpp:113 Frame.cpp:168 Frame.cpp:170
-#, c-format
-msgid "Toggles display of %s records"
-msgstr "Obrne prikaz zapisov %s"
-
-#: Frame.cpp:65
-msgid "E&xit"
-msgstr "I&zhod"
-
-#: Frame.cpp:65
-msgid "Quits this program"
-msgstr "Konča ta program"
-
-#: Frame.cpp:69
-msgid "&Program"
-msgstr "&Program"
-
-#: Frame.cpp:78
-msgid "Copy A&ll"
-msgstr "Kopiraj &vse"
-
-#: Frame.cpp:78 Frame.cpp:156
-msgid "Copies all records to clipboard (including hidden)"
-msgstr "Kopira vse zapise na odložišče (tudi skrite)"
-
-#: Frame.cpp:83 Frame.cpp:158
-msgid "Clear"
-msgstr "Počisti"
-
-#: Frame.cpp:83 Frame.cpp:158
-msgid "Clears all records from the log"
-msgstr "Počisti vse zapise iz dnevnika"
-
-#: Frame.cpp:90
-msgid "Select &All"
-msgstr "Izberi &vse"
-
-#: Frame.cpp:90
-msgid "Selects all visible records"
-msgstr "Izbere vse vidne zapise"
-
-#: Frame.cpp:94
-msgid "Select &None"
-msgstr "Izberi &nič"
-
-#: Frame.cpp:94
-msgid "Clears record selection"
-msgstr "Počisti izbor zapisov"
-
-#: Frame.cpp:97 Frame.cpp:142
-msgid "&Edit"
-msgstr "Ur&edi"
-
-#: Frame.cpp:101
-msgid "Auto &Scroll"
-msgstr "&Samodrsenje"
-
-#: Frame.cpp:101 Frame.cpp:164
-msgid "Automatically scrolls to the most recent records as they come-in"
-msgstr "Samodejno pomikaj do najbolj zadnjega zapisa, ko prihajajo"
-
-#: Frame.cpp:123 Frame.cpp:176
-msgid "Verbose"
-msgstr "Podrobno"
-
-#: Frame.cpp:123 Frame.cpp:176
-msgid "Displays all levels of records"
-msgstr "Prikaže vse ravni zapisov"
-
-#: Frame.cpp:127 Frame.cpp:178
-msgid "Informational"
-msgstr "Informativno"
-
-#: Frame.cpp:127 Frame.cpp:178
-msgid "Displays all records up to informational level"
-msgstr "Prikaže vse zapise do informativne ravni"
-
-#: Frame.cpp:131 Frame.cpp:180
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: Frame.cpp:131 Frame.cpp:180
-msgid "Displays all records up to warning level"
-msgstr "Prikaže vse zapise do opozorilne ravni"
-
-#: Frame.cpp:135 Frame.cpp:182
-msgid "Error"
-msgstr "Napaka"
-
-#: Frame.cpp:135 Frame.cpp:182
-msgid "Displays error level records only"
-msgstr "Prikaže samo zapise ravni napak"
-
-#: Frame.cpp:142 Frame.cpp:146
-#, c-format
-msgid "%s toolbar"
-msgstr "Orodna vrstica %s"
-
-#: Frame.cpp:142 Frame.cpp:146
-#, c-format
-msgid "Toggles display of %s toolbar"
-msgstr "Obrne prikaz orodne vrstice %s"
-
-#: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
-msgid "View"
-msgstr "Pogled"
-
-#: Frame.cpp:146 Frame.cpp:149
-msgid "&View"
-msgstr "Po&gled"
-
-#: Frame.cpp:154
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: Frame.cpp:154
-msgid "Copies selected records to clipboard"
-msgstr "Kopira izbrane zapise na odložišče"
-
-#: Frame.cpp:156
-msgid "Copy All"
-msgstr "Kopiraj vse"
-
-#: Frame.cpp:161
-msgid "Edit"
-msgstr "Uredi"
-
-#: Frame.cpp:164
-msgid "Auto Scroll"
-msgstr "Samodrsenje"
-
-#: Frame.cpp:189
-msgid "Trace Log"
-msgstr "Dnevnik sledenja"
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:3
-#: MSIBuild/En.x64.Release.Feature-2.idtx:3
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:3
-msgid "1252"
-msgstr "1250"
-
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
-msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr "EVENTM~1|Nadzornik dogodkov GÉANTLink"
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.Win32.Release.Shortcut-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Shortcut-2.idtx:4
-msgid "Real-time display of internal events"
-msgstr "Prikazovalnik notranjih dogodkov v realnem času"

EventMonitor/wxEventMonitor_UI.cpp

@@ -13,12 +13,54 @@
 
 ///////////////////////////////////////////////////////////////////////////
 
+wxEventMonitorFrameBase::wxEventMonitorFrameBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxFrame( parent, id, title, pos, size, style, name )
+{
+	this->SetSizeHints( wxSize( 150,150 ), wxDefaultSize );
+	m_mgr.SetManagedWindow(this);
+	m_mgr.SetFlags(wxAUI_MGR_DEFAULT);
+	
+	m_menubar = new wxMenuBar( 0 );
+	m_menuProgram = new wxMenu();
+	wxMenuItem* m_menuItemExit;
+	m_menuItemExit = new wxMenuItem( m_menuProgram, wxID_EXIT, wxString( _("E&xit") ) + wxT('\t') + wxT("Alt+F4"), _("Quit this program"), wxITEM_NORMAL );
+	m_menuProgram->Append( m_menuItemExit );
+	
+	m_menubar->Append( m_menuProgram, _("&Program") ); 
+	
+	this->SetMenuBar( m_menubar );
+	
+	m_panel = new wxEventMonitorLogPanel( this );
+	
+	m_mgr.AddPane( m_panel, wxAuiPaneInfo() .Name( wxT("LogPanel") ).Center() .Caption( _("Log Trace") ).CaptionVisible( false ).CloseButton( false ).PaneBorder( false ).Dock().Resizable().FloatingSize( wxDefaultSize ).Floatable( false ) );
+	
+	m_statusBar = this->CreateStatusBar( 1, wxST_SIZEGRIP, wxID_ANY );
+	
+	m_mgr.Update();
+	this->Centre( wxBOTH );
+	
+	// Connect Events
+	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxEventMonitorFrameBase::OnClose ) );
+	this->Connect( wxEVT_ICONIZE, wxIconizeEventHandler( wxEventMonitorFrameBase::OnIconize ) );
+	this->Connect( wxEVT_IDLE, wxIdleEventHandler( wxEventMonitorFrameBase::OnIdle ) );
+}
+
+wxEventMonitorFrameBase::~wxEventMonitorFrameBase()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( wxEventMonitorFrameBase::OnClose ) );
+	this->Disconnect( wxEVT_ICONIZE, wxIconizeEventHandler( wxEventMonitorFrameBase::OnIconize ) );
+	this->Disconnect( wxEVT_IDLE, wxIdleEventHandler( wxEventMonitorFrameBase::OnIdle ) );
+	
+	m_mgr.UnInit();
+	
+}
+
 wxEventMonitorLogPanelBase::wxEventMonitorLogPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
 {
 	wxBoxSizer* bSizerMain;
 	bSizerMain = new wxBoxSizer( wxVERTICAL );
 	
-	m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER, wxDefaultValidator, wxT("EventMonitorLog") );
+	m_log = new wxETWListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL|wxNO_BORDER );
 	bSizerMain->Add( m_log, 1, wxEXPAND, 5 );
 	
 	

EventMonitor/wxEventMonitor_UI.fbp

@@ -26,6 +26,261 @@
         <property name="ui_table">UI</property>
         <property name="use_enum">1</property>
         <property name="use_microsoft_bom">1</property>
+        <object class="Frame" expanded="1">
+            <property name="aui_managed">1</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center">wxBOTH</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="extra_style"></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">150,150</property>
+            <property name="name">wxEventMonitorFrameBase</property>
+            <property name="pos"></property>
+            <property name="size">600,400</property>
+            <property name="style">wxDEFAULT_FRAME_STYLE</property>
+            <property name="subclass"></property>
+            <property name="title">Event Monitor</property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name">EventMonitor</property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <property name="xrc_skip_sizer">1</property>
+            <event name="OnActivate"></event>
+            <event name="OnActivateApp"></event>
+            <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="OnClose">OnClose</event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize">OnIconize</event>
+            <event name="OnIdle">OnIdle</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="wxMenuBar" expanded="1">
+                <property name="bg"></property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="font"></property>
+                <property name="hidden">0</property>
+                <property name="id">wxID_ANY</property>
+                <property name="label">Menu</property>
+                <property name="maximum_size"></property>
+                <property name="minimum_size"></property>
+                <property name="name">m_menubar</property>
+                <property name="permission">protected</property>
+                <property name="pos"></property>
+                <property name="size"></property>
+                <property name="style"></property>
+                <property name="subclass"></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 class="wxMenu" expanded="1">
+                    <property name="label">&amp;Program</property>
+                    <property name="name">m_menuProgram</property>
+                    <property name="permission">protected</property>
+                    <object class="wxMenuItem" expanded="0">
+                        <property name="bitmap"></property>
+                        <property name="checked">0</property>
+                        <property name="enabled">1</property>
+                        <property name="help">Quit this program</property>
+                        <property name="id">wxID_EXIT</property>
+                        <property name="kind">wxITEM_NORMAL</property>
+                        <property name="label">E&amp;xit</property>
+                        <property name="name">m_menuItemExit</property>
+                        <property name="permission">none</property>
+                        <property name="shortcut">Alt+F4</property>
+                        <property name="unchecked_bitmap"></property>
+                        <event name="OnMenuSelection"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+            </object>
+            <object class="CustomControl" expanded="0">
+                <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">LogPanel</property>
+                <property name="aui_position"></property>
+                <property name="aui_row"></property>
+                <property name="best_size"></property>
+                <property name="bg"></property>
+                <property name="caption">Log Trace</property>
+                <property name="caption_visible">0</property>
+                <property name="center_pane">0</property>
+                <property name="class">wxEventMonitorLogPanel</property>
+                <property name="close_button">0</property>
+                <property name="construction">m_panel = new wxEventMonitorLogPanel( this );&#x0A;</property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="declaration">wxEventMonitorLogPanel* m_panel;</property>
+                <property name="default_pane">0</property>
+                <property name="dock">Dock</property>
+                <property name="dock_fixed">0</property>
+                <property name="docking">Center</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="floatable">0</property>
+                <property name="font"></property>
+                <property name="gripper">0</property>
+                <property name="hidden">0</property>
+                <property name="id">wxID_ANY</property>
+                <property name="include">class wxEventMonitorLogPanel;</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_panel</property>
+                <property name="pane_border">0</property>
+                <property name="pane_position"></property>
+                <property name="pane_size"></property>
+                <property name="permission">public</property>
+                <property name="pin_button">0</property>
+                <property name="pos"></property>
+                <property name="resize">Resizable</property>
+                <property name="settings"></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 class="wxStatusBar" expanded="0">
+                <property name="bg"></property>
+                <property name="context_help"></property>
+                <property name="context_menu">1</property>
+                <property name="enabled">1</property>
+                <property name="fg"></property>
+                <property name="fields">1</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">m_statusBar</property>
+                <property name="permission">protected</property>
+                <property name="pos"></property>
+                <property name="size"></property>
+                <property name="style">wxST_SIZEGRIP</property>
+                <property name="subclass"></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="Panel" expanded="1">
             <property name="aui_managed">0</property>
             <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@@ -126,13 +381,13 @@
                         <property name="pane_border">1</property>
                         <property name="pane_position"></property>
                         <property name="pane_size"></property>
-                        <property name="permission">public</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">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL</property>
+                        <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_SINGLE_SEL</property>
                         <property name="subclass">wxETWListCtrl; ETWLog.h</property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
@@ -141,7 +396,7 @@
                         <property name="validator_type">wxDefaultValidator</property>
                         <property name="validator_variable"></property>
                         <property name="window_extra_style"></property>
-                        <property name="window_name">EventMonitorLog</property>
+                        <property name="window_name"></property>
                         <property name="window_style">wxNO_BORDER</property>
                         <event name="OnChar"></event>
                         <event name="OnEnterWindow"></event>

EventMonitor/wxEventMonitor_UI.h

@@ -13,17 +13,53 @@
 #include <wx/intl.h>
 class wxETWListCtrl;
 
-#include <wx/listctrl.h>
+#include <wx/string.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/menu.h>
 #include <wx/gdicmn.h>
 #include <wx/font.h>
 #include <wx/colour.h>
 #include <wx/settings.h>
-#include <wx/string.h>
+class wxEventMonitorLogPanel;
+#include <wx/statusbr.h>
+#include <wx/frame.h>
+#include <wx/aui/aui.h>
+#include <wx/listctrl.h>
 #include <wx/sizer.h>
 #include <wx/panel.h>
 
 ///////////////////////////////////////////////////////////////////////////
 
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEventMonitorFrameBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEventMonitorFrameBase : public wxFrame 
+{
+	private:
+	
+	protected:
+		wxMenuBar* m_menubar;
+		wxMenu* m_menuProgram;
+		wxStatusBar* m_statusBar;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnIconize( wxIconizeEvent& event ) { event.Skip(); }
+		virtual void OnIdle( wxIdleEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		wxEventMonitorLogPanel* m_panel;
+		
+		wxEventMonitorFrameBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Event Monitor"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 600,400 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitor") );
+		wxAuiManager m_mgr;
+		
+		~wxEventMonitorFrameBase();
+	
+};
+
 ///////////////////////////////////////////////////////////////////////////////
 /// Class wxEventMonitorLogPanelBase
 ///////////////////////////////////////////////////////////////////////////////
@@ -32,9 +68,9 @@ class wxEventMonitorLogPanelBase : public wxPanel
 	private:
 	
 	protected:
+		wxETWListCtrl* m_log;
 	
 	public:
-		wxETWListCtrl* m_log;
 		
 		wxEventMonitorLogPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxT("EventMonitorLogPanel") ); 
 		~wxEventMonitorLogPanelBase();

VS10Solution.sln

@@ -42,9 +42,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MsiUseFeature", "MsiUseFeat
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EventMonitor", "EventMonitor\EventMonitor.vcxproj", "{E0D0725B-B2FC-4225-9481-CA9B1B6306F2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtend", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxExtendLib", "lib\wxExtend\build\wxExtendLib.vcxproj", "{D3E29951-D9F5-486D-A167-20AE8E90B1FA}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WLANManager", "WLANManager\WLANManager.vcxproj", "{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -182,14 +180,6 @@ Global
 		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|Win32.Build.0 = Release|Win32
 		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.ActiveCfg = Release|x64
 		{D3E29951-D9F5-486D-A167-20AE8E90B1FA}.Release|x64.Build.0 = Release|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.ActiveCfg = Debug|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|Win32.Build.0 = Debug|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.ActiveCfg = Debug|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Debug|x64.Build.0 = Debug|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.ActiveCfg = Release|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|Win32.Build.0 = Release|Win32
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.ActiveCfg = Release|x64
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -211,6 +201,5 @@ Global
 		{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}
-		{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
 	EndGlobalSection
 EndGlobal

WLANManager/.gitignore

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

WLANManager/MSIBuild/.gitignore

@@ -1,9 +0,0 @@
-/*-1.idt
-/*-2.idt
-/*-2.idtx
-/*.Binary-1
-/*.Binary-2
-/*.Icon-1
-/*.Icon-2
-/*.lst
-/*.msm

WLANManager/Main.cpp

@@ -1,136 +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"
-
-#pragma comment(lib, "Wlanapi.lib")
-#pragma comment(lib, "Wlanui.lib")
-
-using namespace std;
-using namespace winstd;
-
-DWORD (WINAPI *pfnWlanReasonCodeToString)(__in DWORD dwReasonCode, __in DWORD dwBufferSize, __in_ecount(dwBufferSize) PWCHAR pStringBuffer, __reserved PVOID pReserved);
-
-
-static int DisplayError(_In_z_ _Printf_format_string_ LPCTSTR format, ...)
-{
-    va_list arg;
-    va_start(arg, format);
-    tstring msg;
-    vsprintf(msg, format, arg);
-    va_end(arg);
-
-    return MessageBox(NULL, msg.c_str(), _T("WLANManager"), MB_OK);
-}
-
-
-static int WLANManager()
-{
-    int nArgs;
-    unique_ptr<LPWSTR[], LocalFree_delete<LPWSTR[]> > pwcArglist(CommandLineToArgvW(GetCommandLineW(), &nArgs));
-    if (pwcArglist == NULL) {
-        DisplayError(_T("%s function failed (error %u)."), _T("CommandLineToArgvW"), GetLastError());
-        return 1;
-    }
-
-    if (nArgs < 3) {
-        DisplayError(_T("Not enough parameters."));
-        return -1;
-    }
-
-    if (_wcsicmp(pwcArglist[1], L"profile") != 0) {
-        DisplayError(_T("Unknown command (%ls)."), pwcArglist[1]);
-        return -1;
-    }
-
-    // Open WLAN handle.
-    DWORD dwNegotiatedVersion;
-    wlan_handle wlan;
-    if (!wlan.open(WLAN_API_MAKE_VERSION(2, 0), &dwNegotiatedVersion)) {
-        DisplayError(_T("%s function failed (error %u)."), _T("WlanOpenHandle"), GetLastError());
-        return 2;
-    } else if (dwNegotiatedVersion < WLAN_API_MAKE_VERSION(2, 0)) {
-        DisplayError(_T("WlanOpenHandle negotiated unsupported version (expected: %u, negotiated: %u)."), WLAN_API_MAKE_VERSION(2, 0), dwNegotiatedVersion);
-        return 3;
-    }
-
-    unique_ptr<WLAN_INTERFACE_INFO_LIST, WlanFreeMemory_delete<WLAN_INTERFACE_INFO_LIST> > interfaces;
-    {
-        // Get a list of WLAN interfaces.
-        WLAN_INTERFACE_INFO_LIST *pInterfaceList;
-        DWORD dwResult = WlanEnumInterfaces(wlan, NULL, &pInterfaceList);
-        if (dwResult != ERROR_SUCCESS) {
-            DisplayError(_T("%s function failed (error %u)."), _T("WlanEnumInterfaces"), dwResult);
-            return 4;
-        }
-        interfaces.reset(pInterfaceList);
-    }
-
-    for (DWORD i = 0; i < interfaces->dwNumberOfItems; i++) {
-        if (interfaces->InterfaceInfo[i].isState == wlan_interface_state_not_ready) {
-            // This interface is not ready.
-            continue;
-        }
-
-        // 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) {
-            DisplayError(_T("%s function failed (error %u)."), _T("WlanUIEditProfile"), dwResult);
-            return 5;
-        }
-        if (wlrc != WLAN_REASON_CODE_SUCCESS) {
-            tstring reason;
-            if (WlanReasonCodeToString(wlrc, reason, NULL) == ERROR_SUCCESS)
-                DisplayError(_T("%s function failed: %s"), _T("WlanUIEditProfile"), reason.c_str());
-            else
-                DisplayError(_T("%s function failed (reason code: %u)."), _T("WlanUIEditProfile"), wlrc);
-        }
-
-        break;
-    }
-
-    return 0;
-}
-
-
-int CALLBACK WinMain(_In_ HINSTANCE hInstance, _In_ HINSTANCE hPrevInstance, _In_ LPSTR lpCmdLine, _In_ int nCmdShow)
-{
-    UNREFERENCED_PARAMETER(hInstance);
-    UNREFERENCED_PARAMETER(hPrevInstance);
-    UNREFERENCED_PARAMETER(lpCmdLine);
-    UNREFERENCED_PARAMETER(nCmdShow);
-
-    {
-        // 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;
-
-    int res = WLANManager();
-
-    assert(!_CrtDumpMemoryLeaks());
-    return res;
-}

WLANManager/README.md

@@ -1,18 +0,0 @@
-#WLANManager
-Invokes standard Windows Wireless Network Properties dialog
-
-##Usage
-```
-WLANManager profile <name>
-```
-
-- `name` - The name of the network profile (not neccessarely the same as SSID)
-
-Return codes:
-- -1 = Invalid parameters
-- 0  = Success
-- 1  = Error parsing command line
-- 2  = WLAN handle could not be opened
-- 3  = WLAN provider negotiated unsupported version
-- 4  = Interface enumeration failed
-- 5  = Edit profile UI failed

WLANManager/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"

WLANManager/StdAfx.h

@@ -1,33 +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 "../lib/EAPBase_UI/include/EAP_UI.h"
-
-#include <WinStd/Common.h>
-#include <WinStd/Win.h>
-#include <WinStd/WLAN.h>
-
-#include <Windows.h>
-#include <CommCtrl.h>
-#include <tchar.h>
-
-#include <memory>

WLANManager/WLANManager.props

@@ -1,14 +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>
-    <OutDir>..\output\$(Platform).$(Configuration)\</OutDir>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemGroup />
-</Project>

WLANManager/WLANManager.vcxproj

@@ -1,112 +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>{BFCAA3B4-97A9-4EA9-8FE1-F30280142BCC}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>WLANManager</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</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="WLANManager.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="WLANManager.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="WLANManager.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="WLANManager.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
-  <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="StdAfx.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Main.cpp" />
-    <ClCompile Include="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>
-    <ResourceCompile Include="WLANManager.rc" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="README.md" />
-    <None Include="res\WLANManager.ico" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

WLANManager/WLANManager.vcxproj.filters

@@ -1,41 +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="StdAfx.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="StdAfx.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="WLANManager.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="README.md" />
-    <None Include="res\WLANManager.ico">
-      <Filter>Resource Files</Filter>
-    </None>
-  </ItemGroup>
-</Project>

WLANManager/locale/.gitignore

@@ -1 +0,0 @@
-/*.mo

WLANManager/locale/WLANManager.pot

@@ -1,32 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: WLANManager\n"
-"POT-Creation-Date: 2016-08-28 12:03+0200\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ..\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Language: en_US\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.x64.Release.Feature-2.idtx:3
-msgid "1252"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid "Helper utility to support direct shortcuts to Wireless Network Properties"
-msgstr ""
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid "WLAN Manager"
-msgstr ""

WLANManager/locale/sl_SI.po

@@ -1,37 +0,0 @@
-# Translators:
-# Simon Rozman <simon@rozman.si>, 2016
-msgid ""
-msgstr ""
-"Project-Id-Version: WLANManager\n"
-"POT-Creation-Date: 2016-08-28 12:03+0200\n"
-"PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
-"Language-Team: Slovenian (Slovenia) (https://www.transifex.com/eduroam_devel/teams/11799/sl_SI/)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: sl_SI\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-"X-Generator: Poedit 1.8.8\n"
-"X-Poedit-Basepath: ..\n"
-"X-Poedit-KeywordsList: _\n"
-"X-Poedit-SearchPath-0: .\n"
-"X-Poedit-SourceCharset: UTF-8\n"
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:3
-#: MSIBuild/En.x64.Release.Feature-2.idtx:3
-msgid "1252"
-msgstr "1250"
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid ""
-"Helper utility to support direct shortcuts to Wireless Network Properties"
-msgstr ""
-"Orodje za pomoč, ki omogoča neposredne bližnjice do nastavitev brezžičnega "
-"omrežja"
-
-#: MSIBuild/En.Win32.Release.Feature-2.idtx:4
-#: MSIBuild/En.x64.Release.Feature-2.idtx:4
-msgid "WLAN Manager"
-msgstr "Upravitelj WLAN"

desktop.ini

@@ -1,2 +0,0 @@
-[.ShellClassInfo]
-IconResource=include\icon_full.ico,0

include/Common.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
     Copyright 2016 Amebis
-    Copyright 2016 GÉANT
+	Copyright 2016 GÉANT
 
     This file is part of GÉANTLink.
 
@@ -32,7 +32,7 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;SECURITY_WIN32;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;EAP_TLS=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>_WIN32_WINNT=0x0600;ISOLATION_AWARE_ENABLED=1;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PrecompiledHeader>Use</PrecompiledHeader>
       <PrecompiledHeaderFile>StdAfx.h</PrecompiledHeaderFile>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -43,9 +43,6 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
     <ResourceCompile />
-    <POCompile>
-      <OutputFile>$(OutDir)..\locale\%(Filename)\$(ProjectName).mo</OutputFile>
-    </POCompile>
   </ItemDefinitionGroup>
   <ItemGroup />
 </Project>

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          0x00ff0e00
+#define PRODUCT_VERSION          0x00ff0a00
 
 //
 // Product version by components
@@ -39,31 +39,26 @@
 //
 #define PRODUCT_VERSION_MAJ      0
 #define PRODUCT_VERSION_MIN      255
-#define PRODUCT_VERSION_REV      14
+#define PRODUCT_VERSION_REV      10
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.0-alpha14"
+#define PRODUCT_VERSION_STR      "1.0-alpha10-owntls"
 #define PRODUCT_BUILD_YEAR_STR   "2016"
 
 //
 // Numerical version presentation for ProductVersion propery in
 // MSI packages (syntax: N.N[.N[.N]])
 //
-#define PRODUCT_VERSION_INST     "0.255.14"
+#define PRODUCT_VERSION_INST     "0.255.10"
 
 //
 // 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     "{2C45C10E-80B7-4E3B-A06F-08A1A795EDE5}"
+#define PRODUCT_VERSION_GUID     "{C3675615-0D70-47C7-9BCB-B683A77C6ED6}"
-
-//
-// Product vendor
-//
-#define VENDOR_NAME_STR          "GÉANT"
 
 //
 // Since the product name is not finally confirmed at the time of

lib/EAPBase/include/Config.h

@@ -40,14 +40,14 @@ namespace eap
     class config_method_with_cred;
 
     ///
-    /// Provider configuration storage
+    /// Base class for single provider configuration storage
     ///
     class config_provider;
 
     ///
-    /// Connection configuration storage
+    /// Base class for the list of providers configuration storage
     ///
-    class config_connection;
+    class config_provider_list;
 }
 
 ///
@@ -243,11 +243,6 @@ namespace eap
         /// \returns One of `winstd::eap_type_t` constants.
         ///
         virtual winstd::eap_type_t get_method_id() const = 0;
-
-        ///
-        /// Returns a string identifier of the EAP method type of this configuration
-        ///
-        virtual const wchar_t* get_method_str() const = 0;
     };
 
 
@@ -342,11 +337,6 @@ namespace eap
 
         /// @}
 
-        ///
-        /// Creates a blank set of credentials suitable for this method
-        ///
-        virtual credentials* make_credentials() const = 0;
-
     public:
         bool m_allow_save;                          ///< Are credentials allowed to be saved to Windows Credential Manager?
         bool m_use_preshared;                       ///< Use pre-shared credentials
@@ -464,7 +454,7 @@ namespace eap
     };
 
 
-    class config_connection : public config
+    class config_provider_list : public config
     {
     public:
         ///
@@ -472,21 +462,21 @@ namespace eap
         ///
         /// \param[in] mod  EAP module to use for global services
         ///
-        config_connection(_In_ module &mod);
+        config_provider_list(_In_ module &mod);
 
         ///
         /// Copies configuration
         ///
         /// \param[in] other  Configuration to copy from
         ///
-        config_connection(_In_ const config_connection &other);
+        config_provider_list(_In_ const config_provider_list &other);
 
         ///
         /// Moves configuration
         ///
         /// \param[in] other  Configuration to move from
         ///
-        config_connection(_Inout_ config_connection &&other);
+        config_provider_list(_Inout_ config_provider_list &&other);
 
         ///
         /// Copies configuration
@@ -495,7 +485,7 @@ namespace eap
         ///
         /// \returns Reference to this object
         ///
-        config_connection& operator=(_In_ const config_connection &other);
+        config_provider_list& operator=(_In_ const config_provider_list &other);
 
         ///
         /// Moves configuration
@@ -504,7 +494,7 @@ namespace eap
         ///
         /// \returns Reference to this object
         ///
-        config_connection& operator=(_Inout_ config_connection &&other);
+        config_provider_list& operator=(_Inout_ config_provider_list &&other);
 
         ///
         /// Clones configuration

lib/EAPBase/include/Credentials.h

@@ -58,9 +58,9 @@ namespace eap
         ///
         /// Credential source when combined
         ///
-        enum source_t {
+        enum  source_t {
             source_unknown = -1, ///< Unknown source
-            source_cache = 0,    ///< Credentials were obtained from EapHost cache
+            source_cache = 0,    ///< Credentials were obtained from EAPHost cache
             source_preshared,    ///< Credentials were set by method configuration
             source_storage       ///< Credentials were loaded from Windows Credential Manager
         };
@@ -120,52 +120,6 @@ namespace eap
         ///
         virtual bool empty() const;
 
-        /// \name XML configuration management
-        /// @{
-
-        ///
-        /// Save to XML document
-        ///
-        /// \param[in]  pDoc         XML document
-        /// \param[in]  pConfigRoot  Suggested root element for saving
-        ///
-        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-
-        ///
-        /// Load from XML document
-        ///
-        /// \param[in]  pConfigRoot  Root element for loading
-        ///
-        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-
-        /// @}
-
-        /// \name BLOB management
-        /// @{
-
-        ///
-        /// Packs a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-
-        ///
-        /// Returns packed size of a configuration
-        ///
-        /// \returns Size of data when packed (in bytes)
-        ///
-        virtual size_t get_pk_size() const;
-
-        ///
-        /// Unpacks a configuration
-        ///
-        /// \param[inout] cursor  Memory cursor
-        ///
-        virtual void operator>>(_Inout_ cursor_in &cursor);
-
-        /// @}
-
         /// \name Storage
         /// @{
 
@@ -210,36 +164,12 @@ namespace eap
         ///
         /// Returns credential identity.
         ///
-        virtual std::wstring get_identity() const;
+        virtual std::wstring get_identity() const = 0;
 
         ///
         /// Returns credential name (for GUI display).
         ///
         virtual winstd::tstring get_name() const;
-
-        ///
-        /// Combine credentials in the following order:
-        ///
-        /// 1. Cached credentials
-        /// 2. Pre-configured credentials
-        /// 3. Stored credentials
-        ///
-        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL, must be the same type of credentials as `this`)
-        /// \param[in] cfg            Method configuration (must be the same type of configuration as `this` credentials belong to)
-        /// \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_preshared  Credentials were set by method configuration
-        /// - \c source_storage    Credentials were loaded from Windows Credential Manager
-        ///
-        virtual source_t combine(
-            _In_       const credentials             *cred_cached,
-            _In_       const config_method_with_cred &cfg,
-            _In_opt_z_       LPCTSTR                 pszTargetName) = 0;
-
-    public:
-        std::wstring m_identity;    ///< Identity (username\@domain, certificate name etc.)
     };
 
 
@@ -364,7 +294,13 @@ namespace eap
 
         /// @}
 
+        ///
+        /// Returns credential identity.
+        ///
+        virtual std::wstring get_identity() const;
+
     public:
+        std::wstring               m_identity;  ///< Identity (username\@domain, certificate name etc.)
         winstd::sanitizing_wstring m_password;  ///< Password
 
     private:

lib/EAPBase/include/EAP.h

@@ -391,31 +391,6 @@ template<size_t N> inline size_t pksizeof(_In_ const eap::sanitizing_blob_f<N> &
 ///
 template<size_t N> inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::sanitizing_blob_f<N> &val);
 
-///
-/// Packs a GUID
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[in]    val     Variable with data to pack
-///
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const GUID &val);
-
-///
-/// Returns packed size of a GUID
-///
-/// \param[in] val  Data to pack
-///
-/// \returns Size of data when packed (in bytes)
-///
-inline size_t pksizeof(_In_ const GUID &val);
-
-///
-/// Unpacks a GUID
-///
-/// \param[inout] cursor  Memory cursor
-/// \param[out]   val     Variable to receive unpacked value
-///
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ GUID &val);
-
 #ifndef htonll
 ///
 /// Convert host converts an unsigned __int64 from host to TCP/IP network byte order.
@@ -1000,31 +975,6 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::sanitizing_blo
 }
 
 
-inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const GUID &val)
-{
-    eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(GUID);
-    assert(ptr_end <= cursor.ptr_end);
-    memcpy(cursor.ptr, &val, sizeof(GUID));
-    cursor.ptr = ptr_end;
-}
-
-
-inline size_t pksizeof(_In_ const GUID &val)
-{
-    UNREFERENCED_PARAMETER(val);
-    return sizeof(GUID);
-}
-
-
-inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ GUID &val)
-{
-    eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(GUID);
-    assert(ptr_end <= cursor.ptr_end);
-    memcpy(&val, cursor.ptr, sizeof(GUID));
-    cursor.ptr = ptr_end;
-}
-
-
 #ifndef htonll
 
 inline unsigned __int64 htonll(unsigned __int64 val)

lib/EAPBase/include/Method.h

@@ -51,10 +51,10 @@ namespace eap
         /// Constructs an EAP method
         ///
         /// \param[in] mod   EAP module to use for global services
-        /// \param[in] cfg   Connection configuration
+        /// \param[in] cfg   Providers configuration
         /// \param[in] cred  User credentials
         ///
-        method(_In_ module &module, _In_ config_connection &cfg, _In_ credentials &cred);
+        method(_In_ module &module, _In_ config_provider_list &cfg, _In_ credentials &cred);
 
 
         ///
@@ -77,7 +77,7 @@ namespace eap
         /// @{
 
         ///
-        /// Starts an EAP authentication session on the peer EapHost using the EAP method.
+        /// Starts an EAP authentication session on the peer EAPHost using the EAP method.
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
@@ -95,7 +95,7 @@ namespace eap
         virtual void end_session();
 
         ///
-        /// Processes a packet received by EapHost from a supplicant.
+        /// Processes a packet received by EAPHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
@@ -130,8 +130,8 @@ namespace eap
         method& operator=(_In_ const method &other);
 
     public:
-        module &m_module;           ///< EAP module
+        module &m_module;               ///< EAP module
-        config_connection &m_cfg;   ///< Connection configuration
+        config_provider_list &m_cfg;    ///< Providers configuration
-        credentials &m_cred;        ///< User credentials
+        credentials &m_cred;            ///< User credentials
     };
 }

lib/EAPBase/include/Module.h

@@ -565,7 +565,7 @@ namespace eap
         peer(_In_ winstd::eap_type_t eap_method);
 
         ///
-        /// Initializes an EAP peer method for EapHost.
+        /// Initializes an EAP peer method for EAPHost.
         ///
         /// \sa [EapPeerGetInfo function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363613.aspx)
         ///
@@ -579,7 +579,7 @@ namespace eap
         virtual void shutdown() = 0;
 
         ///
-        /// Returns the user data and user identity after being called by EapHost.
+        /// Returns the user data and user identity after being called by EAPHost.
         ///
         /// \sa [EapPeerGetIdentity function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363607.aspx)
         ///
@@ -662,7 +662,7 @@ namespace eap
             _Inout_                               EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const;
 
         ///
-        /// Converts user information into a user BLOB that can be consumed by EapHost run-time functions.
+        /// Converts user information into a user BLOB that can be consumed by EAPHost run-time functions.
         ///
         /// \sa [EapPeerQueryUIBlobFromInteractiveUIInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb204696.aspx)
         ///
@@ -679,7 +679,7 @@ namespace eap
         /// @{
 
         ///
-        /// Starts an EAP authentication session on the peer EapHost using the EAP method.
+        /// Starts an EAP authentication session on the peer EAPHost using the EAP method.
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
@@ -703,7 +703,7 @@ namespace eap
         virtual void end_session(_In_ EAP_SESSION_HANDLE hSession) = 0;
 
         ///
-        /// Processes a packet received by EapHost from a supplicant.
+        /// Processes a packet received by EAPHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///

lib/EAPBase/src/Config.cpp

@@ -609,40 +609,40 @@ void eap::config_provider::operator>>(_Inout_ cursor_in &cursor)
 
 
 //////////////////////////////////////////////////////////////////////
-// eap::config_connection
+// eap::config_provider_list
 //////////////////////////////////////////////////////////////////////
 
-eap::config_connection::config_connection(_In_ module &mod) : config(mod)
+eap::config_provider_list::config_provider_list(_In_ module &mod) : config(mod)
 {
 }
 
 
-eap::config_connection::config_connection(_In_ const config_connection &other) :
+eap::config_provider_list::config_provider_list(_In_ const config_provider_list &other) :
     m_providers(other.m_providers),
     config(other)
 {
 }
 
 
-eap::config_connection::config_connection(_Inout_ config_connection &&other) :
+eap::config_provider_list::config_provider_list(_Inout_ config_provider_list &&other) :
     m_providers(std::move(other.m_providers)),
     config(std::move(other))
 {
 }
 
 
-eap::config_connection& eap::config_connection::operator=(_In_ const config_connection &other)
+eap::config_provider_list& eap::config_provider_list::operator=(_In_ const config_provider_list &other)
 {
     if (this != &other) {
         (config&)*this = other;
-        m_providers    = other.m_providers;
+        m_providers = other.m_providers;
     }
 
     return *this;
 }
 
 
-eap::config_connection& eap::config_connection::operator=(_Inout_ config_connection &&other)
+eap::config_provider_list& eap::config_provider_list::operator=(_Inout_ config_provider_list &&other)
 {
     if (this != &other) {
         (config&&)*this = std::move(other);
@@ -653,13 +653,13 @@ eap::config_connection& eap::config_connection::operator=(_Inout_ config_connect
 }
 
 
-eap::config* eap::config_connection::clone() const
+eap::config* eap::config_provider_list::clone() const
 {
-    return new config_connection(*this);
+    return new config_provider_list(*this);
 }
 
 
-void eap::config_connection::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
+void eap::config_provider_list::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
 {
     config::save(pDoc, pConfigRoot);
 
@@ -686,7 +686,7 @@ void eap::config_connection::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *
 }
 
 
-void eap::config_connection::load(_In_ IXMLDOMNode *pConfigRoot)
+void eap::config_provider_list::load(_In_ IXMLDOMNode *pConfigRoot)
 {
     assert(pConfigRoot);
     HRESULT hr;
@@ -714,14 +714,14 @@ void eap::config_connection::load(_In_ IXMLDOMNode *pConfigRoot)
 }
 
 
-void eap::config_connection::operator<<(_Inout_ cursor_out &cursor) const
+void eap::config_provider_list::operator<<(_Inout_ cursor_out &cursor) const
 {
     config::operator<<(cursor);
     cursor << m_providers;
 }
 
 
-size_t eap::config_connection::get_pk_size() const
+size_t eap::config_provider_list::get_pk_size() const
 {
     return
         config::get_pk_size() +
@@ -729,7 +729,7 @@ size_t eap::config_connection::get_pk_size() const
 }
 
 
-void eap::config_connection::operator>>(_Inout_ cursor_in &cursor)
+void eap::config_provider_list::operator>>(_Inout_ cursor_in &cursor)
 {
     config::operator>>(cursor);
 

lib/EAPBase/src/Credentials.cpp

@@ -36,14 +36,12 @@ eap::credentials::credentials(_In_ module &mod) : config(mod)
 
 
 eap::credentials::credentials(_In_ const credentials &other) :
-    m_identity(other.m_identity),
     config(other)
 {
 }
 
 
 eap::credentials::credentials(_Inout_ credentials &&other) :
-    m_identity(std::move(other.m_identity)),
     config(std::move(other))
 {
 }
@@ -51,10 +49,8 @@ eap::credentials::credentials(_Inout_ credentials &&other) :
 
 eap::credentials& eap::credentials::operator=(_In_ const credentials &other)
 {
-    if (this != &other) {
+    if (this != &other)
         (config&)*this = other;
-        m_identity     = other.m_identity;
-    }
 
     return *this;
 }
@@ -62,10 +58,8 @@ eap::credentials& eap::credentials::operator=(_In_ const credentials &other)
 
 eap::credentials& eap::credentials::operator=(_Inout_ credentials &&other)
 {
-    if (this != &other) {
+    if (this != &other)
         (config&)*this = std::move(other);
-        m_identity     = std::move(other.m_identity);
-    }
 
     return *this;
 }
@@ -73,81 +67,19 @@ eap::credentials& eap::credentials::operator=(_Inout_ credentials &&other)
 
 void eap::credentials::clear()
 {
-    m_identity.clear();
 }
 
 
 bool eap::credentials::empty() const
 {
-    return m_identity.empty();
+    // Base class always report empty credentials.
-}
+    return true;
-
-
-void eap::credentials::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
-{
-    assert(pDoc);
-    assert(pConfigRoot);
-
-    config::save(pDoc, pConfigRoot);
-
-    const bstr bstrNamespace(L"urn:ietf:params:xml:ns:yang:ietf-eap-metadata");
-    HRESULT hr;
-
-    // <UserName>
-    if (FAILED(hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"UserName"), bstrNamespace, bstr(m_identity))))
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <UserName> element.");
-}
-
-
-void eap::credentials::load(_In_ IXMLDOMNode *pConfigRoot)
-{
-    assert(pConfigRoot);
-    HRESULT hr;
-
-    config::load(pConfigRoot);
-
-    std::wstring xpath(eapxml::get_xpath(pConfigRoot));
-
-    if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:UserName"), m_identity)))
-        m_identity.clear();
-
-    m_module.log_config((xpath + L"/UserName").c_str(), m_identity.c_str());
-}
-
-
-void eap::credentials::operator<<(_Inout_ cursor_out &cursor) const
-{
-    config::operator<<(cursor);
-    cursor << m_identity;
-}
-
-
-size_t eap::credentials::get_pk_size() const
-{
-    return
-        config::get_pk_size() +
-        pksizeof(m_identity);
-}
-
-
-void eap::credentials::operator>>(_Inout_ cursor_in &cursor)
-{
-    config::operator>>(cursor);
-    cursor >> m_identity;
-}
-
-
-wstring eap::credentials::get_identity() const
-{
-    return m_identity;
 }
 
 
 tstring eap::credentials::get_name() const
 {
-    if (empty()) return _T("<empty credentials>");
+    return !empty() ? get_identity() : _T("<blank>");
-    tstring identity(std::move(get_identity()));
-    return !identity.empty() ? identity : _T("<blank identity>");
 }
 
 
@@ -161,6 +93,7 @@ eap::credentials_pass::credentials_pass(_In_ module &mod) : credentials(mod)
 
 
 eap::credentials_pass::credentials_pass(_In_ const credentials_pass &other) :
+    m_identity(other.m_identity),
     m_password(other.m_password),
     credentials(other)
 {
@@ -168,6 +101,7 @@ eap::credentials_pass::credentials_pass(_In_ const credentials_pass &other) :
 
 
 eap::credentials_pass::credentials_pass(_Inout_ credentials_pass &&other) :
+    m_identity(std::move(other.m_identity)),
     m_password(std::move(other.m_password)),
     credentials(std::move(other))
 {
@@ -178,6 +112,7 @@ eap::credentials_pass& eap::credentials_pass::operator=(_In_ const credentials_p
 {
     if (this != &other) {
         (credentials&)*this = other;
+        m_identity          = other.m_identity;
         m_password          = other.m_password;
     }
 
@@ -189,6 +124,7 @@ eap::credentials_pass& eap::credentials_pass::operator=(_Inout_ credentials_pass
 {
     if (this != &other) {
         (credentials&)*this = std::move(other);
+        m_identity          = std::move(other.m_identity);
         m_password          = std::move(other.m_password);
     }
 
@@ -199,13 +135,14 @@ eap::credentials_pass& eap::credentials_pass::operator=(_Inout_ credentials_pass
 void eap::credentials_pass::clear()
 {
     credentials::clear();
+    m_identity.clear();
     m_password.clear();
 }
 
 
 bool eap::credentials_pass::empty() const
 {
-    return credentials::empty() && m_password.empty();
+    return credentials::empty() && m_identity.empty() && m_password.empty();
 }
 
 
@@ -219,6 +156,10 @@ void eap::credentials_pass::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *p
     const bstr bstrNamespace(L"urn:ietf:params:xml:ns:yang:ietf-eap-metadata");
     HRESULT hr;
 
+    // <UserName>
+    if (FAILED(hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"UserName"), bstrNamespace, bstr(m_identity))))
+        throw com_runtime_error(hr, __FUNCTION__ " Error creating <UserName> element.");
+
     // <Password>
     bstr pass(m_password);
     hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"Password"), bstrNamespace, pass);
@@ -237,6 +178,11 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot)
 
     std::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());
+
     bstr pass;
     if (FAILED(hr = eapxml::get_element_value(pConfigRoot, bstr(L"eap-metadata:Password"), &pass)))
         throw com_runtime_error(hr, __FUNCTION__ " Error reading <Password> element.");
@@ -256,6 +202,7 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot)
 void eap::credentials_pass::operator<<(_Inout_ cursor_out &cursor) const
 {
     credentials::operator<<(cursor);
+    cursor << m_identity;
     cursor << m_password;
 }
 
@@ -264,6 +211,7 @@ size_t eap::credentials_pass::get_pk_size() const
 {
     return
         credentials::get_pk_size() +
+        pksizeof(m_identity) +
         pksizeof(m_password);
 }
 
@@ -271,6 +219,7 @@ size_t eap::credentials_pass::get_pk_size() const
 void eap::credentials_pass::operator>>(_Inout_ cursor_in &cursor)
 {
     credentials::operator>>(cursor);
+    cursor >> m_identity;
     cursor >> m_password;
 }
 
@@ -340,7 +289,7 @@ void eap::credentials_pass::retrieve(_In_z_ LPCTSTR pszTargetName)
         m_identity.clear();
 
     wstring xpath(pszTargetName);
-    m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
+    m_module.log_config((xpath + L"/Username").c_str(), m_identity.c_str());
     m_module.log_config((xpath + L"/Password").c_str(),
 #ifdef _DEBUG
         m_password.c_str()
@@ -351,6 +300,12 @@ void eap::credentials_pass::retrieve(_In_z_ LPCTSTR pszTargetName)
 }
 
 
+std::wstring eap::credentials_pass::get_identity() const
+{
+    return m_identity;
+}
+
+
 const unsigned char eap::credentials_pass::s_entropy[1024] = {
     0x40, 0x88, 0xd3, 0x13, 0x81, 0x8a, 0xf6, 0x74, 0x55, 0x8e, 0xcc, 0x73, 0x2c, 0xf8, 0x93, 0x37,
     0x4f, 0xeb, 0x1d, 0x66, 0xb7, 0xfb, 0x47, 0x75, 0xb4, 0xfd, 0x07, 0xbb, 0xf6, 0xb3, 0x05, 0x30,

lib/EAPBase/src/Method.cpp

@@ -28,7 +28,7 @@ using namespace winstd;
 // eap::method
 //////////////////////////////////////////////////////////////////////
 
-eap::method::method(_In_ module &module, _In_ config_connection &cfg, _In_ credentials &cred) :
+eap::method::method(_In_ module &module, _In_ config_provider_list &cfg, _In_ credentials &cred) :
     m_module(module),
     m_cfg(cfg),
     m_cred(cred)

lib/EAPBase/src/Module.cpp

@@ -91,26 +91,20 @@ EAP_ERROR* eap::module::make_error(_In_ std::exception &err) const
     MultiByteToWideChar(CP_ACP, 0, err.what(), -1, what);
 
     {
-        win_runtime_error *e = dynamic_cast<win_runtime_error*>(&err);
+        win_runtime_error &e(dynamic_cast<win_runtime_error&>(err));
-        if (e)
+        if (&e)
-            return make_error(e->number(), what.c_str());
+            return make_error(e.number(), what.c_str());
     }
 
     {
-        com_runtime_error *e = dynamic_cast<com_runtime_error*>(&err);
+        com_runtime_error &e(dynamic_cast<com_runtime_error&>(err));
-        if (e)
+        if (&e)
-            return make_error(HRESULT_CODE(e->number()), what.c_str());
+            return make_error(HRESULT_CODE(e.number()), what.c_str());
     }
 
     {
-        sec_runtime_error *e = dynamic_cast<sec_runtime_error*>(&err);
+        invalid_argument &e(dynamic_cast<invalid_argument&>(err));
-        if (e)
+        if (&e)
-            return make_error(SCODE_CODE(e->number()), what.c_str());
-    }
-
-    {
-        invalid_argument *e = dynamic_cast<invalid_argument*>(&err);
-        if (e)
             return make_error(ERROR_INVALID_PARAMETER, what.c_str());
     }
 

lib/EAPBase/src/StdAfx.h

@@ -30,6 +30,5 @@
 
 #include <WinStd/Cred.h>
 #include <WinStd/ETW.h>
-#include <WinStd/Sec.h>
 
 #include <EventsETW.h>

lib/EAPBase_UI/build/EAPBase_UI.vcxproj

@@ -81,7 +81,6 @@
   <ItemGroup>
     <ClInclude Include="..\include\EAP_UI.h" />
     <ClInclude Include="..\include\Module.h" />
-    <ClInclude Include="..\include\wxEAP_UIBase.h" />
     <ClInclude Include="..\res\wxEAP_UI.h" />
     <ClInclude Include="..\src\StdAfx.h" />
   </ItemGroup>

lib/EAPBase_UI/build/EAPBase_UI.vcxproj.filters

@@ -27,9 +27,6 @@
     <ClInclude Include="..\include\Module.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\wxEAP_UIBase.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\src\StdAfx.cpp">

lib/EAPBase_UI/include/EAP_UI.h

@@ -20,8 +20,8 @@
 
 #include <wx/hyperlink.h>
 #include <wx/icon.h>
-#include <wx/intl.h>
 #include <wx/scrolwin.h>
+#include <wx/statbmp.h>
 #include <Windows.h>
 
 
@@ -81,9 +81,9 @@ class wxEAPConfigProvider;
 template <class _Tcred, class _wxT> class wxEAPCredentialsConfigPanel;
 
 ///
-/// Helper template for all credential entry panels
+/// Base template for all credential entry panels
 ///
-template <class _Tcred, class _Tbase> class wxEAPCredentialsPanel;
+template <class _Tcred, class _Tbase> class wxEAPCredentialsPanelBase;
 
 ///
 /// Generic password credential entry panel
@@ -91,39 +91,15 @@ template <class _Tcred, class _Tbase> class wxEAPCredentialsPanel;
 template <class _Tcred, class _Tbase> class wxPasswordCredentialsPanel;
 
 ///
-/// Loads icon from resource
+/// Sets icon from resource
 ///
-inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, int cx = GetSystemMetrics(SM_CXICON), int cy = GetSystemMetrics(SM_CYICON));
+inline bool wxSetIconFromResource(wxStaticBitmap *bmp, wxIcon &icon, HINSTANCE hinst, PCWSTR pszName);
-
-///
-/// Loads icon from resource
-///
-inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, const wxSize &size);
 
 ///
 /// Returns GUI displayable provider name
 ///
 inline wxString wxEAPGetProviderName(const std::wstring &id);
 
-///
-/// Initializes wxWidgets application configuration scheme
-///
-inline void wxInitializeConfig();
-
-///
-/// Inizializes wxWidgets localization scheme
-///
-inline bool wxInitializeLocale(wxLocale &locale);
-
-
-namespace eap
-{
-    ///
-    /// Base class to prevent multiple instances of the same dialog
-    ///
-    class monitor_ui;
-}
-
 #pragma once
 
 #include <wx/msw/winundef.h> // Fixes `CreateDialog` name collision
@@ -136,7 +112,6 @@ namespace eap
 #include <WinStd/Cred.h>
 #include <WinStd/Win.h>
 
-#include <wx/config.h>
 #include <wx/log.h>
 
 #include <CommCtrl.h>
@@ -167,26 +142,16 @@ public:
     ///
     /// Constructs a configuration dialog
     ///
-    /// \param[inout] cfg     Connection configuration
+    /// \param[inout] cfg     Providers configuration data
     /// \param[in]    parent  Parent window
     ///
-    wxEAPConfigDialog(eap::config_connection &cfg, wxWindow* parent) :
+    wxEAPConfigDialog(eap::config_provider_list &cfg, wxWindow* parent) :
         m_cfg(cfg),
         wxEAPConfigDialogBase(parent)
     {
         // Set extra style here, as wxFormBuilder overrides all default flags.
         this->SetExtraStyle(this->GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
 
-        // Load window icons.
-#ifdef __WINDOWS__
-        wxIconBundle icons;
-        icons.AddIcon(wxIcon(wxT("product.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON)));
-        icons.AddIcon(wxIcon(wxT("product.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXICON  ), ::GetSystemMetrics(SM_CYICON  )));
-        this->SetIcons(icons);
-#else
-        this->SetIcon(wxIcon(wxICON(product.ico)));
-#endif
-
         for (std::vector<eap::config_provider>::iterator provider = m_cfg.m_providers.begin(), provider_end = m_cfg.m_providers.end(); provider != provider_end; ++provider) {
             bool is_single = provider->m_methods.size() == 1;
             std::vector<std::unique_ptr<eap::config_method> >::size_type count = 0;
@@ -223,29 +188,26 @@ protected:
         }
     }
 
-    virtual void OnUpdateUI(wxUpdateUIEvent& /*event*/)
+    virtual void OnUpdateUI(wxUpdateUIEvent& event)
     {
-        int idx = m_providers->GetSelection();
+        UNREFERENCED_PARAMETER(event);
-        eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider();
 
-        m_advanced->Enable(!cfg_provider.m_read_only);
+        m_advanced->Enable(!m_cfg.m_providers.at(m_providers->GetSelection()).m_read_only);
     }
 
-    virtual void OnAdvanced(wxCommandEvent& /*event*/)
+    virtual void OnAdvanced(wxCommandEvent& event)
     {
-        int idx = m_providers->GetSelection();
+        UNREFERENCED_PARAMETER(event);
-        eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider();
 
-        wxEAPConfigProvider dlg(cfg_provider, this);
+        wxEAPConfigProvider dlg(m_cfg.m_providers.at(m_providers->GetSelection()), this);
-        if (dlg.ShowModal() == wxID_OK)
+        dlg.ShowModal();
-            m_providers->SetPageText(idx, wxEAPGetProviderName(cfg_provider.m_id));
     }
 
     /// \endcond
 
 
 protected:
-    eap::config_connection &m_cfg;  ///< Connection configuration
+    eap::config_provider_list &m_cfg;  ///< EAP providers configuration
 };
 
 
@@ -255,7 +217,7 @@ public:
     ///
     /// Constructs a dialog
     ///
-    wxEAPGeneralDialog(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = wxEmptyString, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
+    wxEAPGeneralDialog(wxWindow* parent, const wxString& title = wxEmptyString);
 
     ///
     /// Adds panels to the dialog
@@ -280,7 +242,7 @@ public:
     ///
     /// Constructs a credential dialog
     ///
-    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);
+    wxEAPCredentialsDialog(const eap::config_provider &prov, wxWindow* parent);
 };
 
 
@@ -340,6 +302,10 @@ public:
     /// Constructs a notice pannel and set the title text
     ///
     wxEAPProviderLockedPanel(const eap::config_provider &prov, wxWindow* parent);
+
+protected:
+    winstd::library m_shell32;  ///< shell32.dll resource library reference
+    wxIcon m_icon;              ///< Panel icon
 };
 
 
@@ -350,6 +316,10 @@ public:
     /// Constructs a notice pannel and set the title text
     ///
     wxEAPCredentialWarningPanel(const eap::config_provider &prov, wxWindow* parent);
+
+protected:
+    winstd::library m_shell32;  ///< shell32.dll resource library reference
+    wxIcon m_icon;              ///< Panel icon
 };
 
 
@@ -363,25 +333,22 @@ public:
     /// \param[inout] cfg     Configuration data
     /// \param[in]    parent  Parent window
     ///
-    wxEAPConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent);
+    wxEAPConfigWindow(const eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent);
 
     ///
     /// Destructs the configuration window
     ///
     virtual ~wxEAPConfigWindow();
 
-public:
-    inline eap::config_provider& GetProvider() const { return m_prov; }
-    inline eap::config_method  & GetConfig  () const { return m_cfg ; }
-
 protected:
     /// \cond internal
     virtual void OnInitDialog(wxInitDialogEvent& event);
+    virtual void OnUpdateUI(wxUpdateUIEvent& event);
     /// \endcond
 
 protected:
-    eap::config_provider &m_prov;   ///< EAP provider
+    const eap::config_provider &m_prov;     ///< EAP provider
-    eap::config_method &m_cfg;      ///< Method configuration
+    eap::config_method &m_cfg;              ///< Method configuration
 };
 
 
@@ -406,6 +373,8 @@ protected:
 
 protected:
     eap::config_provider &m_prov;   ///< EAP method configuration
+    winstd::library m_shell32;      ///< shell32.dll resource library reference
+    wxIcon m_icon;                  ///< Panel icon
 };
 
 
@@ -428,6 +397,8 @@ protected:
 
 protected:
     eap::config_provider &m_prov;   ///< EAP method configuration
+    winstd::library m_shell32;      ///< shell32.dll resource library reference
+    wxIcon m_icon;                  ///< Panel icon
 };
 
 
@@ -440,7 +411,7 @@ public:
     /// \param[inout] prov    Provider configuration data
     /// \param[in]    parent  Parent window
     ///
-    wxEAPConfigProvider(eap::config_provider &prov, wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = _("Provider Settings"), const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
+    wxEAPConfigProvider(eap::config_provider &prov, wxWindow* parent);
 
 protected:
     eap::config_provider &m_prov;           ///< EAP method configuration
@@ -465,15 +436,12 @@ public:
         m_prov(prov),
         m_cfg(cfg),
         m_target(pszCredTarget),
-        m_has_own(false),
+        m_cred(cfg.m_module),
-        m_cred_own(cfg.m_module),
-        m_cred_preshared(cfg.m_module),
         wxEAPCredentialsConfigPanelBase(parent)
     {
         // Load and set icon.
-        winstd::library lib_shell32;
+        if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-        if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+            wxSetIconFromResource(m_credentials_icon, m_icon, m_shell32, MAKEINTRESOURCE(/*16770*/269));
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(/*16770*/269)));
     }
 
     ///
@@ -494,13 +462,7 @@ protected:
         else
             m_preshared->SetValue(true);
 
-        if (m_cfg.m_allow_save) {
+        m_cred = *(_Tcred*)m_cfg.m_preshared.get();
-            RetrieveOwnCredentials();
-            m_timer_own.Start(3000);
-        }
-
-        m_cred_preshared = *(_Tcred*)m_cfg.m_preshared.get();
-        UpdatePresharedIdentity();
 
         return wxEAPCredentialsConfigPanelBase::TransferDataToWindow();
     }
@@ -513,31 +475,51 @@ protected:
         if (!m_prov.m_read_only) {
             // This is not a provider-locked configuration. Save the data.
             m_cfg.m_use_preshared = !m_own->GetValue();
-            *m_cfg.m_preshared    = m_cred_preshared;
+            *m_cfg.m_preshared    = m_cred;
         }
 
         return true;
     }
 
 
-    virtual void OnUpdateUI(wxUpdateUIEvent& /*event*/)
+    virtual void OnUpdateUI(wxUpdateUIEvent& event)
     {
+        UNREFERENCED_PARAMETER(event);
+        DWORD dwResult;
+
         if (m_cfg.m_allow_save) {
+            bool has_own;
+            std::unique_ptr<CREDENTIAL, winstd::CredFree_delete<CREDENTIAL> > cred;
+            if (CredRead(m_cred.target_name(m_target.c_str()).c_str(), CRED_TYPE_GENERIC, 0, (PCREDENTIAL*)&cred)) {
+                m_own_identity->SetValue(cred->UserName && cred->UserName[0] != 0 ? cred->UserName : _("<blank>"));
+                has_own = true;
+            } else if ((dwResult = GetLastError()) == ERROR_NOT_FOUND) {
+                m_own_identity->Clear();
+                has_own = false;
+            } else {
+                m_own_identity->SetValue(wxString::Format(_("<error %u>"), dwResult));
+                has_own = true;
+            }
+
             if (m_own->GetValue()) {
                 m_own_identity->Enable(true);
                 m_own_set     ->Enable(true);
-                m_own_clear   ->Enable(m_has_own);
+                m_own_clear   ->Enable(has_own);
             } else {
                 m_own_identity->Enable(false);
                 m_own_set     ->Enable(false);
                 m_own_clear   ->Enable(false);
             }
         } else {
+            m_own_identity->Clear();
+
             m_own_identity->Enable(false);
             m_own_set     ->Enable(false);
             m_own_clear   ->Enable(false);
         }
 
+        m_preshared_identity->SetValue(!m_cred.empty() ? m_cred.get_name() : _("<blank>"));
+
         if (m_prov.m_read_only) {
             // This is provider-locked configuration. Disable controls.
             // To avoid run-away selection of radio buttons, disable the selected one last.
@@ -552,8 +534,8 @@ protected:
             m_preshared_set     ->Enable(false);
         } else {
             // This is not a provider-locked configuration. Selectively enable/disable controls.
-            m_own      ->Enable(true);
+            m_own               ->Enable(true);
-            m_preshared->Enable(true);
+            m_preshared         ->Enable(true);
             if (m_own->GetValue()) {
                 m_preshared_identity->Enable(false);
                 m_preshared_set     ->Enable(false);
@@ -565,100 +547,57 @@ protected:
     }
 
 
-    virtual void OnSetOwn(wxCommandEvent& /*event*/)
+    virtual void OnSetOwn(wxCommandEvent& event)
     {
-        // Read credentials from Credential Manager.
+        UNREFERENCED_PARAMETER(event);
-        RetrieveOwnCredentials();
+
+        // Read credentials from Credential Manager
+        _Tcred cred(m_cfg.m_module);
+        try {
+            cred.retrieve(m_target.c_str());
+        } catch (winstd::win_runtime_error &err) {
+            if (err.number() != ERROR_NOT_FOUND)
+                wxLogError(winstd::tstring_printf(_("Error reading credentials from Credential Manager: %hs (error %u)"), err.what(), err.number()).c_str());
+        } catch (...) {
+            wxLogError(_("Reading credentials failed."));
+        }
 
         // Display credential prompt.
         wxEAPCredentialsDialog dlg(m_prov, this);
-        _wxT *panel = new _wxT(m_prov, m_cfg, m_cred_own, m_target.c_str(), &dlg, true);
+        _wxT *panel = new _wxT(m_prov, m_cfg, cred, m_target.c_str(), &dlg, true);
         dlg.AddContent(panel);
-        if (dlg.ShowModal() == wxID_OK && panel->GetRemember()) {
+        if (dlg.ShowModal() == wxID_OK && panel->GetRememberValue()) {
             // Write credentials to credential manager.
             try {
-                m_cred_own.store(m_target.c_str());
+                cred.store(m_target.c_str());
-                m_has_own = TRUE;
-                UpdateOwnIdentity();
             } 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());
-                RetrieveOwnCredentials();
             } catch (...) {
                 wxLogError(_("Writing credentials failed."));
-                RetrieveOwnCredentials();
             }
         }
     }
 
 
-    virtual void OnClearOwn(wxCommandEvent& /*event*/)
+    virtual void OnClearOwn(wxCommandEvent& event)
     {
-        if (CredDelete(m_cred_own.target_name(m_target.c_str()).c_str(), CRED_TYPE_GENERIC, 0)) {
+        UNREFERENCED_PARAMETER(event);
-            m_own_identity->Clear();
+
-            m_has_own = false;
+        if (!CredDelete(m_cred.target_name(m_target.c_str()).c_str(), CRED_TYPE_GENERIC, 0))
-        } else
             wxLogError(_("Deleting credentials failed (error %u)."), GetLastError());
     }
 
 
-    virtual void OnSetPreshared(wxCommandEvent& /*event*/)
+    virtual void OnSetPreshared(wxCommandEvent& event)
     {
+        UNREFERENCED_PARAMETER(event);
+
         wxEAPCredentialsDialog dlg(m_prov, this);
 
-        _wxT *panel = new _wxT(m_prov, m_cfg, m_cred_preshared, _T(""), &dlg, true);
+        _wxT *panel = new _wxT(m_prov, m_cfg, m_cred, _T(""), &dlg, true);
 
         dlg.AddContent(panel);
-        if (dlg.ShowModal() == wxID_OK)
+        dlg.ShowModal();
-            UpdatePresharedIdentity();
-    }
-
-
-    virtual void OnTimerOwn(wxTimerEvent& /*event*/)
-    {
-        RetrieveOwnCredentials();
-    }
-
-
-    void RetrieveOwnCredentials()
-    {
-        try {
-            m_cred_own.retrieve(m_target.c_str());
-            m_has_own = true;
-            UpdateOwnIdentity();
-        } catch (winstd::win_runtime_error &err) {
-            if (err.number() == ERROR_NOT_FOUND) {
-                m_own_identity->Clear();
-                m_has_own = false;
-            } else {
-                m_own_identity->SetValue(wxString::Format(_("<error %u>"), err.number()));
-                m_has_own = true;
-            }
-        } catch (...) {
-            m_own_identity->SetValue(_("<error>"));
-            m_has_own = true;
-        }
-    }
-
-
-    inline void UpdateOwnIdentity()
-    {
-        if (m_cred_own.empty())
-            m_own_identity->SetValue(_T("<empty credentials>"));
-        else {
-            wxString identity(m_cred_own.get_name());
-            m_own_identity->SetValue(!identity.empty() ? identity : _("<blank identity>"));
-        }
-    }
-
-
-    inline void UpdatePresharedIdentity()
-    {
-        if (m_cred_preshared.empty())
-            m_preshared_identity->SetValue(_T("<empty credentials>"));
-        else {
-            wxString identity(m_cred_preshared.get_name());
-            m_preshared_identity->SetValue(!identity.empty() ? identity : _("<blank identity>"));
-        }
     }
 
     /// \endcond
@@ -666,21 +605,21 @@ protected:
 protected:
     const eap::config_provider &m_prov;     ///< EAP provider
     eap::config_method_with_cred &m_cfg;    ///< EAP method configuration
+    winstd::library m_shell32;              ///< shell32.dll resource library reference
+    wxIcon m_icon;                          ///< Panel icon
     winstd::tstring m_target;               ///< Credential Manager target
 
 private:
-    bool m_has_own;                         ///< Does the user has (some sort of) credentials stored in Credential Manager?
+    _Tcred m_cred;                          ///< Temporary credential data
-    _Tcred m_cred_own;                      ///< Temporary own credential data
-    _Tcred m_cred_preshared;                ///< Temporary pre-shared credential data
 };
 
 
 template <class _Tcred, class _Tbase>
-class wxEAPCredentialsPanel : public _Tbase
+class wxEAPCredentialsPanelBase : public _Tbase
 {
 private:
     /// \cond internal
-    typedef wxEAPCredentialsPanel<_Tcred, _Tbase> _Tthis;
+    typedef wxEAPCredentialsPanelBase<_Tcred, _Tbase> _Tthis;
     /// \endcond
 
 public:
@@ -694,7 +633,7 @@ public:
     /// \param[in]    parent         Parent window
     /// \param[in]    is_config      Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
     ///
-    wxEAPCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
+    wxEAPCredentialsPanelBase(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
         m_prov(prov),
         m_cfg(cfg),
         m_cred(cred),
@@ -702,14 +641,20 @@ public:
         m_is_config(is_config),
         _Tbase(parent)
     {
+        this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(_Tthis::OnUpdateUI));
     }
 
-    virtual void SetRemember(bool val)
+    virtual ~wxEAPCredentialsPanelBase()
+    {
+        this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(_Tthis::OnUpdateUI));
+    }
+
+    inline void SetRememberValue(bool val)
     {
         return m_remember->SetValue(val);
     }
 
-    virtual bool GetRemember() const
+    inline bool GetRememberValue() const
     {
         return m_remember->GetValue();
     }
@@ -717,8 +662,10 @@ public:
 protected:
     /// \cond internal
 
-    virtual bool TransferDataToWindow()
+    virtual void OnUpdateUI(wxUpdateUIEvent& event)
     {
+        UNREFERENCED_PARAMETER(event);
+
         if (m_is_config) {
             // Configuration mode
             // Always store credentials (somewhere).
@@ -733,8 +680,6 @@ protected:
             m_remember->SetValue(false);
             m_remember->Enable(false);
         }
-
-        return _Tbase::TransferDataToWindow();
     }
 
     /// \endcond
@@ -749,7 +694,7 @@ protected:
 
 
 template <class _Tcred, class _Tbase>
-class wxPasswordCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
+class wxPasswordCredentialsPanel : public wxEAPCredentialsPanelBase<_Tcred, _Tbase>
 {
 public:
     ///
@@ -763,12 +708,11 @@ public:
     /// \param[in]    is_config      Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
     ///
     wxPasswordCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false) :
-        wxEAPCredentialsPanel<_Tcred, _Tbase>(prov, cfg, cred, pszCredTarget, parent, is_config)
+        wxEAPCredentialsPanelBase<_Tcred, _Tbase>(prov, cfg, cred, pszCredTarget, parent, is_config)
     {
         // Load and set icon.
-        winstd::library lib_shell32;
+        if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-        if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+            wxSetIconFromResource(m_credentials_icon, m_icon, m_shell32, MAKEINTRESOURCE(269));
-            m_credentials_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(269)));
 
         bool layout = false;
         if (!m_prov.m_lbl_alt_credential.empty()) {
@@ -800,20 +744,12 @@ protected:
         m_identity->SetSelection(0, -1);
         m_password->SetValue(m_cred.m_password.empty() ? wxEmptyString : s_dummy_password);
 
-        if (!m_is_config && m_cfg.m_use_preshared) {
+        return wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPassPanelBase>::TransferDataToWindow();
-            // Credential prompt mode & Using pre-shared credentials
-            m_identity_label->Enable(false);
-            m_identity      ->Enable(false);
-            m_password_label->Enable(false);
-            m_password      ->Enable(false);
-        }
-
-        return wxEAPCredentialsPanel<_Tcred, wxEAPCredentialsPassPanelBase>::TransferDataToWindow();
     }
 
     virtual bool TransferDataFromWindow()
     {
-        if (!wxEAPCredentialsPanel<_Tcred, wxEAPCredentialsPassPanelBase>::TransferDataFromWindow())
+        if (!wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPassPanelBase>::TransferDataFromWindow())
             return false;
 
         m_cred.m_identity = m_identity->GetValue();
@@ -826,8 +762,25 @@ protected:
         return true;
     }
 
+    virtual void OnUpdateUI(wxUpdateUIEvent& event)
+    {
+        if (!m_is_config && m_cfg.m_use_preshared) {
+            // Credential prompt mode & Using pre-shared credentials
+            m_identity_label->Enable(false);
+            m_identity      ->Enable(false);
+            m_password_label->Enable(false);
+            m_password      ->Enable(false);
+        }
+
+        wxEAPCredentialsPanelBase<_Tcred, wxEAPCredentialsPassPanelBase>::OnUpdateUI(event);
+    }
+
     /// \endcond
 
+protected:
+    winstd::library m_shell32;      ///< shell32.dll resource library reference
+    wxIcon m_icon;                  ///< Panel icon
+
 private:
     static const wxStringCharType *s_dummy_password;
 };
@@ -836,27 +789,17 @@ template <class _Tcred, class _Tbase>
 const wxStringCharType *wxPasswordCredentialsPanel<_Tcred, _Tbase>::s_dummy_password = wxT("dummypass");
 
 
-inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, int cx, int cy)
+inline bool wxSetIconFromResource(wxStaticBitmap *bmp, wxIcon &icon, HINSTANCE hinst, PCWSTR pszName)
 {
-    HICON hIcon;
+    wxASSERT(bmp);
-    if (SUCCEEDED(LoadIconWithScaleDown(hinst, pszName, cx, cy, &hIcon))) {
-        wxIcon icon;
-        icon.CreateFromHICON(hIcon);
-        return icon;
-    } else
-        return wxNullIcon;
-}
 
-
-inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, const wxSize &size)
-{
     HICON hIcon;
-    if (SUCCEEDED(LoadIconWithScaleDown(hinst, pszName, size.GetWidth(), size.GetHeight(), &hIcon))) {
+    if (SUCCEEDED(LoadIconWithScaleDown(hinst, pszName, GetSystemMetrics(SM_CXICON), GetSystemMetrics(SM_CYICON), &hIcon))) {
-        wxIcon icon;
         icon.CreateFromHICON(hIcon);
-        return icon;
+        bmp->SetIcon(icon);
+        return true;
     } else
-        return wxNullIcon;
+        return false;
 }
 
 
@@ -865,85 +808,3 @@ inline wxString wxEAPGetProviderName(const std::wstring &id)
     return
         !id.empty() ? id : _("<Your Organization>");
 }
-
-
-inline void wxInitializeConfig()
-{
-    wxConfigBase *cfgPrev = wxConfigBase::Set(new wxConfig(wxT(PRODUCT_NAME_STR), wxT(VENDOR_NAME_STR)));
-    if (cfgPrev) wxDELETE(cfgPrev);
-}
-
-
-inline bool wxInitializeLocale(wxLocale &locale)
-{
-    // Read language from configuration.
-    wxLanguage lang_code;
-    wxString lang;
-    if (wxConfigBase::Get()->Read(wxT("Language"), &lang)) {
-        const wxLanguageInfo *lang_info = wxLocale::FindLanguageInfo(lang);
-        lang_code = lang_info ? (wxLanguage)lang_info->Language : wxLANGUAGE_DEFAULT;
-    } else
-        lang_code = wxLANGUAGE_DEFAULT;
-
-    if (wxLocale::IsAvailable(lang_code)) {
-        // Language is "available". Well... Known actually.
-        wxString sPath;
-        if (wxConfigBase::Get()->Read(wxT("LocalizationRepositoryPath"), &sPath))
-            locale.AddCatalogLookupPathPrefix(sPath);
-        return locale.Init(lang_code);
-    }
-
-    return false;
-}
-
-
-namespace eap
-{
-    class monitor_ui
-    {
-    public:
-        monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid);
-        virtual ~monitor_ui();
-
-        void set_popup(_In_ HWND hwnd);
-        void release_slaves(_In_bytecount_(size) const void *data, _In_ size_t size) const;
-
-        inline bool is_master() const
-        {
-            return m_is_master;
-        }
-
-        inline bool is_slave() const
-        {
-            return !is_master();
-        }
-
-        inline const std::vector<unsigned char>& master_data() const
-        {
-            return m_data;
-        }
-
-    protected:
-        virtual LRESULT winproc(
-            _In_ UINT   msg,
-            _In_ WPARAM wparam,
-            _In_ LPARAM lparam);
-
-        static LRESULT CALLBACK winproc(
-            _In_ HWND   hwnd,
-            _In_ UINT   msg,
-            _In_ WPARAM wparam,
-            _In_ LPARAM lparam);
-
-    protected:
-        bool m_is_master;                   ///< Is this monitor master?
-        HWND m_hwnd;                        ///< Message window handle
-        std::list<HWND> m_slaves;           ///< List of slaves to notify on finish
-        HWND m_hwnd_popup;                  ///< Pop-up window handle
-        std::vector<unsigned char> m_data;  ///< Data master sent
-
-        // Custom window messages
-        static const UINT s_msg_attach;     ///< Slave sends this message to attach to master
-        static const UINT s_msg_finish;     ///< Master sends this message to slaves to notify them it has finished (wparam has size, lparam has data)
-    };
-}

lib/EAPBase_UI/include/wxEAP_UIBase.h

@@ -1,48 +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/>.
-*/
-
-///
-/// Base class for all credential entry panel that must provide "Remember" credentials checkbox
-///
-class wxEAPCredentialsPanelBase;
-
-#pragma once
-
-#include <wx/panel.h>
-
-
-class wxEAPCredentialsPanelBase : public wxPanel
-{
-public:
-    ///
-    /// Constructs a wxPanel with "Remember" credentials checkbox
-    ///
-    wxEAPCredentialsPanelBase(wxWindow *parent,
-            wxWindowID winid = wxID_ANY,
-            const wxPoint& pos = wxDefaultPosition,
-            const wxSize& size = wxDefaultSize,
-            long style = wxTAB_TRAVERSAL | wxNO_BORDER,
-            const wxString& name = wxPanelNameStr) : wxPanel(parent, winid, pos, size, style, name)
-    {
-    }
-
-    virtual void SetRemember(bool val) = 0;
-    virtual bool GetRemember() const = 0;
-};

lib/EAPBase_UI/res/wxEAP_UI.cpp

@@ -272,14 +272,12 @@ wxEAPCredentialsConfigPanelBase::wxEAPCredentialsConfigPanelBase( wxWindow* pare
 	
 	this->SetSizer( sb_credentials );
 	this->Layout();
-	m_timer_own.SetOwner( this, wxID_ANY );
 	
 	// Connect Events
 	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPCredentialsConfigPanelBase::OnUpdateUI ) );
 	m_own_clear->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClearOwn ), NULL, this );
 	m_own_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetOwn ), NULL, this );
 	m_preshared_set->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetPreshared ), NULL, this );
-	this->Connect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( wxEAPCredentialsConfigPanelBase::OnTimerOwn ) );
 }
 
 wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase()
@@ -289,11 +287,10 @@ wxEAPCredentialsConfigPanelBase::~wxEAPCredentialsConfigPanelBase()
 	m_own_clear->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnClearOwn ), NULL, this );
 	m_own_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetOwn ), NULL, this );
 	m_preshared_set->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPCredentialsConfigPanelBase::OnSetPreshared ), NULL, this );
-	this->Disconnect( wxID_ANY, wxEVT_TIMER, wxTimerEventHandler( wxEAPCredentialsConfigPanelBase::OnTimerOwn ) );
 	
 }
 
-wxEAPCredentialsPassPanelBase::wxEAPCredentialsPassPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxEAPCredentialsPanelBase( parent, id, pos, size, style )
+wxEAPCredentialsPassPanelBase::wxEAPCredentialsPassPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
 {
 	wxStaticBoxSizer* sb_credentials;
 	sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Client Credentials") ), wxVERTICAL );
@@ -415,7 +412,7 @@ wxEAPProviderIdentityPanelBase::wxEAPProviderIdentityPanelBase( wxWindow* parent
 	sb_provider_helpdesk_inner->Add( m_provider_web_icon, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 );
 	
 	m_provider_web = new wxTextCtrl( sb_provider_id->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_provider_web->SetToolTip( _("Your helpdesk website address") );
+	m_provider_web->SetToolTip( _("Your helpdesk website") );
 	
 	sb_provider_helpdesk_inner->Add( m_provider_web, 1, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 );
 	
@@ -456,10 +453,16 @@ wxEAPProviderIdentityPanelBase::wxEAPProviderIdentityPanelBase( wxWindow* parent
 	
 	this->SetSizer( sb_provider_id );
 	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPProviderIdentityPanelBase::OnUpdateUI ) );
 }
 
 wxEAPProviderIdentityPanelBase::~wxEAPProviderIdentityPanelBase()
 {
+	// Disconnect Events
+	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPProviderIdentityPanelBase::OnUpdateUI ) );
+	
 }
 
 wxEAPProviderLockPanelBase::wxEAPProviderLockPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
@@ -502,8 +505,14 @@ wxEAPProviderLockPanelBase::wxEAPProviderLockPanelBase( wxWindow* parent, wxWind
 	
 	this->SetSizer( sb_provider_lock );
 	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPProviderLockPanelBase::OnUpdateUI ) );
 }
 
 wxEAPProviderLockPanelBase::~wxEAPProviderLockPanelBase()
 {
+	// Disconnect Events
+	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPProviderLockPanelBase::OnUpdateUI ) );
+	
 }

lib/EAPBase_UI/res/wxEAP_UI.fbp

@@ -1913,15 +1913,6 @@
                     </object>
                 </object>
             </object>
-            <object class="wxTimer" expanded="1">
-                <property name="enabled">0</property>
-                <property name="id">wxID_ANY</property>
-                <property name="name">m_timer_own</property>
-                <property name="oneshot">0</property>
-                <property name="period">3000</property>
-                <property name="permission">protected</property>
-                <event name="OnTimer">OnTimerOwn</event>
-            </object>
         </object>
         <object class="Panel" expanded="1">
             <property name="aui_managed">0</property>
@@ -1940,7 +1931,7 @@
             <property name="name">wxEAPCredentialsPassPanelBase</property>
             <property name="pos"></property>
             <property name="size">500,-1</property>
-            <property name="subclass">wxEAPCredentialsPanelBase; ../include/wxEAP_UIBase.h</property>
+            <property name="subclass"></property>
             <property name="tooltip"></property>
             <property name="window_extra_style"></property>
             <property name="window_name"></property>
@@ -2676,7 +2667,7 @@
             <event name="OnRightUp"></event>
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
+            <event name="OnUpdateUI">OnUpdateUI</event>
             <object class="wxStaticBoxSizer" expanded="1">
                 <property name="id">wxID_ANY</property>
                 <property name="label">Your Organization</property>
@@ -3379,7 +3370,7 @@
                                                         <property name="style"></property>
                                                         <property name="subclass"></property>
                                                         <property name="toolbar_pane">0</property>
-                                                        <property name="tooltip">Your helpdesk website address</property>
+                                                        <property name="tooltip">Your helpdesk website</property>
                                                         <property name="validator_data_type"></property>
                                                         <property name="validator_style">wxFILTER_NONE</property>
                                                         <property name="validator_type">wxDefaultValidator</property>
@@ -3826,7 +3817,7 @@
             <event name="OnRightUp"></event>
             <event name="OnSetFocus"></event>
             <event name="OnSize"></event>
-            <event name="OnUpdateUI"></event>
+            <event name="OnUpdateUI">OnUpdateUI</event>
             <object class="wxStaticBoxSizer" expanded="1">
                 <property name="id">wxID_ANY</property>
                 <property name="label">Configuration Lock</property>

lib/EAPBase_UI/res/wxEAP_UI.h

@@ -11,9 +11,6 @@
 #include <wx/artprov.h>
 #include <wx/xrc/xmlres.h>
 #include <wx/intl.h>
-class wxEAPCredentialsPanelBase;
-
-#include "../include/wxEAP_UIBase.h"
 class wxEAPBannerPanel;
 #include <wx/gdicmn.h>
 #include <wx/font.h>
@@ -33,7 +30,6 @@ class wxEAPBannerPanel;
 #include <wx/radiobut.h>
 #include <wx/textctrl.h>
 #include <wx/statbox.h>
-#include <wx/timer.h>
 #include <wx/checkbox.h>
 
 ///////////////////////////////////////////////////////////////////////////
@@ -144,14 +140,12 @@ class wxEAPCredentialsConfigPanelBase : public wxPanel
 		wxRadioButton* m_preshared;
 		wxTextCtrl* m_preshared_identity;
 		wxButton* m_preshared_set;
-		wxTimer m_timer_own;
 		
 		// Virtual event handlers, overide them in your derived class
 		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
 		virtual void OnClearOwn( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnSetOwn( wxCommandEvent& event ) { event.Skip(); }
 		virtual void OnSetPreshared( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnTimerOwn( wxTimerEvent& event ) { event.Skip(); }
 		
 	
 	public:
@@ -164,7 +158,7 @@ class wxEAPCredentialsConfigPanelBase : public wxPanel
 ///////////////////////////////////////////////////////////////////////////////
 /// Class wxEAPCredentialsPassPanelBase
 ///////////////////////////////////////////////////////////////////////////////
-class wxEAPCredentialsPassPanelBase : public wxEAPCredentialsPanelBase
+class wxEAPCredentialsPassPanelBase : public wxPanel 
 {
 	private:
 	
@@ -204,6 +198,10 @@ class wxEAPProviderIdentityPanelBase : public wxPanel
 		wxTextCtrl* m_provider_email;
 		wxStaticText* m_provider_phone_icon;
 		wxTextCtrl* m_provider_phone;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
+		
 	
 	public:
 		
@@ -224,6 +222,10 @@ class wxEAPProviderLockPanelBase : public wxPanel
 		wxStaticText* m_provider_lock_label;
 		wxCheckBox* m_provider_lock;
 		wxStaticText* m_provider_lock_note;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
+		
 	
 	public:
 		

lib/EAPBase_UI/src/EAP_UI.cpp

@@ -41,22 +41,11 @@ bool wxEAPBannerPanel::AcceptsFocusFromKeyboard() const
 // wxEAPGeneralDialog
 //////////////////////////////////////////////////////////////////////
 
-wxEAPGeneralDialog::wxEAPGeneralDialog(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style) :
+wxEAPGeneralDialog::wxEAPGeneralDialog(wxWindow* parent, const wxString& title) : wxEAPGeneralDialogBase(parent, wxID_ANY, title)
-    wxEAPGeneralDialogBase(parent, id, title, pos, size, style)
 {
     // Set extra style here, as wxFormBuilder overrides all default flags.
     this->SetExtraStyle(this->GetExtraStyle() | wxWS_EX_VALIDATE_RECURSIVELY);
 
-    // Load window icons.
-#ifdef __WINDOWS__
-    wxIconBundle icons;
-    icons.AddIcon(wxIcon(wxT("product.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXSMICON), ::GetSystemMetrics(SM_CYSMICON)));
-    icons.AddIcon(wxIcon(wxT("product.ico"), wxBITMAP_TYPE_ICO_RESOURCE, ::GetSystemMetrics(SM_CXICON  ), ::GetSystemMetrics(SM_CYICON  )));
-    this->SetIcons(icons);
-#else
-    this->SetIcon(wxIcon(wxICON(product.ico)));
-#endif
-
     m_buttonsOK->SetDefault();
 }
 
@@ -91,8 +80,7 @@ void wxEAPGeneralDialog::OnInitDialog(wxInitDialogEvent& event)
 // wxEAPCredentialsDialog
 //////////////////////////////////////////////////////////////////////
 
-wxEAPCredentialsDialog::wxEAPCredentialsDialog(const eap::config_provider &prov, wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style) :
+wxEAPCredentialsDialog::wxEAPCredentialsDialog(const eap::config_provider &prov, wxWindow* parent) : wxEAPGeneralDialog(parent, _("EAP Credentials"))
-    wxEAPGeneralDialog(parent, id, title, pos, size, style)
 {
     // Set banner title.
     m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_id).c_str()));
@@ -184,9 +172,8 @@ void wxEAPNotePanel::CreateContactFields(const eap::config_provider &prov)
 wxEAPProviderLockedPanel::wxEAPProviderLockedPanel(const eap::config_provider &prov, wxWindow* parent) : wxEAPNotePanel(parent)
 {
     // Load and set icon.
-    winstd::library lib_shell32;
+    if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-    if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+        wxSetIconFromResource(m_note_icon, m_icon, m_shell32, MAKEINTRESOURCE(48));
-        m_note_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(48)));
 
     m_note_label->SetLabel(wxString::Format(_("%s has pre-set parts of this configuration. Those parts are locked to prevent accidental modification."),
         !prov.m_name.empty() ? prov.m_name.c_str() :
@@ -206,9 +193,8 @@ wxEAPProviderLockedPanel::wxEAPProviderLockedPanel(const eap::config_provider &p
 wxEAPCredentialWarningPanel::wxEAPCredentialWarningPanel(const eap::config_provider &prov, wxWindow* parent) : wxEAPNotePanel(parent)
 {
     // Load and set icon.
-    winstd::library lib_shell32;
+    if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-    if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+        wxSetIconFromResource(m_note_icon, m_icon, m_shell32, MAKEINTRESOURCE(161));
-        m_note_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(161)));
 
     m_note_label->SetLabel(_("Previous attempt to connect failed. Please, make sure your credentials are correct, or try again later."));
     m_note_label->Wrap(449);
@@ -223,7 +209,7 @@ wxEAPCredentialWarningPanel::wxEAPCredentialWarningPanel(const eap::config_provi
 // wxEAPConfigWindow
 //////////////////////////////////////////////////////////////////////
 
-wxEAPConfigWindow::wxEAPConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent) :
+wxEAPConfigWindow::wxEAPConfigWindow(const eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent) :
     m_prov(prov),
     m_cfg(cfg),
     wxScrolledWindow(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxVSCROLL)
@@ -232,23 +218,42 @@ wxEAPConfigWindow::wxEAPConfigWindow(eap::config_provider &prov, eap::config_met
 
     // Connect Events
     this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEAPConfigWindow::OnInitDialog));
+    this->Connect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEAPConfigWindow::OnUpdateUI));
 }
 
 
 wxEAPConfigWindow::~wxEAPConfigWindow()
 {
     // Disconnect Events
+    this->Disconnect(wxEVT_UPDATE_UI, wxUpdateUIEventHandler(wxEAPConfigWindow::OnUpdateUI));
     this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEAPConfigWindow::OnInitDialog));
 }
 
 
-void wxEAPConfigWindow::OnInitDialog(wxInitDialogEvent& /*event*/)
+void wxEAPConfigWindow::OnInitDialog(wxInitDialogEvent& event)
 {
+    UNREFERENCED_PARAMETER(event);
+
     // Call TransferDataToWindow() manually, as wxScrolledWindow somehow skips that.
     TransferDataToWindow();
 }
 
 
+void wxEAPConfigWindow::OnUpdateUI(wxUpdateUIEvent& event)
+{
+    UNREFERENCED_PARAMETER(event);
+
+    if (m_parent && m_parent->IsKindOf(wxCLASSINFO(wxNotebook))) {
+        // We're a notebook page. Set the ID of our provider as our page label.
+        wxNotebook *notebook = (wxNotebook*)m_parent;
+        int idx = notebook->FindPage(this);
+        if (idx != wxNOT_FOUND)
+            notebook->SetPageText(idx, wxEAPGetProviderName(m_prov.m_id));
+    } else
+        this->SetLabel(wxEAPGetProviderName(m_prov.m_id));
+}
+
+
 //////////////////////////////////////////////////////////////////////
 // wxEAPProviderIdentityPanel
 //////////////////////////////////////////////////////////////////////
@@ -258,9 +263,8 @@ wxEAPProviderIdentityPanel::wxEAPProviderIdentityPanel(eap::config_provider &pro
     wxEAPProviderIdentityPanelBase(parent)
 {
     // Load and set icon.
-    winstd::library lib_shell32;
+    if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-    if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+        wxSetIconFromResource(m_provider_id_icon, m_icon, m_shell32, MAKEINTRESOURCE(259));
-        m_provider_id_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(259)));
 }
 
 
@@ -297,9 +301,8 @@ wxEAPProviderLockPanel::wxEAPProviderLockPanel(eap::config_provider &prov, wxWin
     wxEAPProviderLockPanelBase(parent)
 {
     // Load and set icon.
-    winstd::library lib_shell32;
+    if (m_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
-    if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+        wxSetIconFromResource(m_provider_lock_icon, m_icon, m_shell32, MAKEINTRESOURCE(1003));
-        m_provider_lock_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(1003)));
 }
 
 
@@ -325,12 +328,12 @@ bool wxEAPProviderLockPanel::TransferDataFromWindow()
 // wxEAPConfigProvider
 //////////////////////////////////////////////////////////////////////
 
-wxEAPConfigProvider::wxEAPConfigProvider(eap::config_provider &prov, wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style) :
+wxEAPConfigProvider::wxEAPConfigProvider(eap::config_provider &prov, wxWindow* parent) :
     m_prov(prov),
-    wxEAPGeneralDialog(parent, id, title, pos, size, style)
+    wxEAPGeneralDialog(parent, _("Provider Settings"))
 {
     // Set banner title.
-    m_banner->m_title->SetLabel(title);
+    m_banner->m_title->SetLabel(_("Provider Settings"));
 
     m_identity = new wxEAPProviderIdentityPanel(prov, this);
     AddContent(m_identity);
@@ -340,196 +343,3 @@ wxEAPConfigProvider::wxEAPConfigProvider(eap::config_provider &prov, wxWindow *p
 
     m_identity->m_provider_name->SetFocusFromKbd();
 }
-
-
-using namespace std;
-using namespace winstd;
-
-//////////////////////////////////////////////////////////////////////
-// eap::monitor_ui
-//////////////////////////////////////////////////////////////////////
-
-eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
-    m_hwnd_popup(NULL)
-{
-    // Verify if the monitor is already running.
-    const WNDCLASSEX wnd_class_desc = {
-        sizeof(WNDCLASSEX), // cbSize
-        0,                  // style
-        winproc,            // lpfnWndProc
-        0,                  // cbClsExtra
-        0,                  // cbWndExtra
-        module,             // hInstance
-        NULL,               // hIcon
-        NULL,               // hCursor
-        NULL,               // hbrBackground
-        NULL,               // lpszMenuName
-        _T(__FUNCTION__),   // lpszClassName
-        NULL                // hIconSm
-    };
-    ATOM wnd_class = RegisterClassEx(&wnd_class_desc);
-    if (!wnd_class)
-        throw win_runtime_error(__FUNCTION__ " Error registering master monitor window class.");
-    tstring_guid guid_str(guid);
-    HWND hwnd_master = FindWindowEx(HWND_MESSAGE, NULL, (LPCTSTR)wnd_class, guid_str.c_str());
-    if (hwnd_master) {
-        // Another monitor is already running.
-        m_is_master = false;
-
-        // Register slave windows class slightly different, not to include slaves in FindWindowEx().
-        const WNDCLASSEX wnd_class_desc = {
-            sizeof(WNDCLASSEX),             // cbSize
-            0,                              // style
-            winproc,                        // lpfnWndProc
-            0,                              // cbClsExtra
-            0,                              // cbWndExtra
-            module,                         // hInstance
-            NULL,                           // hIcon
-            NULL,                           // hCursor
-            NULL,                           // hbrBackground
-            NULL,                           // lpszMenuName
-            _T(__FUNCTION__) _T("-Slave"),  // lpszClassName
-            NULL                            // hIconSm
-        };
-        wnd_class = RegisterClassEx(&wnd_class_desc);
-        if (!wnd_class)
-            throw win_runtime_error(__FUNCTION__ " Error registering slave monitor window class.");
-    } else {
-        // This is a fresh monitor.
-        m_is_master = true;
-    }
-
-    m_hwnd = CreateWindowEx(
-        0,                  // dwExStyle
-        (LPCTSTR)wnd_class, // lpClassName
-        guid_str.c_str(),   // lpWindowName
-        0,                  // dwStyle
-        0,                  // x
-        0,                  // y
-        0,                  // nWidth
-        0,                  // nHeight
-        HWND_MESSAGE,       // hWndParent
-        NULL,               // hMenu
-        module,             // hInstance
-        this);              // lpParam
-
-    if (!m_is_master) {
-        // Notify master we are waiting him.
-        SendMessage(hwnd_master, s_msg_attach, 0, (LPARAM)m_hwnd);
-
-        // Slaves must pump message queue until finished.
-        MSG msg;
-        while (GetMessage(&msg, NULL, 0, 0) > 0) {
-            TranslateMessage(&msg);
-            DispatchMessage(&msg);
-        }
-    }
-}
-
-
-eap::monitor_ui::~monitor_ui()
-{
-    if (m_hwnd)
-        DestroyWindow(m_hwnd);
-}
-
-
-void eap::monitor_ui::set_popup(_In_ HWND hwnd)
-{
-    m_hwnd_popup = hwnd;
-}
-
-
-void eap::monitor_ui::release_slaves(_In_bytecount_(size) const void *data, _In_ size_t size) const
-{
-    assert(!size || data);
-
-    for (list<HWND>::const_iterator slave = m_slaves.begin(), slave_end = m_slaves.end(); slave != slave_end; ++slave) {
-        // Get slave's PID.
-        DWORD pid_slave;
-        GetWindowThreadProcessId(*slave, &pid_slave);
-
-        // Get slave's process handle.
-        process proc_slave;
-        if (!proc_slave.open(PROCESS_VM_OPERATION | PROCESS_VM_WRITE, 0, pid_slave))
-            continue;
-
-        // Allocate memory in slave's virtual memory space and save data to it.
-        vmemory mem_slave;
-        if (!mem_slave.alloc(proc_slave, NULL, size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE))
-            continue;
-        if (!WriteProcessMemory(proc_slave, mem_slave, data, size, NULL))
-            continue;
-
-        // Notify slave. Use SendMessage(), not PostMessage(), as memory will get cleaned up.
-        SendMessage(*slave, s_msg_finish, (WPARAM)size, (LPARAM)(LPVOID)mem_slave);
-    }
-}
-
-
-LRESULT eap::monitor_ui::winproc(
-    _In_ UINT   msg,
-    _In_ WPARAM wparam,
-    _In_ LPARAM lparam)
-{
-    UNREFERENCED_PARAMETER(wparam);
-
-    if (msg == s_msg_attach) {
-        // Attach a new slave.
-        assert(m_is_master);
-        m_slaves.push_back((HWND)lparam);
-
-        if (m_hwnd_popup) {
-            // Bring pop-up window up.
-            if (::IsIconic(m_hwnd_popup))
-                ::SendMessage(m_hwnd_popup, WM_SYSCOMMAND, SC_RESTORE, 0);
-            ::SetActiveWindow(m_hwnd_popup);
-            ::SetForegroundWindow(m_hwnd_popup);
-        }
-
-        return TRUE;
-    } else if (msg == s_msg_finish) {
-        // Master finished.
-        assert(!m_is_master);
-        m_data.assign((const unsigned char*)lparam, (const unsigned char*)lparam + wparam);
-
-        // Finish slave too.
-        DestroyWindow(m_hwnd);
-        return TRUE;
-    } else if (msg == WM_DESTROY) {
-        // Stop the message pump.
-        PostQuitMessage(0);
-        return 0;
-    }
-
-    return DefWindowProc(m_hwnd, msg, wparam, lparam);
-}
-
-
-LRESULT CALLBACK eap::monitor_ui::winproc(
-    _In_ HWND   hwnd,
-    _In_ UINT   msg,
-    _In_ WPARAM wparam,
-    _In_ LPARAM lparam)
-{
-    if (msg == WM_CREATE) {
-        // Set window's user data to "this" pointer.
-        const CREATESTRUCT *cs = (CREATESTRUCT*)lparam;
-        SetWindowLongPtr(hwnd, GWLP_USERDATA, (LONG_PTR)cs->lpCreateParams);
-
-        // Forward to our handler.
-        return ((eap::monitor_ui*)cs->lpCreateParams)->winproc(msg, wparam, lparam);
-    } else {
-        // Get "this" pointer from window's user data.
-        eap::monitor_ui *_this = (eap::monitor_ui*)GetWindowLongPtr(hwnd, GWLP_USERDATA);
-        if (_this) {
-            // Forward to our handler.
-            return _this->winproc(msg, wparam, lparam);
-        } else
-            return DefWindowProc(hwnd, msg, wparam, lparam);
-    }
-}
-
-
-const UINT eap::monitor_ui::s_msg_attach  = RegisterWindowMessage(_T(PRODUCT_NAME_STR) _T("-Attach"));
-const UINT eap::monitor_ui::s_msg_finish  = RegisterWindowMessage(_T(PRODUCT_NAME_STR) _T("-Finish"));

lib/PAP/include/Config.h

@@ -95,15 +95,5 @@ namespace eap
         /// \returns `eap::type_pap`
         ///
         virtual winstd::eap_type_t get_method_id() const;
-
-        ///
-        /// Returns a string \c L"PAP"
-        ///
-        virtual const wchar_t* get_method_str() const;
-
-        ///
-        /// Creates a blank set of credentials suitable for this method
-        ///
-        virtual credentials* make_credentials() const;
     };
 }

lib/PAP/include/Credentials.h

@@ -105,18 +105,17 @@ namespace eap
         /// 2. Pre-configured credentials
         /// 3. Stored credentials
         ///
-        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL, must be credentials_pap* type)
+        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL)
-        /// \param[in] cfg            Method configuration (must be config_method_pap type)
+        /// \param[in] cfg            Method configuration
         /// \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 true  if credentials were set;
-        /// - \c source_preshared  Credentials were set by method configuration
+        /// - \c false otherwise
-        /// - \c source_storage    Credentials were loaded from Windows Credential Manager
         ///
-        virtual source_t combine(
+        source_t combine(
-            _In_       const credentials             *cred_cached,
+            _In_       const credentials_pap   *cred_cached,
-            _In_       const config_method_with_cred &cfg,
+            _In_       const config_method_pap &cfg,
-            _In_opt_z_       LPCTSTR                 pszTargetName);
+            _In_opt_z_       LPCTSTR           pszTargetName);
     };
 }

lib/PAP/src/Config.cpp

@@ -74,15 +74,3 @@ eap_type_t eap::config_method_pap::get_method_id() const
 {
     return eap_type_pap;
 }
-
-
-const wchar_t* eap::config_method_pap::get_method_str() const
-{
-    return L"PAP";
-}
-
-
-eap::credentials* eap::config_method_pap::make_credentials() const
-{
-    return new credentials_pap(m_module);
-}

lib/PAP/src/Credentials.cpp

@@ -76,13 +76,13 @@ LPCTSTR eap::credentials_pap::target_suffix() const
 
 
 eap::credentials::source_t eap::credentials_pap::combine(
-    _In_       const credentials             *cred_cached,
+    _In_       const credentials_pap   *cred_cached,
-    _In_       const config_method_with_cred &cfg,
+    _In_       const config_method_pap &cfg,
-    _In_opt_z_       LPCTSTR                 pszTargetName)
+    _In_opt_z_       LPCTSTR           pszTargetName)
 {
     if (cred_cached) {
         // Using EAP service cached credentials.
-        *this = *(credentials_pap*)cred_cached;
+        *this = *cred_cached;
         m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED1, event_data((unsigned int)eap_type_pap), event_data(credentials_pap::get_name()), event_data::blank);
         return source_cache;
     }

lib/TLS/include/Config.h

@@ -1,192 +1,176 @@
-/*
+/*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
-
+
-    This file is part of GÉANTLink.
+    This file is part of GÉANTLink.
-
+
-    GÉANTLink is free software: you can redistribute it and/or modify it
+    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
+    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+    (at your option) any later version.
-
+
-    GÉANTLink is distributed in the hope that it will be useful, but
+    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
+    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU General Public License for more details.
-
+
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
+*/
-
+
-#include <WinStd/Common.h>
+#include <WinStd/Common.h>
-
+
-#include <Windows.h>
+#include <Windows.h>
-#include <WinCrypt.h> // Must include after <Windows.h>
+#include <WinCrypt.h> // Must include after <Windows.h>
-
+
-#include <sal.h>
+#include <sal.h>
-
+
-#define EAP_TLS_OWN             0   ///< We do the TLS ourself
+namespace eap
-#define EAP_TLS_SCHANNEL        1   ///< TLS is done by Schannel, but server certificate check is done ourself
+{
-#define EAP_TLS_SCHANNEL_FULL   2   ///< TLS is fully done by Schannel
+    ///
-
+    /// TLS configuration
-namespace eap
+    ///
-{
+    class config_method_tls;
-    ///
+
-    /// TLS configuration
+    ///
-    ///
+    /// Helper function to compile human-readable certificate name for UI display
-    class config_method_tls;
+    ///
-
+    winstd::tstring get_cert_title(PCCERT_CONTEXT cert);
-    ///
+}
-    /// Helper function to compile human-readable certificate name for UI display
+
-    ///
+#pragma once
-    winstd::tstring get_cert_title(PCCERT_CONTEXT cert);
+
-}
+#include "Credentials.h"
-
+#include "Method.h"
-#pragma once
+#include "TLS.h"
-
+
-#include "Credentials.h"
+#include "../../EAPBase/include/Config.h"
-#include "Method.h"
+
-#include "TLS.h"
+#include <WinStd/Crypt.h>
-
+
-#include "../../EAPBase/include/Config.h"
+#include <Windows.h>
-
+
-#include <WinStd/Crypt.h>
+#include <list>
-
+#include <string>
-#include <Windows.h>
+
-
+
-#include <list>
+namespace eap
-#include <string>
+{
-
+    class config_method_tls : public config_method_with_cred
-
+    {
-namespace eap
+    public:
-{
+        ///
-    class config_method_tls : public config_method_with_cred
+        /// Constructs configuration
-    {
+        ///
-    public:
+        /// \param[in] mod  EAP module to use for global services
-        ///
+        ///
-        /// Constructs configuration
+        config_method_tls(_In_ module &mod);
-        ///
+
-        /// \param[in] mod  EAP module to use for global services
+        ///
-        ///
+        /// Copies configuration
-        config_method_tls(_In_ module &mod);
+        ///
-
+        /// \param[in] other  Configuration to copy from
-        ///
+        ///
-        /// Copies configuration
+        config_method_tls(_In_ const config_method_tls &other);
-        ///
+
-        /// \param[in] other  Configuration to copy from
+        ///
-        ///
+        /// Moves configuration
-        config_method_tls(_In_ const config_method_tls &other);
+        ///
-
+        /// \param[in] other  Configuration to move from
-        ///
+        ///
-        /// Moves configuration
+        config_method_tls(_Inout_ config_method_tls &&other);
-        ///
+
-        /// \param[in] other  Configuration to move from
+        ///
-        ///
+        /// Copies configuration
-        config_method_tls(_Inout_ config_method_tls &&other);
+        ///
-
+        /// \param[in] other  Configuration to copy from
-        ///
+        ///
-        /// Copies configuration
+        /// \returns Reference to this object
-        ///
+        ///
-        /// \param[in] other  Configuration to copy from
+        config_method_tls& operator=(_In_ const config_method_tls &other);
-        ///
+
-        /// \returns Reference to this object
+        ///
-        ///
+        /// Moves configuration
-        config_method_tls& operator=(_In_ const config_method_tls &other);
+        ///
-
+        /// \param[in] other  Configuration to move from
-        ///
+        ///
-        /// Moves configuration
+        /// \returns Reference to this object
-        ///
+        ///
-        /// \param[in] other  Configuration to move from
+        config_method_tls& operator=(_Inout_ config_method_tls &&other);
-        ///
+
-        /// \returns Reference to this object
+        ///
-        ///
+        /// Clones configuration
-        config_method_tls& operator=(_Inout_ config_method_tls &&other);
+        ///
-
+        /// \returns Pointer to cloned configuration
-        ///
+        ///
-        /// Clones configuration
+        virtual config* clone() const;
-        ///
+
-        /// \returns Pointer to cloned configuration
+        /// \name XML configuration management
-        ///
+        /// @{
-        virtual config* clone() const;
+
-
+        ///
-        /// \name XML configuration management
+        /// Save to XML document
-        /// @{
+        ///
-
+        /// \param[in]  pDoc         XML document
-        ///
+        /// \param[in]  pConfigRoot  Suggested root element for saving
-        /// Save to XML document
+        ///
-        ///
+        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
-        /// \param[in]  pDoc         XML document
+
-        /// \param[in]  pConfigRoot  Suggested root element for saving
+        ///
-        ///
+        /// Load from XML document
-        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
+        ///
-
+        /// \param[in]  pConfigRoot  Root element for loading
-        ///
+        ///
-        /// Load from XML document
+        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
-        ///
+
-        /// \param[in]  pConfigRoot  Root element for loading
+        /// @}
-        ///
+
-        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
+        /// \name BLOB management
-
+        /// @{
-        /// @}
+
-
+        ///
-        /// \name BLOB management
+        /// Packs a configuration
-        /// @{
+        ///
-
+        /// \param[inout] cursor  Memory cursor
-        ///
+        ///
-        /// Packs a configuration
+        virtual void operator<<(_Inout_ cursor_out &cursor) const;
-        ///
+
-        /// \param[inout] cursor  Memory cursor
+        ///
-        ///
+        /// Returns packed size of a configuration
-        virtual void operator<<(_Inout_ cursor_out &cursor) const;
+        ///
-
+        /// \returns Size of data when packed (in bytes)
-        ///
+        ///
-        /// Returns packed size of a configuration
+        virtual size_t get_pk_size() const;
-        ///
+
-        /// \returns Size of data when packed (in bytes)
+        ///
-        ///
+        /// Unpacks a configuration
-        virtual size_t get_pk_size() const;
+        ///
-
+        /// \param[inout] cursor  Memory cursor
-        ///
+        ///
-        /// Unpacks a configuration
+        virtual void operator>>(_Inout_ cursor_in &cursor);
-        ///
+
-        /// \param[inout] cursor  Memory cursor
+        /// @}
-        ///
+
-        virtual void operator>>(_Inout_ cursor_in &cursor);
+        ///
-
+        /// Returns EAP method type of this configuration
-        /// @}
+        ///
-
+        /// \returns `eap::type_tls`
-        ///
+        ///
-        /// Returns EAP method type of this configuration
+        virtual winstd::eap_type_t get_method_id() const;
-        ///
+
-        /// \returns `eap::type_tls`
+        ///
-        ///
+        /// Adds CA to the list of trusted root CA's
-        virtual winstd::eap_type_t get_method_id() const;
+        ///
-
+        /// \sa [CertCreateCertificateContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa376033.aspx)
-        ///
+        ///
-        /// Returns a string \c L"EAP-TLS"
+        bool add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ const BYTE *pbCertEncoded, _In_ DWORD cbCertEncoded);
-        ///
+
-        virtual const wchar_t* get_method_str() const;
+    public:
-
+        std::list<winstd::cert_context> m_trusted_root_ca;  ///< Trusted root CAs
-        ///
+        std::list<std::wstring> m_server_names;             ///< Acceptable authenticating server names
-        /// Creates a blank set of credentials suitable for this method
+
-        ///
+        // Following members are used for session resumptions. They are not exported/imported to XML.
-        virtual credentials* make_credentials() const;
+        sanitizing_blob m_session_id;                       ///< TLS session ID
-
+        tls_master_secret m_master_secret;                  ///< TLS master secret
-        ///
+    };
-        /// Adds CA to the list of trusted root CA's
+}
-        ///
-        /// \sa [CertCreateCertificateContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa376033.aspx)
-        ///
-        bool add_trusted_ca(_In_ DWORD dwCertEncodingType, _In_ const BYTE *pbCertEncoded, _In_ DWORD cbCertEncoded);
-
-    public:
-        std::list<winstd::cert_context> m_trusted_root_ca;  ///< Trusted root CAs
-        std::list<std::wstring> m_server_names;             ///< Acceptable authenticating server names
-
-#if EAP_TLS < EAP_TLS_SCHANNEL
-        // Following members are used for session resumptions. They are not exported/imported to XML.
-        sanitizing_blob m_session_id;                       ///< TLS session ID
-        tls_master_secret m_master_secret;                  ///< TLS master secret
-#endif
-    };
-}

lib/TLS/include/Credentials.h

@@ -180,6 +180,11 @@ namespace eap
         ///
         virtual std::wstring get_identity() const;
 
+        ///
+        /// Returns credential name (for GUI display).
+        ///
+        virtual winstd::tstring get_name() const;
+
         ///
         /// Combine credentials in the following order:
         ///
@@ -187,19 +192,18 @@ namespace eap
         /// 2. Pre-configured credentials
         /// 3. Stored credentials
         ///
-        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL, must be credentials_tls* type)
+        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL)
-        /// \param[in] cfg            Method configuration (must be config_method_tls type)
+        /// \param[in] cfg            Method configuration
         /// \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 true  if credentials were set;
-        /// - \c source_preshared  Credentials were set by method configuration
+        /// - \c false otherwise
-        /// - \c source_storage    Credentials were loaded from Windows Credential Manager
         ///
-        virtual source_t combine(
+        source_t combine(
-            _In_       const credentials             *cred_cached,
+            _In_       const credentials_tls   *cred_cached,
-            _In_       const config_method_with_cred &cfg,
+            _In_       const config_method_tls &cfg,
-            _In_opt_z_       LPCTSTR                 pszTargetName);
+            _In_opt_z_       LPCTSTR           pszTargetName);
 
     public:
         winstd::cert_context m_cert;    ///< Client certificate

lib/TLS/include/Method.h

@@ -36,7 +36,6 @@ namespace eap
 #include "../../EAPBase/include/Method.h"
 
 #include <WinStd/Crypt.h>
-#include <WinStd/Sec.h>
 
 #include <list>
 #include <vector>
@@ -146,10 +145,10 @@ namespace eap
         /// Constructs an EAP method
         ///
         /// \param[in] mod   EAP module to use for global services
-        /// \param[in] cfg   Connection configuration
+        /// \param[in] cfg   Providers configuration
         /// \param[in] cred  User credentials
         ///
-        method_tls(_In_ module &module, _In_ config_connection &cfg, _In_ credentials_tls &cred);
+        method_tls(_In_ module &module, _In_ config_provider_list &cfg, _In_ credentials_tls &cred);
 
         ///
         /// Moves an EAP method
@@ -176,7 +175,7 @@ namespace eap
         /// @{
 
         ///
-        /// Starts an EAP authentication session on the peer EapHost using the EAP method.
+        /// Starts an EAP authentication session on the peer EAPHost using the EAP method.
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
@@ -187,7 +186,7 @@ namespace eap
             _In_        DWORD         dwMaxSendPacketSize);
 
         ///
-        /// Processes a packet received by EapHost from a supplicant.
+        /// Processes a packet received by EAPHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
@@ -217,7 +216,6 @@ namespace eap
         /// @}
 
     protected:
-#if EAP_TLS < EAP_TLS_SCHANNEL
         /// \name Client handshake message generation
         /// @{
 
@@ -362,18 +360,6 @@ namespace eap
         ///
         virtual void process_handshake(_In_bytecount_(msg_size) const void *msg, _In_ size_t msg_size);
 
-#else
-        ///
-        /// Process handshake
-        ///
-        void process_handshake();
-
-        ///
-        /// Process application data
-        ///
-        void process_application_data();
-#endif
-
         ///
         /// Processes a TLS application_data message
         ///
@@ -384,16 +370,24 @@ namespace eap
         ///
         virtual void process_application_data(_In_bytecount_(msg_size) const void *msg, _In_ size_t msg_size);
 
+        /////
+        ///// Processes a vendor-specific TLS message
+        /////
+        ///// \note Please see `m_cipher_spec` member if the message data came encrypted.
+        /////
+        ///// \param[in] type      TLS message type
+        ///// \param[in] msg       TLS message data
+        ///// \param[in] msg_size  TLS message data size
+        /////
+        //virtual void process_vendor_data(_In_ tls_message_type_t type, _In_bytecount_(msg_size) const void *msg, _In_ size_t msg_size);
+
         /// @}
 
-#if EAP_TLS < EAP_TLS_SCHANNEL_FULL
         ///
         /// Verifies server's certificate if trusted by configuration
         ///
         void verify_server_trust() const;
-#endif
 
-#if EAP_TLS < EAP_TLS_SCHANNEL
         /// \name Encryption
         /// @{
 
@@ -487,16 +481,13 @@ namespace eap
             _In_                              HCRYPTKEY  key,
             _In_bytecount_(size_secret) const void       *secret,
             _In_                              size_t     size_secret);
-#endif
 
     protected:
         credentials_tls &m_cred;                                ///< EAP-TLS user credentials
-        HANDLE m_user_ctx;                                      ///< Handle to user context
 
         packet m_packet_req;                                    ///< Request packet
         packet m_packet_res;                                    ///< Response packet
 
-#if EAP_TLS < EAP_TLS_SCHANNEL
         winstd::crypt_prov m_cp;                                ///< Cryptography provider for general services
         winstd::crypt_prov m_cp_enc_client;                     ///< Cryptography provider for encryption
         winstd::crypt_prov m_cp_enc_server;                     ///< Cryptography provider for encryption
@@ -537,20 +528,6 @@ namespace eap
 
         unsigned __int64 m_seq_num_client;                      ///< Sequence number for encrypting
         unsigned __int64 m_seq_num_server;                      ///< Sequence number for decrypting
-#else
-        winstd::tstring m_sc_target_name;                       ///< Schannel target name
-        winstd::sec_credentials m_sc_cred;                      ///< Schannel client credentials
-        std::vector<unsigned char> m_sc_queue;                  ///< TLS data queue
-        winstd::sec_context m_sc_ctx;                           ///< Schannel context
-
-        enum {
-            phase_unknown = -1,                                 ///< Unknown phase
-            phase_handshake_init = 0,                           ///< Handshake initialize
-            phase_handshake_cont,                               ///< Handshake continue
-            phase_application_data,                             ///< Exchange application data
-            phase_shutdown,                                     ///< Connection shut down
-        } m_phase, m_phase_prev;                                ///< What phase is our communication at?
-#endif
 
         // The following members are required to avoid memory leakage in get_result()
         EAP_ATTRIBUTES m_eap_attr_desc;                         ///< EAP Radius attributes descriptor

lib/TLS/include/TLS.h

@@ -503,16 +503,7 @@ namespace eap
         ///
         tls_conn_state& operator=(_Inout_ tls_conn_state &&other);
 
-        ///
-        /// Configures state according to given cipher
-        ///
-        /// \param[in] cipher  Cipher ID
-        ///
-        void set_cipher(_In_ const unsigned char cipher[2]);
-
     public:
-        LPCTSTR m_prov_name;            ///< Cryptography provider name
-        DWORD m_prov_type;              ///< Cryptography provider type
         ALG_ID m_alg_encrypt;           ///< Bulk encryption algorithm
         size_t m_size_enc_key;          ///< Encryption key size in bytes (has to comply with `m_alg_encrypt`)
         size_t m_size_enc_iv;           ///< Encryption initialization vector size in bytes (has to comply with `m_alg_encrypt`)

lib/TLS/src/Config.cpp

@@ -1,327 +1,298 @@
-/*
+/*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
-
+
-    This file is part of GÉANTLink.
+    This file is part of GÉANTLink.
-
+
-    GÉANTLink is free software: you can redistribute it and/or modify it
+    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
+    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+    (at your option) any later version.
-
+
-    GÉANTLink is distributed in the hope that it will be useful, but
+    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
+    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU General Public License for more details.
-
+
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
+*/
-
+
-#include "StdAfx.h"
+#include "StdAfx.h"
-
+
-#pragma comment(lib, "Cryptui.lib")
+#pragma comment(lib, "Cryptui.lib")
-
+
-using namespace std;
+using namespace std;
-using namespace winstd;
+using namespace winstd;
-
+
-
+
-//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
-// eap::get_cert_title
+// eap::get_cert_title
-//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
-
+
-tstring eap::get_cert_title(PCCERT_CONTEXT cert)
+tstring eap::get_cert_title(PCCERT_CONTEXT cert)
-{
+{
-    tstring name, str, issuer, title;
+    tstring name, str, issuer, title;
-    FILETIME ft;
+    FILETIME ft;
-    SYSTEMTIME st;
+    SYSTEMTIME st;
-
+
-    // Prepare certificate information
+    // Prepare certificate information
-    CertGetNameString(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, name);
+    CertGetNameString(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, 0, NULL, name);
-    title += name;
+    title += name;
-
+
-    FileTimeToLocalFileTime(&(cert->pCertInfo->NotBefore), &ft);
+    FileTimeToLocalFileTime(&(cert->pCertInfo->NotBefore), &ft);
-    FileTimeToSystemTime(&ft, &st);
+    FileTimeToSystemTime(&ft, &st);
-    GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, str);
+    GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, str);
-    title += _T(", ");
+    title += _T(", ");
-    title += str;
+    title += str;
-
+
-    FileTimeToLocalFileTime(&(cert->pCertInfo->NotAfter ), &ft);
+    FileTimeToLocalFileTime(&(cert->pCertInfo->NotAfter ), &ft);
-    FileTimeToSystemTime(&ft, &st);
+    FileTimeToSystemTime(&ft, &st);
-    GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, str);
+    GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, NULL, str);
-    title += _T('-');
+    title += _T('-');
-    title += str;
+    title += str;
-
+
-    CertGetNameString(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, issuer);
+    CertGetNameString(cert, CERT_NAME_SIMPLE_DISPLAY_TYPE, CERT_NAME_ISSUER_FLAG, NULL, issuer);
-    if (name != issuer) {
+    if (name != issuer) {
-        title += _T(", ");
+        title += _T(", ");
-        title += issuer;
+        title += issuer;
-    }
+    }
-
+
-    return title;
+    return title;
-}
+}
-
+
-
+
-//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
-// eap::config_method_tls
+// eap::config_method_tls
-//////////////////////////////////////////////////////////////////////
+//////////////////////////////////////////////////////////////////////
-
+
-eap::config_method_tls::config_method_tls(_In_ module &mod) : config_method_with_cred(mod)
+eap::config_method_tls::config_method_tls(_In_ module &mod) : config_method_with_cred(mod)
-{
+{
-    m_preshared.reset(new credentials_tls(mod));
+    m_preshared.reset(new credentials_tls(mod));
-}
+}
-
+
-
+
-eap::config_method_tls::config_method_tls(_In_ const config_method_tls &other) :
+eap::config_method_tls::config_method_tls(_In_ const config_method_tls &other) :
-    m_trusted_root_ca(other.m_trusted_root_ca),
+    m_trusted_root_ca(other.m_trusted_root_ca),
-    m_server_names(other.m_server_names),
+    m_server_names(other.m_server_names),
-#if EAP_TLS < EAP_TLS_SCHANNEL
+    m_session_id(other.m_session_id),
-    m_session_id(other.m_session_id),
+    m_master_secret(other.m_master_secret),
-    m_master_secret(other.m_master_secret),
+    config_method_with_cred(other)
-#endif
+{
-    config_method_with_cred(other)
+}
-{
+
-}
+
-
+eap::config_method_tls::config_method_tls(_Inout_ config_method_tls &&other) :
-
+    m_trusted_root_ca(std::move(other.m_trusted_root_ca)),
-eap::config_method_tls::config_method_tls(_Inout_ config_method_tls &&other) :
+    m_server_names(std::move(other.m_server_names)),
-    m_trusted_root_ca(std::move(other.m_trusted_root_ca)),
+    m_session_id(std::move(other.m_session_id)),
-    m_server_names(std::move(other.m_server_names)),
+    m_master_secret(std::move(other.m_master_secret)),
-#if EAP_TLS < EAP_TLS_SCHANNEL
+    config_method_with_cred(std::move(other))
-    m_session_id(std::move(other.m_session_id)),
+{
-    m_master_secret(std::move(other.m_master_secret)),
+}
-#endif
+
-    config_method_with_cred(std::move(other))
+
-{
+eap::config_method_tls& eap::config_method_tls::operator=(_In_ const config_method_tls &other)
-}
+{
-
+    if (this != &other) {
-
+        (config_method_with_cred&)*this = other;
-eap::config_method_tls& eap::config_method_tls::operator=(_In_ const config_method_tls &other)
+        m_trusted_root_ca = other.m_trusted_root_ca;
-{
+        m_server_names    = other.m_server_names;
-    if (this != &other) {
+        m_session_id      = other.m_session_id;
-        (config_method_with_cred&)*this = other;
+        m_master_secret   = other.m_master_secret;
-        m_trusted_root_ca = other.m_trusted_root_ca;
+    }
-        m_server_names    = other.m_server_names;
+
-#if EAP_TLS < EAP_TLS_SCHANNEL
+    return *this;
-        m_session_id      = other.m_session_id;
+}
-        m_master_secret   = other.m_master_secret;
+
-#endif
+
-    }
+eap::config_method_tls& eap::config_method_tls::operator=(_Inout_ config_method_tls &&other)
-
+{
-    return *this;
+    if (this != &other) {
-}
+        (config_method_with_cred&&)*this = std::move(other);
-
+        m_trusted_root_ca = std::move(other.m_trusted_root_ca);
-
+        m_server_names    = std::move(other.m_server_names);
-eap::config_method_tls& eap::config_method_tls::operator=(_Inout_ config_method_tls &&other)
+        m_session_id      = std::move(other.m_session_id);
-{
+        m_master_secret   = std::move(other.m_master_secret);
-    if (this != &other) {
+    }
-        (config_method_with_cred&&)*this = std::move(other);
+
-        m_trusted_root_ca = std::move(other.m_trusted_root_ca);
+    return *this;
-        m_server_names    = std::move(other.m_server_names);
+}
-#if EAP_TLS < EAP_TLS_SCHANNEL
+
-        m_session_id      = std::move(other.m_session_id);
+
-        m_master_secret   = std::move(other.m_master_secret);
+eap::config* eap::config_method_tls::clone() const
-#endif
+{
-    }
+    return new config_method_tls(*this);
-
+}
-    return *this;
+
-}
+
-
+void eap::config_method_tls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
-
+{
-eap::config* eap::config_method_tls::clone() const
+    assert(pDoc);
-{
+    assert(pConfigRoot);
-    return new config_method_tls(*this);
+
-}
+    config_method_with_cred::save(pDoc, pConfigRoot);
-
+
-
+    const bstr bstrNamespace(L"urn:ietf:params:xml:ns:yang:ietf-eap-metadata");
-void eap::config_method_tls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
+    HRESULT hr;
-{
+
-    assert(pDoc);
+    // <ServerSideCredential>
-    assert(pConfigRoot);
+    com_obj<IXMLDOMElement> pXmlElServerSideCredential;
-
+    if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:ServerSideCredential"), bstr(L"ServerSideCredential"), bstrNamespace, &pXmlElServerSideCredential)))
-    config_method_with_cred::save(pDoc, pConfigRoot);
+        throw com_runtime_error(hr, __FUNCTION__ " Error creating <ServerSideCredential> element.");
-
+
-    const bstr bstrNamespace(L"urn:ietf:params:xml:ns:yang:ietf-eap-metadata");
+    for (list<cert_context>::const_iterator i = m_trusted_root_ca.begin(), i_end = m_trusted_root_ca.end(); i != i_end; ++i) {
-    HRESULT hr;
+        // <CA>
-
+        com_obj<IXMLDOMElement> pXmlElCA;
-    // <ServerSideCredential>
+        if (FAILED(hr = eapxml::create_element(pDoc, bstr(L"CA"), bstrNamespace, &pXmlElCA)))
-    com_obj<IXMLDOMElement> pXmlElServerSideCredential;
+            throw com_runtime_error(hr, __FUNCTION__ " Error creating <CA> element.");
-    if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:ServerSideCredential"), bstr(L"ServerSideCredential"), bstrNamespace, &pXmlElServerSideCredential)))
+
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <ServerSideCredential> element.");
+        // <CA>/<format>
-
+        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElCA, bstr(L"format"), bstrNamespace, bstr(L"PEM"))))
-    for (list<cert_context>::const_iterator i = m_trusted_root_ca.begin(), i_end = m_trusted_root_ca.end(); i != i_end; ++i) {
+            throw com_runtime_error(hr, __FUNCTION__ " Error creating <format> element.");
-        // <CA>
+
-        com_obj<IXMLDOMElement> pXmlElCA;
+        // <CA>/<cert-data>
-        if (FAILED(hr = eapxml::create_element(pDoc, bstr(L"CA"), bstrNamespace, &pXmlElCA)))
+        const cert_context &cc = *i;
-            throw com_runtime_error(hr, __FUNCTION__ " Error creating <CA> element.");
+        if (FAILED(hr = eapxml::put_element_base64(pDoc, pXmlElCA, bstr(L"cert-data"), bstrNamespace, cc->pbCertEncoded, cc->cbCertEncoded)))
-
+            throw com_runtime_error(hr, __FUNCTION__ " Error creating <cert-data> element.");
-        // <CA>/<format>
+
-        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElCA, bstr(L"format"), bstrNamespace, bstr(L"PEM"))))
+        if (FAILED(hr = pXmlElServerSideCredential->appendChild(pXmlElCA, NULL)))
-            throw com_runtime_error(hr, __FUNCTION__ " Error creating <format> element.");
+            throw com_runtime_error(hr, __FUNCTION__ " Error appending <CA> element.");
-
+    }
-        // <CA>/<cert-data>
+
-        const cert_context &cc = *i;
+    // <ServerName>
-        if (FAILED(hr = eapxml::put_element_base64(pDoc, pXmlElCA, bstr(L"cert-data"), bstrNamespace, cc->pbCertEncoded, cc->cbCertEncoded)))
+    for (list<wstring>::const_iterator i = m_server_names.begin(), i_end = m_server_names.end(); i != i_end; ++i) {
-            throw com_runtime_error(hr, __FUNCTION__ " Error creating <cert-data> element.");
+        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElServerSideCredential, bstr(L"ServerName"), bstrNamespace, bstr(*i))))
-
+            throw com_runtime_error(hr, __FUNCTION__ " Error creating <ServerName> element.");
-        if (FAILED(hr = pXmlElServerSideCredential->appendChild(pXmlElCA, NULL)))
+    }
-            throw com_runtime_error(hr, __FUNCTION__ " Error appending <CA> element.");
+}
-    }
+
-
+
-    // <ServerName>
+void eap::config_method_tls::load(_In_ IXMLDOMNode *pConfigRoot)
-    for (list<wstring>::const_iterator i = m_server_names.begin(), i_end = m_server_names.end(); i != i_end; ++i) {
+{
-        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElServerSideCredential, bstr(L"ServerName"), bstrNamespace, bstr(*i))))
+    assert(pConfigRoot);
-            throw com_runtime_error(hr, __FUNCTION__ " Error creating <ServerName> element.");
+
-    }
+    config_method_with_cred::load(pConfigRoot);
-}
+
-
+    std::wstring xpath(eapxml::get_xpath(pConfigRoot));
-
+
-void eap::config_method_tls::load(_In_ IXMLDOMNode *pConfigRoot)
+    m_trusted_root_ca.clear();
-{
+    m_server_names.clear();
-    assert(pConfigRoot);
+
-
+    // <ServerSideCredential>
-    config_method_with_cred::load(pConfigRoot);
+    com_obj<IXMLDOMElement> pXmlElServerSideCredential;
-
+    if (SUCCEEDED(eapxml::select_element(pConfigRoot, bstr(L"eap-metadata:ServerSideCredential"), &pXmlElServerSideCredential))) {
-    std::wstring xpath(eapxml::get_xpath(pConfigRoot));
+        std::wstring xpathServerSideCredential(xpath + L"/ServerSideCredential");
-
+
-    m_trusted_root_ca.clear();
+        // <CA>
-    m_server_names.clear();
+        com_obj<IXMLDOMNodeList> pXmlListCAs;
-
+        long lCACount = 0;
-    // <ServerSideCredential>
+        if (SUCCEEDED(eapxml::select_nodes(pXmlElServerSideCredential, bstr(L"eap-metadata:CA"), &pXmlListCAs)) && SUCCEEDED(pXmlListCAs->get_length(&lCACount))) {
-    com_obj<IXMLDOMElement> pXmlElServerSideCredential;
+            for (long j = 0; j < lCACount; j++) {
-    if (SUCCEEDED(eapxml::select_element(pConfigRoot, bstr(L"eap-metadata:ServerSideCredential"), &pXmlElServerSideCredential))) {
+                // Load CA certificate.
-        std::wstring xpathServerSideCredential(xpath + L"/ServerSideCredential");
+                com_obj<IXMLDOMNode> pXmlElCA;
-
+                pXmlListCAs->get_item(j, &pXmlElCA);
-        // <CA>
+                bstr bstrFormat;
-        com_obj<IXMLDOMNodeList> pXmlListCAs;
+                if (FAILED(eapxml::get_element_value(pXmlElCA, bstr(L"eap-metadata:format"), &bstrFormat))) {
-        long lCACount = 0;
+                    // <format> not specified.
-        if (SUCCEEDED(eapxml::select_nodes(pXmlElServerSideCredential, bstr(L"eap-metadata:CA"), &pXmlListCAs)) && SUCCEEDED(pXmlListCAs->get_length(&lCACount))) {
+                    continue;
-            for (long j = 0; j < lCACount; j++) {
+                }
-                // Load CA certificate.
+
-                com_obj<IXMLDOMNode> pXmlElCA;
+                if (CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, bstrFormat, bstrFormat.length(), L"PEM", -1, NULL, NULL, 0) != CSTR_EQUAL) {
-                pXmlListCAs->get_item(j, &pXmlElCA);
+                    // Certificate must be PEM encoded.
-                bstr bstrFormat;
+                    continue;
-                if (FAILED(eapxml::get_element_value(pXmlElCA, bstr(L"eap-metadata:format"), &bstrFormat))) {
+                }
-                    // <format> not specified.
+
-                    continue;
+                vector<unsigned char> aData;
-                }
+                if (FAILED(eapxml::get_element_base64(pXmlElCA, bstr(L"eap-metadata:cert-data"), aData))) {
-
+                    // Error reading <cert-data> element.
-                if (CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, bstrFormat, bstrFormat.length(), L"PEM", -1, NULL, NULL, 0) != CSTR_EQUAL) {
+                    continue;
-                    // Certificate must be PEM encoded.
+                }
-                    continue;
+
-                }
+                add_trusted_ca(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, aData.data(), (DWORD)aData.size());
-
+            }
-                vector<unsigned char> aData;
+
-                if (FAILED(eapxml::get_element_base64(pXmlElCA, bstr(L"eap-metadata:cert-data"), aData))) {
+            // Log loaded CA certificates.
-                    // Error reading <cert-data> element.
+            list<tstring> cert_names;
-                    continue;
+            for (std::list<winstd::cert_context>::const_iterator cert = m_trusted_root_ca.cbegin(), cert_end = m_trusted_root_ca.cend(); cert != cert_end; ++cert)
-                }
+                cert_names.push_back(std::move(get_cert_title(*cert)));
-
+            m_module.log_config((xpathServerSideCredential + L"/CA").c_str(), cert_names);
-                add_trusted_ca(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, aData.data(), (DWORD)aData.size());
+        }
-            }
+
-
+        // <ServerName>
-            // Log loaded CA certificates.
+        com_obj<IXMLDOMNodeList> pXmlListServerIDs;
-            list<tstring> cert_names;
+        long lServerIDCount = 0;
-            for (std::list<winstd::cert_context>::const_iterator cert = m_trusted_root_ca.cbegin(), cert_end = m_trusted_root_ca.cend(); cert != cert_end; ++cert)
+        if (SUCCEEDED(eapxml::select_nodes(pXmlElServerSideCredential, bstr(L"eap-metadata:ServerName"), &pXmlListServerIDs)) && SUCCEEDED(pXmlListServerIDs->get_length(&lServerIDCount))) {
-                cert_names.push_back(std::move(get_cert_title(*cert)));
+            for (long j = 0; j < lServerIDCount; j++) {
-            m_module.log_config((xpathServerSideCredential + L"/CA").c_str(), cert_names);
+                // Load server name (<ServerName>).
-        }
+                com_obj<IXMLDOMNode> pXmlElServerID;
-
+                pXmlListServerIDs->get_item(j, &pXmlElServerID);
-        // <ServerName>
+                bstr bstrServerID;
-        com_obj<IXMLDOMNodeList> pXmlListServerIDs;
+                pXmlElServerID->get_text(&bstrServerID);
-        long lServerIDCount = 0;
+                m_server_names.push_back(wstring(bstrServerID));
-        if (SUCCEEDED(eapxml::select_nodes(pXmlElServerSideCredential, bstr(L"eap-metadata:ServerName"), &pXmlListServerIDs)) && SUCCEEDED(pXmlListServerIDs->get_length(&lServerIDCount))) {
+            }
-            for (long j = 0; j < lServerIDCount; j++) {
+
-                // Load server name (<ServerName>).
+            m_module.log_config((xpathServerSideCredential + L"/ServerName").c_str(), m_server_names);
-                com_obj<IXMLDOMNode> pXmlElServerID;
+        }
-                pXmlListServerIDs->get_item(j, &pXmlElServerID);
+    }
-                bstr bstrServerID;
+}
-                pXmlElServerID->get_text(&bstrServerID);
+
-                m_server_names.push_back(wstring(bstrServerID));
+
-            }
+void eap::config_method_tls::operator<<(_Inout_ cursor_out &cursor) const
-
+{
-            m_module.log_config((xpathServerSideCredential + L"/ServerName").c_str(), m_server_names);
+    config_method_with_cred::operator<<(cursor);
-        }
+    cursor << m_trusted_root_ca;
-    }
+    cursor << m_server_names   ;
-}
+    cursor << m_session_id     ;
-
+    cursor << m_master_secret  ;
-
+}
-void eap::config_method_tls::operator<<(_Inout_ cursor_out &cursor) const
+
-{
+
-    config_method_with_cred::operator<<(cursor);
+size_t eap::config_method_tls::get_pk_size() const
-    cursor << m_trusted_root_ca;
+{
-    cursor << m_server_names   ;
+    return
-#if EAP_TLS < EAP_TLS_SCHANNEL
+        config_method_with_cred::get_pk_size() +
-    cursor << m_session_id     ;
+        pksizeof(m_trusted_root_ca) +
-    cursor << m_master_secret  ;
+        pksizeof(m_server_names   ) +
-#endif
+        pksizeof(m_session_id     ) +
-}
+        pksizeof(m_master_secret  );
-
+}
-
+
-size_t eap::config_method_tls::get_pk_size() const
+
-{
+void eap::config_method_tls::operator>>(_Inout_ cursor_in &cursor)
-    return
+{
-        config_method_with_cred::get_pk_size() +
+    config_method_with_cred::operator>>(cursor);
-        pksizeof(m_trusted_root_ca) +
+    cursor >> m_trusted_root_ca;
-        pksizeof(m_server_names   )
+    cursor >> m_server_names   ;
-#if EAP_TLS < EAP_TLS_SCHANNEL
+    cursor >> m_session_id     ;
-        +
+    cursor >> m_master_secret  ;
-        pksizeof(m_session_id     ) +
+}
-        pksizeof(m_master_secret  );
+
-#else
+
-        ;
+eap_type_t eap::config_method_tls::get_method_id() const
-#endif
+{
-}
+    return eap_type_tls;
-
+}
-
+
-void eap::config_method_tls::operator>>(_Inout_ cursor_in &cursor)
+
-{
+bool eap::config_method_tls::add_trusted_ca(_In_  DWORD dwCertEncodingType, _In_  const BYTE *pbCertEncoded, _In_  DWORD cbCertEncoded)
-    config_method_with_cred::operator>>(cursor);
+{
-    cursor >> m_trusted_root_ca;
+    cert_context cert;
-    cursor >> m_server_names   ;
+    if (!cert.create(dwCertEncodingType, pbCertEncoded, cbCertEncoded)) {
-#if EAP_TLS < EAP_TLS_SCHANNEL
+        // Invalid or unsupported certificate.
-    cursor >> m_session_id     ;
+        return false;
-    cursor >> m_master_secret  ;
+    }
-#endif
+
-}
+    for (list<cert_context>::const_iterator i = m_trusted_root_ca.cbegin(), i_end = m_trusted_root_ca.cend();; ++i) {
-
+        if (i != i_end) {
-
+            if (*i == cert) {
-eap_type_t eap::config_method_tls::get_method_id() const
+                // This certificate is already on the list.
-{
+                return false;
-    return eap_type_tls;
+            }
-}
+        } else {
-
+            // End of list reached. Append certificate.
-
+            m_trusted_root_ca.push_back(std::move(cert));
-const wchar_t* eap::config_method_tls::get_method_str() const
+            return true;
-{
+        }
-    return L"EAP-TLS";
+    }
-}
+}
-
-
-eap::credentials* eap::config_method_tls::make_credentials() const
-{
-    return new credentials_tls(m_module);
-}
-
-
-bool eap::config_method_tls::add_trusted_ca(_In_  DWORD dwCertEncodingType, _In_  const BYTE *pbCertEncoded, _In_  DWORD cbCertEncoded)
-{
-    cert_context cert;
-    if (!cert.create(dwCertEncodingType, pbCertEncoded, cbCertEncoded)) {
-        // Invalid or unsupported certificate.
-        return false;
-    }
-
-    for (list<cert_context>::const_iterator i = m_trusted_root_ca.cbegin(), i_end = m_trusted_root_ca.cend();; ++i) {
-        if (i != i_end) {
-            if (*i == cert) {
-                // This certificate is already on the list.
-                return false;
-            }
-        } else {
-            // End of list reached. Append certificate.
-            m_trusted_root_ca.push_back(std::move(cert));
-            return true;
-        }
-    }
-}

lib/TLS/src/Credentials.cpp

@@ -84,7 +84,7 @@ void eap::credentials_tls::clear()
 
 bool eap::credentials_tls::empty() const
 {
-    return !m_cert;
+    return credentials::empty() && !m_cert;
 }
 
 
@@ -174,20 +174,19 @@ void eap::credentials_tls::store(_In_z_ LPCTSTR pszTargetName) const
 {
     assert(pszTargetName);
 
+    // Encrypt the certificate using user's key.
+    DATA_BLOB cred_blob    = { m_cert->cbCertEncoded,         m_cert->pbCertEncoded };
+    DATA_BLOB entropy_blob = { sizeof(s_entropy)    , (LPBYTE)s_entropy             };
     data_blob cred_enc;
-    if (m_cert) {
+    if (!CryptProtectData(&cred_blob, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, &cred_enc))
-        // Encrypt the certificate using user's key.
+        throw win_runtime_error(__FUNCTION__ " CryptProtectData failed.");
-        DATA_BLOB cred_blob    = { m_cert->cbCertEncoded,         m_cert->pbCertEncoded };
-        DATA_BLOB entropy_blob = { sizeof(s_entropy)    , (LPBYTE)s_entropy             };
-        if (!CryptProtectData(&cred_blob, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, &cred_enc))
-            throw win_runtime_error(__FUNCTION__ " CryptProtectData failed.");
-    }
 
     tstring target(target_name(pszTargetName));
+    wstring name(std::move(get_name()));
 
     // Write credentials.
-    assert(cred_enc.cbData     < CRED_MAX_CREDENTIAL_BLOB_SIZE);
+    assert(cred_enc.cbData < CRED_MAX_CREDENTIAL_BLOB_SIZE);
-    assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH     );
+    assert(name.length()   < CRED_MAX_USERNAME_LENGTH     );
     CREDENTIAL cred = {
         0,                          // Flags
         CRED_TYPE_GENERIC,          // Type
@@ -200,7 +199,7 @@ void eap::credentials_tls::store(_In_z_ LPCTSTR pszTargetName) const
         0,                          // AttributeCount
         NULL,                       // Attributes
         NULL,                       // TargetAlias
-        (LPTSTR)m_identity.c_str()  // UserName
+        (LPTSTR)name.c_str()        // UserName
     };
     if (!CredWrite(&cred, 0))
         throw win_runtime_error(__FUNCTION__ " CredWrite failed.");
@@ -216,29 +215,19 @@ void eap::credentials_tls::retrieve(_In_z_ LPCTSTR pszTargetName)
     if (!CredRead(target_name(pszTargetName).c_str(), CRED_TYPE_GENERIC, 0, (PCREDENTIAL*)&cred))
         throw win_runtime_error(__FUNCTION__ " CredRead failed.");
 
-    if (cred->CredentialBlobSize) {
+    // Decrypt the certificate using user's key.
-        // Decrypt the certificate using user's key.
+    DATA_BLOB cred_enc     = { cred->CredentialBlobSize, cred->CredentialBlob };
-        DATA_BLOB cred_enc     = { cred->CredentialBlobSize, cred->CredentialBlob };
+    DATA_BLOB entropy_blob = { sizeof(s_entropy)       , (LPBYTE)s_entropy    };
-        DATA_BLOB entropy_blob = { sizeof(s_entropy)       , (LPBYTE)s_entropy    };
+    data_blob cred_int;
-        data_blob cred_int;
+    if (!CryptUnprotectData(&cred_enc, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN | CRYPTPROTECT_VERIFY_PROTECTION, &cred_int))
-        if (!CryptUnprotectData(&cred_enc, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN | CRYPTPROTECT_VERIFY_PROTECTION, &cred_int))
+        throw win_runtime_error(__FUNCTION__ " CryptUnprotectData failed.");
-            throw win_runtime_error(__FUNCTION__ " CryptUnprotectData failed.");
 
-        bool bResult = m_cert.create(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, cred_int.pbData, cred_int.cbData);
+    bool bResult = m_cert.create(X509_ASN_ENCODING | PKCS_7_ASN_ENCODING, cred_int.pbData, cred_int.cbData);
-        SecureZeroMemory(cred_int.pbData, cred_int.cbData);
+    SecureZeroMemory(cred_int.pbData, cred_int.cbData);
-        if (!bResult)
+    if (!bResult)
-            throw win_runtime_error(__FUNCTION__ " Error loading certificate.");
+        throw win_runtime_error(__FUNCTION__ " Error loading certificate.");
-    } else
-        m_cert.free();
 
-    if (cred->UserName)
+    m_module.log_config((wstring(pszTargetName) + L"/Certificate").c_str(), get_name().c_str());
-        m_identity = cred->UserName;
-    else
-        m_identity.clear();
-
-    wstring xpath(pszTargetName);
-    m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
-    m_module.log_config((xpath + L"/Certificate").c_str(), get_name().c_str());
 }
 
 
@@ -250,9 +239,7 @@ LPCTSTR eap::credentials_tls::target_suffix() const
 
 std::wstring eap::credentials_tls::get_identity() const
 {
-    if (!m_identity.empty()) {
+    if (m_cert) {
-        return m_identity;
-    } else if (m_cert) {
         wstring identity;
         CertGetNameString(m_cert, CERT_NAME_EMAIL_TYPE, 0, NULL, identity);
         return identity;
@@ -261,14 +248,20 @@ std::wstring eap::credentials_tls::get_identity() const
 }
 
 
+tstring eap::credentials_tls::get_name() const
+{
+    return m_cert ? std::move(get_cert_title(m_cert)) : _T("<blank>");
+}
+
+
 eap::credentials::source_t eap::credentials_tls::combine(
-    _In_       const credentials             *cred_cached,
+    _In_       const credentials_tls   *cred_cached,
-    _In_       const config_method_with_cred &cfg,
+    _In_       const config_method_tls &cfg,
-    _In_opt_z_       LPCTSTR                 pszTargetName)
+    _In_opt_z_       LPCTSTR           pszTargetName)
 {
     if (cred_cached) {
         // Using EAP service cached credentials.
-        *this = *(credentials_tls*)cred_cached;
+        *this = *cred_cached;
         m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED1, event_data((unsigned int)eap_type_tls), event_data(credentials_tls::get_name()), event_data::blank);
         return source_cache;
     }

lib/TLS/src/StdAfx.h

@@ -31,7 +31,6 @@
 #include <WinStd/EAP.h>
 
 #include <EapHostError.h>
-#include <schnlsp.h>
 #include <time.h>
 
 #include <algorithm>

lib/TLS/src/TLS.cpp

@@ -182,8 +182,6 @@ eap::tls_conn_state::tls_conn_state()
 #ifdef _DEBUG
     // Initialize state primitive members for diagnostic purposes.
     :
-    m_prov_name     (NULL),
-    m_prov_type     (0),
     m_alg_encrypt   (0),
     m_size_enc_key  (0),
     m_size_enc_iv   (0),
@@ -197,8 +195,6 @@ eap::tls_conn_state::tls_conn_state()
 
 
 eap::tls_conn_state::tls_conn_state(_In_ const tls_conn_state &other) :
-    m_prov_name     (other.m_prov_name     ),
-    m_prov_type     (other.m_prov_type     ),
     m_alg_encrypt   (other.m_alg_encrypt   ),
     m_size_enc_key  (other.m_size_enc_key  ),
     m_size_enc_iv   (other.m_size_enc_iv   ),
@@ -213,8 +209,6 @@ eap::tls_conn_state::tls_conn_state(_In_ const tls_conn_state &other) :
 
 
 eap::tls_conn_state::tls_conn_state(_Inout_ tls_conn_state &&other) :
-    m_prov_name     (std::move(other.m_prov_name     )),
-    m_prov_type     (std::move(other.m_prov_type     )),
     m_alg_encrypt   (std::move(other.m_alg_encrypt   )),
     m_size_enc_key  (std::move(other.m_size_enc_key  )),
     m_size_enc_iv   (std::move(other.m_size_enc_iv   )),
@@ -227,8 +221,6 @@ eap::tls_conn_state::tls_conn_state(_Inout_ tls_conn_state &&other) :
 {
 #ifdef _DEBUG
     // Reinitialize other state primitive members for diagnostic purposes.
-    other.m_prov_name      = NULL;
-    other.m_prov_type      = 0;
     other.m_alg_encrypt    = 0;
     other.m_size_enc_key   = 0;
     other.m_size_enc_iv    = 0;
@@ -243,8 +235,6 @@ eap::tls_conn_state::tls_conn_state(_Inout_ tls_conn_state &&other) :
 eap::tls_conn_state& eap::tls_conn_state::operator=(_In_ const tls_conn_state &other)
 {
     if (this != std::addressof(other)) {
-        m_prov_name      = other.m_prov_name     ;
-        m_prov_type      = other.m_prov_type     ;
         m_alg_encrypt    = other.m_alg_encrypt   ;
         m_size_enc_key   = other.m_size_enc_key  ;
         m_size_enc_iv    = other.m_size_enc_iv   ;
@@ -263,8 +253,6 @@ eap::tls_conn_state& eap::tls_conn_state::operator=(_In_ const tls_conn_state &o
 eap::tls_conn_state& eap::tls_conn_state::operator=(_Inout_ tls_conn_state &&other)
 {
     if (this != std::addressof(other)) {
-        m_prov_name      = std::move(other.m_prov_name     );
-        m_prov_type      = std::move(other.m_prov_type     );
         m_alg_encrypt    = std::move(other.m_alg_encrypt   );
         m_size_enc_key   = std::move(other.m_size_enc_key  );
         m_size_enc_iv    = std::move(other.m_size_enc_iv   );
@@ -277,8 +265,6 @@ eap::tls_conn_state& eap::tls_conn_state::operator=(_Inout_ tls_conn_state &&oth
 
 #ifdef _DEBUG
         // Reinitialize other state primitive members for diagnostic purposes.
-        other.m_prov_name      = NULL;
-        other.m_prov_type      = 0;
         other.m_alg_encrypt    = 0;
         other.m_size_enc_key   = 0;
         other.m_size_enc_iv    = 0;
@@ -291,142 +277,3 @@ eap::tls_conn_state& eap::tls_conn_state::operator=(_Inout_ tls_conn_state &&oth
 
     return *this;
 }
-
-
-void eap::tls_conn_state::set_cipher(_In_ const unsigned char cipher[2])
-{
-    if (cipher[0] == 0x00 && cipher[1] == 0x0a) {
-        // TLS_RSA_WITH_3DES_EDE_CBC_SHA
-        m_prov_name      = NULL;
-        m_prov_type      = PROV_RSA_AES;
-        m_alg_encrypt    = CALG_3DES;
-        m_size_enc_key   = 192/8; // 3DES 192bits
-        m_size_enc_iv    = 64/8;  // 3DES 64bits
-        m_size_enc_block = 64/8;  // 3DES 64bits
-        m_alg_mac        = CALG_SHA1;
-        m_size_mac_key   = 160/8; // SHA-1
-        m_size_mac_hash  = 160/8; // SHA-1
-    } else if (cipher[0] == 0x00 && cipher[1] == 0x2f) {
-        // TLS_RSA_WITH_AES_128_CBC_SHA
-        m_prov_name      = NULL;
-        m_prov_type      = PROV_RSA_AES;
-        m_alg_encrypt    = CALG_AES_128;
-        m_size_enc_key   = 128/8; // AES-128
-        m_size_enc_iv    = 128/8; // AES-128
-        m_size_enc_block = 128/8; // AES-128
-        m_alg_mac        = CALG_SHA1;
-        m_size_mac_key   = 160/8; // SHA-1
-        m_size_mac_hash  = 160/8; // SHA-1
-    } else if (cipher[0] == 0x00 && cipher[1] == 0x3c) {
-        // AES128-SHA256
-        m_prov_name      = NULL;
-        m_prov_type      = PROV_RSA_AES;
-        m_alg_encrypt    = CALG_AES_128;
-        m_size_enc_key   = 128/8; // AES-128
-        m_size_enc_iv    = 128/8; // AES-128
-        m_size_enc_block = 128/8; // AES-128
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0x00 && cipher[1] == 0x3d) {
-        // AES256-SHA256
-        m_prov_name      = MS_ENH_RSA_AES_PROV;
-        m_prov_type      = PROV_RSA_AES;
-        m_alg_encrypt    = CALG_AES_256;
-        m_size_enc_key   = 256/8; // AES-256
-        m_size_enc_iv    = 128/8; // AES-256
-        m_size_enc_block = 128/8; // AES-256
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0x00 && cipher[1] == 0x40) {
-        // DHE-DSS-AES128-SHA256
-        m_prov_name      = MS_ENH_DSS_DH_PROV;
-        m_prov_type      = PROV_DSS_DH;
-        m_alg_encrypt    = CALG_AES_128;
-        m_size_enc_key   = 128/8; // AES-128
-        m_size_enc_iv    = 128/8; // AES-128
-        m_size_enc_block = 128/8; // AES-128
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0x00 && cipher[1] == 0x67) {
-        // DHE-RSA-AES128-SHA256
-        m_prov_name      = MS_DEF_DH_SCHANNEL_PROV;
-        m_prov_type      = PROV_DH_SCHANNEL;
-        m_alg_encrypt    = CALG_AES_128;
-        m_size_enc_key   = 128/8; // AES-128
-        m_size_enc_iv    = 128/8; // AES-128
-        m_size_enc_block = 128/8; // AES-128
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0x00 && cipher[1] == 0x6a) {
-        // DHE-DSS-AES256-SHA256
-        m_prov_name      = MS_ENH_DSS_DH_PROV;
-        m_prov_type      = PROV_DSS_DH;
-        m_alg_encrypt    = CALG_AES_256;
-        m_size_enc_key   = 256/8; // AES-256
-        m_size_enc_iv    = 128/8; // AES-256
-        m_size_enc_block = 128/8; // AES-256
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0x00 && cipher[1] == 0x6b) {
-        // DHE-RSA-AES256-SHA256
-        m_prov_name      = MS_DEF_DH_SCHANNEL_PROV;
-        m_prov_type      = PROV_DH_SCHANNEL;
-        m_alg_encrypt    = CALG_AES_256;
-        m_size_enc_key   = 256/8; // AES-256
-        m_size_enc_iv    = 128/8; // AES-256
-        m_size_enc_block = 128/8; // AES-256
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0xc0 && cipher[1] == 0x23) {
-        // ECDHE-ECDSA-AES128-SHA256
-        m_prov_name      = MS_ENH_DSS_DH_PROV;
-        m_prov_type      = PROV_DSS_DH;
-        m_alg_encrypt    = CALG_AES_128;
-        m_size_enc_key   = 128/8; // AES-128
-        m_size_enc_iv    = 128/8; // AES-128
-        m_size_enc_block = 128/8; // AES-128
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0xc0 && cipher[1] == 0x24) {
-        // ECDHE-ECDSA-AES256-SHA384
-        m_prov_name      = MS_ENH_DSS_DH_PROV;
-        m_prov_type      = PROV_DSS_DH;
-        m_alg_encrypt    = CALG_AES_256;
-        m_size_enc_key   = 256/8; // AES-256
-        m_size_enc_iv    = 128/8; // AES-256
-        m_size_enc_block = 128/8; // AES-256
-        m_alg_mac        = CALG_SHA_384;
-        m_size_mac_key   = 384/8; // SHA-384
-        m_size_mac_hash  = 384/8; // SHA-384
-    } else if (cipher[0] == 0xc0 && cipher[1] == 0x27) {
-        // ECDHE-RSA-AES128-SHA256
-        m_prov_name      = MS_ENH_DSS_DH_PROV;
-        m_prov_type      = PROV_DSS_DH;
-        m_alg_encrypt    = CALG_AES_128;
-        m_size_enc_key   = 128/8; // AES-128
-        m_size_enc_iv    = 128/8; // AES-128
-        m_size_enc_block = 128/8; // AES-128
-        m_alg_mac        = CALG_SHA_256;
-        m_size_mac_key   = 256/8; // SHA-256
-        m_size_mac_hash  = 256/8; // SHA-256
-    } else if (cipher[0] == 0xc0 && cipher[1] == 0x28) {
-        // ECDHE-RSA-AES256-SHA384
-        m_prov_name      = MS_ENH_DSS_DH_PROV;
-        m_prov_type      = PROV_DSS_DH;
-        m_alg_encrypt    = CALG_AES_256;
-        m_size_enc_key   = 256/8; // AES-256
-        m_size_enc_iv    = 128/8; // AES-256
-        m_size_enc_block = 128/8; // AES-256
-        m_alg_mac        = CALG_SHA_384;
-        m_size_mac_key   = 384/8; // SHA-384
-        m_size_mac_hash  = 384/8; // SHA-384
-    } else
-        throw win_runtime_error(ERROR_NOT_SUPPORTED, string_printf(__FUNCTION__ " Unknown cipher (received 0x%02x%02x).", cipher[0], cipher[1]));
-}

lib/TLS_UI/include/TLS_UI.h

@@ -1,338 +1,342 @@
-/*
+/*
-    Copyright 2015-2016 Amebis
+    Copyright 2015-2016 Amebis
-    Copyright 2016 GÉANT
+    Copyright 2016 GÉANT
-
+
-    This file is part of GÉANTLink.
+    This file is part of GÉANTLink.
-
+
-    GÉANTLink is free software: you can redistribute it and/or modify it
+    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
+    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
+    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
+    (at your option) any later version.
-
+
-    GÉANTLink is distributed in the hope that it will be useful, but
+    GÉANTLink is distributed in the hope that it will be useful, but
-    WITHOUT ANY WARRANTY; without even the implied warranty of
+    WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+    GNU General Public License for more details.
-
+
-    You should have received a copy of the GNU General Public License
+    You should have received a copy of the GNU General Public License
-    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
-*/
+*/
-
+
-#include "../../EAPBase_UI/include/EAP_UI.h"
+#include "../../EAPBase_UI/include/EAP_UI.h"
-#include "../../TLS/include/Config.h"
+#include "../../TLS/include/Config.h"
-#include "../../TLS/include/Credentials.h"
+#include "../../TLS/include/Credentials.h"
-
+
-#include <WinStd/Common.h>
+#include <WinStd/Common.h>
-
+
-#include <wx/filedlg.h>
+#include <wx/filedlg.h>
-#include <wx/msgdlg.h>
+#include <wx/msgdlg.h>
-
+
-#include <Windows.h>
+#include <Windows.h>
-#include <cryptuiapi.h>
+#include <cryptuiapi.h>
-#include <WinCrypt.h> // Must include after <Windows.h>
+#include <WinCrypt.h> // Must include after <Windows.h>
-
+
-#include <list>
+#include <list>
-#include <string>
+#include <string>
-
+
-
+
-///
+///
-/// Helper class for auto-destroyable certificates used in wxWidget's item containers
+/// Helper class for auto-destroyable certificates used in wxWidget's item containers
-///
+///
-class wxCertificateClientData;
+class wxCertificateClientData;
-
+
-///
+///
-/// Validator for host name
+/// Validator for host name
-///
+///
-class wxHostNameValidator;
+class wxHostNameValidator;
-
+
-///
+///
-/// Validator for FQDN
+/// Validator for FQDN
-///
+///
-class wxFQDNValidator;
+class wxFQDNValidator;
-
+
-///
+///
-/// Validator for FQDN lists
+/// Validator for FQDN lists
-///
+///
-class wxFQDNListValidator;
+class wxFQDNListValidator;
-
+
-///
+///
-/// TLS credential panel
+/// TLS credential panel
-///
+///
-class wxTLSCredentialsPanel;
+class wxTLSCredentialsPanel;
-
+
-///
+///
-/// TLS server trust configuration panel
+/// TLS server trust configuration panel
-///
+///
-class wxTLSServerTrustPanel;
+class wxTLSServerTrustPanel;
-
+
-///
+///
-/// TLS credentials configuration panel
+/// TLS credentials configuration panel
-///
+///
-typedef wxEAPCredentialsConfigPanel<eap::credentials_tls, wxTLSCredentialsPanel> wxTLSCredentialsConfigPanel;
+typedef wxEAPCredentialsConfigPanel<eap::credentials_tls, wxTLSCredentialsPanel> wxTLSCredentialsConfigPanel;
-
+
-///
+///
-/// TLS configuration panel
+/// TLS configuration panel
-///
+///
-class wxTLSConfigPanel;
+class wxTLSConfigPanel;
-
+
-#pragma once
+#pragma once
-
+
-#include "../res/wxTLS_UI.h"
+#include "../res/wxTLS_UI.h"
-
+
-#include <WinStd/Win.h>
+#include <WinStd/Win.h>
-
+
-#include <wx/clntdata.h>
+#include <wx/clntdata.h>
-#include <wx/icon.h>
+#include <wx/icon.h>
-#include <wx/panel.h>
+#include <wx/panel.h>
-#include <wx/textctrl.h>
+#include <wx/textctrl.h>
-#include <wx/validate.h>
+#include <wx/validate.h>
-
+
-#include <list>
+#include <list>
-#include <string>
+#include <string>
-#include <vector>
+#include <vector>
-
+
-
+
-class wxCertificateClientData : public wxClientData
+class wxCertificateClientData : public wxClientData
-{
+{
-public:
+public:
-    ///
+    ///
-    /// Constructs client data object with existing handle
+    /// Constructs client data object with existing handle
-    ///
+    ///
-    wxCertificateClientData(PCCERT_CONTEXT cert);
+    wxCertificateClientData(PCCERT_CONTEXT cert);
-
+
-    ///
+    ///
-    /// Releases certificate handle and destructs the object
+    /// Releases certificate handle and destructs the object
-    ///
+    ///
-    virtual ~wxCertificateClientData();
+    virtual ~wxCertificateClientData();
-
+
-public:
+public:
-    PCCERT_CONTEXT m_cert;  ///< Certificate
+    PCCERT_CONTEXT m_cert;  ///< Certificate
-};
+};
-
+
-
+
-class wxHostNameValidator : public wxValidator
+class wxHostNameValidator : public wxValidator
-{
+{
-    wxDECLARE_DYNAMIC_CLASS(wxHostNameValidator);
+    wxDECLARE_DYNAMIC_CLASS(wxHostNameValidator);
-    wxDECLARE_NO_ASSIGN_CLASS(wxHostNameValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxHostNameValidator);
-
+
-public:
+public:
-    ///
+    ///
-    /// Construct the validator with a value to store data
+    /// Construct the validator with a value to store data
-    ///
+    ///
-    wxHostNameValidator(std::wstring *val = NULL);
+    wxHostNameValidator(std::wstring *val = NULL);
-
+
-    ///
+    ///
-    /// Copy constructor
+    /// Copy constructor
-    ///
+    ///
-    wxHostNameValidator(const wxHostNameValidator &other);
+    wxHostNameValidator(const wxHostNameValidator &other);
-
+
-    ///
+    ///
-    /// Copies this validator
+    /// Copies this validator
-    ///
+    ///
-    virtual wxObject* Clone() const;
+    virtual wxObject* Clone() const;
-
+
-    ///
+    ///
-    /// Validates the value
+    /// Validates the value
-    ///
+    ///
-    virtual bool Validate(wxWindow *parent);
+    virtual bool Validate(wxWindow *parent);
-
+
-    ///
+    ///
-    /// Transfers the value to the window
+    /// Transfers the value to the window
-    ///
+    ///
-    virtual bool TransferToWindow();
+    virtual bool TransferToWindow();
-
+
-    ///
+    ///
-    /// Transfers the value from the window
+    /// Transfers the value from the window
-    ///
+    ///
-    virtual bool TransferFromWindow();
+    virtual bool TransferFromWindow();
-
+
-    ///
+    ///
-    /// Parses FQDN value
+    /// Parses FQDN value
-    ///
+    ///
-    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out = NULL);
+    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out = NULL);
-
+
-protected:
+protected:
-    std::wstring *m_val; ///< Pointer to variable to receive control's parsed value
+    std::wstring *m_val; ///< Pointer to variable to receive control's parsed value
-};
+};
-
+
-
+
-class wxFQDNValidator : public wxValidator
+class wxFQDNValidator : public wxValidator
-{
+{
-    wxDECLARE_DYNAMIC_CLASS(wxFQDNValidator);
+    wxDECLARE_DYNAMIC_CLASS(wxFQDNValidator);
-    wxDECLARE_NO_ASSIGN_CLASS(wxFQDNValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxFQDNValidator);
-
+
-public:
+public:
-    ///
+    ///
-    /// Construct the validator with a value to store data
+    /// Construct the validator with a value to store data
-    ///
+    ///
-    wxFQDNValidator(std::wstring *val = NULL);
+    wxFQDNValidator(std::wstring *val = NULL);
-
+
-    ///
+    ///
-    /// Copy constructor
+    /// Copy constructor
-    ///
+    ///
-    wxFQDNValidator(const wxFQDNValidator &other);
+    wxFQDNValidator(const wxFQDNValidator &other);
-
+
-    ///
+    ///
-    /// Copies this validator
+    /// Copies this validator
-    ///
+    ///
-    virtual wxObject* Clone() const;
+    virtual wxObject* Clone() const;
-
+
-    ///
+    ///
-    /// Validates the value
+    /// Validates the value
-    ///
+    ///
-    virtual bool Validate(wxWindow *parent);
+    virtual bool Validate(wxWindow *parent);
-
+
-    ///
+    ///
-    /// Transfers the value to the window
+    /// Transfers the value to the window
-    ///
+    ///
-    virtual bool TransferToWindow();
+    virtual bool TransferToWindow();
-
+
-    ///
+    ///
-    /// Transfers the value from the window
+    /// Transfers the value from the window
-    ///
+    ///
-    virtual bool TransferFromWindow();
+    virtual bool TransferFromWindow();
-
+
-    ///
+    ///
-    /// Parses FQDN value
+    /// Parses FQDN value
-    ///
+    ///
-    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out = NULL);
+    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::wstring *val_out = NULL);
-
+
-protected:
+protected:
-    std::wstring *m_val; ///< Pointer to variable to receive control's parsed value
+    std::wstring *m_val; ///< Pointer to variable to receive control's parsed value
-};
+};
-
+
-
+
-class wxFQDNListValidator : public wxValidator
+class wxFQDNListValidator : public wxValidator
-{
+{
-    wxDECLARE_DYNAMIC_CLASS(wxFQDNListValidator);
+    wxDECLARE_DYNAMIC_CLASS(wxFQDNListValidator);
-    wxDECLARE_NO_ASSIGN_CLASS(wxFQDNListValidator);
+    wxDECLARE_NO_ASSIGN_CLASS(wxFQDNListValidator);
-
+
-public:
+public:
-    ///
+    ///
-    /// Construct the validator with a value to store data
+    /// Construct the validator with a value to store data
-    ///
+    ///
-    wxFQDNListValidator(std::list<std::wstring> *val = NULL);
+    wxFQDNListValidator(std::list<std::wstring> *val = NULL);
-
+
-    ///
+    ///
-    /// Copy constructor
+    /// Copy constructor
-    ///
+    ///
-    wxFQDNListValidator(const wxFQDNListValidator &other);
+    wxFQDNListValidator(const wxFQDNListValidator &other);
-
+
-    ///
+    ///
-    /// Copies this validator
+    /// Copies this validator
-    ///
+    ///
-    virtual wxObject* Clone() const;
+    virtual wxObject* Clone() const;
-
+
-    ///
+    ///
-    /// Validates the value
+    /// Validates the value
-    ///
+    ///
-    virtual bool Validate(wxWindow *parent);
+    virtual bool Validate(wxWindow *parent);
-
+
-    ///
+    ///
-    /// Transfers the value to the window
+    /// Transfers the value to the window
-    ///
+    ///
-    virtual bool TransferToWindow();
+    virtual bool TransferToWindow();
-
+
-    ///
+    ///
-    /// Transfers the value from the window
+    /// Transfers the value from the window
-    ///
+    ///
-    virtual bool TransferFromWindow();
+    virtual bool TransferFromWindow();
-
+
-    ///
+    ///
-    /// Parses FQDN list value
+    /// Parses FQDN list value
-    ///
+    ///
-    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::list<std::wstring> *val_out = NULL);
+    static bool Parse(const wxString &val_in, size_t i_start, size_t i_end, wxTextCtrl *ctrl, wxWindow *parent, std::list<std::wstring> *val_out = NULL);
-
+
-protected:
+protected:
-    std::list<std::wstring> *m_val;  ///< Pointer to variable to receive control's parsed value
+    std::list<std::wstring> *m_val;  ///< Pointer to variable to receive control's parsed value
-};
+};
-
+
-
+
-class wxTLSCredentialsPanel : public wxEAPCredentialsPanel<eap::credentials_tls, wxTLSCredentialsPanelBase>
+class wxTLSCredentialsPanel : public wxEAPCredentialsPanelBase<eap::credentials_tls, wxTLSCredentialsPanelBase>
-{
+{
-public:
+public:
-    ///
+    ///
-    /// Constructs a configuration panel
+    /// Constructs a configuration panel
-    ///
+    ///
-    /// \param[in]    prov           Provider configuration data
+    /// \param[in]    prov           Provider configuration data
-    /// \param[in]    cfg            Configuration data
+    /// \param[in]    cfg            Configuration data
-    /// \param[inout] cred           Credentials data
+    /// \param[inout] cred           Credentials data
-    /// \param[in]    pszCredTarget  Target name of credentials in Windows Credential Manager. Can be further decorated to create final target name.
+    /// \param[in]    pszCredTarget  Target name of credentials in Windows Credential Manager. Can be further decorated to create final target name.
-    /// \param[in]    parent         Parent window
+    /// \param[in]    parent         Parent window
-    /// \param[in]    is_config      Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
+    /// \param[in]    is_config      Is this panel used to pre-enter credentials? When \c true, the "Remember" checkbox is always selected and disabled.
-    ///
+    ///
-    wxTLSCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, eap::credentials_tls &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false);
+    wxTLSCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, eap::credentials_tls &cred, LPCTSTR pszCredTarget, wxWindow* parent, bool is_config = false);
-
+
-protected:
+protected:
-    /// \cond internal
+    /// \cond internal
-    virtual bool TransferDataToWindow();
+    virtual bool TransferDataToWindow();
-    virtual bool TransferDataFromWindow();
+    virtual bool TransferDataFromWindow();
-    virtual void OnUpdateUI(wxUpdateUIEvent& event);
+    virtual void OnUpdateUI(wxUpdateUIEvent& event);
-    /// \endcond
+    /// \endcond
-};
+
-
+protected:
-
+    winstd::library m_shell32;      ///< shell32.dll resource library reference
-class wxTLSServerTrustPanel : public wxEAPTLSServerTrustConfigPanelBase
+    wxIcon m_icon;                  ///< Panel icon
-{
+};
-public:
+
-    ///
+
-    /// Constructs a configuration panel
+class wxTLSServerTrustPanel : public wxEAPTLSServerTrustConfigPanelBase
-    ///
+{
-    wxTLSServerTrustPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent);
+public:
-
+    ///
-protected:
+    /// Constructs a configuration panel
-    /// \cond internal
+    ///
-    virtual bool TransferDataToWindow();
+    wxTLSServerTrustPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, wxWindow* parent);
-    virtual bool TransferDataFromWindow();
+
-    virtual void OnUpdateUI(wxUpdateUIEvent& event);
+protected:
-    virtual void OnRootCADClick(wxCommandEvent& event);
+    /// \cond internal
-    virtual void OnRootCAAddStore(wxCommandEvent& event);
+    virtual bool TransferDataToWindow();
-    virtual void OnRootCAAddFile(wxCommandEvent& event);
+    virtual bool TransferDataFromWindow();
-    virtual void OnRootCARemove(wxCommandEvent& event);
+    virtual void OnUpdateUI(wxUpdateUIEvent& event);
-    /// \endcond
+    virtual void OnRootCADClick(wxCommandEvent& event);
-
+    virtual void OnRootCAAddStore(wxCommandEvent& event);
-    ///
+    virtual void OnRootCAAddFile(wxCommandEvent& event);
-    /// Adds a certificate to the list of trusted root CA list
+    virtual void OnRootCARemove(wxCommandEvent& event);
-    ///
+    /// \endcond
-    /// \param[in] cert  Certificate
+
-    ///
+    ///
-    /// \returns
+    /// Adds a certificate to the list of trusted root CA list
-    /// - \c true  if certificate was added;
+    ///
-    /// - \c false if duplicate found or an error occured.
+    /// \param[in] cert  Certificate
-    ///
+    ///
-    bool AddRootCA(PCCERT_CONTEXT cert);
+    /// \returns
-
+    /// - \c true  if certificate was added;
-protected:
+    /// - \c false if duplicate found or an error occured.
-    const eap::config_provider &m_prov;         ///< EAP provider
+    ///
-    eap::config_method_tls &m_cfg;              ///< TLS configuration
+    bool AddRootCA(PCCERT_CONTEXT cert);
-    std::list<std::wstring> m_server_names_val; ///< Acceptable authenticating server names
+
-};
+protected:
-
+    const eap::config_provider &m_prov;         ///< EAP provider
-
+    eap::config_method_tls &m_cfg;              ///< TLS configuration
-class wxTLSConfigPanel : public wxPanel
+    winstd::library m_certmgr;                  ///< certmgr.dll resource library reference
-{
+    wxIcon m_icon;                              ///< Panel icon
-public:
+    std::list<std::wstring> m_server_names_val; ///< Acceptable authenticating server names
-    ///
+};
-    /// Constructs a configuration panel
+
-    ///
+
-    wxTLSConfigPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, LPCTSTR pszCredTarget, wxWindow* parent);
+class wxTLSConfigPanel : public wxPanel
-
+{
-    ///
+public:
-    /// Destructs the configuration panel
+    ///
-    ///
+    /// Constructs a configuration panel
-    virtual ~wxTLSConfigPanel();
+    ///
-
+    wxTLSConfigPanel(const eap::config_provider &prov, eap::config_method_tls &cfg, LPCTSTR pszCredTarget, wxWindow* parent);
-protected:
+
-    /// \cond internal
+    ///
-    virtual void OnInitDialog(wxInitDialogEvent& event);
+    /// Destructs the configuration panel
-#if EAP_TLS < EAP_TLS_SCHANNEL
+    ///
-    virtual bool TransferDataFromWindow();
+    virtual ~wxTLSConfigPanel();
-#endif
+
-    /// \endcond
+protected:
-
+    /// \cond internal
-protected:
+    virtual void OnInitDialog(wxInitDialogEvent& event);
-    const eap::config_provider &m_prov;          ///< EAP provider
+    virtual bool TransferDataFromWindow();
-    eap::config_method_tls &m_cfg;               ///< TLS configuration
+    /// \endcond
-    wxTLSServerTrustPanel *m_server_trust;       ///< Server trust configuration panel
+
-    wxTLSCredentialsConfigPanel *m_credentials;  ///< Credentials configuration panel
+protected:
-};
+    const eap::config_provider &m_prov;          ///< EAP provider
+    eap::config_method_tls &m_cfg;               ///< TLS configuration
+    wxTLSServerTrustPanel *m_server_trust;       ///< Server trust configuration panel
+    wxTLSCredentialsConfigPanel *m_credentials;  ///< Credentials configuration panel
+};

lib/TLS_UI/res/wxTLS_UI.cpp

@@ -1,207 +1,182 @@
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
-// http://www.wxformbuilder.org/
+// http://www.wxformbuilder.org/
-//
+//
-// PLEASE DO "NOT" EDIT THIS FILE!
+// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
-
+
-#include <StdAfx.h>
+#include <StdAfx.h>
-
+
-#include "wxTLS_UI.h"
+#include "wxTLS_UI.h"
-
+
-///////////////////////////////////////////////////////////////////////////
+///////////////////////////////////////////////////////////////////////////
-
+
-wxEAPTLSServerTrustConfigPanelBase::wxEAPTLSServerTrustConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxEAPTLSServerTrustConfigPanelBase::wxEAPTLSServerTrustConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
-{
+{
-	wxStaticBoxSizer* sb_server_trust;
+	wxStaticBoxSizer* sb_server_trust;
-	sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL );
+	sb_server_trust = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Server Trust") ), wxVERTICAL );
-	
+	
-	wxBoxSizer* sb_server_trust_horiz;
+	wxBoxSizer* sb_server_trust_horiz;
-	sb_server_trust_horiz = new wxBoxSizer( wxHORIZONTAL );
+	sb_server_trust_horiz = new wxBoxSizer( wxHORIZONTAL );
-	
+	
-	m_server_trust_icon = new wxStaticBitmap( sb_server_trust->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_server_trust_icon = new wxStaticBitmap( sb_server_trust->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	sb_server_trust_horiz->Add( m_server_trust_icon, 0, wxALL, 5 );
+	sb_server_trust_horiz->Add( m_server_trust_icon, 0, wxALL, 5 );
-	
+	
-	wxBoxSizer* sb_server_trust_vert;
+	wxBoxSizer* sb_server_trust_vert;
-	sb_server_trust_vert = new wxBoxSizer( wxVERTICAL );
+	sb_server_trust_vert = new wxBoxSizer( wxVERTICAL );
-	
+	
-	m_server_trust_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_server_trust_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Describe the servers you trust to prevent credential interception in case of man-in-the-middle attacks."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_server_trust_label->Wrap( 446 );
+	m_server_trust_label->Wrap( 446 );
-	sb_server_trust_vert->Add( m_server_trust_label, 0, wxALL|wxEXPAND, 5 );
+	sb_server_trust_vert->Add( m_server_trust_label, 0, wxALL|wxEXPAND, 5 );
-	
+	
-	wxBoxSizer* sb_root_ca;
+	wxBoxSizer* sb_root_ca;
-	sb_root_ca = new wxBoxSizer( wxVERTICAL );
+	sb_root_ca = new wxBoxSizer( wxVERTICAL );
-	
+	
-	m_root_ca_lbl = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable Certificate Authorities:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_root_ca_lbl = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable Certificate Authorities:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_root_ca_lbl->Wrap( -1 );
+	m_root_ca_lbl->Wrap( -1 );
-	sb_root_ca->Add( m_root_ca_lbl, 0, wxEXPAND|wxBOTTOM, 5 );
+	sb_root_ca->Add( m_root_ca_lbl, 0, wxEXPAND|wxBOTTOM, 5 );
-	
+	
-	m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SORT ); 
+	m_root_ca = new wxListBox( sb_server_trust->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, NULL, wxLB_SORT ); 
-	m_root_ca->SetToolTip( _("List of certificate authorities server's certificate must be issued by") );
+	m_root_ca->SetToolTip( _("List of certificate authorities server's certificate must be issued by") );
-	
+	
-	sb_root_ca->Add( m_root_ca, 1, wxEXPAND|wxBOTTOM, 5 );
+	sb_root_ca->Add( m_root_ca, 1, wxEXPAND|wxBOTTOM, 5 );
-	
+	
-	wxBoxSizer* sb_root_ca_btn;
+	wxBoxSizer* sb_root_ca_btn;
-	sb_root_ca_btn = new wxBoxSizer( wxHORIZONTAL );
+	sb_root_ca_btn = new wxBoxSizer( wxHORIZONTAL );
-	
+	
-	m_root_ca_add_store = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from Store..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_root_ca_add_store = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from Store..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_root_ca_add_store->SetToolTip( _("Adds a new certificate authority from the certificate store to the list") );
+	m_root_ca_add_store->SetToolTip( _("Adds a new certificate authority from the certificate store to the list") );
-	
+	
-	sb_root_ca_btn->Add( m_root_ca_add_store, 0, wxRIGHT, 5 );
+	sb_root_ca_btn->Add( m_root_ca_add_store, 0, wxRIGHT, 5 );
-	
+	
-	m_root_ca_add_file = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from File..."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_root_ca_add_file = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("Add CA from File..."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_root_ca_add_file->SetToolTip( _("Adds a new certificate authority from the file to the list") );
+	m_root_ca_add_file->SetToolTip( _("Adds a new certificate authority from the file to the list") );
-	
+	
-	sb_root_ca_btn->Add( m_root_ca_add_file, 0, wxRIGHT|wxLEFT, 5 );
+	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 = new wxButton( sb_server_trust->GetStaticBox(), wxID_ANY, _("&Remove CA"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_root_ca_remove->Enable( false );
+	m_root_ca_remove->Enable( false );
-	m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") );
+	m_root_ca_remove->SetToolTip( _("Removes selected certificate authorities from the list") );
-	
+	
-	sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, 5 );
+	sb_root_ca_btn->Add( m_root_ca_remove, 0, wxLEFT, 5 );
-	
+	
-	
+	
-	sb_root_ca->Add( sb_root_ca_btn, 0, wxALIGN_RIGHT, 5 );
+	sb_root_ca->Add( sb_root_ca_btn, 0, wxALIGN_RIGHT, 5 );
-	
+	
-	
+	
-	sb_server_trust_vert->Add( sb_root_ca, 1, wxEXPAND|wxALL, 5 );
+	sb_server_trust_vert->Add( sb_root_ca, 1, wxEXPAND|wxALL, 5 );
-	
+	
-	wxBoxSizer* sb_server_names;
+	wxBoxSizer* sb_server_names;
-	sb_server_names = new wxBoxSizer( wxVERTICAL );
+	sb_server_names = new wxBoxSizer( wxVERTICAL );
-	
+	
-	m_server_names_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable server &names:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_server_names_label = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("Acceptable server &names:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_server_names_label->Wrap( -1 );
+	m_server_names_label->Wrap( -1 );
-	sb_server_names->Add( m_server_names_label, 0, wxBOTTOM, 5 );
+	sb_server_names->Add( m_server_names_label, 0, wxBOTTOM, 5 );
-	
+	
-	m_server_names = new wxTextCtrl( sb_server_trust->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_server_names = new wxTextCtrl( sb_server_trust->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	m_server_names->SetToolTip( _("A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed") );
+	m_server_names->SetToolTip( _("A semicolon delimited list of acceptable server FQDN names; blank to skip name check; Unicode characters allowed") );
-	
+	
-	sb_server_names->Add( m_server_names, 0, wxEXPAND|wxBOTTOM, 5 );
+	sb_server_names->Add( m_server_names, 0, wxEXPAND|wxBOTTOM, 5 );
-	
+	
-	m_server_names_note = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("(Example: foo.bar.com;server2.bar.com)"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_server_names_note = new wxStaticText( sb_server_trust->GetStaticBox(), wxID_ANY, _("(Example: foo.bar.com;server2.bar.com)"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_server_names_note->Wrap( -1 );
+	m_server_names_note->Wrap( -1 );
-	sb_server_names->Add( m_server_names_note, 0, wxALIGN_RIGHT, 5 );
+	sb_server_names->Add( m_server_names_note, 0, wxALIGN_RIGHT, 5 );
-	
+	
-	
+	
-	sb_server_trust_vert->Add( sb_server_names, 0, wxEXPAND|wxALL, 5 );
+	sb_server_trust_vert->Add( sb_server_names, 0, wxEXPAND|wxALL, 5 );
-	
+	
-	
+	
-	sb_server_trust_horiz->Add( sb_server_trust_vert, 1, wxEXPAND, 5 );
+	sb_server_trust_horiz->Add( sb_server_trust_vert, 1, wxEXPAND, 5 );
-	
+	
-	
+	
-	sb_server_trust->Add( sb_server_trust_horiz, 1, wxEXPAND, 5 );
+	sb_server_trust->Add( sb_server_trust_horiz, 1, wxEXPAND, 5 );
-	
+	
-	
+	
-	this->SetSizer( sb_server_trust );
+	this->SetSizer( sb_server_trust );
-	this->Layout();
+	this->Layout();
-	
+	
-	// Connect Events
+	// Connect Events
-	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnUpdateUI ) );
+	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnUpdateUI ) );
-	m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this );
+	m_root_ca->Connect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this );
-	m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this );
+	m_root_ca_add_store->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this );
-	m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this );
+	m_root_ca_add_file->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this );
-	m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this );
+	m_root_ca_remove->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this );
-}
+}
-
+
-wxEAPTLSServerTrustConfigPanelBase::~wxEAPTLSServerTrustConfigPanelBase()
+wxEAPTLSServerTrustConfigPanelBase::~wxEAPTLSServerTrustConfigPanelBase()
-{
+{
-	// Disconnect Events
+	// Disconnect Events
-	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnUpdateUI ) );
+	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnUpdateUI ) );
-	m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this );
+	m_root_ca->Disconnect( wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCADClick ), NULL, this );
-	m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this );
+	m_root_ca_add_store->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddStore ), NULL, this );
-	m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this );
+	m_root_ca_add_file->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCAAddFile ), NULL, this );
-	m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this );
+	m_root_ca_remove->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEAPTLSServerTrustConfigPanelBase::OnRootCARemove ), NULL, this );
-	
+	
-}
+}
-
+
-wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+wxTLSCredentialsPanelBase::wxTLSCredentialsPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
-{
+{
-	wxStaticBoxSizer* sb_credentials;
+	wxStaticBoxSizer* sb_credentials;
-	sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("TLS Client Certificate") ), wxVERTICAL );
+	sb_credentials = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("TLS Client Certificate") ), wxVERTICAL );
-	
+	
-	wxBoxSizer* sb_credentials_horiz;
+	wxBoxSizer* sb_credentials_horiz;
-	sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL );
+	sb_credentials_horiz = new wxBoxSizer( wxHORIZONTAL );
-	
+	
-	m_credentials_icon = new wxStaticBitmap( sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	m_credentials_icon = new wxStaticBitmap( sb_credentials->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 );
+	sb_credentials_horiz->Add( m_credentials_icon, 0, wxALL, 5 );
-	
+	
-	wxBoxSizer* sb_credentials_vert;
+	wxBoxSizer* sb_credentials_vert;
-	sb_credentials_vert = new wxBoxSizer( wxVERTICAL );
+	sb_credentials_vert = new wxBoxSizer( wxVERTICAL );
-	
+	
-	m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Please select your client certificate to use for authentication."), wxDefaultPosition, wxDefaultSize, 0 );
+	m_credentials_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Please select your client certificate to use for authentication."), wxDefaultPosition, wxDefaultSize, 0 );
-	m_credentials_label->Wrap( 446 );
+	m_credentials_label->Wrap( 446 );
-	sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 );
+	sb_credentials_vert->Add( m_credentials_label, 0, wxALL|wxEXPAND, 5 );
-	
+	
-	wxBoxSizer* sb_cert_radio;
+	wxBoxSizer* sb_cert_radio;
-	sb_cert_radio = new wxBoxSizer( wxVERTICAL );
+	sb_cert_radio = new wxBoxSizer( wxVERTICAL );
-	
+	
-	m_cert_none = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Co&nnect without providing a client certificate"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_cert_none = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Co&nnect without providing a client certificate"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
-	m_cert_none->SetToolTip( _("Select if your server does not require you to provide a client certificate") );
+	m_cert_none->SetToolTip( _("Select if your server does not require you to provide a client certificate") );
-	
+	
-	sb_cert_radio->Add( m_cert_none, 1, wxEXPAND, 5 );
+	sb_cert_radio->Add( m_cert_none, 1, wxEXPAND, 5 );
-	
+	
-	wxBoxSizer* sb_cert_select;
+	wxBoxSizer* sb_cert_select;
-	sb_cert_select = new wxBoxSizer( wxHORIZONTAL );
+	sb_cert_select = new wxBoxSizer( wxHORIZONTAL );
-	
+	
-	m_cert_select = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Use the following &certificate:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_cert_select = new wxRadioButton( sb_credentials->GetStaticBox(), wxID_ANY, _("Use the following &certificate:"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_cert_select->SetToolTip( _("Select if you need to provide a client certificate when connecting") );
+	m_cert_select->SetToolTip( _("Select if you need to provide a client certificate when connecting") );
-	
+	
-	sb_cert_select->Add( m_cert_select, 0, wxEXPAND, 5 );
+	sb_cert_select->Add( m_cert_select, 0, wxEXPAND, 5 );
-	
+	
-	wxArrayString m_cert_select_valChoices;
+	wxArrayString m_cert_select_valChoices;
-	m_cert_select_val = new wxChoice( sb_credentials->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cert_select_valChoices, wxCB_SORT );
+	m_cert_select_val = new wxChoice( sb_credentials->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cert_select_valChoices, wxCB_SORT );
-	m_cert_select_val->SetSelection( 0 );
+	m_cert_select_val->SetSelection( 0 );
-	m_cert_select_val->SetToolTip( _("Client certificate to use for authentication") );
+	m_cert_select_val->SetToolTip( _("Client certificate to use for authentication") );
-	
+	
-	sb_cert_select->Add( m_cert_select_val, 1, wxEXPAND, 5 );
+	sb_cert_select->Add( m_cert_select_val, 1, wxEXPAND, 5 );
-	
+	
-	
+	
-	sb_cert_radio->Add( sb_cert_select, 1, wxEXPAND, 5 );
+	sb_cert_radio->Add( sb_cert_select, 1, wxEXPAND, 5 );
-	
+	
-	
+	
-	sb_credentials_vert->Add( sb_cert_radio, 0, wxEXPAND|wxALL, 5 );
+	sb_credentials_vert->Add( sb_cert_radio, 0, wxEXPAND|wxALL, 5 );
-	
+	
-	wxBoxSizer* sb_identity;
+	m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember"), wxDefaultPosition, wxDefaultSize, 0 );
-	sb_identity = new wxBoxSizer( wxVERTICAL );
+	m_remember->SetHelpText( _("Check if you would like to save certificate selection") );
-	
+	
-	m_identity_label = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("Custom &identity:"), wxDefaultPosition, wxDefaultSize, 0 );
+	sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 );
-	m_identity_label->Wrap( -1 );
+	
-	sb_identity->Add( m_identity_label, 0, wxBOTTOM, 5 );
+	
-	
+	sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 );
-	m_identity = new wxTextCtrl( sb_credentials->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	
-	m_identity->SetToolTip( _("Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate") );
+	
-	
+	sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 );
-	sb_identity->Add( m_identity, 0, wxEXPAND|wxBOTTOM, 5 );
+	
-	
+	
-	m_identity_note = new wxStaticText( sb_credentials->GetStaticBox(), wxID_ANY, _("(Example: user@contoso.com)"), wxDefaultPosition, wxDefaultSize, 0 );
+	this->SetSizer( sb_credentials );
-	m_identity_note->Wrap( -1 );
+	this->Layout();
-	sb_identity->Add( m_identity_note, 0, wxALIGN_RIGHT, 5 );
+}
-	
+
-	
+wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase()
-	sb_credentials_vert->Add( sb_identity, 1, wxEXPAND|wxALL, 5 );
+{
-	
+}
-	m_remember = new wxCheckBox( sb_credentials->GetStaticBox(), wxID_ANY, _("&Remember"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_remember->SetHelpText( _("Check if you would like to save certificate selection") );
-	
-	sb_credentials_vert->Add( m_remember, 0, wxALL|wxEXPAND, 5 );
-	
-	
-	sb_credentials_horiz->Add( sb_credentials_vert, 1, wxEXPAND, 5 );
-	
-	
-	sb_credentials->Add( sb_credentials_horiz, 0, wxEXPAND, 5 );
-	
-	
-	this->SetSizer( sb_credentials );
-	this->Layout();
-	
-	// Connect Events
-	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) );
-}
-
-wxTLSCredentialsPanelBase::~wxTLSCredentialsPanelBase()
-{
-	// Disconnect Events
-	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxTLSCredentialsPanelBase::OnUpdateUI ) );
-	
-}

lib/TLS_UI/res/wxTLS_UI.h

@@ -80,14 +80,7 @@ class wxTLSCredentialsPanelBase : public wxPanel
 		wxRadioButton* m_cert_none;
 		wxRadioButton* m_cert_select;
 		wxChoice* m_cert_select_val;
-		wxStaticText* m_identity_label;
-		wxTextCtrl* m_identity;
-		wxStaticText* m_identity_note;
 		wxCheckBox* m_remember;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
-		
 	
 	public:
 		

lib/TLS_UI/src/StdAfx.h

@@ -25,5 +25,3 @@
 #include "../../../include/Version.h"
 
 #include "../include/TLS_UI.h"
-
-#include <WindowsX.h>

lib/TTLS/include/Config.h

@@ -33,6 +33,7 @@ namespace eap
 #include "Credentials.h"
 
 #include "../../TLS/include/Config.h"
+#include "../../PAP/include/Config.h"
 
 #include <Windows.h>
 #include <assert.h>
@@ -141,30 +142,6 @@ namespace eap {
         ///
         virtual winstd::eap_type_t get_method_id() const;
 
-        ///
-        /// Returns a string \c L"EAP-TTLS"
-        ///
-        virtual const wchar_t* get_method_str() const;
-
-        ///
-        /// Creates a blank set of credentials suitable for this method
-        ///
-        virtual credentials* make_credentials() const;
-
-        ///
-        /// Makes a new inner method config
-        ///
-        /// \param[in] eap_type  EAP type
-        ///
-        config_method_with_cred* make_config_method(_In_ winstd::eap_type_t eap_type) const;
-
-        ///
-        /// Makes a new inner method config
-        ///
-        /// \param[in] eap_type  EAP type
-        ///
-        config_method_with_cred* make_config_method(_In_ const wchar_t *eap_type) const;
-
         ///
         /// Generates public identity using current configuration and given credentials
         ///

lib/TTLS/include/Credentials.h

@@ -29,8 +29,10 @@ namespace eap
 #pragma once
 
 #include "../../TLS/include/Credentials.h"
+#include "../../PAP/include/Credentials.h"
 
 #include <memory>
+#include <utility>
 
 
 namespace eap
@@ -159,6 +161,11 @@ namespace eap
         ///
         virtual void retrieve(_In_z_ LPCTSTR pszTargetName);
 
+        ///
+        /// Return target suffix for Windows Credential Manager credential name
+        ///
+        virtual LPCTSTR target_suffix() const;
+
         ///
         /// Returns credential identity.
         ///
@@ -173,19 +180,18 @@ namespace eap
         /// 2. Pre-configured credentials
         /// 3. Stored credentials
         ///
-        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL, must be credentials_ttls* type)
+        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL)
-        /// \param[in] cfg            Method configuration (must be config_method_ttls type)
+        /// \param[in] cfg            Method configuration
         /// \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 true  if credentials were set;
-        /// - \c source_preshared  Credentials were set by method configuration
+        /// - \c false otherwise
-        /// - \c source_storage    Credentials were loaded from Windows Credential Manager
         ///
-        virtual source_t combine(
+        std::pair<source_t, source_t> combine(
-            _In_       const credentials             *cred_cached,
+            _In_       const credentials_ttls   *cred_cached,
-            _In_       const config_method_with_cred &cfg,
+            _In_       const config_method_ttls &cfg,
-            _In_opt_z_       LPCTSTR                 pszTargetName);
+            _In_opt_z_       LPCTSTR            pszTargetName);
 
     public:
         std::unique_ptr<credentials> m_inner;   ///< Inner credentials

lib/TTLS/include/Method.h

@@ -57,11 +57,11 @@ namespace eap
         ///
         /// Constructs an EAP method
         ///
-        /// \param[in] mod   EAP module to use for global services
+        /// \param[in] mod  EAP module to use for global services
-        /// \param[in] cfg   Connection configuration
+        /// \param[in] cfg   Providers configuration
         /// \param[in] cred  User credentials
         ///
-        method_ttls(_In_ module &module, _In_ config_connection &cfg, _In_ credentials_ttls &cred);
+        method_ttls(_In_ module &module, _In_ config_provider_list &cfg, _In_ credentials_ttls &cred);
 
         ///
         /// Moves an EAP method
@@ -83,7 +83,7 @@ namespace eap
         /// @{
 
         ///
-        /// Processes a packet received by EapHost from a supplicant.
+        /// Processes a packet received by EAPHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
@@ -112,9 +112,6 @@ namespace eap
 
         /// @}
 
-    protected:
-#if EAP_TLS < EAP_TLS_SCHANNEL
-
         ///
         /// Generates master session key
         ///
@@ -122,18 +119,7 @@ namespace eap
         ///
         virtual void derive_msk();
 
-#else
+    protected:
-
-        ///
-        /// Processes an application message
-        ///
-        /// \param[in] msg       Application message data
-        /// \param[in] size_msg  Application message data size
-        ///
-        virtual void process_application_data(_In_bytecount_(size_msg) const void *msg, _In_ size_t size_msg);
-
-#endif
-
         ///
         /// Makes a PAP client message
         ///

lib/TTLS/include/Module.h

@@ -49,7 +49,7 @@ namespace eap
         virtual config_method* make_config_method();
 
         ///
-        /// Initializes an EAP peer method for EapHost.
+        /// Initializes an EAP peer method for EAPHost.
         ///
         /// \sa [EapPeerGetInfo function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363613.aspx)
         ///
@@ -63,7 +63,7 @@ namespace eap
         virtual void shutdown();
 
         ///
-        /// Returns the user data and user identity after being called by EapHost.
+        /// Returns the user data and user identity after being called by EAPHost.
         ///
         /// \sa [EapPeerGetIdentity function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363607.aspx)
         ///
@@ -111,7 +111,7 @@ namespace eap
         /// @{
 
         ///
-        /// Starts an EAP authentication session on the peer EapHost using the EAP method.
+        /// Starts an EAP authentication session on the peer EAPHost using the EAP method.
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
@@ -135,7 +135,7 @@ namespace eap
         virtual void end_session(_In_ EAP_SESSION_HANDLE hSession);
 
         ///
-        /// Processes a packet received by EapHost from a supplicant.
+        /// Processes a packet received by EAPHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
@@ -221,7 +221,7 @@ namespace eap
             {}
 
         public:
-            config_connection m_cfg;    ///< Connection configuration
+            config_provider_list m_cfg; ///< Providers configuration
             credentials_ttls m_cred;    ///< User credentials
             method_ttls m_method;       ///< EAP-TTLS method
         };

lib/TTLS/src/Config.cpp

@@ -105,19 +105,15 @@ void eap::config_method_ttls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode
     if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:InnerAuthenticationMethod"), bstr(L"InnerAuthenticationMethod"), bstrNamespace, &pXmlElInnerAuthenticationMethod)))
         throw com_runtime_error(hr, __FUNCTION__ " Error creating <InnerAuthenticationMethod> element.");
 
-    eap_type_t eap_type = m_inner->get_method_id();
+    if (dynamic_cast<const config_method_pap*>(m_inner.get())) {
-    if (eap_type_noneap_start <= eap_type && eap_type < eap_type_noneap_end) {
         // <InnerAuthenticationMethod>/<NonEAPAuthMethod>
-        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElInnerAuthenticationMethod, bstr(L"NonEAPAuthMethod"), bstrNamespace, bstr(m_inner->get_method_str()))))
+        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElInnerAuthenticationMethod, bstr(L"NonEAPAuthMethod"), bstrNamespace, bstr(L"PAP"))))
             throw com_runtime_error(hr, __FUNCTION__ " Error creating <NonEAPAuthMethod> element.");
-    } else {
-        // <InnerAuthenticationMethod>/<EAPMethod>
-        if (FAILED(hr = eapxml::put_element_value(pDoc, pXmlElInnerAuthenticationMethod, bstr(L"EAPMethod"), bstrNamespace, (DWORD)m_inner->get_method_id())))
-            throw com_runtime_error(hr, __FUNCTION__ " Error creating <EAPMethod> element.");
-    }
 
-    // <InnerAuthenticationMethod>/...
+        // <InnerAuthenticationMethod>/...
-    m_inner->save(pDoc, pXmlElInnerAuthenticationMethod);
+        m_inner->save(pDoc, pXmlElInnerAuthenticationMethod);
+    } else
+        throw win_runtime_error(ERROR_NOT_SUPPORTED, __FUNCTION__ " Unsupported inner authentication method.");
 }
 
 
@@ -148,38 +144,63 @@ void eap::config_method_ttls::load(_In_ IXMLDOMNode *pConfigRoot)
         throw com_runtime_error(hr, __FUNCTION__ " Error selecting <InnerAuthenticationMethod> element.");
 
     // Determine inner authentication type (<EAPMethod> and <NonEAPAuthMethod>).
-    DWORD dwMethod;
+    //DWORD dwMethodID;
     bstr bstrMethod;
-    if (SUCCEEDED(eapxml::get_element_value(pXmlElInnerAuthenticationMethod, bstr(L"eap-metadata:EAPMethod"), &dwMethod)) &&
+    /*if (SUCCEEDED(eapxml::get_element_value(pXmlElInnerAuthenticationMethod, bstr(L"eap-metadata:EAPMethod"), &dwMethodID)) &&
-        eap_type_start <= dwMethod && dwMethod < eap_type_end)
+        dwMethodID == EAP_TYPE_MSCHAPV2)
     {
-        m_inner.reset(make_config_method((eap_type_t)dwMethod));
+        // MSCHAPv2
-        m_module.log_config((xpath + L"/EAPMethod").c_str(), m_inner->get_method_str());
+        // TODO: Add MSCHAPv2 support.
-    } else if (SUCCEEDED(eapxml::get_element_value(pXmlElInnerAuthenticationMethod, bstr(L"eap-metadata:NonEAPAuthMethod"), &bstrMethod))) {
+        throw win_runtime_error(ERROR_NOT_SUPPORTED, __FUNCTION__ " MSCHAPv2 not supported yet.");
-        m_inner.reset(make_config_method(bstrMethod));
+    } else*/ if (SUCCEEDED(eapxml::get_element_value(pXmlElInnerAuthenticationMethod, bstr(L"eap-metadata:NonEAPAuthMethod"), &bstrMethod)) &&
-        m_module.log_config((xpath + L"/NonEAPAuthMethod").c_str(), m_inner->get_method_str());
+        CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, bstrMethod, bstrMethod.length(), L"PAP", -1, NULL, NULL, 0) == CSTR_EQUAL)
+    {
+        // PAP
+        m_module.log_config((xpath + L"/NonEAPAuthMethod").c_str(), L"PAP");
+        m_inner.reset(new config_method_pap(m_module));
+        m_inner->load(pXmlElInnerAuthenticationMethod);
     } else
         throw win_runtime_error(ERROR_NOT_SUPPORTED, __FUNCTION__ " Unsupported inner authentication method.");
-
-    m_inner->load(pXmlElInnerAuthenticationMethod);
 }
 
 
 void eap::config_method_ttls::operator<<(_Inout_ cursor_out &cursor) const
 {
     config_method_tls::operator<<(cursor);
-    cursor << m_inner->get_method_id();
+
-    cursor << *m_inner;
+    if (m_inner) {
+        if (dynamic_cast<config_method_pap*>(m_inner.get())) {
+            cursor << eap_type_pap;
+            cursor << *m_inner;
+        } else {
+            assert(0); // Unsupported inner authentication method type.
+            cursor << eap_type_undefined;
+        }
+    } else
+        cursor << eap_type_undefined;
+
     cursor << m_anonymous_identity;
 }
 
 
 size_t eap::config_method_ttls::get_pk_size() const
 {
+    size_t size_inner;
+    if (m_inner) {
+        if (dynamic_cast<config_method_pap*>(m_inner.get())) {
+            size_inner =
+                pksizeof(eap_type_pap) +
+                pksizeof(*m_inner);
+        } else {
+            assert(0); // Unsupported inner authentication method type.
+            size_inner = pksizeof(eap_type_undefined);
+        }
+    } else
+        size_inner = pksizeof(eap_type_undefined);
+
     return
         config_method_tls::get_pk_size() +
-        pksizeof(m_inner->get_method_id()) +
+        size_inner +
-        pksizeof(*m_inner) +
         pksizeof(m_anonymous_identity);
 }
 
@@ -190,8 +211,16 @@ void eap::config_method_ttls::operator>>(_Inout_ cursor_in &cursor)
 
     eap_type_t eap_type;
     cursor >> eap_type;
-    m_inner.reset(make_config_method(eap_type));
+    switch (eap_type) {
-    cursor >> *m_inner;
+        case eap_type_pap:
+            m_inner.reset(new config_method_pap(m_module));
+            cursor >> *m_inner;
+            break;
+        default:
+            assert(0); // Unsupported inner authentication method type.
+            m_inner.reset(nullptr);
+    }
+
     cursor >> m_anonymous_identity;
 }
 
@@ -202,42 +231,6 @@ eap_type_t eap::config_method_ttls::get_method_id() const
 }
 
 
-const wchar_t* eap::config_method_ttls::get_method_str() const
-{
-    return L"EAP-TTLS";
-}
-
-
-eap::credentials* eap::config_method_ttls::make_credentials() const
-{
-    return new credentials_ttls(m_module);
-}
-
-
-eap::config_method_with_cred* eap::config_method_ttls::make_config_method(_In_ winstd::eap_type_t eap_type) const
-{
-    switch (eap_type) {
-    case eap_type_tls : return new config_method_tls (m_module);
-    case eap_type_ttls: return new config_method_ttls(m_module);
-    case eap_type_pap : return new config_method_pap (m_module);
-    default           : throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method.");
-    }
-}
-
-
-eap::config_method_with_cred* eap::config_method_ttls::make_config_method(_In_ const wchar_t *eap_type) const
-{
-    if (_wcsicmp(eap_type, L"EAP-TLS") == 0)
-        return new config_method_tls(m_module);
-    else if (_wcsicmp(eap_type, L"EAP-TTLS") == 0)
-        return new config_method_ttls(m_module);
-    else if (_wcsicmp(eap_type, L"PAP") == 0)
-        return new config_method_pap(m_module);
-    else
-        throw invalid_argument(__FUNCTION__ " Unsupported inner authentication method.");
-}
-
-
 wstring eap::config_method_ttls::get_public_identity(const credentials_ttls &cred) const
 {
     if (m_anonymous_identity.empty()) {

lib/TTLS/src/Credentials.cpp

@@ -79,13 +79,14 @@ eap::config* eap::credentials_ttls::clone() const
 void eap::credentials_ttls::clear()
 {
     credentials_tls::clear();
-    m_inner->clear();
+    if (m_inner)
+        m_inner->clear();
 }
 
 
 bool eap::credentials_ttls::empty() const
 {
-    return credentials_tls::empty() && m_inner->empty();
+    return credentials_tls::empty() && (!m_inner || m_inner->empty());
 }
 
 
@@ -99,15 +100,17 @@ void eap::credentials_ttls::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *p
     const bstr bstrNamespace(L"urn:ietf:params:xml:ns:yang:ietf-eap-metadata");
     HRESULT hr;
 
-    // <InnerAuthenticationMethod>
+    if (m_inner) {
-    winstd::com_obj<IXMLDOMElement> pXmlElInnerAuthenticationMethod;
+        // <InnerAuthenticationMethod>
-    if (FAILED(hr = eapxml::create_element(pDoc, winstd::bstr(L"InnerAuthenticationMethod"), bstrNamespace, &pXmlElInnerAuthenticationMethod)))
+        winstd::com_obj<IXMLDOMElement> pXmlElInnerAuthenticationMethod;
-        throw com_runtime_error(hr, __FUNCTION__ " Error creating <InnerAuthenticationMethod> element.");
+        if (FAILED(hr = eapxml::create_element(pDoc, winstd::bstr(L"InnerAuthenticationMethod"), bstrNamespace, &pXmlElInnerAuthenticationMethod)))
+            throw com_runtime_error(hr, __FUNCTION__ " Error creating <InnerAuthenticationMethod> element.");
 
-    m_inner->save(pDoc, pXmlElInnerAuthenticationMethod);
+        m_inner->save(pDoc, pXmlElInnerAuthenticationMethod);
 
-    if (FAILED(hr = pConfigRoot->appendChild(pXmlElInnerAuthenticationMethod, NULL)))
+        if (FAILED(hr = pConfigRoot->appendChild(pXmlElInnerAuthenticationMethod, NULL)))
-        throw com_runtime_error(hr, __FUNCTION__ " Error appending <InnerAuthenticationMethod> element.");
+            throw com_runtime_error(hr, __FUNCTION__ " Error appending <InnerAuthenticationMethod> element.");
+    }
 }
 
 
@@ -118,85 +121,117 @@ void eap::credentials_ttls::load(_In_ IXMLDOMNode *pConfigRoot)
 
     credentials_tls::load(pConfigRoot);
 
-    // Load inner credentials.
+    // TODO: For the time being, there is no detection what type is inner method. Introduce one!
-    com_obj<IXMLDOMNode> pXmlElInnerAuthenticationMethod;
+    if (m_inner) {
-    if (SUCCEEDED(hr = eapxml::select_node(pConfigRoot, bstr(L"eap-metadata:InnerAuthenticationMethod"), &pXmlElInnerAuthenticationMethod)))
+        com_obj<IXMLDOMNode> pXmlElInnerAuthenticationMethod;
+        if (FAILED(hr = eapxml::select_node(pConfigRoot, bstr(L"eap-metadata:InnerAuthenticationMethod"), &pXmlElInnerAuthenticationMethod)))
+            throw com_runtime_error(hr, __FUNCTION__ " Error selecting <InnerAuthenticationMethod> element.");
+
         m_inner->load(pXmlElInnerAuthenticationMethod);
-    else
+    }
-        m_inner->clear();
 }
 
 
 void eap::credentials_ttls::operator<<(_Inout_ cursor_out &cursor) const
 {
     credentials_tls::operator<<(cursor);
-    cursor << *m_inner;
+    if (m_inner) {
+        if (dynamic_cast<credentials_pap*>(m_inner.get())) {
+            cursor << eap_type_pap;
+            cursor << *m_inner;
+        } else {
+            assert(0); // Unsupported inner authentication method type.
+            cursor << eap_type_undefined;
+        }
+    } else
+        cursor << eap_type_undefined;
 }
 
 
 size_t eap::credentials_ttls::get_pk_size() const
 {
+    size_t size_inner;
+    if (m_inner) {
+        if (dynamic_cast<credentials_pap*>(m_inner.get())) {
+            size_inner =
+                pksizeof(eap_type_pap) +
+                pksizeof(*m_inner);
+        } else {
+            assert(0); // Unsupported inner authentication method type.
+            size_inner = pksizeof(eap_type_undefined);
+        }
+    } else
+        size_inner = pksizeof(eap_type_undefined);
+
     return
         credentials_tls::get_pk_size() +
-        pksizeof(*m_inner);
+        size_inner;
 }
 
 
 void eap::credentials_ttls::operator>>(_Inout_ cursor_in &cursor)
 {
     credentials_tls::operator>>(cursor);
-    cursor >> *m_inner;
+
+    eap_type_t eap_type;
+    cursor >> eap_type;
+    switch (eap_type) {
+        case eap_type_pap:
+            m_inner.reset(new credentials_pap(m_module));
+            cursor >> *m_inner;
+            break;
+        default:
+            assert(0); // Unsupported inner authentication method type.
+            m_inner.reset(nullptr);
+    }
 }
 
 
 void eap::credentials_ttls::store(_In_z_ LPCTSTR pszTargetName) const
 {
-    assert(0); // Not that we would ever store inner&outer credentials to Windows Credential Manager joined, but for completness sake... Here we go:
-
     credentials_tls::store(pszTargetName);
 
-    m_inner->store(pszTargetName);
+    if (m_inner)
+        m_inner->store(pszTargetName);
 }
 
 
 void eap::credentials_ttls::retrieve(_In_z_ LPCTSTR pszTargetName)
 {
-    assert(0); // Not that we would ever retrieve inner&outer credentials to Windows Credential Manager joined, but for completness sake... Here we go:
-
     credentials_tls::retrieve(pszTargetName);
 
-    m_inner->retrieve(pszTargetName);
+    if (m_inner)
+        m_inner->retrieve(pszTargetName);
 }
 
 
-wstring eap::credentials_ttls::get_identity() const
+LPCTSTR eap::credentials_ttls::target_suffix() const
+{
+    assert(0); // Not that we would ever store inner&outer credentials to Windows Credential Manager joined, but for completness sake... Here we go:
+    return _T("TTLS");
+}
+
+
+std::wstring eap::credentials_ttls::get_identity() const
 {
     // Outer identity has the right-of-way.
-    wstring identity(credentials_tls::get_identity());
+    if (!credentials_tls::empty())
-    if (!identity.empty())
+        return credentials_tls::get_identity();
-        return identity;
 
     // Inner identity.
-    return m_inner->get_identity();
+    if (m_inner)
+        return m_inner->get_identity();
+
+    return L"";
 }
 
 
-eap::credentials::source_t eap::credentials_ttls::combine(
+pair<eap::credentials::source_t, eap::credentials::source_t> eap::credentials_ttls::combine(
-    _In_       const credentials             *cred_cached,
+    _In_       const credentials_ttls   *cred_cached,
-    _In_       const config_method_with_cred &cfg,
+    _In_       const config_method_ttls &cfg,
-    _In_opt_z_       LPCTSTR                 pszTargetName)
+    _In_opt_z_       LPCTSTR            pszTargetName)
 {
-    // Combine outer credentials.
+    return pair<source_t, source_t>(
-    source_t src_outer = credentials_tls::combine(
+        credentials_tls::combine(cred_cached, cfg, pszTargetName),
-        cred_cached,
+        dynamic_cast<const credentials_pap*>(m_inner.get()) ? ((credentials_pap*)m_inner.get())->combine(cred_cached ? (credentials_pap*)cred_cached->m_inner.get() : NULL, (const config_method_pap&)*cfg.m_inner, pszTargetName) : source_unknown);
-        cfg,
-        pszTargetName);
-
-    // Combine inner credentials.
-    source_t src_inner = m_inner->combine(
-        cred_cached ? ((const credentials_ttls*)cred_cached)->m_inner.get() : NULL,
-        *((const config_method_ttls&)cfg).m_inner,
-        pszTargetName);
-
-    return std::min<source_t>(src_outer, src_inner);
 }

lib/TTLS/src/Method.cpp

@@ -28,7 +28,7 @@ using namespace winstd;
 // eap::method_ttls
 //////////////////////////////////////////////////////////////////////
 
-eap::method_ttls::method_ttls(_In_ module &module, _In_ config_connection &cfg, _In_ credentials_ttls &cred) :
+eap::method_ttls::method_ttls(_In_ module &module, _In_ config_provider_list &cfg, _In_ credentials_ttls &cred) :
     m_cred(cred),
     m_version(version_0),
     method_tls(module, cfg, cred)
@@ -72,7 +72,6 @@ void eap::method_ttls::process_request_packet(
     // Do the TLS.
     method_tls::process_request_packet(pReceivedPacket, dwReceivedPacketSize, pEapOutput);
 
-#if EAP_TLS < EAP_TLS_SCHANNEL
     if (m_phase == phase_application_data) {
         // Send inner authentication.
         if (!m_state_client.m_alg_encrypt)
@@ -85,8 +84,10 @@ void eap::method_ttls::process_request_packet(
         m_packet_res.m_flags = 0;
         sanitizing_blob msg_application(make_message(tls_message_type_application_data, make_pap_client()));
         m_packet_res.m_data.insert(m_packet_res.m_data.end(), msg_application.begin(), msg_application.end());
+
+        pEapOutput->fAllowNotifications = FALSE;
+        pEapOutput->action = EapPeerMethodResponseActionSend;
     }
-#endif
 }
 
 
@@ -125,30 +126,18 @@ void eap::method_ttls::get_result(
 
         case EapPeerMethodResultFailure:
             m_module.log_event(&EAPMETHOD_TTLS_INNER_FAILURE, event_data((unsigned int)eap_type_ttls), event_data::blank);
-
+            cfg_method->m_inner->m_auth_failed = true;
-            // Mark credentials as failed, so GUI can re-prompt user.
-            // But be careful: do so only if this happened after transition from handshake to application data phase.
-            cfg_method->m_inner->m_auth_failed = m_phase_prev < phase_application_data;
             break;
 
         default:
             throw win_runtime_error(ERROR_NOT_SUPPORTED, __FUNCTION__ " Not supported.");
         }
 
-#if EAP_TLS >= EAP_TLS_SCHANNEL
-        // EAP-TTLS uses different label in PRF for MSK derivation than EAP-TLS.
-        static const DWORD s_key_id = 0x01; // EAP-TTLSv0 Keying Material
-        static const SecPkgContext_EapPrfInfo s_prf_info = { 0, sizeof(s_key_id), (PBYTE)&s_key_id };
-        SECURITY_STATUS status = SetContextAttributes(m_sc_ctx, SECPKG_ATTR_EAP_PRF_INFO, (void*)&s_prf_info, sizeof(s_prf_info));
-        if (FAILED(status))
-            throw sec_runtime_error(status, __FUNCTION__ "Error setting EAP-TTLS PRF in Schannel.");
-#endif
-
         // The TLS was OK.
         method_tls::get_result(EapPeerMethodResultSuccess, ppResult);
 
-        // Do not report failure to EapHost, as it will not save updated configuration then. But we need it to save it, to alert user on next connection attempt.
+        // Do not report failure to EAPHost, as it will not save updated configuration then. But we need it to save it, to alert user on next connection attempt.
-        // EapHost is well aware of the failed condition.
+        // EAPHost is well aware of the failed condition.
         //if (reason == EapPeerMethodResultFailure) {
         //    ppResult->fIsSuccess = FALSE;
         //    ppResult->dwFailureReasonCode = EAP_E_AUTHENTICATION_FAILED;
@@ -157,8 +146,6 @@ void eap::method_ttls::get_result(
 }
 
 
-#if EAP_TLS < EAP_TLS_SCHANNEL
-
 void eap::method_ttls::derive_msk()
 {
     //
@@ -192,57 +179,6 @@ void eap::method_ttls::derive_msk()
     _key_block += sizeof(tls_random);
 }
 
-#else
-
-void eap::method_ttls::process_application_data(_In_bytecount_(size_msg) const void *msg, _In_ size_t size_msg)
-{
-    UNREFERENCED_PARAMETER(msg);
-    UNREFERENCED_PARAMETER(size_msg);
-
-    // Prepare inner authentication.
-    if (!(m_sc_ctx.m_attrib & ISC_RET_CONFIDENTIALITY))
-        throw runtime_error(__FUNCTION__ " Refusing to send credentials unencrypted.");
-
-    m_module.log_event(&EAPMETHOD_TTLS_INNER_CRED, event_data((unsigned int)eap_type_ttls), event_data(m_cred.m_inner->get_name()), event_data::blank);
-
-    SECURITY_STATUS status;
-
-    // Get maximum message sizes.
-    SecPkgContext_StreamSizes sizes;
-    status = QueryContextAttributes(m_sc_ctx, SECPKG_ATTR_STREAM_SIZES, &sizes);
-    if (FAILED(status))
-        throw sec_runtime_error(status, __FUNCTION__ " Error getting Schannel required encryption sizes.");
-
-    // Make PAP message.
-    sanitizing_blob msg_pap(make_pap_client());
-    assert(msg_pap.size() < sizes.cbMaximumMessage);
-    unsigned long size_data = std::min<unsigned long>(sizes.cbMaximumMessage, (unsigned long)msg_pap.size()); // Truncate
-
-    sanitizing_blob data(sizes.cbHeader + size_data + sizes.cbTrailer, 0);
-    memcpy(data.data() + sizes.cbHeader, msg_pap.data(), size_data);
-
-    // Prepare input/output buffer(s).
-    SecBuffer buf[] = {
-        {  sizes.cbHeader, SECBUFFER_STREAM_HEADER , data.data()                              },
-        {       size_data, SECBUFFER_DATA          , data.data() + sizes.cbHeader             },
-        { sizes.cbTrailer, SECBUFFER_STREAM_TRAILER, data.data() + sizes.cbHeader + size_data },
-        {               0, SECBUFFER_EMPTY         , NULL                                     },
-    };
-    SecBufferDesc buf_desc = {
-        SECBUFFER_VERSION,
-        _countof(buf),
-        buf
-    };
-
-    // Encrypt the message.
-    status = EncryptMessage(m_sc_ctx, 0, &buf_desc, 0);
-    if (FAILED(status))
-        throw sec_runtime_error(status, __FUNCTION__ " Error encrypting message.");
-    m_packet_res.m_data.insert(m_packet_res.m_data.end(), (const unsigned char*)buf[0].pvBuffer, (const unsigned char*)buf[0].pvBuffer + buf[0].cbBuffer + buf[1].cbBuffer + buf[2].cbBuffer);
-}
-
-#endif
-
 
 eap::sanitizing_blob eap::method_ttls::make_pap_client() const
 {

lib/TTLS/src/Module.cpp

@@ -74,12 +74,12 @@ void eap::peer_ttls::get_identity(
     assert(ppwszIdentity);
 
     // Unpack configuration.
-    config_connection cfg(*this);
+    config_provider_list cfg(*this);
     unpack(cfg, pConnectionData, dwConnectionDataSize);
-
-    // Get method configuration.
     if (cfg.m_providers.empty() || cfg.m_providers.front().m_methods.empty())
         throw invalid_argument(__FUNCTION__ " Configuration has no providers and/or methods.");
+
+    // Get method configuration.
     const config_provider &cfg_prov(cfg.m_providers.front());
     const config_method_ttls *cfg_method = dynamic_cast<const config_method_ttls*>(cfg_prov.m_methods.front().get());
     assert(cfg_method);
@@ -87,36 +87,39 @@ void eap::peer_ttls::get_identity(
 #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE
     // Unpack cached credentials.
     credentials_ttls cred_in(*this);
-    if (dwUserDataSize) {
+    if (dwUserDataSize)
-        cred_in.m_inner.reset(cfg_method->m_inner->make_credentials());
         unpack(cred_in, pUserData, dwUserDataSize);
-    }
 #else
     UNREFERENCED_PARAMETER(pUserData);
     UNREFERENCED_PARAMETER(dwUserDataSize);
 #endif
 
     credentials_ttls cred_out(*this);
-    cred_out.m_inner.reset(cfg_method->m_inner->make_credentials());
 
-    // Assume no UI will be necessary.
+    // Determine inner credential type.
-    *pfInvokeUI = FALSE;
+    eap_type_t type_inner;
+    if (dynamic_cast<const config_method_pap*>(cfg_method->m_inner.get())) {
+        cred_out.m_inner.reset(new credentials_pap(*this));
+        type_inner = eap_type_pap;
+    } else {
+        assert(0); // Unsupported inner authentication method type.
+        type_inner = eap_type_undefined;
+    }
 
     {
         // Combine credentials.
         user_impersonator impersonating(hTokenImpersonateUser);
-        eap::credentials::source_t cred_source = cred_out.combine(
+        pair<eap::credentials::source_t, eap::credentials::source_t> cred_source(cred_out.combine(
 #ifdef EAP_USE_NATIVE_CREDENTIAL_CACHE
             &cred_in,
 #else
             NULL,
 #endif
             *cfg_method,
-            (dwFlags & EAP_FLAG_GUEST_ACCESS) == 0 ? cfg_prov.m_id.c_str() : NULL);
+            (dwFlags & EAP_FLAG_GUEST_ACCESS) == 0 ? cfg_prov.m_id.c_str() : NULL));
 
         // If either of credentials is unknown, request UI.
-        if (cred_source == eap::credentials::source_unknown)
+        *pfInvokeUI = cred_source.first == eap::credentials::source_unknown || cred_source.second == eap::credentials::source_unknown ? TRUE : FALSE;
-            *pfInvokeUI = TRUE;
     }
 
     if (*pfInvokeUI) {
@@ -141,7 +144,7 @@ void eap::peer_ttls::get_identity(
 
     if (cfg_method->m_inner->m_auth_failed) {
         // Inner: Credentials failed on last connection attempt.
-        log_event(&EAPMETHOD_TRACE_EVT_CRED_PROBLEM, event_data((unsigned int)cfg_method->m_inner->get_method_id()), event_data::blank);
+        log_event(&EAPMETHOD_TRACE_EVT_CRED_PROBLEM, event_data((unsigned int)type_inner), event_data::blank);
         *pfInvokeUI = TRUE;
         return;
     }
@@ -248,15 +251,7 @@ EAP_SESSION_HANDLE eap::peer_ttls::begin_session(
     // Unpack configuration.
     unpack(s->m_cfg, pConnectionData, dwConnectionDataSize);
 
-    // Get method configuration.
-    if (s->m_cfg.m_providers.empty() || s->m_cfg.m_providers.front().m_methods.empty())
-        throw invalid_argument(__FUNCTION__ " Configuration has no providers and/or methods.");
-    const config_provider &cfg_prov(s->m_cfg.m_providers.front());
-    const config_method_ttls *cfg_method = dynamic_cast<const config_method_ttls*>(cfg_prov.m_methods.front().get());
-    assert(cfg_method);
-
     // Unpack credentials.
-    s->m_cred.m_inner.reset(cfg_method->m_inner->make_credentials());
     unpack(s->m_cred, pUserData, dwUserDataSize);
 
     // Initialize method.

lib/TTLS/src/StdAfx.h

@@ -25,12 +25,8 @@
 #include "../include/Method.h"
 #include "../include/Module.h"
 
-#include "../../PAP/include/Config.h"
-#include "../../PAP/include/Credentials.h"
-
 #include "../../EAPBase/include/EAPXML.h"
 
 #include <WinStd/EAP.h>
 
 #include <EapHostError.h>
-#include <schannel.h>

lib/TTLS_UI/include/TTLS_UI.h

@@ -40,7 +40,6 @@ class wxTTLSCredentialsPanel;
 #include "../../TLS_UI/include/TLS_UI.h"
 
 #include "../../TTLS/include/Config.h"
-#include "../../PAP/include/Config.h"
 
 #include <WinStd/Win.h>
 
@@ -69,6 +68,8 @@ protected:
 protected:
     const eap::config_provider &m_prov; ///< EAP provider
     eap::config_method_ttls &m_cfg;     ///< TTLS configuration
+    winstd::library m_shell32;          ///< shell32.dll resource library reference
+    wxIcon m_icon;                      ///< Panel icon
 };
 
 
@@ -76,19 +77,14 @@ class wxTTLSConfigWindow : public wxEAPConfigWindow
 {
 public:
     ///
-    /// Constructs a configuration window
+    /// Constructs a configuration panel
     ///
     /// \param[in]    prov           Provider configuration data
     /// \param[inout] cfg            Configuration data
     /// \param[in]    pszCredTarget  Target name of credentials in Windows Credential Manager. Can be further decorated to create final target name.
     /// \param[in]    parent         Parent window
     ///
-    wxTTLSConfigWindow(eap::config_provider &prov, eap::config_method &cfg, LPCTSTR pszCredTarget, wxWindow* parent);
+    wxTTLSConfigWindow(const eap::config_provider &prov, eap::config_method &cfg, LPCTSTR pszCredTarget, wxWindow* parent);
-
-    ///
-    /// Destructs the configuration window
-    ///
-    virtual ~wxTTLSConfigWindow();
 
 protected:
     /// \cond internal
@@ -137,12 +133,12 @@ protected:
     /// \endcond
 
 public:
-    wxTLSCredentialsPanel *m_outer_cred;        ///< Outer credentials panel
+    wxTLSCredentialsPanel *m_outer_cred;    ///< Outer credentials panel
-    wxEAPCredentialsPanelBase *m_inner_cred;    ///< Inner credentials panel
+    wxPanel *m_inner_cred;                  ///< Inner credentials panel
 
 protected:
-    const eap::config_provider &m_prov;         ///< EAP provider
+    const eap::config_provider &m_prov;     ///< EAP provider
-    const eap::config_method_ttls &m_cfg;       ///< TTLS configuration
+    const eap::config_method_ttls &m_cfg;   ///< TTLS configuration
-    wxStaticText *m_outer_title;                ///< Outer authentication title
+    wxStaticText *m_outer_title;            ///< Outer authentication title
-    wxStaticText *m_inner_title;                ///< Inner authentication title
+    wxStaticText *m_inner_title;            ///< Inner authentication title
 };

lib/TTLS_UI/res/wxTTLS_UI.cpp

@@ -32,7 +32,7 @@ wxTTLSConfigPanelBase::wxTTLSConfigPanelBase( wxWindow* parent, wxWindowID id, c
 	wxBoxSizer* sb_outer_identity_radio;
 	sb_outer_identity_radio = new wxBoxSizer( wxVERTICAL );
 	
-	m_outer_identity_same = new wxRadioButton( sb_outer_identity->GetStaticBox(), wxID_ANY, _("&True identity"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
+	m_outer_identity_same = new wxRadioButton( sb_outer_identity->GetStaticBox(), wxID_ANY, _("&Same as inner identity"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
 	m_outer_identity_same->SetToolTip( _("Use my true user name") );
 	
 	sb_outer_identity_radio->Add( m_outer_identity_same, 1, wxEXPAND, 5 );