Version set to 1.1-beta

- Some minor issues stumbled upon fixed
- WIN1250 >> UTF-8

Doxyfile

@@ -51,7 +51,7 @@ PROJECT_BRIEF          = "EAP Supplicant for Windows"
 # and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
 # to the output directory.
 
-PROJECT_LOGO           =
+PROJECT_LOGO           = include\icon_ui.ico
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
 # into which the generated documentation will be written. If a relative path is
@@ -694,7 +694,7 @@ CITE_BIB_FILES         =
 # messages are off.
 # The default value is: NO.
 
-QUIET                  = NO
+QUIET                  = YES
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
 # generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
@@ -718,7 +718,7 @@ WARN_IF_UNDOCUMENTED   = YES
 # markup commands wrongly.
 # The default value is: YES.
 
-WARN_IF_DOC_ERROR      = NO
+WARN_IF_DOC_ERROR      = YES
 
 # This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
 # are documented, but have no documentation for their parameters or return
@@ -790,10 +790,16 @@ RECURSIVE              = YES
 # run.
 
 EXCLUDE                = \
+	CredWrite\README.md \
+	EventMonitor\res \
 	lib\EAPBase_UI\res \
+	lib\EapHost_UI\res \
 	lib\TLS_UI\res \
 	lib\TTLS_UI\res \
-	lib\WinStd
+	lib\WinStd \
+	lib\wxExtend \
+	MsiUseFeature\README.md \
+	WLANManager\README.md
 
 # The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
 # directories that are symbolic links (a Unix file system feature) are excluded

EAPMethods/EAPTTLS/EAPTTLS.vcxproj

@@ -97,6 +97,9 @@
     <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
       <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
+      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>

EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj

@@ -100,6 +100,12 @@
     <ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
       <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\EapHost\build\EapHost.vcxproj">
+      <Project>{b385ec2b-c3f4-48bb-9bac-8b996de7f754}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\EapHost_UI\build\EapHost_UI.vcxproj">
+      <Project>{13d2d8b5-f6aa-459d-b5f7-29b95dd9d583}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
@@ -130,6 +136,9 @@
     <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\wxExtend\build\wxExtendLib.vcxproj">
+      <Project>{d3e29951-d9f5-486d-a167-20ae8e90b1fa}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\build\EAPMethodUI.def" />

EAPMethods/locale/EAPMethods.pot

@@ -2,23 +2,24 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EAPMethods\n"
-"POT-Creation-Date: 2016-09-28 13:27+0200\n"
+"POT-Creation-Date: 2016-11-07 12:40+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: ../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: lib/EAPBase_UI\n"
-"X-Poedit-SearchPath-1: lib/MSCHAPv2_UI\n"
-"X-Poedit-SearchPath-2: lib/PAP_UI\n"
-"X-Poedit-SearchPath-3: lib/TLS_UI\n"
-"X-Poedit-SearchPath-4: lib/TTLS_UI\n"
-"X-Poedit-SearchPath-5: EAPMethods\n"
+"X-Poedit-SearchPath-1: lib/EapHost_UI\n"
+"X-Poedit-SearchPath-2: lib/MSCHAPv2_UI\n"
+"X-Poedit-SearchPath-3: lib/PAP_UI\n"
+"X-Poedit-SearchPath-4: lib/TLS_UI\n"
+"X-Poedit-SearchPath-5: lib/TTLS_UI\n"
+"X-Poedit-SearchPath-6: EAPMethods\n"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
@@ -44,7 +45,7 @@ msgstr ""
 msgid "Opens dialog with provider settings"
 msgstr ""
 
-#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
+#: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:665
 #, c-format
 msgid "%s User Credentials"
 msgstr ""
@@ -211,66 +212,102 @@ msgstr ""
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:97
+#: lib/EAPBase_UI/src/EAP_UI.cpp:103
 #, c-format
 msgid "%s Credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
-#: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
-msgid "EAP Credentials"
-msgstr ""
-
-#: lib/EAPBase_UI/src/EAP_UI.cpp:165
+#: lib/EAPBase_UI/src/EAP_UI.cpp:139
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:166
+#: lib/EAPBase_UI/src/EAP_UI.cpp:140
 msgid "your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:185
+#: lib/EAPBase_UI/src/EAP_UI.cpp:159
 msgid "Open the default web browser"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:196
+#: lib/EAPBase_UI/src/EAP_UI.cpp:170
 msgid "Open your e-mail program"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:207
+#: lib/EAPBase_UI/src/EAP_UI.cpp:181
 msgid "Dial the phone number"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:227
+#: lib/EAPBase_UI/src/EAP_UI.cpp:203
 #, 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:228
+#: lib/EAPBase_UI/src/EAP_UI.cpp:204
 msgid "Your provider"
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:249
+#: lib/EAPBase_UI/src/EAP_UI.cpp:225
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:250
+#: lib/EAPBase_UI/src/EAP_UI.cpp:226
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:251
+#: lib/EAPBase_UI/src/EAP_UI.cpp:227
 msgid "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:252
+#: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Previous attempt to connect failed."
 msgstr ""
 
-#: lib/EAPBase_UI/src/EAP_UI.cpp:253
+#: lib/EAPBase_UI/src/EAP_UI.cpp:229
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
 
+#: lib/EAPBase_UI/src/EAP_UI.cpp:250
+#, c-format
+msgid "The %s version installed on this computer logs credentials in visible and easy to read way."
+msgstr ""
+
+#: lib/EAPBase_UI/src/EAP_UI.cpp:251
+msgid "Please, reconsider necessity to enter your credentials."
+msgstr ""
+
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:17
+msgid "Inner EAP Method"
+msgstr ""
+
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:28
+msgid "Select and configure inner EAP method"
+msgstr ""
+
+#: lib/EapHost_UI/res/wxEapHost_UI.cpp:40
+msgid "&Settings"
+msgstr ""
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:59
+#, c-format
+msgid "Enumerating EAP methods failed (error %u, %s, %s)."
+msgstr ""
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:61
+#, c-format
+msgid "Enumerating EAP methods failed (error %u)."
+msgstr ""
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:136
+#, c-format
+msgid "Configuring EAP method failed (error %u, %s, %s)."
+msgstr ""
+
+#: lib/EapHost_UI/src/EapHost_UI.cpp:138
+#, c-format
+msgid "Configuring EAP method failed (error %u)."
+msgstr ""
+
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
 msgstr ""
@@ -331,7 +368,7 @@ msgstr ""
 msgid "(Example: foo.bar.com;server2.bar.com)"
 msgstr ""
 
-#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
+#: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:325
 msgid "User Certificate"
 msgstr ""
 
@@ -351,46 +388,37 @@ msgstr ""
 msgid "Your identity (username@domain) to override one from certificate; or blank to use one provided in certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:118
-#, c-format
-msgid "Invalid character in host name found: %c"
-msgstr ""
-
-#: lib/TLS_UI/src/TLS_UI.cpp:118
-msgid "Validation conflict"
-msgstr ""
-
-#: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
-#: lib/EAPBase_UI/include/EAP_UI.h:778
+#: lib/TLS_UI/src/TLS_UI.cpp:61 lib/EAPBase_UI/include/EAP_UI.h:861
+#: lib/EAPBase_UI/include/EAP_UI.h:870
 msgid "<empty>"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:500
+#: lib/TLS_UI/src/TLS_UI.cpp:252
 msgid "Add Certificate"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:501
+#: lib/TLS_UI/src/TLS_UI.cpp:253
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:502
+#: lib/TLS_UI/src/TLS_UI.cpp:254
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:503
+#: lib/TLS_UI/src/TLS_UI.cpp:255
 msgid "PKCS #7 Certificate Files (*.p7b)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:504
+#: lib/TLS_UI/src/TLS_UI.cpp:256
 msgid "All Files (*.*)"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:520
+#: lib/TLS_UI/src/TLS_UI.cpp:270
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
 msgstr ""
 
-#: lib/TLS_UI/src/TLS_UI.cpp:520
+#: lib/TLS_UI/src/TLS_UI.cpp:270
 msgid "Error"
 msgstr ""
 
@@ -430,77 +458,99 @@ msgstr ""
 msgid "Custom outer identity to use"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
-#: lib/EAPBase_UI/include/EAP_UI.h:696
+#: lib/TTLS_UI/src/Module.cpp:262 lib/TTLS_UI/src/Module.cpp:318
+#: lib/EAPBase_UI/include/EAP_UI.h:784
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
 
-#: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
-#: lib/EAPBase_UI/include/EAP_UI.h:699
+#: lib/TTLS_UI/src/Module.cpp:264 lib/TTLS_UI/src/Module.cpp:320
+#: lib/EAPBase_UI/include/EAP_UI.h:787
 msgid "Writing credentials failed."
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
+#: lib/TTLS_UI/src/Module.cpp:355
+#, c-format
+msgid "Invoking EAP identity UI failed (error %u, %s, %s)."
+msgstr ""
+
+#: lib/TTLS_UI/src/Module.cpp:357
+#, c-format
+msgid "Invoking EAP identity UI failed (error %u)."
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:117
 msgid "Inner Authentication"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
-msgid "Outer Authentication"
-msgstr ""
-
-#: lib/TTLS_UI/src/TTLS_UI.cpp:187
+#: lib/TTLS_UI/src/TTLS_UI.cpp:123
 msgid "Select inner authentication method from the list"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:189
+#: lib/TTLS_UI/src/TTLS_UI.cpp:125
 msgid "PAP"
 msgstr ""
 
-#: lib/TTLS_UI/src/TTLS_UI.cpp:191
+#: lib/TTLS_UI/src/TTLS_UI.cpp:127
 msgid "MSCHAPv2"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:292
-#, c-format
-msgid "Are you sure you want to permanently remove %ls provider from configuration?"
+#: lib/TTLS_UI/src/TTLS_UI.cpp:129
+msgid "EAP-MSCHAPv2"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:292
+#: lib/TTLS_UI/src/TTLS_UI.cpp:132
+msgid "Other EAP methods..."
+msgstr ""
+
+#: lib/TTLS_UI/src/TTLS_UI.cpp:138
+msgid "Outer Authentication"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:284
+#, c-format
+msgid "Are you sure you want to permanently remove %s provider from configuration?"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:284
 msgid "Warning"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:552
+#: lib/EAPBase_UI/include/EAP_UI.h:362 lib/EAPBase_UI/res/wxEAP_UI.h:119
+msgid "EAP Credentials"
+msgstr ""
+
+#: lib/EAPBase_UI/include/EAP_UI.h:632
 msgid "Provider Settings"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:717
+#: lib/EAPBase_UI/include/EAP_UI.h:807
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:754
+#: lib/EAPBase_UI/include/EAP_UI.h:846
 #, c-format
 msgid "<error %u>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:758
+#: lib/EAPBase_UI/include/EAP_UI.h:850
 msgid "<error>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
+#: lib/EAPBase_UI/include/EAP_UI.h:861 lib/EAPBase_UI/include/EAP_UI.h:870
 msgid "<blank ID>"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:820
+#: lib/EAPBase_UI/include/EAP_UI.h:910
 msgid "&Remember"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:821
+#: lib/EAPBase_UI/include/EAP_UI.h:911
 msgid "Check if you would like to save credentials"
 msgstr ""
 
-#: lib/EAPBase_UI/include/EAP_UI.h:964
+#: lib/EAPBase_UI/include/EAP_UI.h:1069
 msgid "<Your Organization>"
 msgstr ""
 
@@ -508,6 +558,10 @@ msgstr ""
 msgid "EAP Connection Configuration"
 msgstr ""
 
+#: lib/EAPBase_UI/res/wxEAP_UI.h:312
+msgid "EAP Identity Provider"
+msgstr ""
+
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4

EAPMethods/locale/bg_BG.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EAPMethods\n"
 "POT-Creation-Date: 2016-09-28 13:27+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
+"Last-Translator: University of Ruse <support@uni-ruse.bg>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,133 +25,152 @@ msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
-msgstr ""
+msgstr "Добавяне на нов доставчик"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
-msgstr ""
+msgstr "Премахване на избрания доставчик"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
-msgstr ""
+msgstr "За напреднали ..."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
 msgid "Opens dialog with provider settings"
-msgstr ""
+msgstr "Отваряне на диалог за настройки на доставчика"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
 #, c-format
 msgid "%s User Credentials"
-msgstr ""
+msgstr "%s Удостоверения за самолочност на потребителя"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
+"Изберете източника, съхраняващ Вашите удостоверения за самоличност за "
+"свързване."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager:"
-msgstr ""
+msgstr "Използвайте удостоверения за самоличност от Credential &Manager:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
+"Изберете тази опция, ако желаете да използвате удостоверения за "
+"самосличност, съхранявани в Windows Credential Manager"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
+"Вашите настоящи удостоверения за самоличност са съхранени в Windows "
+"Credential Manager"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
-msgstr ""
+msgstr "&Изчистете удостоверенията за самоличност"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
+"Кликнете, за да изчистите Вашите удостоверения за самоличност от  Credential Manager.\n"
+"\n"
+"Забележка: Когато се свързвате, ще Ви бъде поискано да въведете удостоверения за самоличност."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
-msgstr ""
+msgstr "&Настройте удостоверения за самоличност ..."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
 msgstr ""
+"Кликнете тук, за да настроите или модифицирате Вашите удостоверения за "
+"самоличност"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Use credentials from &profile configuration:"
 msgstr ""
+"Използвайте удостоверения за самоличност от &конфигурацията на профила:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
+"Изберете тази опция, ако желаете да съхраните удостоверенията за самоличност"
+" като част от конфигурацията на профила"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr ""
+msgstr "Конфигуриране на удостоверенията за самоличност на профила"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr ""
+msgstr "Потребителско ID и парола"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
-msgstr ""
+msgstr "Моля въведете Вашият потребителски ID и парола."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
-msgstr ""
+msgstr "Потребителско ID:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
+"Въведете Вашето потребителско име тук (user@domain.org, DOMAIN\\User, т.н.)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
-msgstr ""
+msgstr "Парола:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
-msgstr ""
+msgstr "Въведете Вашата парола тук"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
-msgstr ""
+msgstr "Вашата организация"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 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:418
 msgid "Your organization &name:"
-msgstr ""
+msgstr "Вашата организация &name:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
+"Името на организацията Ви както ще бъде изписано в контактите за помощ"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
-msgstr ""
+msgstr "(Бъдете кратки, моля)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
-msgstr ""
+msgstr "Контакти за помощ &информация:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
@@ -159,7 +178,7 @@ msgstr "¶"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
-msgstr ""
+msgstr "Уебсайт адреса за помощ"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
@@ -167,7 +186,7 @@ msgstr "*"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
-msgstr ""
+msgstr "E-mail адреса за помощ"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
@@ -175,21 +194,24 @@ msgstr ")"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
-msgstr ""
+msgstr "Телефонен номер за помощ"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
-msgstr ""
+msgstr "Доставчик на уникален идентификатор"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
 msgstr ""
+"Определете уникален ID на Вашата организация, за да разрешите споделяне на "
+"същите удостоверения за самоличност, настроени между различните мрежови "
+"профили."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
-msgstr ""
+msgstr "&Пространство от имена:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
@@ -201,62 +223,71 @@ msgstr "urn:uuid"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
-msgstr ""
+msgstr "Доставчик на уникален &идентификатор:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
+"ID на Вашата организация за определяне на същите удостоверения за "
+"самоличност от другите профили"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
-msgstr ""
+msgstr "Заключване на конфигурацията"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 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:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
+"&Заключете тази конфигурация и предотвратете всякакви по-нататъшни "
+"модификации посредством потребителския интерфейс."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
+"(Внимание: Веднъж заключен, не може да се върнете назад, използвайки този "
+"диалог!)"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
-msgstr ""
+msgstr "%s Удостоверения за самоличност"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
 msgid "EAP Credentials"
-msgstr ""
+msgstr "EAP удостоверения за самоличност"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
-msgstr ""
+msgstr "За допълнителна помощ и инструкции, моля свържете се с %s на:"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
-msgstr ""
+msgstr "Вашият доставчик"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
-msgstr ""
+msgstr "Отворете уеб браузера по подразбиране"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
-msgstr ""
+msgstr "Отворете Вашата програма за електронна поща"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
-msgstr ""
+msgstr "Наберете телефонният номер"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
@@ -264,303 +295,329 @@ msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
 "prevent accidental modification."
 msgstr ""
+"%s има предварително настроени части на тази конфигурация. Тези части са "
+"заключени, за да се предотврати инцидентно модифициране."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
-msgstr ""
+msgstr "Вашият доставчик"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
+"Предишният опит за свързване докладва невалидни удостоверения за "
+"самоличност."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
+"Предишният опит за свързване докладва, че Вашите удостоверения за "
+"самоличност са изтекли."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
+"Предишният опит за свързване докладва, че Вашите удостоверения за "
+"самоличност са били променени."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
-msgstr ""
+msgstr "Предишният опит за свързване е неуспешен."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
+"Моля уверете се, че удостоверенията Ви за самоличност са коректни или "
+"опитайте отново по-късно."
 
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr ""
+msgstr "MSCHAPv2 потребителски ID и парола"
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr ""
+msgstr "PAP потребителски ID и парола"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
-msgstr ""
+msgstr "Верен сървър"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:28
 msgid ""
 "Describe the servers you trust to prevent credential interception in case of"
 " man-in-the-middle attacks."
 msgstr ""
+"Опишете сървърите, на които вярвате, за да предотвратите прихващане на "
+"удостоверения за самоличност, в случай на man-in-the-middle атаки."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
-msgstr ""
+msgstr "Допустими Certificate Authorities:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:40
 msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
 msgstr ""
+"Сертификатът на сървъра трябва да бъде издаден от един от изброените тук "
+"certificate authorities"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
-msgstr ""
+msgstr "Добавете CA от ..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:48
 msgid ""
 "Adds a new certificate authority from the certificate store to the list"
 msgstr ""
+"Добавяне към списъка на нов certificate authority от хранилището със "
+"сертификати"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
-msgstr ""
+msgstr "Добавете CA от файл ..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:53
 msgid "Adds a new certificate authority from the file to the list"
-msgstr ""
+msgstr "Добавяне към списъка на нов certificate authority от файл"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
-msgstr ""
+msgstr "&Премахнете CA"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
-msgstr ""
+msgstr "Премахване на избраните certificate authorities от списъка"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
-msgstr ""
+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"
 msgstr ""
+"Допустимите FQDN имена на сървъри са разделени с точка и запетая; оставете "
+"непопълнено, за да пропуснете проверката на името; позволени са уникод "
+"символи"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
-msgstr ""
+msgstr "(Например: foo.bar.com;server2.bar.com)"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr ""
+msgstr "Потребителски сертификат"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
-msgstr ""
+msgstr "Моля изберете Вашия &сертификат, за да се аутентикирате."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
-msgstr ""
+msgstr "Клиентски сертификат за аутентикация"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
-msgstr ""
+msgstr "Клиентска &самоличност:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
 msgstr ""
+"Вашата самоличност (username@domain) да препокрие един от сертификатите; или"
+" оставете непопълнено, за да използвате една от предоставените в сертификата"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 #, c-format
 msgid "Invalid character in host name found: %c"
-msgstr ""
+msgstr "Открит е невалиден символ в името на хоста: %c"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
-msgstr ""
+msgstr "Проверка на конфликт"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
 #: lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<empty>"
-msgstr ""
+msgstr "<празно>"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
-msgstr ""
+msgstr "Добавете сертификат"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
-msgstr ""
+msgstr "Файлове на сертификати (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
-msgstr ""
+msgstr "X.509 файлове на сертификати (*.cer;*.crt;*.der;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
-msgstr ""
+msgstr "PKCS #7 файлови сертификати (*.p7b)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
-msgstr ""
+msgstr "Всички файлове (*.*)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
-msgstr ""
+msgstr "Невалиден или неподдържан файл на сертификат %s"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
 msgid "Outer Identity"
-msgstr ""
+msgstr "Външна самоличност"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
-msgstr ""
+msgstr "Изберете потребителски ID, за да се удостоверите:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
 msgid "&True identity"
-msgstr ""
+msgstr "&Истинска самоличност"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
 msgid "Use my true user name"
-msgstr ""
+msgstr "Използвай моето истинско потребителско име"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
 msgid "Use &empty outer identity (RFC 4822)"
-msgstr ""
+msgstr "Използвай &празна външна самоличност (RFC 4822)"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 msgid "Ommit my user name and use @mydomain.org only"
-msgstr ""
+msgstr "Пропусни моето потребителско име и използвай само @mydomain.org"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 msgid "&Custom outer identity:"
-msgstr ""
+msgstr "&Клиентска външна самоличност:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
 msgid "Specify custom outer identity"
-msgstr ""
+msgstr "Специфицирай клиентска външна самоличност"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
 msgid "Custom outer identity to use"
-msgstr ""
+msgstr "Клиентска външна самоличност да се използва"
 
 #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
 #: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
+"Грешка при запис на удостоверения за самоличност в Credential Manager: %hs "
+"(error %u)"
 
 #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
 #: lib/EAPBase_UI/include/EAP_UI.h:699
 msgid "Writing credentials failed."
-msgstr ""
+msgstr "Записването на удостоверенията за самоличност е неуспешно "
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
-msgstr ""
+msgstr "Вътрешна аутентикация"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
-msgstr ""
+msgstr "Външна аутентикация"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:187
 msgid "Select inner authentication method from the list"
-msgstr ""
+msgstr "Изберете метод за вътрешна аутентикация от списъка"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
-msgstr ""
+msgstr "PAP"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
+"Сигурни ли сте, че искате да изтриете за постоянно %s доставчика от "
+"конфигурацията?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"
-msgstr ""
+msgstr "Предупреждение"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:552
 msgid "Provider Settings"
-msgstr ""
+msgstr "Настройки на доставчика"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:717
 #, c-format
 msgid "Deleting credentials failed (error %u)."
 msgstr ""
+"Изтриването на удостоверенията за самоличност е неуспешно (грешка %u)."
 
 #: lib/EAPBase_UI/include/EAP_UI.h:754
 #, c-format
 msgid "<error %u>"
-msgstr ""
+msgstr "<грешка %u>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:758
 msgid "<error>"
-msgstr ""
+msgstr "<грешка>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<blank ID>"
-msgstr ""
+msgstr "<непопълнен ID>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:820
 msgid "&Remember"
-msgstr ""
+msgstr "&Запомнете"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:821
 msgid "Check if you would like to save credentials"
-msgstr ""
+msgstr "Отметнете, ако желаете да запазите удостоверенията за замоличност"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:964
 msgid "<Your Organization>"
-msgstr ""
+msgstr "<Вашата организация>"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.h:69
 msgid "EAP Connection Configuration"
-msgstr ""
+msgstr "Конфигуриране на EAP свързване"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
-msgstr ""
+msgstr "EAP методи"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
-msgstr ""
+msgstr "Модули за поддръжка на индивидуални EAP методи"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
-msgstr ""
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/ca_ES.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EAPMethods\n"
 "POT-Creation-Date: 2016-09-28 13:27+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
+"Last-Translator: eduki <ecercos@xtec.cat>, 2016\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,133 +25,146 @@ msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
-msgstr ""
+msgstr "Afegir nou proveidor"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
-msgstr ""
+msgstr "Esborrar proveidor seleccionat"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
-msgstr ""
+msgstr "Avançat..."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
 msgid "Opens dialog with provider settings"
-msgstr ""
+msgstr "Obre formulari amb ajustos de proveidor"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
 #, c-format
 msgid "%s User Credentials"
-msgstr ""
+msgstr "%s Credencials d'usuari"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
-msgstr ""
+msgstr "Selecciona la font on les credencials utilitzades es desen"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager:"
-msgstr ""
+msgstr "Utilitzar credencials del Credential &Manager: "
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
+"Seleccioneu aquesta opció si voleu utilitzar les credencials desades a "
+"l'Administrador de Credencials de Windows"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
+"Les vostres credencials actuals a l'Administrador de Credencials de Windows"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
-msgstr ""
+msgstr "&Esborrar Credencials"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
+"Cliqueu per a esborrar les credencials de l'Administrador de Credencials.\n"
+"Nota: Se us demanaran noves credencials en connectar."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
-msgstr ""
+msgstr "&Desar Credencials..."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
-msgstr ""
+msgstr "Cliqueu aquí per a desar o modificar les vostres credencials"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Use credentials from &profile configuration:"
-msgstr ""
+msgstr "Utilitzeu les credencials de la configuració del vostre &perfil:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
+"Escolliu aquesta opció si voleu desar les credencials com a part del perfil "
+"de configuració"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr ""
+msgstr "Configuració de credencials del perfil"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr ""
+msgstr "ID d'usuari i contrasenya"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
-msgstr ""
+msgstr "Sisplau introduiu el vostre ID d'usuari i contrasenya"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
-msgstr ""
+msgstr "ID d'usuari:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
+"Introduiu el vostre identificador aquí (identificador@domini.org, "
+"DOMINI\\identificador, etc.)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
-msgstr ""
+msgstr "Contrasenya:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
-msgstr ""
+msgstr "Introduiu la vostra contrasenya aquí"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
-msgstr ""
+msgstr "La vostra organització"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
 msgstr ""
+"Descriviu la vostra organització per personalitzar la interfície. Quan s'hi "
+"introdueix, l'usuari troba missatges més comprensibles i senzills de seguir."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
-msgstr ""
+msgstr "El &nom de la vostra organització:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
+"El nom de la vostra organització tal i com apareixerà en les notificacions "
+"de contacte del SAU"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
-msgstr ""
+msgstr "(Sigueu breus, sisplau)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
-msgstr ""
+msgstr "Contacte d'ajuda i &informació:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
@@ -159,7 +172,7 @@ msgstr "¶"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
-msgstr ""
+msgstr "Adreça web del centre de suport"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
@@ -167,7 +180,7 @@ msgstr "*"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
-msgstr ""
+msgstr "Adreça de correu del centre de suport"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
@@ -175,21 +188,23 @@ msgstr ")"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
-msgstr ""
+msgstr "Telèfon del centre de suport"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
-msgstr ""
+msgstr "Identificador únic del proveidor"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
 msgstr ""
+"Assigneu a la vostra organització un ID únic per a comparit el mateix joc de"
+" credencials entre diferents perfils de xarxa."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
-msgstr ""
+msgstr "&Namespace:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
@@ -201,62 +216,69 @@ msgstr "urn:uuid"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
-msgstr ""
+msgstr "&Identificador únic del proveidor:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
+"L'ID de la vostra organització per assignar les mateixes credencials des "
+"d'altres perfils"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
-msgstr ""
+msgstr "Bloqueig de configuració"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
 msgstr ""
+"Podeu bloquejar la configuració per prevenir modificacions accidentals dels "
+"usuaris finals. Els usuaris només podran introduir credencials."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
+"&Bloqueja la configuració i preveniu qualsevol modificació via interfície "
+"d'usuari."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
+"(Alerta: un cop bloquejada, no ho podeu revertir des d'aquesta finestra!)"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
-msgstr ""
+msgstr "%s Credencials"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
 msgid "EAP Credentials"
-msgstr ""
+msgstr "Credencials EAP"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
-msgstr ""
+msgstr "Per instruccions i ajuda, sisplau contacteu amb %s a:"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
-msgstr ""
+msgstr "el vostre proveidor"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
-msgstr ""
+msgstr "Obriu el navegador per defecte"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
-msgstr ""
+msgstr "Obriu el programa de correu"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
-msgstr ""
+msgstr "Marqueu el telèfon"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
@@ -264,303 +286,322 @@ msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
 "prevent accidental modification."
 msgstr ""
+"%s ha preconfigurat parts d'aquesta configuració. Aquestes parts estan "
+"bloquejades per evitar modificacions accidentals."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
-msgstr ""
+msgstr "El vostre proveidor"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
-msgstr ""
+msgstr "L'intent de connexió anterior ha informat de credencials no vàlides."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
-msgstr ""
+msgstr "L'intent de connexió anterior indica que les credencials han caducat."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
+"L'intent de connexió anterior indica que les credencials han estat "
+"modificades."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
-msgstr ""
+msgstr "L'intent de connexió anterior ha fallat."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
+"Sisplau assegureu-vos que les vostres credencials són correctes, o proveu-ho"
+" més tard."
 
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr ""
+msgstr "ID d'usuari i contrasenya MSCHAPv2"
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr ""
+msgstr "ID usuari i contrasenya PAP"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
-msgstr ""
+msgstr "Servidors de confiança"
 
 #: 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 ""
+"Descriu els servidors en que hi confieu per prevenir la intercepció de "
+"credencials en cas d'atacs 'man-in-the-middle'."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
-msgstr ""
+msgstr "Autoritats de Certificació acceptades:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:40
 msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
 msgstr ""
+"El certificat del servidor ha d'haver estat emés per una de les autoritats "
+"de certificació enumerades"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
-msgstr ""
+msgstr "Afegir CA des del Repositori..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:48
 msgid ""
 "Adds a new certificate authority from the certificate store to the list"
 msgstr ""
+"Afegeix una nova autoritat de certificació des del repositori de certificats"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
-msgstr ""
+msgstr "Afegir CA des d'un fitxer..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:53
 msgid "Adds a new certificate authority from the file to the list"
-msgstr ""
+msgstr "Afegeix una nova autoritat de certificació des de d'un arxiu"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
-msgstr ""
+msgstr "&Eliminar CA"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
-msgstr ""
+msgstr "Elimina les autoritats de certificació seleccionades"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
-msgstr ""
+msgstr "&Noms de servidors acceptats:"
 
 #: 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 ""
+"Llista de noms de servidors acceptats, separats per ;, en blanc per no "
+"comprovar noms. S'admeten caracters Unicode"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
-msgstr ""
+msgstr "(Per exemple: foo.bar.com;server2.bar.com)"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr ""
+msgstr "Certificat d'usuari"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
-msgstr ""
+msgstr "Sisplau escolliu el vostre &certificat per a l'autenticació."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
-msgstr ""
+msgstr "Certificat de client per a l'autenticació"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
-msgstr ""
+msgstr "Personalitzar la &identitat:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
 msgstr ""
+"La vostra identitat (identificador@domini) per substituir la indicada en el "
+"certificat; o en blanc per fer servir la continguda en el mateix"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 #, c-format
 msgid "Invalid character in host name found: %c"
-msgstr ""
+msgstr "S'ha trobat un caracter invàlid en el nom de servidor: %c"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
-msgstr ""
+msgstr "Conflicte de validació"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
 #: lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<empty>"
-msgstr ""
+msgstr "<buit>"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
-msgstr ""
+msgstr "Afegir Certificat"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
-msgstr ""
+msgstr "Fitxers de certificat (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
-msgstr ""
+msgstr "Fitxers de certificat X.509 (*.cer;*.crt;*.der;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
-msgstr ""
+msgstr "Fitxers de certificat PKCS #7 (*.p7b)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
-msgstr ""
+msgstr "Tots els fitxers (*.*)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
-msgstr ""
+msgstr "Fitxer de certificat no vàlid o no suportat %s"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
 msgid "Outer Identity"
-msgstr ""
+msgstr "Identitat externa"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
+"Seleccioneu l'ID d'usuari que presenta el propi client a l'autentitcador:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
 msgid "&True identity"
-msgstr ""
+msgstr "Identitat &real"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
 msgid "Use my true user name"
-msgstr ""
+msgstr "Utitlitza el meu usuari real"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
 msgid "Use &empty outer identity (RFC 4822)"
-msgstr ""
+msgstr "Utilitza una identitat externa &buida (RFC 4822)"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 msgid "Ommit my user name and use @mydomain.org only"
-msgstr ""
+msgstr "Omet el meu identificador i utilitza només @elmeudomini.org"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 msgid "&Custom outer identity:"
-msgstr ""
+msgstr "Identitat externa &personalitzada:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
 msgid "Specify custom outer identity"
-msgstr ""
+msgstr "Especifiqueu la identitat externa personalitzada"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
 msgid "Custom outer identity to use"
-msgstr ""
+msgstr "Identitat externa a utilitzar"
 
 #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
 #: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
+"Error escrivint les credencial a l'Administrador de credencials: %hs (error "
+"%u)"
 
 #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
 #: lib/EAPBase_UI/include/EAP_UI.h:699
 msgid "Writing credentials failed."
-msgstr ""
+msgstr "Ha fallat l'escriptura de les credencials."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
-msgstr ""
+msgstr "Autenticació interna"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
-msgstr ""
+msgstr "Autenticació externa"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:187
 msgid "Select inner authentication method from the list"
-msgstr ""
+msgstr "Escolliu de la llista el mètode d'autenticació externa"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
-msgstr ""
+msgstr "PAP"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
+"Segur que voleu esborrar permanentment el proveidor %s de la configuració?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:552
 msgid "Provider Settings"
-msgstr ""
+msgstr "Ajustos del proveidor"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:717
 #, c-format
 msgid "Deleting credentials failed (error %u)."
-msgstr ""
+msgstr "Ha fallat l'esborrat de credencials (error %u)."
 
 #: lib/EAPBase_UI/include/EAP_UI.h:754
 #, c-format
 msgid "<error %u>"
-msgstr ""
+msgstr "<error %u>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:758
 msgid "<error>"
-msgstr ""
+msgstr "<error>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<blank ID>"
-msgstr ""
+msgstr "<blank ID>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:820
 msgid "&Remember"
-msgstr ""
+msgstr "&Recordar"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:821
 msgid "Check if you would like to save credentials"
-msgstr ""
+msgstr "Marqueu si voleu desar les credencials"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:964
 msgid "<Your Organization>"
-msgstr ""
+msgstr "<La vostra organització>"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.h:69
 msgid "EAP Connection Configuration"
-msgstr ""
+msgstr "Configuració de la connexió EAP"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
-msgstr ""
+msgstr "Mètodes EAP"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
-msgstr ""
+msgstr "Móduls per soportar mètodes EAP individuals"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
-msgstr ""
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/de_DE.po

@@ -542,9 +542,9 @@ msgstr "MSCHAPv2"
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
-"Sind Sie sicher, dass Sie den Identitätsprovider %ls aus der Konfiguration "
+"Sind Sie sicher, dass Sie den Identitätsprovider %s aus der Konfiguration "
 "löschen möchten?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292

EAPMethods/locale/el_GR.po

@@ -50,25 +50,30 @@ msgstr "Ανοίγει ένα παράθυρο διαλόγου με τις ρυ
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
 #, c-format
 msgid "%s User Credentials"
-msgstr ""
+msgstr "%s Διαπιστευτήρια Χρήστη"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
+"Επιλέξτε την πηγή όπου είναι αποθηκευμένα τα διαπιστευτήριά σας που "
+"χρησιμοποιείται για τη σύνδεση."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager:"
-msgstr ""
+msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από τον Credential &Manager:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
+"Επιλέξτε αυτήν την επιλογή αν θέλετε να χρησιμοποιήσετε τα διαπιστευτήρια "
+"που αποθηκεύονται στο Windows Credential Manager"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
+"Τα παρόντα διαπιστευτήρια είναι αποθηκευμένα στο Windows Credential Manager"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
@@ -93,21 +98,23 @@ msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Use credentials from &profile configuration:"
-msgstr ""
+msgstr "Χρησιμοποιήστε τα διαπιστευτήρια από το &προφίλ ρύθμισης παραμέτρων:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
+"Επιλέξτε αυτήν την επιλογή αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια ως "
+"μέρος της διαμόρφωσης προφίλ"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr ""
+msgstr "Προφίλ ρύθμισης διαπιστευτηρίων"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr ""
+msgstr "ID χρήστη και κωδικός πρόσβασης"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
@@ -322,11 +329,11 @@ msgstr ""
 
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr ""
+msgstr "MSCHAPv2 ID χρήστη και κωδικός πρόσβασης"
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr ""
+msgstr "PAP ID χρήστη και κωδικός πρόσβασης"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
@@ -349,6 +356,8 @@ msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
 msgstr ""
+"Το πιστοποιητικό του διακομιστή πρέπει να εκδίδεται από μία από τις αρχές "
+"έκδοσης πιστοποιητικών που αναφέρονται εδώ"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
@@ -396,11 +405,13 @@ msgstr "(Παράδειγμα: foo.bar.com;server2.bar.com)"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr ""
+msgstr "Πιστοποιητικό χρήστη"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
 msgstr ""
+"Επιλέξτε το &πιστοποιητικό σας που θα χρησιμοποιηθεί για τον έλεγχο "
+"ταυτότητας."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
@@ -537,9 +548,9 @@ msgstr "MSCHAPv2"
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
-"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %ls από τη "
+"Είστε βέβαιοι ότι θέλετε να καταργήσετε οριστικά τον πάροχο %s από τη "
 "διαμόρφωση;"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
@@ -574,7 +585,7 @@ msgstr "&Υπενθύμιση"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:821
 msgid "Check if you would like to save credentials"
-msgstr ""
+msgstr "Ελέγξτε αν θέλετε να αποθηκεύσετε τα διαπιστευτήρια"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:964
 msgid "<Your Organization>"

EAPMethods/locale/es_ES.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EAPMethods\n"
 "POT-Creation-Date: 2016-09-28 13:27+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: José Manuel Macías <jmanuel.macias@rediris.es>, 2016\n"
+"Last-Translator: Alberto Martínez <alberto_martinez@deusto.es>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/eduroam_devel/teams/11799/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -50,25 +50,30 @@ msgstr "Abrir diálogo configuración de proveedores"
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
 #, c-format
 msgid "%s User Credentials"
-msgstr ""
+msgstr "Credenciales %s de usuario"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
 msgstr ""
+"Selecciona el repositorio en el que se guardan las credenciales de conexión."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager:"
-msgstr ""
+msgstr "Usa credenciales del &Administrador de Credenciales:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
+"Selecciona esta opción si quieres usar credenciales guardadas en el "
+"Administrador de Credenciales de Windows"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
 msgstr ""
+"Sus credenciales actuales guardadas en el Administrador de Credenciales de "
+"Windows"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
@@ -92,21 +97,23 @@ msgstr "Haga clic aquí para establecer o modificar sus credenciales"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Use credentials from &profile configuration:"
-msgstr ""
+msgstr "Usa las credenciales de la configuración del &perfil:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
+"Selecciona esta opción si quieres guardar credenciales como parte de la "
+"configuración del perfil"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr ""
+msgstr "Credenciales de la configuración del perfil"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr ""
+msgstr "Identificador de usuario y contraseña"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
@@ -321,11 +328,11 @@ msgstr ""
 
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr ""
+msgstr "Identificador MSCHAPv2 de usuario y contraseña"
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr ""
+msgstr "Identificador PAP de usuario y contraseña"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
@@ -397,11 +404,11 @@ msgstr "(Ejemplo: foo.bar.com;servidor2.bar.com)"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr ""
+msgstr "Certificado de usuario"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
-msgstr ""
+msgstr "Por favor seleccione su &certificado a usar para la autenticación."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
@@ -535,10 +542,10 @@ msgstr "MSCHAPv2"
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
 "¿está seguro de que quiere borrar permanentemente la configuración del "
-"proveedor %ls?"
+"proveedor %s?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"
@@ -572,7 +579,7 @@ msgstr "&Recordar"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:821
 msgid "Check if you would like to save credentials"
-msgstr ""
+msgstr "Marca si quieres guardar las credenciales"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:964
 msgid "<Your Organization>"

EAPMethods/locale/hr_HR.po

@@ -521,9 +521,9 @@ msgstr "MSCHAPv2"
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
-"Da li ste sigurni da želite za stalno opbrisati davatelja usluge %ls iz "
+"Da li ste sigurni da želite za stalno opbrisati davatelja usluge %s iz "
 "konfiguracije ? "
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292

EAPMethods/locale/lt_LT.po

@@ -527,9 +527,9 @@ msgstr "MSCHAPv2"
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
-"Ar tikrai norite visam laikui pašalinti teikėją „%ls“ iš konfigūracijos?"
+"Ar tikrai norite visam laikui pašalinti teikėją „%s“ iš konfigūracijos?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"

EAPMethods/locale/nb_NO.po

@@ -50,25 +50,27 @@ msgstr "Åpner dialog med tilbyder innstillinger"
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
 #, c-format
 msgid "%s User Credentials"
-msgstr ""
+msgstr "%s Påloggingsinformasjon"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
-msgstr ""
+msgstr "Velg kilden for din påloggingsinformasjon"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager:"
-msgstr ""
+msgstr "Bruk brukerdetaljer fra Credential &Manager:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
+"Velg denne opsjonen om du vil bruke brukerinformasjon lagret i Windows "
+"Credential Manager"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
-msgstr ""
+msgstr "Din nåværende brukerinformasjon i Windows Credential Manager"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
@@ -92,68 +94,74 @@ msgstr "Klikk her for å sette eller endre påloggingsinformasjon"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Use credentials from &profile configuration:"
-msgstr ""
+msgstr "Bruk brukerinformasjon fra &profil konfigurasjon:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
+"Velg denne opsjonen om du vil lagre brukerinformasjon som en del av profil "
+"konfigurasjon"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr ""
+msgstr "Profil konfigurasjon brukerinformasjon"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr ""
+msgstr "Bruker ID og passord"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
-msgstr ""
+msgstr "Vennligst oppgi bruker ID og passord."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
-msgstr ""
+msgstr "Bruker ID:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
-msgstr ""
+msgstr "Oppgi ditt brukernavn (bruker@domain.org, DOMIAN\\User, etc)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
-msgstr ""
+msgstr "Passord:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
-msgstr ""
+msgstr "Oppgi ditt passord"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
-msgstr ""
+msgstr "Din organisasjon"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 msgid ""
 "Describe your organization to customize user prompts.  When organization is "
 "introduced, end-users find program messages easier to understand and act."
 msgstr ""
+"Beskriv din organisasjon for å tilpasse ledetekster til brukere. Når "
+"organisasjon introduseres vil sluttbrukere lettere forstå meldinger fra "
+"programmet og kan gi korrekt respons."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
-msgstr ""
+msgstr "Din organisasjons %navn:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
+"Din organisasjons navn som det vil fremkomme på kontakt helpdesk varslinger"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
-msgstr ""
+msgstr "(Vennligst, vær kort)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
-msgstr ""
+msgstr "Helpdesk kontakt&informasjon:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
@@ -161,7 +169,7 @@ msgstr "¶"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
-msgstr ""
+msgstr "Nettadresse til din helpdesk"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
@@ -169,7 +177,7 @@ msgstr "*"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
-msgstr ""
+msgstr "E-post adresse til din helpdesk"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
@@ -177,21 +185,23 @@ msgstr ")"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
-msgstr ""
+msgstr "Telefonnummer til din helpdesk"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
-msgstr ""
+msgstr "Oppgi unik identifikator"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
 msgstr ""
+"Tildel din organisasjon en unik ID for å tillate bruk av de samme "
+"brukeropplysninger i forskjellige nettverksprofiler"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
-msgstr ""
+msgstr "&Namespace:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
@@ -203,62 +213,67 @@ msgstr "urn:uuid"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
-msgstr ""
+msgstr "Oppgi unik &identifikator:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
+"Din organisasjons ID for å kunne bruke de samme brukeropplysninger i andre "
+"profiler"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
-msgstr ""
+msgstr "Konfigurasjonslås"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
 msgstr ""
+"Din konfigurasjon kan låses for å hindre utilsiktet modifikasjon av "
+"sluttbrukere. Brukere vil kun kunne oppgi brukerinformasjon."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
+"&Lås denne konfigurasjonen og hindre modifikasjon via brukergrensesnitt."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
-msgstr ""
+msgstr "(Advarsel: Når låst, kan du ikke gå tilbake til denne dialogen!)"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
-msgstr ""
+msgstr "%s Brukeropplysninger"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
 msgid "EAP Credentials"
-msgstr ""
+msgstr "EAP brukeropplysninger"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
-msgstr ""
+msgstr "For mer hjelp og instruksjoner, kontakt %s via:"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
-msgstr ""
+msgstr "Din tilbyder"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
-msgstr ""
+msgstr "Åpne standard nettleser"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
-msgstr ""
+msgstr "Åpne e-post program"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
-msgstr ""
+msgstr "Ring telefon"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
@@ -266,303 +281,322 @@ msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
 "prevent accidental modification."
 msgstr ""
+"%s har pre-satt deler av denne konfigurasjonen. De delene er låst for å "
+"hindre utilsiktet modifikasjon."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
-msgstr ""
+msgstr "Din tibyder"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
-msgstr ""
+msgstr "Tidligere forsøk på tilkobling rapporterte feil brukeropplysninger."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
+"Tidligere forsøk på tilkobling rapporterte brukeropplysninger utløpt på dato"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
+"Tidligere forsøk på tilkobling rapporterte at dine brukeropplysninger blir "
+"endret. "
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
-msgstr ""
+msgstr "Tidligere forsøk på tilkobling feilet."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
+"Vennligst sjekk at dine brukeropplysninger er korrekt, eller prøv igjen "
+"senere."
 
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr ""
+msgstr "MSCHAPv2 bruker ID and passord"
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr ""
+msgstr "PAP bruker ID og passord"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
-msgstr ""
+msgstr "Server Trust"
 
 #: 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 ""
+"Beskriv tjenere du stoler på for å hindre tyveri av brukeropplysninger i "
+"tilfelle et man-in-the-middle angrep."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
-msgstr ""
+msgstr "Akseptable sertifikat utstedere:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:40
 msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
 msgstr ""
+"Tjeneren's sertifikat må være utstedt av en av sertifikat utstederene listet"
+" her"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
-msgstr ""
+msgstr "Legg til CA fra ..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:48
 msgid ""
 "Adds a new certificate authority from the certificate store to the list"
-msgstr ""
+msgstr "Legg til en ny sertifikat utsteder i listen"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
-msgstr ""
+msgstr "Legg til CA fra fil..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:53
 msgid "Adds a new certificate authority from the file to the list"
-msgstr ""
+msgstr "Legger til en ny CA fra filen til listen"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
-msgstr ""
+msgstr "&Fjern CA"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
-msgstr ""
+msgstr "Fjerner valgte CA fra listen"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
-msgstr ""
+msgstr "Aksepterte tjener&navn:"
 
 #: 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 ""
+"En semikolon separert liste med aksepterte tjener FQDN navn; blank for å "
+"hoppe over navne sjekk; Unicode tegn er tillatt"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
-msgstr ""
+msgstr "(Eksempel: foo.bar.com;server2.bar.com)"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr ""
+msgstr "Bruker sertifikat"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
-msgstr ""
+msgstr "Vennligst velg ditt &sertifikat for autentisering."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
-msgstr ""
+msgstr "Klientsertifikat for autentisering "
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
-msgstr ""
+msgstr "Tilpasset &identitet:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
 msgstr ""
+"Din identitet (brukernavn@domene) for overskriving av sertifikat; eller tomt"
+" for å bruke den fra sertifikatet. "
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 #, c-format
 msgid "Invalid character in host name found: %c"
-msgstr ""
+msgstr "Ugyldig tegn funnet i navn: %c"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
-msgstr ""
+msgstr "Valideringskonflikt"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
 #: lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<empty>"
-msgstr ""
+msgstr "<tom>"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
-msgstr ""
+msgstr "Legg til sertifikat"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
-msgstr ""
+msgstr "Sertifikat filer  (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
-msgstr ""
+msgstr "X.509 sertifikat filer (*.cer;*.crt;*.der;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
-msgstr ""
+msgstr "PKCS #7 sertifikat filer (*.p7b)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
-msgstr ""
+msgstr "Alle filer (*.*)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
-msgstr ""
+msgstr "Ugyldig eller ikke støttet sertifikat fil %s"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
 msgid "Outer Identity"
-msgstr ""
+msgstr "Ytre identitet"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
+"Velg den bruker ID som supplikat introduserer seg som til autentikator:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
 msgid "&True identity"
-msgstr ""
+msgstr "&Faktisk identitet"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
 msgid "Use my true user name"
-msgstr ""
+msgstr "Bruke mitt faktiske brukernavn"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
 msgid "Use &empty outer identity (RFC 4822)"
-msgstr ""
+msgstr "Bruk &tom ytre identitet (RFC 4822)"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 msgid "Ommit my user name and use @mydomain.org only"
-msgstr ""
+msgstr "Utelat mitt brukernavn og bruk kun @mydomian.org"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 msgid "&Custom outer identity:"
-msgstr ""
+msgstr "&Tilpasset ytre identitet:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
 msgid "Specify custom outer identity"
-msgstr ""
+msgstr "Spesifiser tilpasset ytre identitet"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
 msgid "Custom outer identity to use"
-msgstr ""
+msgstr "Tilpasset ytre identitet som brukes"
 
 #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
 #: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
+"Feil under skriving av brukeropplysninger til Credential Manager: %hs (feil "
+"%u)"
 
 #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
 #: lib/EAPBase_UI/include/EAP_UI.h:699
 msgid "Writing credentials failed."
-msgstr ""
+msgstr "Skriving av brukeropplysninger feilet."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
-msgstr ""
+msgstr "Indre autentisering"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
-msgstr ""
+msgstr "Ytre autentisering"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:187
 msgid "Select inner authentication method from the list"
-msgstr ""
+msgstr "Velg den indre autentiseringsmetoden fra listen"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
-msgstr ""
+msgstr "PAP"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
+"Er du sikker på at du vil fjerne tilbyder %s permanent fra konfigurasjonen?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"
-msgstr ""
+msgstr "Advarsel"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:552
 msgid "Provider Settings"
-msgstr ""
+msgstr "Tilbyder innstillinger"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:717
 #, c-format
 msgid "Deleting credentials failed (error %u)."
-msgstr ""
+msgstr "Sletting av brukeropplysninger feilet (feil %u)"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:754
 #, c-format
 msgid "<error %u>"
-msgstr ""
+msgstr "<feil %u>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:758
 msgid "<error>"
-msgstr ""
+msgstr "<feil>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<blank ID>"
-msgstr ""
+msgstr "<blank ID>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:820
 msgid "&Remember"
-msgstr ""
+msgstr "&Husk"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:821
 msgid "Check if you would like to save credentials"
-msgstr ""
+msgstr "Huk av om du vil lagre brukeropplysninger "
 
 #: lib/EAPBase_UI/include/EAP_UI.h:964
 msgid "<Your Organization>"
-msgstr ""
+msgstr "<Din organisasjon>"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.h:69
 msgid "EAP Connection Configuration"
-msgstr ""
+msgstr "Konfigurasjon av EAP forbindelse"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
-msgstr ""
+msgstr "EAP Metoder"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
-msgstr ""
+msgstr "Moduler for støtte av individuelle EAP metoder"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
-msgstr ""
+msgstr "Tunneled Transport Layer Security"

EAPMethods/locale/pl_PL.po

@@ -526,9 +526,9 @@ msgstr "MSCHAPv2"
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
-"Czy jesteś pewny, że chcesz usunąć konfigurację dostawcy tożsamości %ls?"
+"Czy jesteś pewny, że chcesz usunąć konfigurację dostawcy tożsamości %s?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"

EAPMethods/locale/sl_SI.po

@@ -524,9 +524,9 @@ msgstr "MSCHAPv2"
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
-"Ali ste prepričani, da želite trajno izbrisati ponudnika %ls iz "
+"Ali ste prepričani, da želite trajno izbrisati ponudnika %s iz "
 "konfiguracije?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292

EAPMethods/locale/sr_RS.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: EAPMethods\n"
 "POT-Creation-Date: 2016-09-28 13:27+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
+"Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -25,133 +25,146 @@ msgstr ""
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:37
 msgid "+"
-msgstr ""
+msgstr "+"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:38
 msgid "Adds new provider"
-msgstr ""
+msgstr "Dodaje novog provajdera"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:42
 msgid "-"
-msgstr ""
+msgstr "-"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:43
 msgid "Removes selected provider"
-msgstr ""
+msgstr "Uklanja izabranog provajdera"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:47
 msgid "Advanced..."
-msgstr ""
+msgstr "Napredno..."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:48
 msgid "Opens dialog with provider settings"
-msgstr ""
+msgstr "Otvara dijalog sa podešavanjima za provajdera"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:229 lib/EAPBase_UI/include/EAP_UI.h:581
 #, c-format
 msgid "%s User Credentials"
-msgstr ""
+msgstr "%s korisnikovi kredencijali"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:240
 msgid "Select the source where your credentials used to connect are stored."
-msgstr ""
+msgstr "Izaberite izvor gde se nalaze vaši kredencijali za povezivanje."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:244
 msgid "Use credentials from Credential &Manager:"
-msgstr ""
+msgstr "Koristi kredencijale iz &Manager kredencijala:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:245
 msgid ""
 "Select this option if you would like to use credentials stored in Windows "
 "Credential Manager"
 msgstr ""
+"Odaberite ovu opciju ako želite da koristite kredencijale sačuvane u Windows"
+" menadžeru kredencijala"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:253
 msgid "Your present credentials stored in Windows Credential Manager"
-msgstr ""
+msgstr "Vaši trenutni kredencijali se čuvaju u Windows menadžeru kredencijala"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:260
 msgid "&Clear Credentials"
-msgstr ""
+msgstr "&Clear kredencijale"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:261
 msgid ""
 "Click to clear your credentials from Credential Manager.\n"
 "Note: You will be prompted to enter credentials when connecting."
 msgstr ""
+"Kliknite ovde kako biste ukolnili svoje kredencijale iz menadžera kredencijala.\n"
+"Napomena: Biće vam traženo da unesete kredencijale prilikom povezivanja."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:265 lib/EAPBase_UI/res/wxEAP_UI.cpp:292
 msgid "&Set Credentials..."
-msgstr ""
+msgstr "&Set kredencijale..."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:266 lib/EAPBase_UI/res/wxEAP_UI.cpp:293
 msgid "Click here to set or modify your credentials"
-msgstr ""
+msgstr "Kliknite ovde kako biste promenili svoje kredencijale"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:276
 msgid "Use credentials from &profile configuration:"
-msgstr ""
+msgstr "Koristi kredencijale iz konfiguracije &profila:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:277
 msgid ""
 "Select this option if you would like to store credentials as a part of  "
 "profile configuration"
 msgstr ""
+"Odaberite ovu opciju ako želite da sačuvate kredencijale kao deo "
+"konfiguracije profila"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:285
 msgid "Profile configuration credentials"
-msgstr ""
+msgstr "Kredencijali za konfiguraciju profila"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:335
 msgid "User ID and Password"
-msgstr ""
+msgstr "Korisničko ime i lozinka"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:345
 msgid "Please provide your user ID and password."
-msgstr ""
+msgstr "Unesite vaše korisničko ime i lozinku."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:355
 msgid "User ID:"
-msgstr ""
+msgstr "Korisničko ime:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:360
 msgid "Enter your user name here (user@domain.org, DOMAIN\\User, etc.)"
 msgstr ""
+"Unesite vaše korisničko ime ovde (korisnik@domen.ac.rs, DOMEN\\Korisnik, "
+"itd.)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:364
 msgid "Password:"
-msgstr ""
+msgstr "Lozinka:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:369
 msgid "Enter your password here"
-msgstr ""
+msgstr "Unesite lozinku ovde"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:400
 msgid "Your Organization"
-msgstr ""
+msgstr "Vaša organizacija"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:411
 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 vašu organizaciju kako biste prilagodili vođenje korisnika kroz "
+"instalaciju. Kada se organizacija predstavi, krajnji korisnici bolje "
+"razumeju poruke koje program generiše i lakše mogu da preduzimaju akcije."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:418
 msgid "Your organization &name:"
-msgstr ""
+msgstr "&name vaše organizacije:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:423
 msgid ""
 "Your organization name as it will appear on helpdesk contact notifications"
 msgstr ""
+"Ime vaše institucije u formatu koji će se pojavljivati u obaveštenjima "
+"službe za podršku korisnicima"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:427
 msgid "(Keep it short, please)"
-msgstr ""
+msgstr "(budite kratki, molimo vas)"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:437
 msgid "Helpdesk contact &information:"
-msgstr ""
+msgstr "Helpdesk kontakt &information:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:447
 msgid "¶"
@@ -159,7 +172,7 @@ msgstr "¶"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:454
 msgid "Your helpdesk website address"
-msgstr ""
+msgstr "Web stranice službe za podršku korisnicima"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:458
 msgid "*"
@@ -167,7 +180,7 @@ msgstr "*"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:465
 msgid "Your helpdesk e-mail address"
-msgstr ""
+msgstr "e-mail adresa službe za podršku korisnicima"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:469
 msgid ")"
@@ -175,21 +188,23 @@ msgstr ")"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:476
 msgid "Your helpdesk phone number"
-msgstr ""
+msgstr "Broj telefona službe za podršku korisnicima"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:504
 msgid "Provider Unique Identifier"
-msgstr ""
+msgstr "Jedinstveni identifikator provajdera"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:515
 msgid ""
 "Assign your organization a unique ID to allow sharing the same credential "
 "set across different network profiles."
 msgstr ""
+"Dodelite jedinstven ID vašoj organizaciji kako bi se omogućilo deljenje "
+"istog seta kredencijala u više različitih mrežnih profila."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:522
 msgid "&Namespace:"
-msgstr ""
+msgstr "&Namespace:"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:526
 msgid "urn:RFC4282:realm"
@@ -201,62 +216,71 @@ msgstr "urn:uuid"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:538
 msgid "Provider unique &identifier:"
-msgstr ""
+msgstr "Jedinstveni &identifier provajdera: "
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:543
 msgid "Your organization ID to assign same credentials from other profiles"
 msgstr ""
+"ID vaše organizacije kako bi se dodelili isti kredencijali kao i na drugim "
+"profilima"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:568
 msgid "Configuration Lock"
-msgstr ""
+msgstr "Zaključavanje konfiguracije"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:579
 msgid ""
 "Your configuration can be locked to prevent accidental modification by end-"
 "users. Users will only be allowed to enter credentials."
 msgstr ""
+"Vaša konfiguracija se može zaključati kako bi se sprečile slučajne "
+"modifikacije od strane krajnjih korisnika. Korisnici će moći jedino da unesu"
+" kredencijale.  "
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:586
 msgid ""
 "&Lock this configuration and prevent any further modification via user "
 "interface."
 msgstr ""
+"&Lock ovu konfiguraciju i sprečite bilo kakve nove izmene preko korisničkog "
+"interfejsa."
 
 #: lib/EAPBase_UI/res/wxEAP_UI.cpp:589
 msgid "(Warning: Once locked, you can not revert using this dialog!)"
 msgstr ""
+"(Upozorenje: Kada se jednom zaključa, ne možete se vratiti na početna "
+"podešavanja!)"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:97
 #, c-format
 msgid "%s Credentials"
-msgstr ""
+msgstr "%s kredencijali"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:122 lib/EAPBase_UI/include/EAP_UI.h:355
 #: lib/EAPBase_UI/include/EAP_UI.h:365 lib/EAPBase_UI/res/wxEAP_UI.h:119
 msgid "EAP Credentials"
-msgstr ""
+msgstr "EAP kredencijali"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:165
 #, c-format
 msgid "For additional help and instructions, please contact %s at:"
-msgstr ""
+msgstr "Za dodatnu pomoć i instrukcije, kontaktirajte %s na:"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:166
 msgid "your provider"
-msgstr ""
+msgstr "vaš provajder"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:185
 msgid "Open the default web browser"
-msgstr ""
+msgstr "Otvorite uobičajeni web brauzer"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:196
 msgid "Open your e-mail program"
-msgstr ""
+msgstr "Otvorite vašeg mejl klijenta"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:207
 msgid "Dial the phone number"
-msgstr ""
+msgstr "Pozovite broj"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:227
 #, c-format
@@ -264,303 +288,326 @@ msgid ""
 "%s has pre-set parts of this configuration. Those parts are locked to "
 "prevent accidental modification."
 msgstr ""
+"%s ima predefinisane delove ove konfiguracije. Ti delovi su zaključani kako "
+"bi se izbegla njihova slučajna izmena."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:228
 msgid "Your provider"
-msgstr ""
+msgstr "Vaš provajder"
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:249
 msgid "Previous attempt to connect reported invalid credentials."
 msgstr ""
+"Prethodni pokušaj povezivanja je prijavio da ste uneli pogrešne "
+"kredencijale."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:250
 msgid "Previous attempt to connect reported your credentials expired."
 msgstr ""
+"Prethodni pokušaj povezivanja je prijavio da su vaši kredencijali istekli."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:251
 msgid ""
 "Previous attempt to connect reported your credentials are being changed."
 msgstr ""
+"Prethodni pokušaj povezivanja je prijavio da se vaši kredencijali trenutno "
+"menjaju."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:252
 msgid "Previous attempt to connect failed."
-msgstr ""
+msgstr "Prethodni pokušaj povezivanja nije bio uspešan."
 
 #: lib/EAPBase_UI/src/EAP_UI.cpp:253
 msgid "Please, make sure your credentials are correct, or try again later."
 msgstr ""
+"Proverite da li ste uneli ispravne kredencijale ili pokušajte ponovo "
+"kasnije."
 
 #: lib/MSCHAPv2_UI/src/MSCHAPv2_UI.cpp:33
 msgid "MSCHAPv2 User ID and Password"
-msgstr ""
+msgstr "MSCHAPv2 korisničko ime i lozinka"
 
 #: lib/PAP_UI/src/PAP_UI.cpp:33
 msgid "PAP User ID and Password"
-msgstr ""
+msgstr "PAP korisničko ime i lozinka"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:17
 msgid "Server Trust"
-msgstr ""
+msgstr "Serveri kojima se veruje"
 
 #: 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 servere kojima verujete kako bi se izbegla mogućnost krađe "
+"kredencijala u slučaju man-in-the-middle napada."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:35
 msgid "Acceptable Certificate Authorities:"
-msgstr ""
+msgstr "Prihvatljiva sertifikaciona tela:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:40
 msgid ""
 "Server's certificate must be issued by one of certificate authorities listed"
 " here"
 msgstr ""
+"Sertifikat servera mora biti izdat od strane sertifikacionog tela koje je "
+"izlistano ovde"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:47
 msgid "Add CA from Store..."
-msgstr ""
+msgstr "Dodaj CA sertifikat iz skladišta..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:48
 msgid ""
 "Adds a new certificate authority from the certificate store to the list"
-msgstr ""
+msgstr "Dodaje na listu novo sertifikaciono telo iz skladišta sertifikata"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:52
 msgid "Add CA from File..."
-msgstr ""
+msgstr "Dodaj CA sertifikat iz fajla..."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:53
 msgid "Adds a new certificate authority from the file to the list"
-msgstr ""
+msgstr "Dodaje novo sertifikaciono telo iz fajla u listu"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:57
 msgid "&Remove CA"
-msgstr ""
+msgstr "&Remove CA"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:59
 msgid "Removes selected certificate authorities from the list"
-msgstr ""
+msgstr "Uklanja odabrano sertifikaciono telo sa liste"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:72
 msgid "Acceptable server &names:"
-msgstr ""
+msgstr "Prihvatljiva &names servera"
 
 #: 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 ""
+"Lista prihvatljivih FQDN imena servera razdvojenih tačka-zarezom; ostaviti "
+"prazno ukoliko nije potrebna provera imena servera; dozvoljeno je korišćenje"
+" <i>unicode</i> karaktera"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:81
 msgid "(Example: foo.bar.com;server2.bar.com)"
-msgstr ""
+msgstr "(npr: foo.bar.com;server2.bar.com)"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:119 lib/TLS_UI/src/TLS_UI.cpp:571
 msgid "User Certificate"
-msgstr ""
+msgstr "Korisnički sertifikat"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:129
 msgid "Please select your &certificate to use for authentication."
-msgstr ""
+msgstr "Izaberite vaš &certificate koji ćete koristiti za autentifikaciju."
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:136
 msgid "Client certificate to use for authentication"
-msgstr ""
+msgstr "Klijentski sertifikat koji se koristi za autentifikaciju"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:143
 msgid "Custom &identity:"
-msgstr ""
+msgstr "Proizvoljan &identity:"
 
 #: lib/TLS_UI/res/wxTLS_UI.cpp:148
 msgid ""
 "Your identity (username@domain) to override one from certificate; or blank "
 "to use one provided in certificate"
 msgstr ""
+"Vaš identitet (korisničko_ime@domen.ac.rs) kako biste obrisali korisničko "
+"ime iz sertifikata; ili prazno kako biste koristili ono koje se nalazi u "
+"sertifikatu"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 #, c-format
 msgid "Invalid character in host name found: %c"
-msgstr ""
+msgstr "Neispravan karakter je pronađen u DNS imenu: %c"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:118
 msgid "Validation conflict"
-msgstr ""
+msgstr "Konflikt prilikom validacije"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:327 lib/EAPBase_UI/include/EAP_UI.h:769
 #: lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<empty>"
-msgstr ""
+msgstr "<prazno>"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:500
 msgid "Add Certificate"
-msgstr ""
+msgstr "Dodaj sertifikat"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:501
 msgid "Certificate Files (*.cer;*.crt;*.der;*.p7b;*.pem)"
-msgstr ""
+msgstr "Fajlovi sa sertifikatima (*.cer;*.crt;*.der;*.p7b;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:502
 msgid "X.509 Certificate Files (*.cer;*.crt;*.der;*.pem)"
-msgstr ""
+msgstr "Fajlovi sa X.509 sertifikatima (*.cer;*.crt;*.der;*.pem)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:503
 msgid "PKCS #7 Certificate Files (*.p7b)"
-msgstr ""
+msgstr "Fajlovi sa PKCS #7 sertifikatima (*.p7b)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:504
 msgid "All Files (*.*)"
-msgstr ""
+msgstr "Svi fajlovi (*.*)"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 #, c-format
 msgid "Invalid or unsupported certificate file %s"
-msgstr ""
+msgstr "Pogrešan ili nepodržan sertifikat %s"
 
 #: lib/TLS_UI/src/TLS_UI.cpp:520
 msgid "Error"
-msgstr ""
+msgstr "Greška"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:17
 msgid "Outer Identity"
-msgstr ""
+msgstr "Spoljni identitet"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:28
 msgid "Select the user ID supplicant introduces itself as to authenticator:"
 msgstr ""
+"Izaberite korisničko ime kojim se softver predstavlja autentifikatoru:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:35
 msgid "&True identity"
-msgstr ""
+msgstr "&True identitet"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:36
 msgid "Use my true user name"
-msgstr ""
+msgstr "Koristi moje pravo korisničko ime"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:40
 msgid "Use &empty outer identity (RFC 4822)"
-msgstr ""
+msgstr "Koristi &empty spoljni identitet (RFC 4822)"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:41
 msgid "Ommit my user name and use @mydomain.org only"
-msgstr ""
+msgstr "Izostavi korisničko ime i koristi samo @mojdomen.ac.rs"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:48
 msgid "&Custom outer identity:"
-msgstr ""
+msgstr "&Custom spoljni identitet:"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:49
 msgid "Specify custom outer identity"
-msgstr ""
+msgstr "Unesite proizvoljan spoljni identitet"
 
 #: lib/TTLS_UI/res/wxTTLS_UI.cpp:54
 msgid "Custom outer identity to use"
-msgstr ""
+msgstr "Koristi proizvoljan spoljni identitet"
 
 #: lib/TTLS_UI/src/Module.cpp:274 lib/TTLS_UI/src/Module.cpp:284
 #: lib/EAPBase_UI/include/EAP_UI.h:696
 #, c-format
 msgid "Error writing credentials to Credential Manager: %hs (error %u)"
 msgstr ""
+"Greška prilikom upisa kredencijala u Menadžera kredencijala: %hs (greška %u)"
 
 #: lib/TTLS_UI/src/Module.cpp:276 lib/TTLS_UI/src/Module.cpp:286
 #: lib/EAPBase_UI/include/EAP_UI.h:699
 msgid "Writing credentials failed."
-msgstr ""
+msgstr "Upis kredencijala je neuspešan."
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:36 lib/TTLS_UI/src/TTLS_UI.cpp:181
 msgid "Inner Authentication"
-msgstr ""
+msgstr "Unutrašnja autentifikacija"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:61 lib/TTLS_UI/src/TTLS_UI.cpp:196
 msgid "Outer Authentication"
-msgstr ""
+msgstr "Spoljna autentifikacija"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:187
 msgid "Select inner authentication method from the list"
-msgstr ""
+msgstr "Izaberite unutrašnji metod autentifikacije sa liste"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:189
 msgid "PAP"
-msgstr ""
+msgstr "PAP"
 
 #: lib/TTLS_UI/src/TTLS_UI.cpp:191
 msgid "MSCHAPv2"
-msgstr ""
+msgstr "MSCHAPv2"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 #, c-format
 msgid ""
-"Are you sure you want to permanently remove %ls provider from configuration?"
+"Are you sure you want to permanently remove %s provider from configuration?"
 msgstr ""
+"Da li ste sigurni da želite da trajno uklonite %s provajdera iz "
+"konfiguracije?"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:292
 msgid "Warning"
-msgstr ""
+msgstr "Upozorenje"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:552
 msgid "Provider Settings"
-msgstr ""
+msgstr "Podešavanja provajdera"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:717
 #, c-format
 msgid "Deleting credentials failed (error %u)."
-msgstr ""
+msgstr "Brisanje kredencijala neuspešno (greška %u)."
 
 #: lib/EAPBase_UI/include/EAP_UI.h:754
 #, c-format
 msgid "<error %u>"
-msgstr ""
+msgstr "<greška %u>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:758
 msgid "<error>"
-msgstr ""
+msgstr "<greška>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:769 lib/EAPBase_UI/include/EAP_UI.h:778
 msgid "<blank ID>"
-msgstr ""
+msgstr "<prazan ID>"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:820
 msgid "&Remember"
-msgstr ""
+msgstr "&Zapamti"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:821
 msgid "Check if you would like to save credentials"
-msgstr ""
+msgstr "Označite ako želite da sačuvate kredencijale"
 
 #: lib/EAPBase_UI/include/EAP_UI.h:964
 msgid "<Your Organization>"
-msgstr ""
+msgstr "<Vaša organizacija>"
 
 #: lib/EAPBase_UI/res/wxEAP_UI.h:69
 msgid "EAP Connection Configuration"
-msgstr ""
+msgstr "Podešavanja za EAP povezivanje"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "EAP Methods"
-msgstr ""
+msgstr "EAP metodi"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Modules to support individual EAP methods"
-msgstr ""
+msgstr "Moduli podržani u određenim EAP metodima"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "TTLS"
-msgstr ""
+msgstr "TTLS"
 
 #: EAPMethods/MSIBuild/en_US.Win32.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.Win32.Release.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Debug.Feature-2.idtx:5
 #: EAPMethods/MSIBuild/en_US.x64.Release.Feature-2.idtx:5
 msgid "Tunneled Transport Layer Security"
-msgstr ""
+msgstr "Tunneled Transport Layer Security"

EAPMethods/src/Main.cpp

@@ -449,7 +449,7 @@ DWORD APIENTRY EapPeerGetResponsePacket(
 DWORD APIENTRY EapPeerGetResult(
     _In_  EAP_SESSION_HANDLE        hSession,
     _In_  EapPeerMethodResultReason reason,
-    _Out_ EapPeerMethodResult       *ppResult,
+    _Out_ EapPeerMethodResult       *pResult,
     _Out_ EAP_ERROR                 **ppEapError)
 {
     DWORD dwResult = ERROR_SUCCESS;
@@ -466,11 +466,11 @@ DWORD APIENTRY EapPeerGetResult(
 
     if (!hSession)
         g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" hSession is NULL.")));
-    else if (!ppResult)
-        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" ppResult is NULL.")));
+    else if (!pResult)
+        g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pResult is NULL.")));
     else {
         try {
-            g_peer.get_result(hSession, reason, ppResult);
+            g_peer.get_result(hSession, reason, pResult);
         } catch (std::exception &err) {
             g_peer.log_error(*ppEapError = g_peer.make_error(err));
             dwResult = (*ppEapError)->dwWinError;
@@ -537,11 +537,11 @@ DWORD APIENTRY EapPeerGetUIContext(
 /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx)
 ///
 DWORD APIENTRY EapPeerSetUIContext(
-    _In_                                      EAP_SESSION_HANDLE  hSession,
-    _In_                                      DWORD               dwUIContextDataSize,
-    _In_count_(dwUIContextDataSize)   const   BYTE                *pUIContextData,
-    _In_                            /*const*/ EapPeerMethodOutput *pEapOutput,
-    _Out_                                     EAP_ERROR           **ppEapError)
+    _In_                                  EAP_SESSION_HANDLE  hSession,
+    _In_                                  DWORD               dwUIContextDataSize,
+    _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
+    _Out_                                 EapPeerMethodOutput *pEapOutput,
+    _Out_                                 EAP_ERROR           **ppEapError)
 {
     DWORD dwResult = ERROR_SUCCESS;
     event_fn_auto_ret<DWORD> event_auto(g_peer.get_event_fn_auto(__FUNCTION__, dwResult));

EAPMethods/src/Main_UI.cpp

@@ -130,8 +130,10 @@ DWORD WINAPI EapPeerConfigXml2Blob(
     else if (!pdwConnectionDataOutSize)
         g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" pdwConnectionDataOutSize is NULL.")));
     else {
+        // Configure XML selection namespaces used.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
+
         // <Config>
-        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
         com_obj<IXMLDOMElement> pXmlElConfig;
         if (FAILED(eapxml::select_element(pConfigDoc, bstr(L"//eaphostconfig:Config"), pXmlElConfig))) {
             g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_INVALID_PARAMETER, _T(__FUNCTION__) _T(" Error reading <Config> element.")));
@@ -139,7 +141,6 @@ DWORD WINAPI EapPeerConfigXml2Blob(
         }
 
         // Load configuration.
-        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\""));
         try {
             g_peer.config_xml2blob(dwFlags, pXmlElConfig, pConnectionDataOut, pdwConnectionDataOutSize);
         } catch (std::exception &err) {
@@ -212,9 +213,11 @@ DWORD WINAPI EapPeerConfigBlob2Xml(
             return dwResult;
         }
 
+        // Configure XML selection namespaces used.
+        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eap-metadata=\"urn:ietf:params:xml:ns:yang:ietf-eap-metadata\" xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
+
         // Select <Config> node.
         com_obj<IXMLDOMNode> pXmlElConfig;
-        pConfigDoc->setProperty(bstr(L"SelectionNamespaces"), variant(L"xmlns:eaphostconfig=\"http://www.microsoft.com/provisioning/EapHostConfig\""));
         if (FAILED(eapxml::select_node(pConfigDoc, bstr(L"eaphostconfig:Config"), pXmlElConfig))) {
             g_peer.log_error(*ppEapError = g_peer.make_error(dwResult = ERROR_NOT_FOUND, _T(__FUNCTION__) _T(" Error selecting <Config> element.")));
             return dwResult;

EventMonitor/App.cpp

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdAfx.h"
@@ -52,7 +52,7 @@ bool wxEventMonitorApp::OnInit()
         return false;
 
     if (wxInitializeLocale(m_locale)) {
-        //wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
+        wxVERIFY(m_locale.AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)));
         wxVERIFY(m_locale.AddCatalog(wxT("EventMonitor")));
     }
 
@@ -70,9 +70,9 @@ bool wxEventMonitorApp::OnInit()
     }
 #endif
 
-    m_mainWnd = new wxEventMonitorFrame(NULL);
-    wxPersistentRegisterAndRestore<wxEventMonitorFrame>(m_mainWnd);
-    m_mainWnd->Show();
+    wxEventMonitorFrame *mainWnd = new wxEventMonitorFrame(NULL);
+    wxPersistentRegisterAndRestore<wxEventMonitorFrame>(mainWnd);
+    mainWnd->Show();
 
     return true;
 }

EventMonitor/App.h

@@ -1,26 +1,28 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 ///
-/// EventMonitor application
+/// \defgroup EventMonitor  Event Monitor
+/// Real-time log of application events
 ///
+
 class wxEventMonitorApp;
 
 #pragma once
@@ -32,6 +34,12 @@ class wxEventMonitorApp;
 #include <wx/intl.h>
 
 
+/// \addtogroup EventMonitor
+/// @{
+
+///
+/// EventMonitor application
+///
 class wxEventMonitorApp : public wxApp
 {
 public:
@@ -54,8 +62,9 @@ public:
     //virtual int OnExit();
 
 public:
-    wxEventMonitorFrame *m_mainWnd; ///< Main window
     wxLocale             m_locale;  ///< Current locale
 };
 
+/// @}
+
 wxDECLARE_APP(wxEventMonitorApp);

EventMonitor/ETWLog.cpp

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdAfx.h"
@@ -77,7 +77,7 @@ wxEventTraceProcessorThread::wxEventTraceProcessorThread(wxEvtHandler *parent, c
 
     for (size_t i = 0, i_end = sessions.GetCount(); i < i_end; i++) {
         // Open trace.
-        tlf.LoggerName = (LPTSTR)(LPCTSTR)(sessions[i]);
+        tlf.LoggerName = const_cast<LPTSTR>((LPCTSTR)(sessions[i]));
         event_trace trace;
         if (!trace.create(&tlf)) {
             wxLogError(_("Error opening event trace (error %u)."), GetLastError());
@@ -92,7 +92,7 @@ wxEventTraceProcessorThread::wxEventTraceProcessorThread(wxEvtHandler *parent, c
 
 wxEventTraceProcessorThread::~wxEventTraceProcessorThread()
 {
-    for (vector<TRACEHANDLE>::iterator trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) {
+    for (auto trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) {
         TRACEHANDLE &h = *trace;
         if (h) {
             // Close trace.
@@ -104,7 +104,7 @@ wxEventTraceProcessorThread::~wxEventTraceProcessorThread()
 
 void wxEventTraceProcessorThread::Abort()
 {
-    for (vector<TRACEHANDLE>::iterator trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) {
+    for (auto trace = m_traces.begin(), trace_end = m_traces.end(); trace != trace_end; ++trace) {
         TRACEHANDLE &h = *trace;
         if (h) {
             // Close trace.
@@ -115,6 +115,8 @@ void wxEventTraceProcessorThread::Abort()
 }
 
 
+/// \cond internal
+
 wxThread::ExitCode wxEventTraceProcessorThread::Entry()
 {
     // Process events.
@@ -139,6 +141,8 @@ VOID WINAPI wxEventTraceProcessorThread::EventRecordCallback(_In_ PEVENT_RECORD
     _this->m_parent->QueueEvent(new wxETWEvent(wxEVT_ETW_EVENT, *pEvent));
 }
 
+/// \endcond
+
 
 //////////////////////////////////////////////////////////////////////////
 // wxETWListCtrl
@@ -207,7 +211,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
             ulSizeName    = (ULONG)((name    .length() + 1)*sizeof(TCHAR)),
             //ulSizeLogFile = (ULONG)((log_file.length() + 1)*sizeof(TCHAR)),
             ulSize        = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName /*+ ulSizeLogFile*/;
-        unique_ptr<EVENT_TRACE_PROPERTIES> properties((EVENT_TRACE_PROPERTIES*)new char[ulSize]);
+        unique_ptr<EVENT_TRACE_PROPERTIES> properties(reinterpret_cast<EVENT_TRACE_PROPERTIES*>(new char[ulSize]));
         wxASSERT_MSG(properties, wxT("error allocating session properties memory"));
 
         // Initialize properties.
@@ -220,7 +224,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
         properties->MaximumFileSize     = 1;  // 1 MB
         properties->LoggerNameOffset    = sizeof(EVENT_TRACE_PROPERTIES);
         //properties->LogFileNameOffset   = sizeof(EVENT_TRACE_PROPERTIES) + ulSizeName;
-        //memcpy((LPTSTR)((char*)properties.get() + properties->LogFileNameOffset), log_file.c_str(), ulSizeLogFile);
+        //memcpy(reinterpret_cast<char*>(properties.get()) + properties->LogFileNameOffset, log_file.c_str(), ulSizeLogFile);
 
         if ((ulResult = m_session.create(name.c_str(), properties.get())) == ERROR_SUCCESS) {
             break;
@@ -228,7 +232,7 @@ wxETWListCtrl::wxETWListCtrl(wxWindow *parent, wxWindowID id, const wxPoint& pos
             wxLogError(_("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."));
             return;
         } else if (ulResult == ERROR_ALREADY_EXISTS) {
-            wxLogDebug(_("The %s event session already exists."), name.c_str());
+            wxLogDebug(_("The %s event session already exists."), name);
             // Do not despair... Retry with a new session name and ID.
             continue;
         } else {
@@ -415,7 +419,7 @@ void wxETWListCtrl::RebuildItems()
 
     // Rebuild the index.
     m_rec_idx.clear();
-    set<size_t>::const_iterator selection_end = selection.end(), focus_end = focus.end();
+    auto selection_end = selection.cend(), focus_end = focus.cend();
     vector<long> selection_out, focus_out;
     long center_out = -1;
     for (size_t i = 0, n = m_rec_db.size(); i < n; i++) {
@@ -460,6 +464,8 @@ void wxETWListCtrl::RebuildItems()
 }
 
 
+/// \cond internal
+
 bool wxETWListCtrl::IsVisible(const EVENT_RECORD &rec) const
 {
     return
@@ -561,7 +567,7 @@ wxString wxETWListCtrl::OnGetItemText(long item, long column) const
 }
 
 
-wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
+wxString wxETWListCtrl::OnGetItemText(const winstd::event_rec &rec, long column) const
 {
     switch (column) {
     case 0: {
@@ -605,7 +611,7 @@ wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
             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;
+                    return reinterpret_cast<LPCWSTR>(rec.UserData);
                 } else {
                     // This is not a string-only event. Prepare parameters.
 
@@ -621,12 +627,12 @@ wxString wxETWListCtrl::OnGetItemText(const event_rec &rec, long column) const
 
                     if (info->EventMessageOffset) {
                         // Format the message.
-                        return wstring_msg(0, (LPCTSTR)((LPCBYTE)info.get() + info->EventMessageOffset), props_msg.data()).c_str();
+                        return wstring_msg(0, reinterpret_cast<LPCTSTR>(reinterpret_cast<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);
+                return reinterpret_cast<LPCWSTR>(reinterpret_cast<LPCBYTE>(info.get()) + info->EventMessageOffset);
             }
         }
     }
@@ -678,6 +684,8 @@ void wxETWListCtrl::OnETWEvent(wxETWEvent& event)
     }
 }
 
+/// \endcond
+
 
 //////////////////////////////////////////////////////////////////////////
 // wxPersistentETWListCtrl
@@ -703,13 +711,13 @@ void wxPersistentETWListCtrl::Save() const
     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(wxString::Format(wxT("Column%sWidth"), col.GetText()), 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)
+    for (auto 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);
 
@@ -728,7 +736,7 @@ bool wxPersistentETWListCtrl::Restore()
         wnd->GetColumn(i, col);
 
         int width;
-        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText().c_str()), &width))
+        if (RestoreValue(wxString::Format(wxT("Column%sWidth"), col.GetText()), &width))
             wnd->SetColumnWidth(i, width);
     }
 
@@ -816,21 +824,21 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
         case TDH_INTYPE_ANSICHAR: {
             // Convert strings from ANSI code page, all others (JSON, XML etc.) from UTF-8
             wstring str;
-            MultiByteToWideChar(OutType == TDH_OUTTYPE_STRING ? CP_ACP : CP_UTF8, 0, (LPCSTR)pData, (int)nDataSize, str);
+            MultiByteToWideChar(OutType == TDH_OUTTYPE_STRING ? CP_ACP : CP_UTF8, 0, reinterpret_cast<LPCSTR>(pData), (int)nDataSize, str);
             return tstring_printf(_T("%ls"), str.c_str());
         }
 
         case TDH_INTYPE_COUNTEDSTRING:
-            return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize);
+            return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, reinterpret_cast<LPCBYTE>((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize);
 
         case TDH_INTYPE_COUNTEDANSISTRING:
-            return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize);
+            return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, reinterpret_cast<LPCBYTE>((PUSHORT)pData + 1), *(PUSHORT)pData, pMapInfo, nPtrSize);
 
         case TDH_INTYPE_REVERSEDCOUNTEDSTRING:
-            return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize);
+            return DataToString(TDH_INTYPE_NONNULLTERMINATEDSTRING, OutType, reinterpret_cast<LPCBYTE>((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize);
 
         case TDH_INTYPE_REVERSEDCOUNTEDANSISTRING:
-            return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, (LPCBYTE)((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize);
+            return DataToString(TDH_INTYPE_NONNULLTERMINATEDANSISTRING, OutType, reinterpret_cast<LPCBYTE>((PUSHORT)pData + 1), MAKEWORD(HIBYTE(*(PUSHORT)pData), LOBYTE(*(PUSHORT)pData)), pMapInfo, nPtrSize);
 
         case TDH_INTYPE_INT8:
             assert(nDataSize >= sizeof(CHAR));
@@ -966,7 +974,7 @@ static tstring DataToString(_In_ USHORT InType, _In_ USHORT OutType, _In_count_(
             SYSTEMTIME st, st_local;
             FileTimeToSystemTime((PFILETIME)pData, &st);
             SystemTimeToTzSpecificLocalTime(NULL, &st, &st_local);
-            return DataToString(TDH_INTYPE_SYSTEMTIME, OutType, (LPCBYTE)&st_local, sizeof(st_local), pMapInfo, nPtrSize);
+            return DataToString(TDH_INTYPE_SYSTEMTIME, OutType, reinterpret_cast<LPCBYTE>(&st_local), sizeof(st_local), pMapInfo, nPtrSize);
         }
 
         case TDH_INTYPE_SYSTEMTIME:
@@ -1019,7 +1027,7 @@ static ULONG GetArraySize(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, ULONG i
         ULONG ulResult;
 
         // Get array count property.
-        PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset), ULONG_MAX };
+        PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[pInfo->EventPropertyInfoArray[i].countPropertyIndex].NameOffset), ULONG_MAX };
         vector<unsigned char> count;
         if ((ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, count)) != ERROR_SUCCESS)
             return ulResult;
@@ -1059,8 +1067,8 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
             if (out_nonfirst) out += _T(", "); else out_nonfirst = true;
             out += _T('(');
             for (USHORT j = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex, usLastMember = pInfo->EventPropertyInfoArray[ulPropIndex].structType.StructStartIndex + pInfo->EventPropertyInfoArray[ulPropIndex].structType.NumOfStructMembers; j < usLastMember; j++) {
-                out += tstring_printf(_T("%ls: "), (LPBYTE)pInfo + pInfo->EventPropertyInfoArray[j].NameOffset);
-                out += PropertyToString(pEvent, pInfo, j, (LPWSTR)((LPBYTE)(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k, nPtrSize);
+                out += tstring_printf(_T("%ls: "), reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[j].NameOffset);
+                out += PropertyToString(pEvent, pInfo, j, reinterpret_cast<LPWSTR>(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k, nPtrSize);
             }
             out += _T(')');
         } else {
@@ -1078,12 +1086,12 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                     // The first descriptor in the array identifies the name of the structure and the second 
                     // descriptor defines the member of the structure whose data you want to retrieve. 
                     PROPERTY_DATA_DESCRIPTOR data_desc[2] = {
-                        { (ULONGLONG)pStructureName                                                         , ulStructIndex },
-                        { (ULONGLONG)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k             }
+                        { (ULONGLONG)pStructureName                                                                           , ulStructIndex },
+                        { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k             }
                     };
                     ulResult = TdhGetProperty(pEvent, 0, NULL, _countof(data_desc), data_desc, data);
                 } else {
-                    PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k };
+                    PROPERTY_DATA_DESCRIPTOR data_desc = { (ULONGLONG)(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].NameOffset), k };
                     ulResult = TdhGetProperty(pEvent, 0, NULL, 1, &data_desc, data);
                 }
                 if (ulResult == ERROR_EVT_INVALID_EVENT_DATA) {
@@ -1094,7 +1102,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
 
                 // Get the name/value mapping if the property specifies a value map.
                 unique_ptr<EVENT_MAP_INFO> map_info;
-                ulResult = TdhGetEventMapInformation(pEvent, (LPWSTR)((LPBYTE)pInfo + pInfo->EventPropertyInfoArray[ulPropIndex].nonStructType.MapNameOffset), map_info);
+                ulResult = TdhGetEventMapInformation(pEvent, reinterpret_cast<LPWSTR>(reinterpret_cast<LPBYTE>(pInfo) + pInfo->EventPropertyInfoArray[ulPropIndex].nonStructType.MapNameOffset), map_info);
                 if (ulResult == ERROR_NOT_FOUND) {
                     // name/value mapping not found. Not an error actually.
                     assert(!map_info);
@@ -1105,7 +1113,7 @@ static tstring PropertyToString(PEVENT_RECORD pEvent, PTRACE_EVENT_INFO pInfo, U
                     // in the EVENT_MAP_ENTRY structure. Replace the trailing space with a null-
                     // terminating character, so that the bit mapped strings are correctly formatted.
                     for (ULONG i = 0; i < map_info->EntryCount; i++) {
-                        LPWSTR str = (LPWSTR)((PBYTE)map_info.get() + map_info->MapEntryArray[i].OutputOffset);
+                        LPWSTR str = reinterpret_cast<LPWSTR>((PBYTE)map_info.get() + map_info->MapEntryArray[i].OutputOffset);
                         SIZE_T len = wcslen(str);
                         if (len) str[len - 1] = 0;
                     }

EventMonitor/ETWLog.h

@@ -1,51 +1,42 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <wx/event.h>
 
+/// \addtogroup EventMonitor
+/// @{
+
 ///
 /// Maximum number of event records kept
 ///
 #define wxETWEVENT_RECORDS_MAX  1000000
 
-///
-/// ETW event
-///
+/// @}
+
 class wxETWEvent;
 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
-///
 class wxPersistentETWListCtrl;
 
 #pragma once
@@ -61,47 +52,106 @@ class wxPersistentETWListCtrl;
 #include <set>
 
 
+/// \addtogroup EventMonitor
+/// @{
+
+///
+/// ETW event
+///
 class wxETWEvent : public wxEvent
 {
 public:
+    ///
+    /// Creates ETW event
+    ///
+    /// \param[in] type    The unique type of event
+    /// \param[in] record  ETW event record
+    ///
     wxETWEvent(wxEventType type = wxEVT_NULL, const EVENT_RECORD &record = s_record_null);
+
+    ///
+    /// Copies an ETW event
+    ///
+    /// \param[in] event  ETW event to copy from
+    ///
     wxETWEvent(const wxETWEvent& event);
-    virtual wxEvent *Clone() const { return new wxETWEvent(*this); }
 
-    inline const winstd::event_rec&  GetRecord() const { return m_record; }
-    inline       winstd::event_rec&  GetRecord()       { return m_record; }
+    ///
+    /// Clones the ETW event
+    ///
+    /// \returns Event copy
+    ///
+    virtual wxEvent *Clone() const
+    {
+        return new wxETWEvent(*this);
+    }
 
-protected:
-    bool DoSetExtendedData(size_t extended_data_count, const EVENT_HEADER_EXTENDED_DATA_ITEM *extended_data);
-    bool DoSetUserData(size_t user_data_length, const void *user_data);
+    ///
+    /// Returns ETW event record assosiated with event
+    ///
+    inline const winstd::event_rec& GetRecord() const
+    {
+        return m_record;
+    }
+
+    ///
+    /// Returns ETW event record assosiated with event
+    ///
+    inline winstd::event_rec& GetRecord()
+    {
+        return m_record;
+    }
 
 private:
     DECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxETWEvent)
 
 public:
-    static const EVENT_RECORD s_record_null;
+    static const EVENT_RECORD s_record_null; ///< Blank ETW event record
 
 protected:
     winstd::event_rec m_record; ///< ETW event record
 };
 
 
+///
+/// Prototype of the function consuming `wxETWEvent` events
+///
 typedef void (wxEvtHandler::*wxETWEventFunction)(wxETWEvent&);
 
 
+///
+/// Monitors ETW events and forwards them as `wxETWEvent` event
+///
 class wxEventTraceProcessorThread : public wxThread
 {
 public:
+    ///
+    /// A thread to process ETW events
+    ///
+    /// \param[in] parent    Event handler this thread will send record notifications
+    /// \param[in] sessions  An array of sessions to monitor
+    ///
     wxEventTraceProcessorThread(wxEvtHandler *parent, const wxArrayString &sessions);
+
+    ///
+    /// Destructor
+    ///
     virtual ~wxEventTraceProcessorThread();
 
+    ///
+    /// Closes all session handles to allow graceful thread termination
+    ///
     void Abort();
 
 protected:
+    /// \cond internal
     virtual ExitCode Entry();
+    /// \endcond
 
 private:
+    /// \cond internal
     static VOID WINAPI EventRecordCallback(PEVENT_RECORD pEvent);
+    /// \endcond
 
 protected:
     std::vector<TRACEHANDLE> m_traces;  ///< An array of tracing sessions this thread is monitoring
@@ -109,6 +159,9 @@ protected:
 };
 
 
+///
+/// Event list control
+///
 class wxETWListCtrl : public wxListCtrl
 {
 protected:
@@ -117,6 +170,9 @@ protected:
     ///
     struct less_guid : public std::binary_function<GUID, GUID, bool>
     {
+        ///
+        /// Compares two GUIDs
+        ///
         bool operator()(const GUID &a, const GUID &b) const
         {
             if (a.Data1 < b.Data1) return true;
@@ -136,6 +192,17 @@ protected:
     typedef std::set<GUID, less_guid> guidset;
 
 public:
+    ///
+    /// Creates a list control for ETW log display
+    ///
+    /// \param[in] parent     Parent window. Must not be \c NULL.
+    /// \param[in] id         Window identifier. The value \c wxID_ANY indicates a default value.
+    /// \param[in] pos        Window position. If \c wxDefaultPosition is specified then a default position is chosen.
+    /// \param[in] size       Window size. If \c wxDefaultSize is specified then the window is sized appropriately.
+    /// \param[in] style      Window style. See \c wxListCtrl.
+    /// \param[in] validator  Window validator
+    /// \param[in] name       Window name
+    ///
     wxETWListCtrl(
               wxWindow    *parent,
               wxWindowID  id         = wxID_ANY,
@@ -144,24 +211,73 @@ public:
               long        style      = wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL|wxNO_BORDER,
         const wxValidator &validator = wxDefaultValidator,
         const wxString    &name      = wxListCtrlNameStr);
+
+    ///
+    /// Destructor
+    ///
     virtual ~wxETWListCtrl();
 
-    inline bool IsEmpty() const { return m_rec_db.empty(); }
+    ///
+    /// Returns true if the list is empty
+    ///
+    inline bool IsEmpty() const
+    {
+        return m_rec_db.empty();
+    }
+
+    ///
+    /// Copies selected rows to clipboard
+    ///
     void CopySelected() const;
+
+    ///
+    /// Copies all rows (including hidden ones) to clipboard
+    ///
     void CopyAll() const;
+
+    ///
+    /// Empties the list
+    ///
     void ClearAll();
+
+    ///
+    /// Selects all rows
+    ///
     void SelectAll();
+
+    ///
+    /// Clears row selection
+    ///
     void SelectNone();
+
+    ///
+    /// Rebuilds the list
+    ///
     void RebuildItems();
 
+    ///
+    /// Checks if given ETW source is enabled
+    ///
+    /// \param[in] guid  GUID of ETW source
+    ///
+    /// \returns
+    /// - \c true if ETW source with \p guid GUID is enabled;
+    /// - \c false otherwise.
+    ///
     inline bool IsSourceEnabled(const GUID &guid) const
     {
         return m_sources.find(guid) != m_sources.end();
     }
 
+    ///
+    /// Enables/Disables ETW source
+    ///
+    /// \param[in] guid    GUID of ETW source
+    /// \param[in] enable  \c true to enable, \c false to disable
+    ///
     inline void EnableSource(const GUID &guid, bool enable = true)
     {
-        guidset::iterator s = m_sources.find(guid);
+        auto s = m_sources.find(guid);
         if (enable) {
             if (s == m_sources.end()) {
                 m_sources.insert(guid);
@@ -178,6 +294,7 @@ public:
     friend class wxPersistentETWListCtrl;   // Allow saving/restoring window state.
 
 protected:
+    /// \cond internal
     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;
@@ -186,6 +303,8 @@ protected:
     virtual wxString OnGetItemText(long item, long column) const;
     virtual wxString OnGetItemText(const winstd::event_rec &rec, long column) const;
     void OnETWEvent(wxETWEvent& event);
+    /// \endcond
+
     DECLARE_EVENT_TABLE()
 
 public:
@@ -209,18 +328,48 @@ protected:
 };
 
 
+///
+/// Supports saving/restoring `wxETWListCtrl` state
+///
 class wxPersistentETWListCtrl : public wxPersistentWindow<wxETWListCtrl>
 {
 public:
+    ///
+    /// Constructor for a persistent window object
+    ///
+    /// \param[in] wnd  Window this object will save/restore
+    ///
     wxPersistentETWListCtrl(wxETWListCtrl *wnd);
 
+    ///
+    /// Returns the string uniquely identifying the objects supported by this adapter.
+    ///
+    /// \returns This implementation always returns `wxT(wxPERSIST_TLW_KIND)`
+    ///
     virtual wxString GetKind() const;
+
+    ///
+    /// Saves the object properties
+    ///
     virtual void Save() const;
+
+    ///
+    /// Restores the object properties
+    ///
+    /// \returns
+    /// - \c true if the properties were successfully restored;
+    /// - \c false otherwise.
+    ///
     virtual bool Restore();
 };
 
 
+///
+/// Creates persistent window object for `wxETWListCtrl` class window
+///
 inline wxPersistentObject *wxCreatePersistentObject(wxETWListCtrl *wnd)
 {
     return new wxPersistentETWListCtrl(wnd);
 }
+
+/// @}

EventMonitor/EventMonitor.vcxproj

@@ -91,7 +91,7 @@
     <ClInclude Include="Frame.h" />
     <ClInclude Include="LogPanel.h" />
     <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="wxEventMonitor_UI.h" />
+    <ClInclude Include="res\wxEventMonitor_UI.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="App.cpp" />
@@ -104,7 +104,7 @@
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="wxEventMonitor_UI.cpp" />
+    <ClCompile Include="res\wxEventMonitor_UI.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
@@ -120,7 +120,7 @@
   <ItemGroup>
     <None Include="locale\EventMonitor.pot" />
     <None Include="res\EventMonitor.ico" />
-    <None Include="wxEventMonitor_UI.fbp" />
+    <None Include="res\wxEventMonitor_UI.fbp" />
   </ItemGroup>
   <ItemGroup>
     <POCompile Include="locale\bg_BG.po" />

EventMonitor/EventMonitor.vcxproj.filters

@@ -30,7 +30,7 @@
     <ClInclude Include="App.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="wxEventMonitor_UI.h">
+    <ClInclude Include="res\wxEventMonitor_UI.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="Frame.h">
@@ -50,7 +50,7 @@
     <ClCompile Include="App.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="wxEventMonitor_UI.cpp">
+    <ClCompile Include="res\wxEventMonitor_UI.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="Frame.cpp">
@@ -64,7 +64,7 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="wxEventMonitor_UI.fbp">
+    <None Include="res\wxEventMonitor_UI.fbp">
       <Filter>Resource Files</Filter>
     </None>
     <None Include="locale\EventMonitor.pot">

EventMonitor/Frame.cpp

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdAfx.h"
@@ -261,6 +261,8 @@ wxEventMonitorFrame::~wxEventMonitorFrame()
 }
 
 
+/// \cond internal
+
 void wxEventMonitorFrame::OnExit(wxCommandEvent& event)
 {
     Close();
@@ -408,6 +410,8 @@ void wxEventMonitorFrame::OnViewToolbar(wxCommandEvent& event)
     }
 }
 
+/// \endcond
+
 
 //////////////////////////////////////////////////////////////////////////
 // wxPersistentEventMonitorFrame

EventMonitor/Frame.h

@@ -1,39 +1,30 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-///
-/// EventMonitor main frame
-///
 class wxEventMonitorFrame;
-
-///
-/// Supports saving/restoring wxEventMonitorFrame GUI state
-///
 class wxPersistentEventMonitorFrame;
 
 #pragma once;
 
 #include "LogPanel.h"
 
-#include "wxEventMonitor_UI.h"
-
 #include <wx/frame.h>
 #include <wx/menu.h>
 #include <wx/statusbr.h>
@@ -44,6 +35,12 @@ class wxPersistentEventMonitorFrame;
 #include <WinStd/Win.h>
 
 
+/// \addtogroup EventMonitor
+/// @{
+
+///
+/// EventMonitor main frame
+///
 class wxEventMonitorFrame : public wxFrame
 {
 protected:
@@ -64,12 +61,28 @@ protected:
     };
 
 public:
+    ///
+    /// Creates an EventMonitor frame window
+    ///
+    /// \param[in] parent  The window parent. This may be \c NULL. If it is non-NULL, the frame will always be displayed on top of the parent window on Windows.
+    /// \param[in] id      The window identifier. It may take a value of \c wxID_ANY to indicate a default value.
+    /// \param[in] title   The caption to be displayed on the frame's title bar.
+    /// \param[in] pos     The window position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in] size    The window size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in] style   The window style. See `wxFrame` class description.
+    /// \param[in] name    The name of the window. This parameter is used to associate a name with the item, allowing the application user to set Motif resource values for individual windows.
+    ///
     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"));
+
+    ///
+    /// Destructor
+    ///
     ~wxEventMonitorFrame();
 
     friend class wxPersistentEventMonitorFrame;
 
 protected:
+    /// \cond internal
     void OnExit(wxCommandEvent& event);
     void OnEditCopyUpdate(wxUpdateUIEvent& event);
     void OnEditCopy(wxCommandEvent& event);
@@ -89,8 +102,10 @@ protected:
     void OnViewLevel(wxCommandEvent& event);
     void OnViewToolbarUpdate(wxUpdateUIEvent& event);
     void OnViewToolbar(wxCommandEvent& event);
+    /// \endcond
 
 protected:
+    /// \cond internal
     wxMenuBar* m_menubar;
     wxMenu* m_menuProgram;
     wxMenu* m_menuEdit;
@@ -116,20 +131,45 @@ protected:
     wxStatusBar* m_statusBar;
     wxEventMonitorLogPanel* m_panel;
     wxAuiManager m_mgr;
+    /// \endcond
 };
 
 
+///
+/// Supports saving/restoring `wxEventMonitorFrame` GUI state
+///
 class wxPersistentEventMonitorFrame : public wxPersistentTLW
 {
 public:
+    ///
+    /// Constructor for a persistent window object
+    ///
+    /// \param[in] wnd  Window this object will save/restore
+    ///
     wxPersistentEventMonitorFrame(wxEventMonitorFrame *wnd);
 
+    ///
+    /// Saves the object properties
+    ///
     virtual void Save() const;
+
+    ///
+    /// Restores the object properties
+    ///
+    /// \returns
+    /// - \c true if the properties were successfully restored;
+    /// - \c false otherwise.
+    ///
     virtual bool Restore();
 };
 
 
+///
+/// Creates persistent window object for `wxETWListCtrl` class window
+///
 inline wxPersistentObject *wxCreatePersistentObject(wxEventMonitorFrame *wnd)
 {
     return new wxPersistentEventMonitorFrame(wnd);
 }
+
+/// @}

EventMonitor/LogPanel.cpp

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdAfx.h"

EventMonitor/LogPanel.h

@@ -1,60 +1,94 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
-///
-/// EventMonitor trace log panel
-///
 class wxEventMonitorLogPanel;
-
-///
-/// Supports saving/restoring wxEventMonitorLogPanel state
-///
 class wxPersistentEventMonitorLogPanel;
 
 #pragma once
 
-#include "wxEventMonitor_UI.h"
+#include "res/wxEventMonitor_UI.h"
 #include <wx/persist/window.h>
 
 
+/// \addtogroup EventMonitor
+/// @{
+
+///
+/// EventMonitor trace log panel
+///
 class wxEventMonitorLogPanel : public wxEventMonitorLogPanelBase
 {
 public:
+    ///
+    /// Constructs EventMonitor log panel
+    ///
+    /// \param[in] parent  Parent window. Must not be \c NULL.
+    ///
     wxEventMonitorLogPanel(wxWindow* parent);
 
     friend class wxPersistentEventMonitorLogPanel;   // Allow saving/restoring window state.
 };
 
 
+///
+/// Supports saving/restoring `wxEventMonitorLogPanel` state
+///
 class wxPersistentEventMonitorLogPanel : public wxPersistentWindow<wxEventMonitorLogPanel>
 {
 public:
+    ///
+    /// Constructor for a persistent window object
+    ///
+    /// \param[in] wnd  Window this object will save/restore
+    ///
     wxPersistentEventMonitorLogPanel(wxEventMonitorLogPanel *wnd);
 
+    ///
+    /// Returns the string uniquely identifying the objects supported by this adapter.
+    ///
+    /// \returns This implementation always returns `wxT(wxPERSIST_TLW_KIND)`
+    ///
     virtual wxString GetKind() const;
+
+    ///
+    /// Saves the object properties
+    ///
     virtual void Save() const;
+
+    ///
+    /// Restores the object properties
+    ///
+    /// \returns
+    /// - \c true if the properties were successfully restored;
+    /// - \c false otherwise.
+    ///
     virtual bool Restore();
 };
 
 
+///
+/// Creates persistent window object for `wxEventMonitorLogPanel` class window
+///
 inline wxPersistentObject *wxCreatePersistentObject(wxEventMonitorLogPanel *wnd)
 {
     return new wxPersistentEventMonitorLogPanel(wnd);
 }
+
+/// @}

EventMonitor/locale/EventMonitor.pot

@@ -2,14 +2,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: EventMonitor\n"
-"POT-Creation-Date: 2016-09-19 11:14+0200\n"
+"POT-Creation-Date: 2016-11-04 14:10+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: ..\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: en_US\n"
@@ -17,7 +17,9 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
-#: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: App.cpp:61 Frame.h:75 MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
 msgstr ""
@@ -27,41 +29,41 @@ msgstr ""
 msgid "Error opening event trace (error %u)."
 msgstr ""
 
-#: ETWLog.cpp:167
+#: ETWLog.cpp:171
 msgid "Time"
 msgstr ""
 
-#: ETWLog.cpp:168
+#: ETWLog.cpp:172
 msgid "PID"
 msgstr ""
 
-#: ETWLog.cpp:169
+#: ETWLog.cpp:173
 msgid "TID"
 msgstr ""
 
-#: ETWLog.cpp:170
+#: ETWLog.cpp:174
 msgid "Source"
 msgstr ""
 
-#: ETWLog.cpp:171
+#: ETWLog.cpp:175
 msgid "Event"
 msgstr ""
 
-#: ETWLog.cpp:228
+#: ETWLog.cpp:232
 msgid "Access denied creating event session: you need administrative privileges (Run As Administrator) or be a member of Performance Log Users group to start event tracing session."
 msgstr ""
 
-#: ETWLog.cpp:231
-#, c-format
-msgid "The %s event session already exists."
-msgstr ""
-
 #: ETWLog.cpp:235
 #, c-format
+msgid "The %s event session already exists."
+msgstr ""
+
+#: ETWLog.cpp:239
+#, c-format
 msgid "Error creating event session (error %u)."
 msgstr ""
 
-#: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
+#: ETWLog.cpp:255 ETWLog.cpp:271 ETWLog.cpp:285
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
 msgstr ""
@@ -205,14 +207,20 @@ msgstr ""
 msgid "Trace Log"
 msgstr ""
 
+#: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
 msgstr ""
 
+#: MSIBuild/en_US.Win32.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
+#: MSIBuild/en_US.x64.Debug.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
 msgstr ""

EventMonitor/locale/bg_BG.po

@@ -5,6 +5,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2016-09-19 11:14+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: University of Ruse <support@uni-ruse.bg>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,32 +21,32 @@ msgstr ""
 #: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
-msgstr ""
+msgstr "Следене на събития"
 
 #: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
-msgstr ""
+msgstr "Грешка при отваряне проследяването на събитие (error %u)."
 
 #: ETWLog.cpp:167
 msgid "Time"
-msgstr ""
+msgstr "Време"
 
 #: ETWLog.cpp:168
 msgid "PID"
-msgstr ""
+msgstr "PID"
 
 #: ETWLog.cpp:169
 msgid "TID"
-msgstr ""
+msgstr "TID"
 
 #: ETWLog.cpp:170
 msgid "Source"
-msgstr ""
+msgstr "Източник"
 
 #: ETWLog.cpp:171
 msgid "Event"
-msgstr ""
+msgstr "Събитие"
 
 #: ETWLog.cpp:228
 msgid ""
@@ -53,169 +54,172 @@ msgid ""
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
+"Достъпът до създаването сесия на събитие е отказан: необходимо е да имате "
+"администраторски права (Run As Administrator) или да бъдете член на групата "
+"Performance Log Users, за да стартирате сесия за проследяване на събитие."
 
 #: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
-msgstr ""
+msgstr "Сесията на събитие %s вече съществува."
 
 #: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
-msgstr ""
+msgstr "Грешка при създаване сесията на събитие (error %u)."
 
 #: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
-msgstr ""
+msgstr "Грешка при разрешаване %s събитие на доставчик (error %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 ""
+msgstr "Сборно изобразяване на записи %s"
 
 #: Frame.cpp:65
 msgid "E&xit"
-msgstr ""
+msgstr "Из&ход"
 
 #: Frame.cpp:65
 msgid "Quits this program"
-msgstr ""
+msgstr "Излизане от тази програма"
 
 #: Frame.cpp:69
 msgid "&Program"
-msgstr ""
+msgstr "&Програма"
 
 #: Frame.cpp:73
 msgid "&Copy"
-msgstr ""
+msgstr "&Копиране"
 
 #: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
-msgstr ""
+msgstr "Копиране на избраните записи в клипборда"
 
 #: Frame.cpp:78
 msgid "Copy A&ll"
-msgstr ""
+msgstr "Копиране на Всич&ко"
 
 #: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
-msgstr ""
+msgstr "Копиране на всички записи в клипборда (включително скритите)"
 
 #: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
-msgstr ""
+msgstr "Изчистване"
 
 #: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
-msgstr ""
+msgstr "Изчистване на всички записи от лога"
 
 #: Frame.cpp:90
 msgid "Select &All"
-msgstr ""
+msgstr "Изберете &всичко"
 
 #: Frame.cpp:90
 msgid "Selects all visible records"
-msgstr ""
+msgstr "Изберете всички видими записи"
 
 #: Frame.cpp:94
 msgid "Select &None"
-msgstr ""
+msgstr "Изберете &Нищо"
 
 #: Frame.cpp:94
 msgid "Clears record selection"
-msgstr ""
+msgstr "Изчистете избраните записи"
 
 #: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
-msgstr ""
+msgstr "&Редактиране"
 
 #: Frame.cpp:101
 msgid "Auto &Scroll"
-msgstr ""
+msgstr "Автоматичен &скрол"
 
 #: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
-msgstr ""
+msgstr "Автоматичен скрол на най-последните записи, така както са влезли"
 
 #: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
-msgstr ""
+msgstr "Подробно"
 
 #: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
-msgstr ""
+msgstr "Показва всички нива на записите"
 
 #: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
-msgstr ""
+msgstr "Информационен"
 
 #: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
-msgstr ""
+msgstr "Показва всички записи, по-високи от информационното ниво"
 
 #: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
-msgstr ""
+msgstr "Предупреждение"
 
 #: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
-msgstr ""
+msgstr "Показва всички записи, по-високи от ниво предупреждение"
 
 #: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
-msgstr ""
+msgstr "Грешка"
 
 #: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
-msgstr ""
+msgstr "Показва само записи с ниво грешка"
 
 #: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
-msgstr ""
+msgstr "%s лента с инструменти"
 
 #: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
-msgstr ""
+msgstr "Сборно изобразяване на лентата с инструменти %s"
 
 #: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
-msgstr ""
+msgstr "Изглед"
 
 #: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
-msgstr ""
+msgstr "&Изглед"
 
 #: Frame.cpp:154
 msgid "Copy"
-msgstr ""
+msgstr "Копиране"
 
 #: Frame.cpp:156
 msgid "Copy All"
-msgstr ""
+msgstr "Копиране на всичко"
 
 #: Frame.cpp:161
 msgid "Edit"
-msgstr ""
+msgstr "Редактиране"
 
 #: Frame.cpp:164
 msgid "Auto Scroll"
-msgstr ""
+msgstr "Автоматичен скрол"
 
 #: Frame.cpp:189
 msgid "Trace Log"
-msgstr ""
+msgstr "Лог с проследяване"
 
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
-msgstr ""
+msgstr "Покзва в реално време вътрешни събития"
 
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr ""
+msgstr "EVENTM~1|GÉANTLink следене на събитие"

EventMonitor/locale/ca_ES.po

@@ -5,6 +5,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2016-09-19 11:14+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: eduki <ecercos@xtec.cat>, 2016\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,32 +21,32 @@ msgstr ""
 #: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
-msgstr ""
+msgstr "Monitor de Successos"
 
 #: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
-msgstr ""
+msgstr "Error obrint la traça (error %u)."
 
 #: ETWLog.cpp:167
 msgid "Time"
-msgstr ""
+msgstr "Temps"
 
 #: ETWLog.cpp:168
 msgid "PID"
-msgstr ""
+msgstr "PID"
 
 #: ETWLog.cpp:169
 msgid "TID"
-msgstr ""
+msgstr "TID"
 
 #: ETWLog.cpp:170
 msgid "Source"
-msgstr ""
+msgstr "Font"
 
 #: ETWLog.cpp:171
 msgid "Event"
-msgstr ""
+msgstr "Succés"
 
 #: ETWLog.cpp:228
 msgid ""
@@ -53,169 +54,173 @@ msgid ""
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
+"Accés denegat creant sessió de successos: necessiteu privilegis "
+"administratius (Executa com Administrador) o bé ser membre del grup "
+"d'usuaris del Log de Rendiment per iniciar una sessió de traces de "
+"successos."
 
 #: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
-msgstr ""
+msgstr "La sessió de successos %s ja existeix."
 
 #: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
-msgstr ""
+msgstr "Error creant la sessió de successos (error %u)."
 
 #: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
-msgstr ""
+msgstr "Error habilitant el proveidor de successos %s (error %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 ""
+msgstr "Canvia la visualització de %s registres"
 
 #: Frame.cpp:65
 msgid "E&xit"
-msgstr ""
+msgstr "S&ortida"
 
 #: Frame.cpp:65
 msgid "Quits this program"
-msgstr ""
+msgstr "Surt del programa"
 
 #: Frame.cpp:69
 msgid "&Program"
-msgstr ""
+msgstr "&Programa"
 
 #: Frame.cpp:73
 msgid "&Copy"
-msgstr ""
+msgstr "&Copia"
 
 #: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
-msgstr ""
+msgstr "Copia els registres seleccionats al portapapers"
 
 #: Frame.cpp:78
 msgid "Copy A&ll"
-msgstr ""
+msgstr "Copia T&ot"
 
 #: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
-msgstr ""
+msgstr "Copia tots els registres al portapapers (incloent els amagats)"
 
 #: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
-msgstr ""
+msgstr "Neteja"
 
 #: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
-msgstr ""
+msgstr "Esborra tots els registres del log"
 
 #: Frame.cpp:90
 msgid "Select &All"
-msgstr ""
+msgstr "Selecciona-ho &Tot"
 
 #: Frame.cpp:90
 msgid "Selects all visible records"
-msgstr ""
+msgstr "Selecciona tots els registres visibles"
 
 #: Frame.cpp:94
 msgid "Select &None"
-msgstr ""
+msgstr "&Esborrar selecció"
 
 #: Frame.cpp:94
 msgid "Clears record selection"
-msgstr ""
+msgstr "Esborra la selecció de registres"
 
 #: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
-msgstr ""
+msgstr "&Edita"
 
 #: Frame.cpp:101
 msgid "Auto &Scroll"
-msgstr ""
+msgstr "Auto &Scroll"
 
 #: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
-msgstr ""
+msgstr "Mostra automàticament els registres més recents així que arriben"
 
 #: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
-msgstr ""
+msgstr "Detallat"
 
 #: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
-msgstr ""
+msgstr "Mostra tots els nivells de registre"
 
 #: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
-msgstr ""
+msgstr "Informatiu"
 
 #: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
-msgstr ""
+msgstr "Mostra els registres fins al nivell informatiu"
 
 #: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
-msgstr ""
+msgstr "Alerta"
 
 #: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
-msgstr ""
+msgstr "Mostra els registres fins al nivell d'alerta"
 
 #: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
-msgstr ""
+msgstr "Error"
 
 #: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
-msgstr ""
+msgstr "Mostra només els registres d'error"
 
 #: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
-msgstr ""
+msgstr "Barra %s"
 
 #: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
-msgstr ""
+msgstr "Alterna la visió de la barra %s"
 
 #: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
-msgstr ""
+msgstr "Vista"
 
 #: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
-msgstr ""
+msgstr "&Vista"
 
 #: Frame.cpp:154
 msgid "Copy"
-msgstr ""
+msgstr "Copia"
 
 #: Frame.cpp:156
 msgid "Copy All"
-msgstr ""
+msgstr "Copia-ho tot"
 
 #: Frame.cpp:161
 msgid "Edit"
-msgstr ""
+msgstr "Edita"
 
 #: Frame.cpp:164
 msgid "Auto Scroll"
-msgstr ""
+msgstr "Auto Scroll"
 
 #: Frame.cpp:189
 msgid "Trace Log"
-msgstr ""
+msgstr "Registre de traces"
 
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
-msgstr ""
+msgstr "Mostra en temps real dels successos interns"
 
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr ""
+msgstr "EVENTM~1|GÉANTLink Monitor de successos"

EventMonitor/locale/sr_RS.po

@@ -5,6 +5,7 @@ msgstr ""
 "Project-Id-Version: EventMonitor\n"
 "POT-Creation-Date: 2016-09-19 11:14+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,32 +21,32 @@ msgstr ""
 #: App.cpp:61 Frame.h:67 MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "Event Monitor"
-msgstr ""
+msgstr "Monitor događaja"
 
 #: ETWLog.cpp:83
 #, c-format
 msgid "Error opening event trace (error %u)."
-msgstr ""
+msgstr "Greška prilikom otvaranja log fajla za praćenje događaja (greška %u)."
 
 #: ETWLog.cpp:167
 msgid "Time"
-msgstr ""
+msgstr "Vreme"
 
 #: ETWLog.cpp:168
 msgid "PID"
-msgstr ""
+msgstr "PID"
 
 #: ETWLog.cpp:169
 msgid "TID"
-msgstr ""
+msgstr "TID"
 
 #: ETWLog.cpp:170
 msgid "Source"
-msgstr ""
+msgstr "Izvor"
 
 #: ETWLog.cpp:171
 msgid "Event"
-msgstr ""
+msgstr "Događaj"
 
 #: ETWLog.cpp:228
 msgid ""
@@ -53,169 +54,173 @@ msgid ""
 "(Run As Administrator) or be a member of Performance Log Users group to "
 "start event tracing session."
 msgstr ""
+"Pristup zabranjen prilikom kreiranja sesije: potrebne su vam "
+"administratorske privilegije (\"Run As Administrator\") ili da budete član "
+"\"Performance Log Users\" grupe kako biste mogli da počnete sa praćenjem ove"
+" sesije."
 
 #: ETWLog.cpp:231
 #, c-format
 msgid "The %s event session already exists."
-msgstr ""
+msgstr "Ova %s sesija već postoji."
 
 #: ETWLog.cpp:235
 #, c-format
 msgid "Error creating event session (error %u)."
-msgstr ""
+msgstr "Greška prilikom kreiranja sesije (greška %u)."
 
 #: ETWLog.cpp:251 ETWLog.cpp:267 ETWLog.cpp:281
 #, c-format
 msgid "Error enabling %s event provider (error %u)."
-msgstr ""
+msgstr "Greška prilikom omogućavanja %s provajdera (greška %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 ""
+msgstr "Isključuje prikaz %s zapisa"
 
 #: Frame.cpp:65
 msgid "E&xit"
-msgstr ""
+msgstr "E&xit"
 
 #: Frame.cpp:65
 msgid "Quits this program"
-msgstr ""
+msgstr "Prekida izvršavanje ovog programa"
 
 #: Frame.cpp:69
 msgid "&Program"
-msgstr ""
+msgstr "&Program"
 
 #: Frame.cpp:73
 msgid "&Copy"
-msgstr ""
+msgstr "&Copy"
 
 #: Frame.cpp:73 Frame.cpp:154
 msgid "Copies selected records to clipboard"
-msgstr ""
+msgstr "Kopira izabrane zapise na clipboard"
 
 #: Frame.cpp:78
 msgid "Copy A&ll"
-msgstr ""
+msgstr "Kopiraj A&ll"
 
 #: Frame.cpp:78 Frame.cpp:156
 msgid "Copies all records to clipboard (including hidden)"
-msgstr ""
+msgstr "Kopira sve zapise na clipboard (uključujući i skrivene)"
 
 #: Frame.cpp:83 Frame.cpp:158
 msgid "Clear"
-msgstr ""
+msgstr "Skloni"
 
 #: Frame.cpp:83 Frame.cpp:158
 msgid "Clears all records from the log"
-msgstr ""
+msgstr "Sklanja sve zapise iz log fajla"
 
 #: Frame.cpp:90
 msgid "Select &All"
-msgstr ""
+msgstr "Izaberi &All"
 
 #: Frame.cpp:90
 msgid "Selects all visible records"
-msgstr ""
+msgstr "Odabira sve vidljive zapise"
 
 #: Frame.cpp:94
 msgid "Select &None"
-msgstr ""
+msgstr "Odaberi &None"
 
 #: Frame.cpp:94
 msgid "Clears record selection"
-msgstr ""
+msgstr "Uklanja izbor zapisa"
 
 #: Frame.cpp:97 Frame.cpp:142
 msgid "&Edit"
-msgstr ""
+msgstr "&Edit"
 
 #: Frame.cpp:101
 msgid "Auto &Scroll"
-msgstr ""
+msgstr "Automatski &Scroll"
 
 #: Frame.cpp:101 Frame.cpp:164
 msgid "Automatically scrolls to the most recent records as they come-in"
-msgstr ""
+msgstr "Automatski skroluje na najnovije zapise kako se pojavljuju"
 
 #: Frame.cpp:123 Frame.cpp:176
 msgid "Verbose"
-msgstr ""
+msgstr "Detalj"
 
 #: Frame.cpp:123 Frame.cpp:176
 msgid "Displays all levels of records"
-msgstr ""
+msgstr "Prikazuje sve nivoe zapisa"
 
 #: Frame.cpp:127 Frame.cpp:178
 msgid "Informational"
-msgstr ""
+msgstr "Informacija"
 
 #: Frame.cpp:127 Frame.cpp:178
 msgid "Displays all records up to informational level"
-msgstr ""
+msgstr "Prikazuje sve zapise za određeni nivo informacija"
 
 #: Frame.cpp:131 Frame.cpp:180
 msgid "Warning"
-msgstr ""
+msgstr "Upozorenje"
 
 #: Frame.cpp:131 Frame.cpp:180
 msgid "Displays all records up to warning level"
-msgstr ""
+msgstr "Prikazuje sve zapise za određeni nivo upozorenja"
 
 #: Frame.cpp:135 Frame.cpp:182
 msgid "Error"
-msgstr ""
+msgstr "Greška"
 
 #: Frame.cpp:135 Frame.cpp:182
 msgid "Displays error level records only"
-msgstr ""
+msgstr "Prikazuje samo zapise za greške koje su se javile"
 
 #: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "%s toolbar"
-msgstr ""
+msgstr "%s toolbar"
 
 #: Frame.cpp:142 Frame.cpp:146
 #, c-format
 msgid "Toggles display of %s toolbar"
-msgstr ""
+msgstr "Isključuje prikaz %s toolbar"
 
 #: Frame.cpp:142 Frame.cpp:146 Frame.cpp:185
 msgid "View"
-msgstr ""
+msgstr "Prikaži"
 
 #: Frame.cpp:146 Frame.cpp:149
 msgid "&View"
-msgstr ""
+msgstr "&View"
 
 #: Frame.cpp:154
 msgid "Copy"
-msgstr ""
+msgstr "Kopiraj"
 
 #: Frame.cpp:156
 msgid "Copy All"
-msgstr ""
+msgstr "Kopiraj sve"
 
 #: Frame.cpp:161
 msgid "Edit"
-msgstr ""
+msgstr "Izmeni"
 
 #: Frame.cpp:164
 msgid "Auto Scroll"
-msgstr ""
+msgstr "Automaski skrol"
 
 #: Frame.cpp:189
 msgid "Trace Log"
-msgstr ""
+msgstr "Log fajl"
 
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "Real-time display of internal events"
-msgstr ""
+msgstr "Prikaz internih događaja u realnom vremenu"
 
 #: MSIBuild/en_US.Win32.Release.Shortcut-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Shortcut-2.idtx:4
 msgid "EVENTM~1|GÉANTLink Event Monitor"
-msgstr ""
+msgstr "EVENTM~1|GÉANTLink Event Monitor"

EventMonitor/res/wxEventMonitor_UI.cpp

@@ -7,7 +7,7 @@
 
 #include "StdAfx.h"
 
-#include "ETWLog.h"
+#include "../ETWLog.h"
 
 #include "wxEventMonitor_UI.h"
 

EventMonitor/res/wxEventMonitor_UI.fbp

@@ -133,7 +133,7 @@
                         <property name="show">1</property>
                         <property name="size"></property>
                         <property name="style">wxLC_NO_SORT_HEADER|wxLC_REPORT|wxLC_VIRTUAL</property>
-                        <property name="subclass">wxETWListCtrl; ETWLog.h</property>
+                        <property name="subclass">wxETWListCtrl; ../ETWLog.h</property>
                         <property name="toolbar_pane">0</property>
                         <property name="tooltip"></property>
                         <property name="validator_data_type"></property>

MSI/Base/locale/MSIBase.pot

@@ -2,14 +2,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
-"POT-Creation-Date: 2016-09-19 11:20+0200\n"
+"POT-Creation-Date: 2016-11-04 14:10+0100\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
 "Last-Translator: Simon Rozman <simon.rozman@amebis.si>\n"
 "Language-Team: Amebis, d. o. o., Kamnik <info@amebis.si>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Poedit 1.8.10\n"
 "X-Poedit-Basepath: ../Main\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "Language: en_US\n"
@@ -17,16 +17,21 @@ msgstr ""
 "X-Poedit-KeywordsList: _\n"
 "X-Poedit-SearchPath-0: .\n"
 
+#: en_US.Win32.Debug.LaunchCondition-2.idtx:4
 #: en_US.Win32.Release.LaunchCondition-2.idtx:4
+#: en_US.x64.Debug.LaunchCondition-2.idtx:4
 #: en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""
 
+#: en_US.Win32.Debug.Property-2.idtx:4 en_US.Win32.Debug.Property-2.idtx:5
 #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5
+#: en_US.x64.Debug.Property-2.idtx:4 en_US.x64.Debug.Property-2.idtx:5
 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
 msgstr ""
 
-#: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
+#: en_US.Win32.Debug.Property-2.idtx:6 en_US.Win32.Release.Property-2.idtx:6
+#: en_US.x64.Debug.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"
 msgstr ""

MSI/Base/locale/bg_BG.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2016-09-19 11:20+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
+"Last-Translator: University of Ruse <support@uni-ruse.bg>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +21,12 @@ msgstr ""
 #: en_US.Win32.Release.LaunchCondition-2.idtx:4
 #: en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
-msgstr ""
+msgstr "[ProductName] изисква Windows Vista или по-висока версия на Windows."
 
 #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5
 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
-msgstr ""
+msgstr "http://www.geant.org/"
 
 #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"

MSI/Base/locale/ca_ES.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2016-09-19 11:20+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
+"Last-Translator: eduki <ecercos@xtec.cat>, 2016\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,12 +21,12 @@ msgstr ""
 #: en_US.Win32.Release.LaunchCondition-2.idtx:4
 #: en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
-msgstr ""
+msgstr "[ProductName] requereix Windows Vista o posterior"
 
 #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5
 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
-msgstr ""
+msgstr "http://www.geant.org/"
 
 #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"

MSI/Base/locale/sr_RS.po

@@ -5,7 +5,7 @@ msgstr ""
 "Project-Id-Version: GÉANTLink MSI\n"
 "POT-Creation-Date: 2016-09-19 11:20+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
-"Last-Translator: Simon Rozman <simon@rozman.si>, 2016\n"
+"Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,11 +22,13 @@ msgstr ""
 #: en_US.x64.Release.LaunchCondition-2.idtx:4
 msgid "[ProductName] requires Windows Vista or later version of Windows."
 msgstr ""
+"[ProductName] zahteva Windows Vista operativni sistem ili noviju verziju "
+"Windows operativnog sistema."
 
 #: en_US.Win32.Release.Property-2.idtx:4 en_US.Win32.Release.Property-2.idtx:5
 #: en_US.x64.Release.Property-2.idtx:4 en_US.x64.Release.Property-2.idtx:5
 msgid "http://www.geant.org/"
-msgstr ""
+msgstr "http://www.geant.org/"
 
 #: en_US.Win32.Release.Property-2.idtx:6 en_US.x64.Release.Property-2.idtx:6
 msgid "https://github.com/Amebis/GEANTLink/releases"

README.md

@@ -8,22 +8,22 @@ Suite of EAP supplicants for Windows - IEEE 802.1X plug-ins for enterprise netwo
 - Microsoft Windows Vista or later
 - Microsoft Visual Studio 2010 SP1
 - _msgfmt.exe_ from [gettext](https://www.gnu.org/software/gettext/);
-  Hint: [Poedit](https://poedit.net/) contains up-to-date binary Win32 compiled gettext-utilities. Install it and add _GettextTools\bin_ folder to path.
+  Hint: [Poedit](https://poedit.net/) contains up-to-date binary Win32 compiled gettext-utilities. Install it and add `GettextTools\bin` folder to the system path.
 - _sed.exe_ and _grep.exe_
-- _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's _Bin_ folder to path.
+- _MsiDb.Exe_ and other command line utilities for MSI packaging distributed as a part of Microsoft Windows SDK (installed with Visual Studio). Add SDK's `Bin` folder to the system path.
 
 ### wxWidgets
-GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, dynamic libraries (DLL) variant is available as a binary download only. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets).
+GÉANTLink is using wxWidgets v3.0.2 static libraries. Unfortunately, only dynamic libraries (DLL) variant is available as a binary download. Therefore static libraries needs to be compiled from [source](https://github.com/wxWidgets/wxWidgets).
 
 #### Compiling wxWidgets Win32 static libraries
 1. Start _Visual Studio Command Prompt (2010)_
-2. Change working directory to _build\msw_
+2. Change working folder to `build\msw`
 3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0`
 4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 BUILD=release`
 
 #### Compiling wxWidgets x64 static libraries
 1. Start _Visual Studio x64 Cross Tools Command Prompt (2010)_
-2. Change working directory to _build\msw_
+2. Change working folder to `build\msw`
 3. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64`
 4. Run: `nmake /f makefile.vc /ls RUNTIME_LIBS=static SHARED=0 TARGET_CPU=X64 BUILD=release`
 
@@ -43,6 +43,9 @@ Please note that only Release builds are configured for timestamp signing. Debug
 ### Building
 
 #### Building in Visual Studio IDE
+GÉANTLink has some submodules. When cloning Git repository, make sure to use `--recursive` Git switch to clone submodules too. Example:
+`git clone --recursive "https://github.com/Amebis/GEANTLink.git" "C:\Projects\GEANTLink"`
+
 GÉANTLink can be build and debugged opening _VS10Solution.sln_ in Visual C++ 2010 IDE.
 
 Before one can attempt to debug EAP DLLs, you should run `nmake register` from an elevated command prompt. See _Building in command line_ chapter below.
@@ -52,17 +55,21 @@ Next, one must configure a network profile actually using GÉANTLink for the aut
 GÉANTLink EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLSUI.dll_).
 
 ##### Backend DLL
-The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _VS10Solution.sln_, and attach to running _Eap3Host.exe_ process.
-On initial connection attempt _Eap3Host.exe_ will load the DLL and will not release it until _EapHost_ service is restarted.
-To debug early life of our backend DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _Eap3Host.exe_ process before our DLL starts servicing authentication.
+The backend DLL is loaded by _Eap3Host.exe_ process when connecting to the network. One approach to debug the module is to start Visual C++ elevated, open _VS10Solution.sln_, and attach to the running _Eap3Host.exe_ process.
+
+On initial connection attempt _Eap3Host.exe_ will load the DLL and will not release it until _EapHost_ service is restarted. To release our DLL (i.e. for rebuild) you have to restart _EapHost_ service manually or run `nmake register` again.
+
+To debug early life of our backend DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to catch emerging _Eap3Host.exe_ process and attach the debugger to it before our DLL starts servicing authentication.
 
 ##### GUI DLL
 The GUI DLL is loaded by _DllHost.exe_ process on XML profile configuration import/export and when interactive user interface is required.
+
 A few seconds after desired function call has finished, _DllHost.exe_ terminates and releases the DLL.
+
 To debug early life of our GUI DLL, uncomment `Sleep(10000)` in `DllMain()` of the module, and set breakpoints. This should give you plenty of time to attach the debugger to _DllHost.exe_ process before our DLL starts.
 
 #### Building in command line
-Use of standard command prompt is recommended, providing that Microsoft Visual Studio 2010 folders containing _nmake.exe_ and _devenv.com_ are added to the path.
+Use of standard command prompt is recommended, providing that Microsoft Visual Studio 2010 folders containing _nmake.exe_ and _devenv.com_ are added to the system path.
 
 Use Microsoft NMAKE to build the project.
 
@@ -71,7 +78,7 @@ Command            | Explanation
 `nmake Clean`      | Deletes all intermediate and output files.
 `nmake Register`   | Builds a debug version of project, registers DLLs, and adds Start Menu shortcuts. For testing and development purposes only! Requires elevated command prompt.
 `nmake Unregister` | Removes Start Menu shortcuts, unregisters DLLs. For testing development purposes only! Requires elevated command prompt.
-`nmake Setup`      | Builds a release version of project and release MSI setup files. The resulting files can be found in _output\Setup_ folder.
-`nmake SetupDebug` | Builds a debug version of project and debug MSI setup files. The resulting files can be found in _output\Setup_ folder.
+`nmake Setup`      | Builds a release version of project and release MSI setup files. The resulting files can be found in `output\Setup` folder.
+`nmake SetupDebug` | Builds a debug version of project and debug MSI setup files. The resulting files can be found in `output\Setup` folder.
 
 The `/ls` flag can be appended to the commands above to reduce NMAKE’s verbosity. You can combine multiple targets (i.e. nmake Unregister Clean). Please, see NMAKE reference for further reading.

VS10Solution.sln

@@ -51,6 +51,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2", "lib\MSCHAPv2\bu
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSCHAPv2_UI", "lib\MSCHAPv2_UI\build\MSCHAPv2_UI.vcxproj", "{7AF5B922-7C17-428A-97E0-09E3B41A684D}"
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost", "lib\EapHost\build\EapHost.vcxproj", "{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EapHost_UI", "lib\EapHost_UI\build\EapHost_UI.vcxproj", "{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -211,6 +215,22 @@ Global
 		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|Win32.Build.0 = Release|Win32
 		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.ActiveCfg = Release|x64
 		{7AF5B922-7C17-428A-97E0-09E3B41A684D}.Release|x64.Build.0 = Release|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.ActiveCfg = Debug|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|Win32.Build.0 = Debug|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.ActiveCfg = Debug|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Debug|x64.Build.0 = Debug|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.ActiveCfg = Release|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|Win32.Build.0 = Release|Win32
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.ActiveCfg = Release|x64
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}.Release|x64.Build.0 = Release|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.ActiveCfg = Debug|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|Win32.Build.0 = Debug|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.ActiveCfg = Debug|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Debug|x64.Build.0 = Debug|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.ActiveCfg = Release|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|Win32.Build.0 = Release|Win32
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.ActiveCfg = Release|x64
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -231,6 +251,8 @@ Global
 		{D3E29951-D9F5-486D-A167-20AE8E90B1FA} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{86A6D6A0-4B7D-4134-BE81-A5755C77584D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{7AF5B922-7C17-428A-97E0-09E3B41A684D} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
+		{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583} = {E66A3FE1-4EE4-401F-8EAD-BE518B230393}
 		{2D3CE079-7EB1-4F47-B79E-F0310671ECCB} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
 		{679D03C5-CD70-4FFA-93F8-A4AB3637509B} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}
 		{E0D0725B-B2FC-4225-9481-CA9B1B6306F2} = {7B5EC9B7-208C-426A-941D-DAF9271BD4A4}

WLANManager/locale/bg_BG.po

@@ -5,6 +5,7 @@ msgstr ""
 "Project-Id-Version: WLANManager\n"
 "POT-Creation-Date: 2016-09-19 11:22+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: University of Ruse <support@uni-ruse.bg>, 2016\n"
 "Language-Team: Bulgarian (Bulgaria) (https://www.transifex.com/eduroam_devel/teams/11799/bg_BG/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "WLAN Manager"
-msgstr ""
+msgstr "Управление на WLAN"
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -31,3 +32,5 @@ msgstr ""
 msgid ""
 "Helper utility to support direct shortcuts to Wireless Network Properties"
 msgstr ""
+"Помощно средство, поддържащо директен пряк линк до Wireless Network "
+"Properties"

WLANManager/locale/ca_ES.po

@@ -5,6 +5,7 @@ msgstr ""
 "Project-Id-Version: WLANManager\n"
 "POT-Creation-Date: 2016-09-19 11:22+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: eduki <ecercos@xtec.cat>, 2016\n"
 "Language-Team: Catalan (Spain) (https://www.transifex.com/eduroam_devel/teams/11799/ca_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "WLAN Manager"
-msgstr ""
+msgstr "Administrador de WLAN"
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -31,3 +32,5 @@ msgstr ""
 msgid ""
 "Helper utility to support direct shortcuts to Wireless Network Properties"
 msgstr ""
+"Utilitat d'ajuda per a accessos directes a les Propietats de Xarxa "
+"inalàmbrica"

WLANManager/locale/sr_RS.po

@@ -5,6 +5,7 @@ msgstr ""
 "Project-Id-Version: WLANManager\n"
 "POT-Creation-Date: 2016-09-19 11:22+0200\n"
 "PO-Revision-Date: 2016-06-02 12:27+0200\n"
+"Last-Translator: Marko Eremija <marko.eremija@amres.ac.rs>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/eduroam_devel/teams/11799/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,7 +23,7 @@ msgstr ""
 #: MSIBuild/en_US.x64.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.x64.Release.Feature-2.idtx:4
 msgid "WLAN Manager"
-msgstr ""
+msgstr "WLAN Manager"
 
 #: MSIBuild/en_US.Win32.Debug.Feature-2.idtx:4
 #: MSIBuild/en_US.Win32.Release.Feature-2.idtx:4
@@ -31,3 +32,5 @@ msgstr ""
 msgid ""
 "Helper utility to support direct shortcuts to Wireless Network Properties"
 msgstr ""
+"Alat za podršku koji pomaže prilikom kreiranja direktnih prečica za bežične "
+"mrežne profile"

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          0x00ff1900
+#define PRODUCT_VERSION          0x01010000
 
 //
 // Product version by components
@@ -37,28 +37,28 @@
 // thus we need to specify major, minor and other version components
 // separately.
 //
-#define PRODUCT_VERSION_MAJ      0
-#define PRODUCT_VERSION_MIN      255
-#define PRODUCT_VERSION_REV      25
+#define PRODUCT_VERSION_MAJ      1
+#define PRODUCT_VERSION_MIN      1
+#define PRODUCT_VERSION_REV      0
 #define PRODUCT_VERSION_BUILD    0
 
 //
 // Human readable product version and build year for UI
 //
-#define PRODUCT_VERSION_STR      "1.0-beta7"
+#define PRODUCT_VERSION_STR      "1.1-beta"
 #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.25"
+#define PRODUCT_VERSION_INST     "1.1"
 
 //
 // 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     "{603E4647-DA68-4F56-9503-9050756C3159}"
+#define PRODUCT_VERSION_GUID     "{AD491849-8F70-4C09-BDF9-3FD9608DF418}"
 
 //
 // Product vendor

lib/EAPBase/include/Config.h

@@ -24,32 +24,16 @@
 
 namespace eap
 {
-    ///
-    /// Base class for configuration storage
-    ///
     class config;
-
-    ///
-    /// Base class for method configuration storage
-    ///
     class config_method;
-
-    ///
-    /// Base class for method with credentials
-    ///
     class config_method_with_cred;
-
-    ///
-    /// Provider configuration storage
-    ///
     class config_provider;
-
-    ///
-    /// Connection configuration storage
-    ///
     class config_connection;
 }
 
+/// \addtogroup EAPBaseStream
+/// @{
+
 ///
 /// Packs a configuration
 ///
@@ -65,7 +49,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config &
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-inline size_t pksizeof(const eap::config &val);
+inline size_t pksizeof(_In_ const eap::config &val);
 
 ///
 /// Unpacks a configuration
@@ -75,6 +59,8 @@ inline size_t pksizeof(const eap::config &val);
 ///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val);
 
+/// @}
+
 #pragma once
 
 #include "Module.h"
@@ -96,6 +82,15 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val);
 
 namespace eap
 {
+    ///
+    /// \defgroup EAPBaseConfig  Configuration
+    /// Configuration management
+    ///
+    /// @{
+
+    ///
+    /// Base class for configuration storage
+    ///
     class config
     {
     public:
@@ -139,17 +134,17 @@ namespace eap
         config& operator=(_Inout_ config &&other);
 
         ///
-        /// Clones this configuration
+        /// Clones this object
         ///
-        /// \returns Pointer to cloned configuration
+        /// \returns Pointer to cloned object with identical data
         ///
         virtual config* clone() const = 0;
 
-        /// \name XML configuration management
+        /// \name XML management
         /// @{
 
         ///
-        /// Save to XML document
+        /// Save data to XML document
         ///
         /// \param[in]  pDoc         XML document
         /// \param[in]  pConfigRoot  Suggested root element for saving
@@ -169,21 +164,21 @@ namespace eap
         /// @{
 
         ///
-        /// Packs a configuration
+        /// Packs this object
         ///
         /// \param[inout] cursor  Memory cursor
         ///
         virtual void operator<<(_Inout_ cursor_out &cursor) const;
 
         ///
-        /// Returns packed size of a configuration
+        /// Returns packed size of this object
         ///
         /// \returns Size of data when packed (in bytes)
         ///
         virtual size_t get_pk_size() const;
 
         ///
-        /// Unpacks a configuration
+        /// Unpacks this object
         ///
         /// \param[inout] cursor  Memory cursor
         ///
@@ -192,13 +187,19 @@ namespace eap
         /// @}
 
     public:
-        module &m_module;   ///< EAP module
+        module &m_module;                                   ///< EAP module
 
     protected:
-        static const winstd::bstr namespace_eapmetadata;
+        static const winstd::bstr namespace_eapmetadata;    ///< Reusable BSTR containing "urn:ietf:params:xml:ns:yang:ietf-eap-metadata"
     };
 
 
+    class credentials;
+
+
+    ///
+    /// Base class for method configuration storage
+    ///
     class config_method : public config
     {
     public:
@@ -261,50 +262,17 @@ namespace eap
         ///
         config_method& operator=(_Inout_ config_method &&other);
 
-        /// \name XML configuration management
+        /// \name XML 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);
-
         /// @}
 
         ///
@@ -319,6 +287,11 @@ namespace eap
         ///
         virtual const wchar_t* get_method_str() const = 0;
 
+        ///
+        /// Creates a blank set of credentials suitable for this method
+        ///
+        virtual credentials* make_credentials() const = 0;
+
     public:
         const unsigned int m_level; ///< Config level (0=outer, 1=inner, 2=inner-inner...)
         bool m_allow_save;          ///< Are credentials allowed to be saved to Windows Credential Manager?
@@ -327,9 +300,9 @@ namespace eap
     };
 
 
-    class credentials;
-
-
+    ///
+    /// Base class for method with credentials
+    ///
     class config_method_with_cred : public config_method
     {
     public:
@@ -373,63 +346,28 @@ namespace eap
         ///
         config_method_with_cred& operator=(_Inout_ config_method_with_cred &&other);
 
-        /// \name XML configuration management
+        /// \name XML 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);
-
         /// @}
 
-        ///
-        /// Creates a blank set of credentials suitable for this method
-        ///
-        virtual credentials* make_credentials() const = 0;
-
     public:
         bool m_use_cred;                        ///< Use configured credentials
         std::unique_ptr<credentials> m_cred;    ///< Configured credentials
     };
 
 
+    ///
+    /// Provider configuration storage
+    ///
     class config_provider : public config
     {
     public:
@@ -472,57 +410,19 @@ namespace eap
         ///
         config_provider& operator=(_Inout_ config_provider &&other);
 
-        ///
-        /// Clones configuration
-        ///
-        /// \returns Pointer to cloned configuration
-        ///
         virtual config* clone() const;
 
-        /// \name XML configuration management
+        /// \name XML 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);
-
         /// @}
 
         ///
@@ -555,9 +455,15 @@ namespace eap
     };
 
 
+    ///
+    /// Connection configuration storage
+    ///
     class config_connection : public config
     {
     public:
+        ///
+        /// List of configuration providers
+        ///
         typedef std::list<eap::config_provider> provider_list;
 
     public:
@@ -600,62 +506,26 @@ namespace eap
         ///
         config_connection& operator=(_Inout_ config_connection &&other);
 
-        ///
-        /// Clones configuration
-        ///
-        /// \returns Pointer to cloned configuration
-        ///
         virtual config* clone() const;
 
-        /// \name XML configuration management
+        /// \name XML 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);
-
         /// @}
 
     public:
         std::list<eap::config_provider> m_providers;    ///< Provider configurations
     };
+
+    /// @}
 }
 
 
@@ -665,7 +535,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config &
 }
 
 
-inline size_t pksizeof(const eap::config &val)
+inline size_t pksizeof(_In_ const eap::config &val)
 {
     return val.get_pk_size();
 }
@@ -677,19 +547,43 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config &val)
 }
 
 
+/// \addtogroup EAPBaseStream
+/// @{
+
+///
+/// Packs a method status
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Method status to pack
+///
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::config_method::status_t &val)
 {
     cursor << (unsigned char)val;
 }
 
 
+///
+/// Returns packed size of a method status
+///
+/// \param[in] val  Method status to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
 inline size_t pksizeof(_In_ const eap::config_method::status_t &val)
 {
     return pksizeof((unsigned char)val);
 }
 
 
+///
+/// Unpacks a method status
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Method status to unpack to
+///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::config_method::status_t &val)
 {
     cursor >> (unsigned char&)val;
 }
+
+/// @}

lib/EAPBase/include/Credentials.h

@@ -22,19 +22,8 @@
 
 namespace eap
 {
-    ///
-    /// Base class for method credential storage
-    ///
     class credentials;
-
-    ///
-    /// Password based method credentials
-    ///
     class credentials_pass;
-
-    ///
-    /// Connection credentials
-    ///
     class credentials_connection;
 }
 
@@ -58,6 +47,15 @@ namespace eap
 
 namespace eap
 {
+    ///
+    /// \defgroup EAPBaseCred  Credentials
+    /// Credential management
+    ///
+    /// @{
+
+    ///
+    /// Base class for method credential storage
+    ///
     class credentials : public config
     {
     public:
@@ -68,7 +66,8 @@ namespace eap
             source_unknown = -1, ///< Unknown source
             source_cache = 0,    ///< Credentials were obtained from EapHost cache
             source_config,       ///< Credentials were set by method configuration
-            source_storage       ///< Credentials were loaded from Windows Credential Manager
+            source_storage,      ///< Credentials were loaded from Windows Credential Manager
+            source_lower,        ///< Credentials were set by lower EAP method
         };
 
 
@@ -126,50 +125,17 @@ namespace eap
         ///
         virtual bool empty() const;
 
-        /// \name XML configuration management
+        /// \name XML 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
@@ -239,12 +205,14 @@ namespace eap
         /// Combine credentials in the following order:
         ///
         /// 1. Cached credentials
-        /// 2. Pre-configured credentials
+        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
         /// 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)
+        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
+        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
+        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL, 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
@@ -252,15 +220,20 @@ namespace eap
         /// - \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;
+            _In_             DWORD         dwFlags,
+            _In_             HANDLE        hTokenImpersonateUser,
+            _In_opt_   const credentials   *cred_cached,
+            _In_       const config_method &cfg,
+            _In_opt_z_       LPCTSTR       pszTargetName) = 0;
 
     public:
         std::wstring m_identity;    ///< Identity (username\@domain, certificate name etc.)
     };
 
 
+    ///
+    /// Password based method credentials
+    ///
     class credentials_pass : public credentials
     {
     public:
@@ -314,109 +287,47 @@ namespace eap
         ///
         credentials_pass& operator=(_Inout_ credentials_pass &&other);
 
-        ///
-        /// Clones credentials
-        ///
-        /// \returns Pointer to cloned credentials
-        ///
         virtual config* clone() const;
-
-        ///
-        /// Resets credentials
-        ///
         virtual void clear();
-
-        ///
-        /// Test credentials if blank
-        ///
-        /// \returns
-        /// - \c true if blank
-        /// - \c false otherwise
-        ///
         virtual bool empty() const;
 
-        /// \name XML configuration management
+        /// \name XML 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
         /// @{
-
-        ///
-        /// Save credentials to Windows Credential Manager
-        ///
-        /// \param[in]  pszTargetName  The name in Windows Credential Manager to store credentials as
-        /// \param[in]  level          Credential level (0=outer, 1=inner, 2=inner-inner...)
-        ///
         virtual void store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const;
-
-        ///
-        /// Retrieve credentials from Windows Credential Manager
-        ///
-        /// \param[in]  pszTargetName  The name in Windows Credential Manager to retrieve credentials from
-        /// \param[in]  level          Credential level (0=outer, 1=inner, 2=inner-inner...)
-        ///
         virtual void retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level);
 
         ///
-        /// Return target suffix for Windows Credential Manager credential name
+        /// @copydoc eap::credentials::target_suffix()
+        /// \returns This implementation always returns `_T("pass")`
         ///
         virtual LPCTSTR target_suffix() const;
-
         /// @}
 
         ///
         /// Combine credentials in the following order:
         ///
         /// 1. Cached credentials
-        /// 2. Pre-configured credentials
+        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
         /// 3. Stored credentials
         ///
-        /// \param[in] cred_cached    Cached credentials (optional, can be \c NULL, must be credentials_pass* type)
-        /// \param[in] cfg            Method configuration (must be config_method_pap type)
-        /// \param[in] pszTargetName  The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
+        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
+        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
+        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL)
+        /// \param[in] cfg                    Method configuration (when derived from `config_method_with_cred`, metod attempt to load credentials from \p cfg)
+        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
         ///
         /// \returns
         /// - \c source_cache   Credentials were obtained from EapHost cache
@@ -424,13 +335,15 @@ namespace eap
         /// - \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);
+            _In_             DWORD         dwFlags,
+            _In_             HANDLE        hTokenImpersonateUser,
+            _In_opt_   const credentials   *cred_cached,
+            _In_       const config_method &cfg,
+            _In_opt_z_       LPCTSTR       pszTargetName);
 
     public:
-        winstd::sanitizing_wstring m_password;  ///< Password
-        enc_alg_t m_enc_alg;                    ///< Encryption algorithm used for XML password keeping
+        winstd::sanitizing_wstring m_password;      ///< Password
+        enc_alg_t m_enc_alg;                        ///< Encryption algorithm used for XML password keeping
 
     private:
         /// \cond internal
@@ -439,6 +352,9 @@ namespace eap
     };
 
 
+    ///
+    /// Connection credentials
+    ///
     class credentials_connection : public config
     {
     public:
@@ -482,57 +398,19 @@ namespace eap
         ///
         credentials_connection& operator=(_Inout_ credentials_connection &&other);
 
-        ///
-        /// Clones configuration
-        ///
-        /// \returns Pointer to cloned configuration
-        ///
         virtual config* clone() const;
 
-        /// \name XML configuration management
+        /// \name XML 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);
-
         /// @}
 
         ///
@@ -566,22 +444,47 @@ namespace eap
         std::wstring m_id;                      ///< Provider ID
         std::unique_ptr<credentials> m_cred;    ///< Credentials
     };
+
+    /// @}
 }
 
+/// \addtogroup EAPBaseStream
+/// @{
 
+///
+/// Packs a credential encryption algorithm ID
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Credential encryption algorithm ID to pack
+///
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::credentials_pass::enc_alg_t &val)
 {
     cursor << (unsigned char)val;
 }
 
 
+///
+/// Returns packed size of a credential encryption algorithm ID
+///
+/// \param[in] val  Credential encryption algorithm ID to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
 inline size_t pksizeof(_In_ const eap::credentials_pass::enc_alg_t &val)
 {
     return pksizeof((unsigned char)val);
 }
 
 
+///
+/// Unpacks a credential encryption algorithm ID
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Credential encryption algorithm ID to unpack to
+///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::credentials_pass::enc_alg_t &val)
 {
     cursor >> (unsigned char&)val;
 }
+
+/// @}

lib/EAPBase/include/EAP.h

@@ -21,9 +21,18 @@
 #define IDR_EAP_KEY_PUBLIC  1
 #define IDR_EAP_KEY_PRIVATE 2
 
+///
+/// \defgroup EAPBaseStream  Memory Packaging
+/// Simple serialization/deserialization of data to/from memory opaque BLOBs
+///
+/// @{
 #ifndef EAP_ENCRYPT_BLOBS
+///
+/// Compiler variable to control whether BLOBs leaving our module get encrypted
+///
 #define EAP_ENCRYPT_BLOBS 1
 #endif
+/// @}
 
 #define _HOST_LOW_ENDIAN
 
@@ -42,15 +51,17 @@
 
 namespace eap
 {
-    ///
-    /// Output BLOB cursor
-    ///
     struct cursor_out;
+    struct cursor_in;
+
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f;
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf;
 
     ///
-    /// Input BLOB cursor
+    /// \defgroup EAPBaseSanitizing  Sanitizing memory
+    /// Secure memory erasing after use
     ///
-    struct cursor_in;
+    /// @{
 
     ///
     /// Sanitizing dynamically allocated BLOB
@@ -58,17 +69,7 @@ namespace eap
     typedef std::vector<unsigned char, winstd::sanitizing_allocator<unsigned char> > sanitizing_blob;
 
     ///
-    /// Sanitizing BLOB of fixed size
-    ///
-    template<size_t N> struct sanitizing_blob_f;
-
-    ///
-    /// Sanitizing BLOB of fixed size (zero initialized)
-    ///
-    template<size_t N> struct sanitizing_blob_zf;
-
-    ///
-    /// Sanitizing BLOB of fixed size (zero initialized in _DEBUG version)
+    /// Sanitizing BLOB of fixed size (zero initialized in _DEBUG version, non-initialized in release version)
     ///
 #ifdef _DEBUG
     #define sanitizing_blob_xf sanitizing_blob_zf
@@ -76,27 +77,55 @@ namespace eap
     #define sanitizing_blob_xf sanitizing_blob_f
 #endif
 
-    ///
-    /// Diameter AVP flags
-    ///
+    /// @}
+
+    /// \addtogroup EAPBaseDiameter
+    /// @{
+
     enum diameter_avp_flags_t;
-
-    ///
-    /// Diameter AVP header
-    ///
     struct diameter_avp_header;
-
-    ///
-    /// Diameter AVP header with Vendor-ID
-    ///
     struct diameter_avp_header_ven;
 
     ///
-    /// EAP packet
+    /// Appends Diameter AVP to response packet
     ///
-    class packet;
+    /// \param[in   ] code    AVP code
+    /// \param[in   ] flags   AVP flags
+    /// \param[in   ] data    AVP data (<16777212B)
+    /// \param[in   ] size    Size of \p data in bytes
+    /// \param[inout] packet  Response packet to append data to
+    ///
+    void diameter_avp_append(
+        _In_                       unsigned int    code,
+        _In_                       unsigned char   flags,
+        _In_bytecount_(size) const void            *data,
+        _In_                       unsigned int    size,
+        _Inout_                    sanitizing_blob &packet);
+
+    ///
+    /// Appends Diameter AVP to response packet
+    ///
+    /// \param[in   ] code       AVP code
+    /// \param[in   ] vendor_id  Vendor-ID
+    /// \param[in   ] flags      AVP flags
+    /// \param[in   ] data       AVP data (<16777212B)
+    /// \param[in   ] size       Size of \p data in bytes
+    /// \param[inout] packet     Response packet to append data to
+    ///
+    void diameter_avp_append(
+        _In_                       unsigned int    code,
+        _In_                       unsigned int    vendor_id,
+        _In_                       unsigned char   flags,
+        _In_bytecount_(size) const void            *data,
+        _In_                       unsigned int    size,
+        _Inout_                    sanitizing_blob &packet);
+
+    /// @}
 }
 
+/// \addtogroup EAPBaseStream
+/// @{
+
 ///
 /// Packs a boolean
 ///
@@ -214,7 +243,7 @@ template<class _Elem, class _Traits, class _Ax> inline void operator<<(_Inout_ e
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Elem, class _Traits, class _Ax> inline size_t pksizeof(const std::basic_string<_Elem, _Traits, _Ax> &val);
+template<class _Elem, class _Traits, class _Ax> inline size_t pksizeof(_In_ const std::basic_string<_Elem, _Traits, _Ax> &val);
 
 ///
 /// Unpacks a string
@@ -239,7 +268,7 @@ template<class _Traits, class _Ax> inline void operator<<(_Inout_ eap::cursor_ou
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Traits, class _Ax> inline size_t pksizeof(const std::basic_string<wchar_t, _Traits, _Ax> &val);
+template<class _Traits, class _Ax> inline size_t pksizeof(_In_ const std::basic_string<wchar_t, _Traits, _Ax> &val);
 
 ///
 /// Unpacks a wide string
@@ -264,7 +293,7 @@ template<class _Ty, class _Ax> inline void operator<<(_Inout_ eap::cursor_out &c
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Ty, class _Ax> inline size_t pksizeof(const std::vector<_Ty, _Ax> &val);
+template<class _Ty, class _Ax> inline size_t pksizeof(_In_ const std::vector<_Ty, _Ax> &val);
 
 ///
 /// Unpacks a vector
@@ -289,7 +318,7 @@ template<class _Ty, class _Ax> inline void operator<<(_Inout_ eap::cursor_out &c
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Ty, class _Ax> inline size_t pksizeof(const std::list<_Ty, _Ax> &val);
+template<class _Ty, class _Ax> inline size_t pksizeof(_In_ const std::list<_Ty, _Ax> &val);
 
 ///
 /// Unpacks a list
@@ -314,16 +343,9 @@ template<class _Ty, class _Dx> inline void operator<<(_Inout_ eap::cursor_out &c
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-template<class _Ty, class _Dx> inline size_t pksizeof(const std::unique_ptr<_Ty, _Dx> &val);
+template<class _Ty, class _Dx> inline size_t pksizeof(_In_ const std::unique_ptr<_Ty, _Dx> &val);
 
-/////
-///// Unpacks a std::unique_ptr
-/////
-///// \note Not generally unpackable, since we do not know, how to create a new instance of unique_ptr.
-/////
-///// \param[inout] cursor  Memory cursor
-///// \param[out]   val     std::unique_ptr to unpack to
-/////
+// std::unique_ptr<> is generally not unpackable, since we do not know, how to create a new instance of unique_ptr.
 //template<class _Ty, class _Dx> inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::unique_ptr<_Ty, _Dx> &val);
 
 ///
@@ -341,7 +363,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::cert_
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-inline size_t pksizeof(const winstd::cert_context &val);
+inline size_t pksizeof(_In_ const winstd::cert_context &val);
 
 ///
 /// Unpacks a certificate context
@@ -366,7 +388,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::eap_t
 ///
 /// \returns Size of data when packed (in bytes)
 ///
-inline size_t pksizeof(const winstd::eap_type_t &val);
+inline size_t pksizeof(_In_ const winstd::eap_type_t &val);
 
 ///
 /// Unpacks an EAP method type
@@ -426,6 +448,39 @@ inline size_t pksizeof(_In_ const GUID &val);
 ///
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ GUID &val);
 
+///
+/// Packs a EAP_METHOD_TYPE
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[in]    val     Variable with data to pack
+///
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const EAP_METHOD_TYPE &val);
+
+///
+/// Returns packed size of a EAP_METHOD_TYPE
+///
+/// \param[in] val  Data to pack
+///
+/// \returns Size of data when packed (in bytes)
+///
+inline size_t pksizeof(_In_ const EAP_METHOD_TYPE &val);
+
+///
+/// Unpacks a EAP_METHOD_TYPE
+///
+/// \param[inout] cursor  Memory cursor
+/// \param[out]   val     Variable to receive unpacked value
+///
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ EAP_METHOD_TYPE &val);
+
+/// @}
+
+///
+/// \defgroup EAPBaseConversion  Data conversion
+/// Data conversion
+///
+/// @{
+
 #ifndef htonll
 ///
 /// Converts an unsigned __int64 from host to TCP/IP network byte order.
@@ -438,7 +493,7 @@ inline unsigned __int64 htonll(unsigned __int64 val);
 #endif
 
 ///
-/// Converts an 24-bit integer from host to TCP/IP network byte order.
+/// Converts a 24-bit integer from host to TCP/IP network byte order.
 ///
 /// \param[in ] val  A 24-bit unsigned number in host byte order
 /// \param[out] out  A 24-bit unsigned number in network byte order
@@ -446,7 +501,7 @@ inline unsigned __int64 htonll(unsigned __int64 val);
 inline void hton24(_In_ unsigned int val, _Out_ unsigned char out[3]);
 
 ///
-/// Converts an 24-bit integer from TCP/IP network to host byte order.
+/// Converts a 24-bit integer from TCP/IP network to host byte order.
 ///
 /// \param[in] val  A 24-bit unsigned number in network byte order
 ///
@@ -454,13 +509,24 @@ inline void hton24(_In_ unsigned int val, _Out_ unsigned char out[3]);
 ///
 inline unsigned int ntoh24(_In_ const unsigned char val[3]);
 
+/// @}
+
 #pragma once
 
 
 namespace eap
 {
+    /// \addtogroup EAPBaseStream
+    /// @{
+
+    ///
+    /// Output BLOB cursor
+    ///
     struct cursor_out
     {
+        ///
+        /// Pointer to output data type
+        ///
         typedef unsigned char *ptr_type;
 
         ptr_type ptr;       ///< Pointer to first data unwritten
@@ -468,20 +534,32 @@ namespace eap
     };
 
 
+    ///
+    /// Input BLOB cursor
+    ///
     struct cursor_in
     {
+        ///
+        /// Pointer to input data type
+        ///
         typedef const unsigned char *ptr_type;
 
         ptr_type ptr;       ///< Pointer to first data unread
         ptr_type ptr_end;   ///< Pointer to the end of BLOB
     };
 
+    /// @}
+
+    /// \addtogroup EAPBaseSanitizing
+    /// @{
 
 #pragma pack(push)
 #pragma pack(1)
 
-    template<size_t N>
-    struct __declspec(novtable) sanitizing_blob_f<N>
+    ///
+    /// Sanitizing BLOB of fixed size
+    ///
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_f<N>
     {
         unsigned char data[N]; ///< BLOB data
 
@@ -604,8 +682,11 @@ namespace eap
         }
     };
 
-    template<size_t N>
-    struct __declspec(novtable) sanitizing_blob_zf<N> : sanitizing_blob_f<N>
+
+    ///
+    /// Sanitizing BLOB of fixed size (zero initialized)
+    ///
+    template<size_t N> struct WINSTD_NOVTABLE sanitizing_blob_zf<N> : sanitizing_blob_f<N>
     {
         ///
         /// Constructor
@@ -637,7 +718,17 @@ namespace eap
     };
 #pragma pack(pop)
 
+    /// @}
 
+    ///
+    /// \defgroup EAPBaseDiameter  Diameter
+    /// Diameter authentication protocol
+    ///
+    /// @{
+
+    ///
+    /// Diameter AVP flags
+    ///
     #pragma warning(suppress: 4480)
     enum diameter_avp_flags_t : unsigned char {
         diameter_avp_flag_vendor    = 0x80, ///< Vendor-ID present
@@ -649,6 +740,9 @@ namespace eap
 #pragma pack(push)
 #pragma pack(1)
 
+    ///
+    /// Diameter AVP header
+    ///
     struct diameter_avp_header
     {
         unsigned char code[4];      ///< AVP Code
@@ -657,6 +751,9 @@ namespace eap
     };
 
 
+    ///
+    /// Diameter AVP header with Vendor-ID
+    ///
     struct diameter_avp_header_ven : public diameter_avp_header
     {
         unsigned char vendor[4];    ///< Vendor-ID
@@ -664,63 +761,13 @@ namespace eap
 
 #pragma pack(pop)
 
-
-    class packet
-    {
-    public:
-        ///
-        /// Constructs an empty packet
-        ///
-        packet();
-
-        ///
-        /// Copies a packet
-        ///
-        /// \param[in] other  Packet to copy from
-        ///
-        packet(_In_ const packet &other);
-
-        ///
-        /// Moves a packet
-        ///
-        /// \param[in] other  Packet to move from
-        ///
-        packet(_Inout_ packet &&other);
-
-        ///
-        /// Copies a packet
-        ///
-        /// \param[in] other  Packet to copy from
-        ///
-        /// \returns Reference to this object
-        ///
-        packet& operator=(_In_ const packet &other);
-
-        ///
-        /// Moves a packet
-        ///
-        /// \param[in] other  Packet to move from
-        ///
-        /// \returns Reference to this object
-        ///
-        packet& operator=(_Inout_ packet &&other);
-
-        ///
-        /// Empty the packet
-        ///
-        virtual void clear();
-
-    public:
-        EapCode m_code;         ///< Packet code
-        unsigned char m_id;     ///< Packet ID
-        sanitizing_blob m_data; ///< Packet data
-    };
+    /// @}
 }
 
 
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const bool &val)
 {
-    eap::cursor_out::ptr_type ptr_end = cursor.ptr + 1;
+    auto ptr_end = cursor.ptr + 1;
     assert(ptr_end <= cursor.ptr_end);
     *cursor.ptr = val ? 1 : 0;
     cursor.ptr = ptr_end;
@@ -736,7 +783,7 @@ inline size_t pksizeof(_In_ const bool &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ bool &val)
 {
-    eap::cursor_in::ptr_type ptr_end = cursor.ptr + 1;
+    auto ptr_end = cursor.ptr + 1;
     assert(ptr_end <= cursor.ptr_end);
     val = *cursor.ptr ? true : false;
     cursor.ptr = ptr_end;
@@ -745,7 +792,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ bool &val)
 
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const unsigned char &val)
 {
-    eap::cursor_out::ptr_type ptr_end = cursor.ptr + 1;
+    auto ptr_end = cursor.ptr + 1;
     assert(ptr_end <= cursor.ptr_end);
     *cursor.ptr = val;
     cursor.ptr = ptr_end;
@@ -761,7 +808,7 @@ inline size_t pksizeof(_In_ const unsigned char &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned char &val)
 {
-    eap::cursor_in::ptr_type ptr_end = cursor.ptr + 1;
+    auto ptr_end = cursor.ptr + 1;
     assert(ptr_end <= cursor.ptr_end);
     val = *cursor.ptr;
     cursor.ptr = ptr_end;
@@ -770,9 +817,9 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned char &val)
 
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const unsigned int &val)
 {
-    eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(unsigned int);
+    auto ptr_end = cursor.ptr + sizeof(unsigned int);
     assert(ptr_end <= cursor.ptr_end);
-    *(unsigned int*)cursor.ptr = val;
+    *reinterpret_cast<unsigned int*>(cursor.ptr) = val;
     cursor.ptr = ptr_end;
 }
 
@@ -786,9 +833,9 @@ inline size_t pksizeof(_In_ const unsigned int &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned int &val)
 {
-    eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(unsigned int);
+    auto ptr_end = cursor.ptr + sizeof(unsigned int);
     assert(ptr_end <= cursor.ptr_end);
-    val = *(unsigned int*)cursor.ptr;
+    val = *reinterpret_cast<const unsigned int*>(cursor.ptr);
     cursor.ptr = ptr_end;
 }
 
@@ -796,7 +843,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ unsigned int &val)
 #ifdef _WIN64
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const size_t &val)
 {
-    eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(size_t);
+    auto ptr_end = cursor.ptr + sizeof(size_t);
     assert(ptr_end <= cursor.ptr_end);
     *(size_t*)cursor.ptr = val;
     cursor.ptr = ptr_end;
@@ -812,7 +859,7 @@ inline size_t pksizeof(_In_ const size_t &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ size_t &val)
 {
-    eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(size_t);
+    auto ptr_end = cursor.ptr + sizeof(size_t);
     assert(ptr_end <= cursor.ptr_end);
     val = *(size_t*)cursor.ptr;
     cursor.ptr = ptr_end;
@@ -823,10 +870,10 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ size_t &val)
 template<class _Elem, class _Traits, class _Ax>
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_string<_Elem, _Traits, _Ax> &val)
 {
-    std::basic_string<_Elem, _Traits, _Ax>::size_type count = val.length();
+    size_t count = val.length();
     assert(strlen(val.c_str()) == count); // String should not contain zero terminators.
     size_t size = sizeof(_Elem)*(count + 1);
-    eap::cursor_out::ptr_type ptr_end = cursor.ptr + size;
+    auto ptr_end = cursor.ptr + size;
     assert(ptr_end <= cursor.ptr_end);
     memcpy(cursor.ptr, (const _Elem*)val.c_str(), size);
     cursor.ptr = ptr_end;
@@ -834,7 +881,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_st
 
 
 template<class _Elem, class _Traits, class _Ax>
-inline size_t pksizeof(const std::basic_string<_Elem, _Traits, _Ax> &val)
+inline size_t pksizeof(_In_ const std::basic_string<_Elem, _Traits, _Ax> &val)
 {
     return sizeof(_Elem)*(val.length() + 1);
 }
@@ -844,7 +891,7 @@ template<class _Elem, class _Traits, class _Ax>
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::basic_string<_Elem, _Traits, _Ax> &val)
 {
     size_t count_max = cursor.ptr_end - cursor.ptr;
-    std::basic_string<_Elem, _Traits, _Ax>::size_type count = strnlen((const _Elem*&)cursor.ptr, count_max);
+    size_t count = strnlen((const _Elem*&)cursor.ptr, count_max);
     assert(count < count_max); // String should be zero terminated.
     val.assign((const _Elem*&)cursor.ptr, count);
     cursor.ptr += sizeof(_Elem)*(count + 1);
@@ -855,13 +902,13 @@ template<class _Traits, class _Ax>
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::basic_string<wchar_t, _Traits, _Ax> &val)
 {
     std::string val_utf8;
-    WideCharToMultiByte(CP_UTF8, 0, val.c_str(), (int)val.length(), val_utf8, NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, val, val_utf8, NULL, NULL);
     cursor << val_utf8;
 }
 
 
 template<class _Traits, class _Ax>
-inline size_t pksizeof(const std::basic_string<wchar_t, _Traits, _Ax> &val)
+inline size_t pksizeof(_In_ const std::basic_string<wchar_t, _Traits, _Ax> &val)
 {
     return sizeof(char)*(WideCharToMultiByte(CP_UTF8, 0, val.c_str(), (int)val.length(), NULL, 0, NULL, NULL) + 1);
 }
@@ -872,32 +919,32 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::basic_string<w
 {
     std::string val_utf8;
     cursor >> val_utf8;
-    MultiByteToWideChar(CP_UTF8, 0, val_utf8.c_str(), (int)val_utf8.length(), val);
+    MultiByteToWideChar(CP_UTF8, 0, val_utf8, val);
 }
 
 
 template<class _Ty, class _Ax>
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::vector<_Ty, _Ax> &val)
 {
-    std::vector<_Ty, _Ax>::size_type count = val.size();
+    auto count = val.size();
     cursor << count;
 
     // Since we do not know wheter vector elements are primitives or objects, iterate instead of memcpy.
     // For performance critical vectors of flat opaque data types write specialized template instantiation.
-    for (std::vector<_Ty, _Ax>::size_type i = 0; i < count; i++)
-        cursor << val[i];
+    for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i)
+        cursor << *i;
 }
 
 
 template<class _Ty, class _Ax>
-inline size_t pksizeof(const std::vector<_Ty, _Ax> &val)
+inline size_t pksizeof(_In_ const std::vector<_Ty, _Ax> &val)
 {
     // Since we do not know wheter vector elements are primitives or objects, iterate instead of sizeof().
     // For performance critical vectors of flat opaque data types write specialized template instantiation.
-    std::vector<_Ty, _Ax>::size_type count = val.size();
+    auto count = val.size();
     size_t size = pksizeof(count);
-    for (std::vector<_Ty, _Ax>::size_type i = 0; i < count; i++)
-        size += pksizeof(val[i]);
+    for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i)
+        size += pksizeof(*i);
     return size;
 }
 
@@ -905,14 +952,14 @@ inline size_t pksizeof(const std::vector<_Ty, _Ax> &val)
 template<class _Ty, class _Ax>
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::vector<_Ty, _Ax> &val)
 {
-    std::vector<_Ty, _Ax>::size_type count;
+    std::vector<_Ty, _Ax>::size_type i, count;
     cursor >> count;
 
     // Since we do not know wheter vector elements are primitives or objects, iterate instead of assign().
     // For performance critical vectors of flat opaque data types write specialized template instantiation.
     val.clear();
     val.reserve(count);
-    for (std::vector<_Ty, _Ax>::size_type i = 0; i < count; i++) {
+    for (i = 0; i < count; i++) {
         _Ty el;
         cursor >> el;
         val.push_back(el);
@@ -923,24 +970,24 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::vector<_Ty, _A
 template<class _Ty, class _Ax>
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::list<_Ty, _Ax> &val)
 {
-    std::list<_Ty, _Ax>::size_type count = val.size();
+    auto count = val.size();
     cursor << count;
 
     // Since we do not know wheter list elements are primitives or objects, iterate instead of memcpy.
     // For performance critical vectors of flat opaque data types write specialized template instantiation.
-    for (std::list<_Ty, _Ax>::const_iterator i = val.cbegin(), i_end = val.cend(); i != i_end; ++i)
+    for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i)
         cursor << *i;
 }
 
 
 template<class _Ty, class _Ax>
-inline size_t pksizeof(const std::list<_Ty, _Ax> &val)
+inline size_t pksizeof(_In_ const std::list<_Ty, _Ax> &val)
 {
     // Since we do not know wheter list elements are primitives or objects, iterate instead of sizeof().
     // For performance critical vectors of flat opaque data types write specialized template instantiation.
-    std::list<_Ty, _Ax>::size_type count = val.size();
+    auto count = val.size();
     size_t size = pksizeof(count);
-    for (std::list<_Ty, _Ax>::const_iterator i = val.cbegin(), i_end = val.cend(); i != i_end; ++i)
+    for (auto i = val.cbegin(), i_end = val.cend(); i != i_end; ++i)
         size += pksizeof(*i);
     return size;
 }
@@ -949,13 +996,11 @@ inline size_t pksizeof(const std::list<_Ty, _Ax> &val)
 template<class _Ty, class _Ax>
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ std::list<_Ty, _Ax> &val)
 {
-    std::list<_Ty, _Ax>::size_type count;
+    std::list<_Ty, _Ax>::size_type i, count;
     cursor >> count;
 
-    // Since we do not know wheter list elements are primitives or objects, iterate instead of assign().
-    // For performance critical vectors of flat opaque data types write specialized template instantiation.
     val.clear();
-    for (std::list<_Ty, _Ax>::size_type i = 0; i < count; i++) {
+    for (i = 0; i < count; i++) {
         _Ty el;
         cursor >> el;
         val.push_back(el);
@@ -975,7 +1020,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const std::unique_p
 
 
 template<class _Ty, class _Dx>
-inline size_t pksizeof(const std::unique_ptr<_Ty, _Dx> &val)
+inline size_t pksizeof(_In_ const std::unique_ptr<_Ty, _Dx> &val)
 {
     return
         val ?
@@ -990,7 +1035,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::cert_
     if (val) {
         cursor << (unsigned int)val->dwCertEncodingType;
         cursor << (unsigned int)val->cbCertEncoded     ;
-        eap::cursor_out::ptr_type ptr_end = cursor.ptr + val->cbCertEncoded;
+        auto ptr_end = cursor.ptr + val->cbCertEncoded;
         assert(ptr_end <= cursor.ptr_end);
         memcpy(cursor.ptr, val->pbCertEncoded, val->cbCertEncoded);
         cursor.ptr = ptr_end;
@@ -1001,7 +1046,7 @@ inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const winstd::cert_
 }
 
 
-inline size_t pksizeof(const winstd::cert_context &val)
+inline size_t pksizeof(_In_ const winstd::cert_context &val)
 {
     return
         val ?
@@ -1022,7 +1067,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::cert_contex
     cursor >> (unsigned int&)dwCertEncodedSize;
 
     if (dwCertEncodedSize) {
-        eap::cursor_in::ptr_type ptr_end = cursor.ptr + dwCertEncodedSize;
+        auto ptr_end = cursor.ptr + dwCertEncodedSize;
         assert(ptr_end <= cursor.ptr_end);
         val.create(dwCertEncodingType, (BYTE*)cursor.ptr, dwCertEncodedSize);
         cursor.ptr = ptr_end;
@@ -1052,7 +1097,7 @@ inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ winstd::eap_type_t
 template<size_t N>
 inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const eap::sanitizing_blob_f<N> &val)
 {
-    eap::cursor_out::ptr_type ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f<N>);
+    auto ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f<N>);
     assert(ptr_end <= cursor.ptr_end);
     memcpy(cursor.ptr, val.data, sizeof(eap::sanitizing_blob_f<N>));
     cursor.ptr = ptr_end;
@@ -1070,7 +1115,7 @@ inline size_t pksizeof(_In_ const eap::sanitizing_blob_f<N> &val)
 template<size_t N>
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ eap::sanitizing_blob_f<N> &val)
 {
-    eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f<N>);
+    auto ptr_end = cursor.ptr + sizeof(eap::sanitizing_blob_f<N>);
     assert(ptr_end <= cursor.ptr_end);
     memcpy(val.data, cursor.ptr, sizeof(eap::sanitizing_blob_f<N>));
     cursor.ptr = ptr_end;
@@ -1079,7 +1124,7 @@ 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);
+    auto ptr_end = cursor.ptr + sizeof(GUID);
     assert(ptr_end <= cursor.ptr_end);
     memcpy(cursor.ptr, &val, sizeof(GUID));
     cursor.ptr = ptr_end;
@@ -1095,13 +1140,38 @@ inline size_t pksizeof(_In_ const GUID &val)
 
 inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ GUID &val)
 {
-    eap::cursor_in::ptr_type ptr_end = cursor.ptr + sizeof(GUID);
+    auto ptr_end = cursor.ptr + sizeof(GUID);
     assert(ptr_end <= cursor.ptr_end);
     memcpy(&val, cursor.ptr, sizeof(GUID));
     cursor.ptr = ptr_end;
 }
 
 
+inline void operator<<(_Inout_ eap::cursor_out &cursor, _In_ const EAP_METHOD_TYPE &val)
+{
+    auto ptr_end = cursor.ptr + sizeof(EAP_METHOD_TYPE);
+    assert(ptr_end <= cursor.ptr_end);
+    memcpy(cursor.ptr, &val, sizeof(EAP_METHOD_TYPE));
+    cursor.ptr = ptr_end;
+}
+
+
+inline size_t pksizeof(_In_ const EAP_METHOD_TYPE &val)
+{
+    UNREFERENCED_PARAMETER(val);
+    return sizeof(EAP_METHOD_TYPE);
+}
+
+
+inline void operator>>(_Inout_ eap::cursor_in &cursor, _Out_ EAP_METHOD_TYPE &val)
+{
+    auto ptr_end = cursor.ptr + sizeof(EAP_METHOD_TYPE);
+    assert(ptr_end <= cursor.ptr_end);
+    memcpy(&val, cursor.ptr, sizeof(EAP_METHOD_TYPE));
+    cursor.ptr = ptr_end;
+}
+
+
 #ifndef htonll
 
 inline unsigned __int64 htonll(unsigned __int64 val)

lib/EAPBase/include/EAPXML.h

@@ -29,39 +29,531 @@
 
 namespace eapxml
 {
+    ///
+    /// \defgroup EAPBaseXML  XML DOM
+    /// Easy interaction with MSXML
+    ///
+    /// @{
+
+    ///
+    /// Returns owner document object for a given node
+    ///
+    /// \param[in ] pXmlNode  XML node
+    /// \param[out] ppXmlDoc  XML document
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_document(_In_ IXMLDOMNode *pXmlNode, _Out_ winstd::com_obj<IXMLDOMDocument2> &ppXmlDoc);
+
+    ///
+    /// Selects single child node by name
+    ///
+    /// \param[in ] pXmlParent    Parent XML node
+    /// \param[in ] bstrNodeName  XML node selection name
+    /// \param[out] ppXmlNode     Child XML node found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT select_node(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrNodeName, _Out_ winstd::com_obj<IXMLDOMNode> &ppXmlNode);
+
+    ///
+    /// Selects child nodes by name
+    ///
+    /// \param[in ] pXmlParent    Parent XML node
+    /// \param[in ] bstrNodeName  XML node selection name
+    /// \param[out] ppXmlNodes    List of child XML nodes found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT select_nodes(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrNodeName, _Out_ winstd::com_obj<IXMLDOMNodeList> &ppXmlNodes);
+
+    ///
+    /// Selects single child element by name
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT select_element(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Creates a new element
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT create_element(_In_ IXMLDOMDocument *pDoc, _In_z_ const BSTR bstrElementName, _In_z_ const BSTR bstrNamespace, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Creates a new child element if not already present
+    ///
+    /// \param[in ] pDoc                   Owner XML document
+    /// \param[in ] pXmlParent             Parent XML node
+    /// \param[in ] bstrElementNameSelect  XML element selection name
+    /// \param[in ] bstrElementNameCreate  XML element name
+    /// \param[in ] bstrNamespace          XML element namespace
+    /// \param[out] ppXmlElement           XML element found or created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT create_element(_In_ IXMLDOMDocument *pDoc, IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementNameSelect, _In_z_ const BSTR bstrElementNameCreate, _In_z_ const BSTR bstrNamespace, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Tests if node has a parent set
+    ///
+    /// \param[in] pXmlNode  XML node
+    ///
+    /// \returns
+    /// - Non zero when \p pXmlNode has a parent set;
+    /// - Zero otherwise.
+    ///
     inline bool has_parent(_In_ IXMLDOMNode *pXmlNode);
+
+    ///
+    /// Returns child element text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] pbstrValue       XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ winstd::bstr &pbstrValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] sValue           XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Traits, class _Ax> inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element text converted to number
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] pdwValue         XML element text converted to number
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ DWORD &pdwValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element text converted to boolean
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] pbValue          XML element text converted to boolean
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ bool &pbValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element BLOB encoded as Base64 text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] aValue           XML element BLOB
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_element_base64(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ std::vector<_Ty, _Ax> &aValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element BLOB encoded as hexadecimal text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[out] aValue           XML element BLOB
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_element_hex(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _Out_ std::vector<_Ty, _Ax> &aValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element localizable text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[in ] pszLang          Desired localization
+    /// \param[out] pbstrValue       XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_element_localized(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _In_z_ LPCWSTR pszLang, _Out_ winstd::bstr &pbstrValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns child element localizable text
+    ///
+    /// \param[in ] pXmlParent       Parent XML node
+    /// \param[in ] bstrElementName  XML element selection name
+    /// \param[in ] pszLang          Desired localization
+    /// \param[out] sValue           XML element text
+    /// \param[out] ppXmlElement     Child XML element found
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Traits, class _Ax> inline HRESULT get_element_localized(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrElementName, _In_z_ LPCWSTR pszLang, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _Out_ winstd::com_obj<IXMLDOMElement> &ppXmlElement);
+
+    ///
+    /// Creates a new child element with text
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] bstrValue        XML element text
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_z_ const BSTR bstrValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with text converted from number
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] dwValue          XML element number
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_ DWORD dwValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with text converted from boolean
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] bValue           XML element boolean
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_value(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_ bool bValue, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with Base64 encoded text from BLOB
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] pValue           Pointer to BLOB data
+    /// \param[in ] nValueLen        Size of \p pValue in bytes
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_base64(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Creates a new child element with hexadecimal encoded text from BLOB
+    ///
+    /// \param[in ] pDoc             Owner XML document
+    /// \param[in ] pCurrentDOMNode  Parent XML node
+    /// \param[in ] bstrElementName  XML element name
+    /// \param[in ] bstrNamespace    XML element namespace
+    /// \param[in ] pValue           Pointer to BLOB data
+    /// \param[in ] nValueLen        Size of \p pValue in bytes
+    /// \param[out] ppXmlElement     XML element created
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_element_hex(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrElementName, _In_opt_z_ const BSTR bstrNamespace, _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen, _Out_opt_ winstd::com_obj<IXMLDOMElement> *ppXmlElement = NULL);
+
+    ///
+    /// Returns attribute text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] pbstrValue         XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ winstd::bstr &pbstrValue);
+
+    ///
+    /// Returns attribute text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] sValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Traits, class _Ax> inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ std::basic_string<wchar_t, _Traits, _Ax> &sValue);
+
+    ///
+    /// Returns attribute text converted to number
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] pdwValue           XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ DWORD &pdwValue);
+
+    ///
+    /// Returns attribute text converted to boolean
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] pbValue            XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT get_attrib_value(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ bool &pbValue);
+
+    ///
+    /// Returns attribute BLOB converted from Base64 encoded text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] aValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_attrib_base64(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ std::vector<_Ty, _Ax> &aValue);
+
+    ///
+    /// Returns attribute BLOB converted from hexadecimal encoded text
+    ///
+    /// \param[in ] pXmlParent         Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute selection name
+    /// \param[out] aValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     template<class _Ty, class _Ax> inline HRESULT get_attrib_hex(_In_ IXMLDOMNode *pXmlParent, _In_z_ const BSTR bstrAttributeName, _Out_ std::vector<_Ty, _Ax> &aValue);
+
+    ///
+    /// Sets node attribute
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[out] bstrValue          XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_z_ const BSTR bstrValue);
+
+    ///
+    /// Sets node attribute converted from number
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[out] dwValue            XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_ DWORD dwValue);
+
+    ///
+    /// Sets node attribute converted from boolean
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[out] bValue             XML atribute value
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_value(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_ bool bValue);
+
+    ///
+    /// Sets node attribute to Base64 encoded text from BLOB
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[in ] pValue             Pointer to BLOB data
+    /// \param[in ] nValueLen          Size of \p pValue in bytes
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_base64(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_opt_z_ _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen);
+    ///
+    /// Sets node attribute to hexadecimal encoded text from BLOB
+    ///
+    /// \param[in ] pCurrentDOMNode    Parent XML node
+    /// \param[in ] bstrAttributeName  XML attribute name
+    /// \param[in ] pValue             Pointer to BLOB data
+    /// \param[in ] nValueLen          Size of \p pValue in bytes
+    ///
+    /// \returns
+    /// - >0 if succeeded with warnings;
+    /// - =0 (\c S_OK) if successful;
+    /// - <0 if failed.
+    /// Use `SUCCEEDED()` macro to test for first two cases (>=0) or `FAILED()` to test for failure.
+    ///
     inline HRESULT put_attrib_hex(_In_ IXMLDOMNode *pCurrentDOMNode, _In_z_ const BSTR bstrAttributeName, _In_count_(nValueLen) LPCVOID pValue, _In_ SIZE_T nValueLen);
+
+    ///
+    /// Builds XPath for a given node
+    ///
+    /// \param[in] pXmlNode  XML node
+    ///
+    /// \returns String with XPath for a given node up to node terminal parent
+    ///
     inline std::wstring get_xpath(_In_ IXMLDOMNode *pXmlNode);
+
+    /// @}
 }
 
 #pragma once

lib/EAPBase/include/Method.h

@@ -20,15 +20,9 @@
 
 namespace eap
 {
-    ///
-    /// EAP and non-EAP method base class
-    ///
     class method;
-
-    ///
-    /// Non-EAP method base class
-    ///
-    class method_noneap;
+    class method_tunnel;
+    class method_eap;
 }
 
 #pragma once
@@ -49,37 +43,44 @@ extern "C" {
 
 namespace eap
 {
+    ///
+    /// \defgroup EAPBaseMethod  Methods
+    /// Methods
+    ///
+    /// @{
+
+    ///
+    /// Method base class
+    ///
     class method
     {
         WINSTD_NONCOPYABLE(method)
 
     public:
         ///
-        /// Constructs an EAP method
+        /// Constructs a method
         ///
-        /// \param[in] mod   EAP module to use for global services
-        /// \param[in] cfg   Method configuration
-        /// \param[in] cred  User credentials
+        /// \param[in] mod  Module to use for global services
         ///
-        method(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred);
+        method(_In_ module &mod);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
         method(_Inout_ method &&other);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
         /// \returns Reference to this object
         ///
         method& operator=(_Inout_ method &&other);
 
-        /// \name Packet processing
+        /// \name Session management
         /// @{
 
         ///
@@ -87,6 +88,11 @@ namespace eap
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
+        /// \param[in] dwFlags                A combination of EAP flags that describe the new EAP authentication session behavior.
+        /// \param[in] pAttributeArray        A pointer to an array structure that specifies the EAP attributes of the entity to authenticate.
+        /// \param[in] hTokenImpersonateUser  Specifies a handle to the user impersonation token to use in this session.
+        /// \param[in] dwMaxSendPacketSize    Specifies the maximum size in bytes of an EAP packet sent during the session. If the method needs to send a packet larger than the maximum size, the method must accommodate fragmentation and reassembly.
+        ///
         virtual void begin_session(
             _In_        DWORD         dwFlags,
             _In_  const EapAttributes *pAttributeArray,
@@ -100,111 +106,271 @@ namespace eap
         ///
         virtual void end_session();
 
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
         ///
         /// Processes a packet received by EapHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
-        virtual void process_request_packet(
-            _In_bytecount_(dwReceivedPacketSize) const void                *pReceivedPacket,
-            _In_                                       DWORD               dwReceivedPacketSize,
-            _Inout_                                    EapPeerMethodOutput *pEapOutput) = 0;
+        /// \param[in] pReceivedPacket       Received packet data
+        /// \param[in] dwReceivedPacketSize  \p pReceivedPacket size in bytes
+        ///
+        /// \returns Action peer wants EapHost to do next.
+        ///
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize) = 0;
 
         ///
         /// Obtains a response packet from the EAP method.
         ///
         /// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
         ///
+        /// \param[out] packet    Response packet
+        /// \param[in]  size_max  The maximum size in bytes \p packet must not exceed. If the method needs to send a packet larger than the maximum size, the method must accommodate fragmentation and reassembly.
+        ///
         virtual void get_response_packet(
-            _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
-            _Inout_                            DWORD *pdwSendPacketSize) = 0;
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD) = 0;
+
+        /// @}
 
         ///
         /// Obtains the result of an authentication session from the EAP method.
         ///
         /// \sa [EapPeerGetResult function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363611.aspx)
         ///
+        /// \param[in ] reason   The reason code for the authentication result returned in \p pResult.
+        /// \param[out] pResult  A pointer to a structure that contains the authentication results.
+        ///
         virtual void get_result(
-            _In_    EapPeerMethodResultReason reason,
-            _Inout_ EapPeerMethodResult       *ppResult);
+            _In_  EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult);
+
+        /// \name User Interaction
+        /// @{
+
+        ///
+        /// Obtains the user interface context from the EAP method.
+        ///
+        /// \note This function is always followed by the `EapPeerInvokeInteractiveUI()` function, which is followed by the `EapPeerSetUIContext()` function.
+        ///
+        /// \sa [EapPeerGetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363612.aspx)
+        ///
+        /// \param[out] ppUIContextData       A pointer to an address that contains a byte buffer with the supplicant user interface context data from EAPHost.
+        /// \param[out] pdwUIContextDataSize  A pointer to a value that specifies the size of the user interface context data byte buffer returned in \p ppUIContextData.
+        ///
+        virtual void get_ui_context(
+            _Out_ BYTE  **ppUIContextData,
+            _Out_ DWORD *pdwUIContextDataSize);
+
+        ///
+        /// Provides a user interface context to the EAP method.
+        ///
+        /// \note This function is called after the UI has been raised through the `EapPeerGetUIContext()` function.
+        ///
+        /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx)
+        ///
+        /// \param[in] pUIContextData       A pointer to an address that contains a byte buffer with the new supplicant UI context data to set on EAPHost.
+        /// \param[in] dwUIContextDataSize  \p pUIContextData size in bytes
+        ///
+        /// \returns Action peer wants EapHost to do next.
+        ///
+        virtual EapPeerMethodResponseAction set_ui_context(
+            _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+            _In_                                  DWORD dwUIContextDataSize);
+
+        /// @}
+
+        /// \name EAP Response Attributes
+        /// @{
+
+        ///
+        /// Obtains an array of EAP response attributes from the EAP method.
+        ///
+        /// \sa [EapPeerGetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363609.aspx)
+        ///
+        /// \param[out] pAttribs  A pointer to a structure that contains an array of EAP authentication response attributes for the supplicant.
+        ///
+        virtual void get_response_attributes(_Out_ EapAttributes *pAttribs);
+
+        ///
+        /// Provides an updated array of EAP response attributes to the EAP method.
+        ///
+        /// \sa [EapPeerSetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363625.aspx)
+        ///
+        /// \param[in] pAttribs  A pointer to a structure that contains an array of new EAP authentication response attributes to set for the supplicant on EAPHost.
+        ///
+        /// \returns Action peer wants EapHost to do next.
+        ///
+        virtual EapPeerMethodResponseAction set_response_attributes(_In_ const EapAttributes *pAttribs);
 
         /// @}
 
     public:
-        module &m_module;                           ///< EAP module
-        config_method &m_cfg;                       ///< Connection configuration
-        credentials &m_cred;                        ///< User credentials
-        std::vector<winstd::eap_attr> m_eap_attr;   ///< EAP attributes
+        module &m_module;   ///< Module for global services
     };
 
 
-    class method_noneap : public method
+    ///
+    /// Tunnel method base class
+    ///
+    /// This is a base class for all the methods that encapsulate inner methods to provide stacking framework.
+    ///
+    class method_tunnel : public method
     {
-        WINSTD_NONCOPYABLE(method_noneap)
+        WINSTD_NONCOPYABLE(method_tunnel)
 
     public:
         ///
-        /// Constructs an EAP method
+        /// Constructs a method
         ///
-        /// \param[in] mod   EAP module to use for global services
-        /// \param[in] cfg   Method configuration
-        /// \param[in] cred  User credentials
+        /// \param[in] mod    Module to use for global services
+        /// \param[in] inner  Inner method
         ///
-        method_noneap(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred);
+        method_tunnel(_In_ module &mod, _In_ method *inner);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
-        method_noneap(_Inout_ method_noneap &&other);
+        method_tunnel(_Inout_ method_tunnel &&other);
 
         ///
-        /// Moves an EAP method
+        /// Moves a method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  Method to move from
         ///
         /// \returns Reference to this object
         ///
-        method_noneap& operator=(_Inout_ method_noneap &&other);
+        method_tunnel& operator=(_Inout_ method_tunnel &&other);
+
+        /// \name Session management
+        /// @{
+
+        virtual void begin_session(
+            _In_        DWORD         dwFlags,
+            _In_  const EapAttributes *pAttributeArray,
+            _In_        HANDLE        hTokenImpersonateUser,
+            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
+
+        virtual void end_session();
+
+        /// @}
 
         /// \name Packet processing
         /// @{
 
-        ///
-        /// Obtains a response packet from the EAP method.
-        ///
-        /// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
-        ///
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize);
+
         virtual void get_response_packet(
-            _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
-            _Inout_                            DWORD *pdwSendPacketSize);
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD);
+
+        /// @}
+
+        virtual void get_result(
+            _In_  EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult);
+
+        /// \name User Interaction
+        /// @{
+
+        virtual void get_ui_context(
+            _Out_ BYTE  **ppUIContextData,
+            _Out_ DWORD *pdwUIContextDataSize);
+
+        virtual EapPeerMethodResponseAction set_ui_context(
+            _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+            _In_                                  DWORD dwUIContextDataSize);
+
+        /// @}
+
+        /// \name EAP Response Attributes
+        /// @{
+
+        virtual void get_response_attributes(_Out_ EapAttributes *pAttribs);
+
+        virtual EapPeerMethodResponseAction set_response_attributes(_In_ const EapAttributes *pAttribs);
 
         /// @}
 
     protected:
+        std::unique_ptr<method> m_inner;    ///< Inner method
+    };
+
+
+    ///
+    /// EAP tunnel method
+    ///
+    /// This method encapsulates inner data in EAP packets.
+    ///
+    class method_eap : public method_tunnel
+    {
+        WINSTD_NONCOPYABLE(method_eap)
+
+    public:
         ///
-        /// Appends Diameter AVP to response packet
+        /// Constructs a method
         ///
-        /// \param[in] code     AVP code
-        /// \param[in] flags    AVP flags
-        /// \param[in] data     AVP data (<16777212B)
-        /// \param[in] size     Size of \p data in bytes
+        /// \param[in] mod         Module to use for global services
+        /// \param[in] eap_method  EAP method type
+        /// \param[in] inner       Inner method
         ///
-        void append_avp(_In_ unsigned int code, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size);
+        method_eap(_In_ module &mod, _In_ winstd::eap_type_t eap_method, _In_ method *inner);
 
         ///
-        /// Appends Diameter AVP to response packet
+        /// Moves a method
         ///
-        /// \param[in] code       AVP code
-        /// \param[in] vendor_id  Vendor-ID
-        /// \param[in] flags      AVP flags
-        /// \param[in] data       AVP data (<16777212B)
-        /// \param[in] size       Size of \p data in bytes
+        /// \param[in] other  Method to move from
         ///
-        void append_avp(_In_ unsigned int code, _In_ unsigned int vendor_id, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size);
+        method_eap(_Inout_ method_eap &&other);
+
+        ///
+        /// Moves a method
+        ///
+        /// \param[in] other  Method to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        method_eap& operator=(_Inout_ method_eap &&other);
+
+        /// \name Session management
+        /// @{
+
+        virtual void begin_session(
+            _In_        DWORD         dwFlags,
+            _In_  const EapAttributes *pAttributeArray,
+            _In_        HANDLE        hTokenImpersonateUser,
+            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
+
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize);
+
+        virtual void get_response_packet(
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD);
+
+        /// @}
 
     protected:
-        sanitizing_blob m_packet_res;   ///< Response packet
+        const winstd::eap_type_t m_eap_method;  ///< EAP method type
+        unsigned char m_id;                     ///< Request packet ID
+        bool m_send_nak;                        ///< Are we sending Legacy Nak response?
     };
+
+    /// @}
 }

lib/EAPBase/include/Module.h

@@ -20,18 +20,7 @@
 
 namespace eap
 {
-    ///
-    /// EAP module base class
-    ///
-    /// Provides basic services to EAP methods.
-    ///
     class module;
-
-    ///
-    /// EAP peer base class
-    ///
-    /// A group of methods all EAP peers must or should implement.
-    ///
     class peer;
 }
 
@@ -58,6 +47,17 @@ extern "C" {
 
 namespace eap
 {
+    ///
+    /// \defgroup EAPBaseModule  Modules
+    /// Modules
+    ///
+    /// @{
+
+    ///
+    /// EAP module base class
+    ///
+    /// Provides basic services to EAP methods.
+    ///
     class module
     {
         WINSTD_NONCOPYABLE(module)
@@ -88,6 +88,11 @@ namespace eap
         ///
         EAP_ERROR* make_error(_In_ std::exception &err) const;
 
+        ///
+        /// Allocate a EAP_ERROR and fill it according to another EAP_ERROR
+        ///
+        EAP_ERROR* make_error(_In_ const EAP_ERROR *err) const;
+
         ///
         /// Allocate BLOB
         ///
@@ -104,7 +109,9 @@ namespace eap
         void free_error_memory(_In_ EAP_ERROR *err);
 
         ///
-        /// Makes a new method config
+        /// Makes a new method configuration
+        ///
+        /// \returns New method configuration
         ///
         virtual config_method* make_config_method();
 
@@ -129,6 +136,7 @@ namespace eap
         /// Writes EAPMETHOD_TRACE_EVT_FN_CALL and returns auto event writer class
         ///
         /// \param[in] pszFnName  Function name
+        /// \param[in] result     Reference to function return variable
         ///
         /// \returns A new auto event writer that writes EAPMETHOD_TRACE_EVT_FN_RETURN_DWORD event on destruction
         ///
@@ -147,14 +155,19 @@ namespace eap
         ///
         inline void log_config(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const
         {
-            m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_UNICODE_STRING, winstd::event_data(name), winstd::event_data(value), winstd::event_data::blank);
+            EVENT_DATA_DESCRIPTOR desc[] = {
+                winstd::event_data(name ),
+                winstd::event_data(value)
+            };
+
+            m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_UNICODE_STRING, _countof(desc), desc);
         }
 
         ///
         /// Logs string list config value
         ///
         template<class _Traits, class _Ax, class _Ax_list>
-        inline void log_config(_In_z_ LPCWSTR name, _In_z_ const std::list<std::basic_string<char, _Traits, _Ax>, _Ax_list> &value) const
+        inline void log_config(_In_z_ LPCWSTR name, _In_ const std::list<std::basic_string<char, _Traits, _Ax>, _Ax_list> &value) const
         {
             // Prepare a table of event data descriptors.
             std::vector<EVENT_DATA_DESCRIPTOR> desc;
@@ -162,7 +175,7 @@ namespace eap
             desc.reserve(count + 2);
             desc.push_back(winstd::event_data(              name ));
             desc.push_back(winstd::event_data((unsigned int)count));
-            for (std::list<std::basic_string<char, _Traits, _Ax>, _Ax_list>::const_iterator v = value.cbegin(), v_end = value.cend(); v != v_end; ++v)
+            for (auto v = value.cbegin(), v_end = value.cend(); v != v_end; ++v)
                 desc.push_back(winstd::event_data(*v));
 
             m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_ANSI_STRING_ARRAY, (ULONG)desc.size(), desc.data());
@@ -172,7 +185,7 @@ namespace eap
         /// Logs Unicode string list config value
         ///
         template<class _Traits, class _Ax, class _Ax_list>
-        inline void log_config(_In_z_ LPCWSTR name, _In_z_ const std::list<std::basic_string<wchar_t, _Traits, _Ax>, _Ax_list> &value) const
+        inline void log_config(_In_z_ LPCWSTR name, _In_ const std::list<std::basic_string<wchar_t, _Traits, _Ax>, _Ax_list> &value) const
         {
             // Prepare a table of event data descriptors.
             std::vector<EVENT_DATA_DESCRIPTOR> desc;
@@ -180,7 +193,7 @@ namespace eap
             desc.reserve(count + 2);
             desc.push_back(winstd::event_data(              name ));
             desc.push_back(winstd::event_data((unsigned int)count));
-            for (std::list<std::basic_string<wchar_t, _Traits, _Ax>, _Ax_list>::const_iterator v = value.cbegin(), v_end = value.cend(); v != v_end; ++v)
+            for (auto v = value.cbegin(), v_end = value.cend(); v != v_end; ++v)
                 desc.push_back(winstd::event_data(*v));
 
             m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_UNICODE_STRING_ARRAY, (ULONG)desc.size(), desc.data());
@@ -191,12 +204,70 @@ namespace eap
         ///
         inline void log_config(_In_z_ LPCWSTR name, _In_ bool value) const
         {
-            m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_BOOL, winstd::event_data(name), winstd::event_data((int)value), winstd::event_data::blank);
+            EVENT_DATA_DESCRIPTOR desc[] = {
+                winstd::event_data(     name ),
+                winstd::event_data((int)value)
+            };
+
+            m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_BOOL, _countof(desc), desc);
+        }
+
+        ///
+        /// Logs binary config value
+        ///
+        inline void log_config(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const
+        {
+            EVENT_DATA_DESCRIPTOR desc[] = {
+                winstd::event_data(      name),
+                winstd::event_data(      size),
+                winstd::event_data(data, size)
+            };
+
+            m_ep.write(&EAPMETHOD_TRACE_EVT_CFG_VALUE_BINARY, _countof(desc), desc);
+        }
+
+        ///
+        /// Discretely logs Unicode string config value
+        ///
+        /// If \c _DEBUG is set the value is masked.
+        ///
+        /// \param[in] name   Variable name
+        /// \param[in] value  Variable value
+        ///
+        inline void log_config_discrete(_In_z_ LPCWSTR name, _In_z_ LPCWSTR value) const
+        {
+#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
+#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!!  Passwords and certificates will be logged as a clear-text. Please, consider undefining __DANGEROUS__LOG_CONFIDENTIAL_DATA.")
+            log_config(name, value);
+#else
+            log_config(name, value ? value[0] ? L"********" : L"" : NULL);
+#endif
+        }
+
+        ///
+        /// Discretely logs binary config value
+        ///
+        /// If \c _DEBUG is set the value is masked.
+        ///
+        /// \param[in] name  Variable name
+        /// \param[in] data  Variable data
+        /// \param[in] size  \p data size in bytes
+        ///
+        inline void log_config_discrete(_In_z_ LPCWSTR name, _In_bytecount_(size) const void *data, _In_ ULONG size) const
+        {
+#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
+#pragma message (__FILE__ "(" STRING(__LINE__) "): Warning: !!! DANGER !!!  Passwords and certificates will be logged as a clear-text. Please, consider undefining __DANGEROUS__LOG_CONFIDENTIAL_DATA.")
+            log_config(name, data, size);
+#else
+            log_config(name, data ? size ? L"********" : L"" : NULL);
+#endif
         }
 
         ///
         /// Logs event
         ///
+        /// \param[in] EventDescriptor  Event descriptor
+        ///
         inline void log_event(_In_ PCEVENT_DESCRIPTOR EventDescriptor, ...) const
         {
             va_list arg;
@@ -216,7 +287,6 @@ namespace eap
         /// \param[in ] hProv  Handle of cryptographics provider
         /// \param[in ] data   Pointer to data to encrypt
         /// \param[in ] size   Size of \p data in bytes
-        /// \param[out] enc    Encrypted data
         /// \param[out] hHash  Handle of hashing object
         ///
         /// \returns Encrypted data
@@ -253,7 +323,7 @@ namespace eap
         std::vector<unsigned char> encrypt(_In_ HCRYPTPROV hProv, _In_ const std::basic_string<wchar_t, _Traits, _Ax> &val, _Out_opt_ HCRYPTHASH hHash = NULL) const
         {
             winstd::sanitizing_string val_utf8;
-            WideCharToMultiByte(CP_UTF8, 0, val.c_str(), (int)val.length(), val_utf8, NULL, NULL);
+            WideCharToMultiByte(CP_UTF8, 0, val, val_utf8, NULL, NULL);
             return encrypt(hProv, val_utf8, hHash);
         }
 
@@ -297,7 +367,7 @@ namespace eap
         std::vector<unsigned char> encrypt_md5(_In_ HCRYPTPROV hProv, _In_ const std::basic_string<wchar_t, _Traits, _Ax> &val) const
         {
             winstd::sanitizing_string val_utf8;
-            WideCharToMultiByte(CP_UTF8, 0, val.c_str(), (int)val.length(), val_utf8, NULL, NULL);
+            WideCharToMultiByte(CP_UTF8, 0, val, val_utf8, NULL, NULL);
             return encrypt_md5(hProv, val_utf8);
         }
 
@@ -330,12 +400,12 @@ namespace eap
 
             // Import the 256-bit AES session key.
             winstd::crypt_key key_aes;
-            if (!CryptImportKey(hProv, (LPCBYTE)data, 268, key_rsa, 0, &key_aes))
+            if (!CryptImportKey(hProv, reinterpret_cast<LPCBYTE>(data), 268, key_rsa, 0, &key_aes))
                 throw win_runtime_error(__FUNCTION__ " CryptImportKey failed.");
 
             // Decrypt the data using AES session key.
             std::vector<unsigned char, winstd::sanitizing_allocator<unsigned char> > buf;
-            buf.assign((const unsigned char*)data + 268, (const unsigned char*)data + size);
+            buf.assign(reinterpret_cast<const unsigned char*>(data) + 268, reinterpret_cast<const unsigned char*>(data) + size);
             if (!CryptDecrypt(key_aes, hHash, TRUE, 0, buf))
                 throw win_runtime_error(__FUNCTION__ " CryptDecrypt failed.");
 
@@ -378,7 +448,7 @@ namespace eap
         {
             winstd::sanitizing_string buf(std::move(decrypt_str(hProv, data, size, hHash)));
             std::basic_string<wchar_t, _Traits, _Ax> dec;
-            MultiByteToWideChar(CP_UTF8, 0, buf.data(), (int)buf.size(), dec);
+            MultiByteToWideChar(CP_UTF8, 0, buf, dec);
             return dec;
         }
 
@@ -412,7 +482,7 @@ namespace eap
             std::vector<unsigned char> hash_bin;
             if (!CryptGetHashParam(hash, HP_HASHVAL, hash_bin, 0))
                 throw win_runtime_error(__FUNCTION__ " Calculating MD5 hash failed.");
-            if (memcmp((unsigned char*)data + enc_size, hash_bin.data(), dwHashSize) != 0)
+            if (memcmp(reinterpret_cast<const unsigned char*>(data) + enc_size, hash_bin.data(), dwHashSize) != 0)
                 throw invalid_argument(__FUNCTION__ " Invalid encrypted data.");
 
             return dec;
@@ -450,7 +520,7 @@ namespace eap
         {
             winstd::sanitizing_string buf(std::move(decrypt_str_md5<char, std::char_traits<char>, sanitizing_allocator<char> >(hProv, data, size)));
             std::basic_string<wchar_t, _Traits, _Ax> dec;
-            MultiByteToWideChar(CP_UTF8, 0, buf.data(), (int)buf.size(), dec);
+            MultiByteToWideChar(CP_UTF8, 0, buf, dec);
             return dec;
         }
 
@@ -465,11 +535,6 @@ namespace eap
         /// \param[inout] record        Object to unpack to
         /// \param[in   ] pDataIn       Pointer to encrypted BLOB
         /// \param[in   ] dwDataInSize  Size of \p pDataIn
-        /// \param[out  ] ppEapError    Pointer to error descriptor in case of failure. Free using `module::free_error_memory()`.
-        ///
-        /// \returns
-        /// - \c true if succeeded
-        /// - \c false otherwise. See \p ppEapError for details.
         ///
         template<class T>
         void unpack(
@@ -558,6 +623,11 @@ namespace eap
     };
 
 
+    ///
+    /// EAP peer base class
+    ///
+    /// A group of methods all EAP peers must or should implement.
+    ///
     class peer : public module
     {
         WINSTD_NONCOPYABLE(peer)
@@ -589,23 +659,43 @@ namespace eap
         ///
         /// \sa [EapPeerGetIdentity function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363607.aspx)
         ///
+        /// \param[in ] dwFlags                  A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] pConnectionData          Connection data used for the EAP method. If set to \c NULL, the static property of the method, as configured in the registry, is returned.
+        /// \param[in ] dwConnectionDataSize     The size, in bytes, of the connection data buffer provided in \p pConnectionData.
+        /// \param[in ] pUserData                A pointer to a byte buffer that contains the opaque user data BLOB. This parameter can be \c NULL.
+        /// \param[in ] dwUserDataSize           The size, in bytes, of the user data buffer provided in \p pUserData.
+        /// \param[out] ppUserDataOut            A pointer to a pointer to the returned user data. The data is passed to \p EapPeerBeginSession() as input \p pUserData.
+        /// \param[out] pdwUserDataOutSize       Specifies the size, in bytes, of the \p ppUserDataOut buffer.
+        /// \param[in ] hTokenImpersonateUser    A handle to the user impersonation token to use in this session.
+        /// \param[out] pfInvokeUI               Returns \c TRUE if the user identity and user data blob aren't returned successfully, and the method seeks to collect the information from the user through the user interface dialog.
+        /// \param[out] ppwszIdentity            A pointer to the returned user identity. The pointer will be included in the identity response packet and returned to the server.
+        ///
         virtual void get_identity(
             _In_                                   DWORD  dwFlags,
             _In_count_(dwConnectionDataSize) const BYTE   *pConnectionData,
             _In_                                   DWORD  dwConnectionDataSize,
             _In_count_(dwUserDataSize)       const BYTE   *pUserData,
             _In_                                   DWORD  dwUserDataSize,
-            _Inout_                                BYTE   **ppUserDataOut,
-            _Inout_                                DWORD  *pdwUserDataOutSize,
+            _Out_                                  BYTE   **ppUserDataOut,
+            _Out_                                  DWORD  *pdwUserDataOutSize,
             _In_                                   HANDLE hTokenImpersonateUser,
-            _Inout_                                BOOL   *pfInvokeUI,
-            _Inout_                                WCHAR  **ppwszIdentity) = 0;
+            _Out_                                  BOOL   *pfInvokeUI,
+            _Out_                                  WCHAR  **ppwszIdentity) = 0;
 
         ///
         /// Defines the implementation of an EAP method-specific function that retrieves the properties of an EAP method given the connection and user data.
         ///
         /// \sa [EapPeerGetMethodProperties function](https://msdn.microsoft.com/en-us/library/windows/desktop/hh706636.aspx)
         ///
+        /// \param[in ] dwVersion                The version number of the API.
+        /// \param[in ] dwFlags                  A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] hUserImpersonationToken  A handle to the user impersonation token to use in this session.
+        /// \param[in ] pConnectionData          Connection data used for the EAP method. If set to \c NULL, the static property of the method, as configured in the registry, is returned.
+        /// \param[in ] dwConnectionDataSize     The size, in bytes, of the connection data buffer provided in \p pConnectionData.
+        /// \param[in ] pUserData                A pointer to a byte buffer that contains the opaque user data BLOB. This parameter can be \c NULL.
+        /// \param[in ] dwUserDataSize           The size, in bytes, of the user data buffer provided in \p pUserData.
+        /// \param[out] pMethodPropertyArray     A pointer to the method properties array. Caller should free the inner pointers using `EapHostPeerFreeMemory()` starting at the innermost pointer. The caller should free an \c empvtString value only when the type is \c empvtString.
+        ///
         virtual void get_method_properties(
             _In_                                   DWORD                     dwVersion,
             _In_                                   DWORD                     dwFlags,
@@ -614,72 +704,107 @@ namespace eap
             _In_                                   DWORD                     dwConnectionDataSize,
             _In_count_(dwUserDataSize)       const BYTE                      *pUserData,
             _In_                                   DWORD                     dwUserDataSize,
-            _Inout_                                EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray) = 0;
+            _Out_                                  EAP_METHOD_PROPERTY_ARRAY *pMethodPropertyArray) = 0;
 
         ///
         /// Converts XML into the configuration BLOB. The XML based credentials can come from group policy or from a system administrator.
         ///
         /// \sa [EapPeerCredentialsXml2Blob function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363603.aspx)
         ///
+        /// \param[in ] dwFlags                A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] pConfigRoot            A pointer to an XML node that contains credentials, which are either user or machine credentials depending on the configuration passed in. The XML document is created with the EapHostUserCredentials Schema.
+        /// \param[in ] dwConnectionDataSize   The size of the EAP SSO configuration data pointed to by \p pConnectionData, in bytes.
+        /// \param[in ] pConnectionData        A pointer to an opaque byte buffer that contains the EAP SSO configuration data BLOB.
+        /// \param[out] ppCredentialsOut       A pointer to the byte buffer that receives the credentials BLOB buffer generated by the input XML. The buffer can is of size \p pdwCredentialsOutSize. After consuming the data, this memory must be freed by calling `EapPeerFreeMemory()`.
+        /// \param[out] pdwCredentialsOutSize  The size, in bytes, of the buffer pointed to by \p ppCredentialsOut.
+        ///
         virtual void credentials_xml2blob(
             _In_                                   DWORD       dwFlags,
             _In_                                   IXMLDOMNode *pConfigRoot,
             _In_count_(dwConnectionDataSize) const BYTE        *pConnectionData,
             _In_                                   DWORD       dwConnectionDataSize,
-            _Inout_                                BYTE        **ppCredentialsOut,
-            _Inout_                                DWORD       *pdwCredentialsOutSize) = 0;
+            _Out_                                  BYTE        **ppCredentialsOut,
+            _Out_                                  DWORD       *pdwCredentialsOutSize) = 0;
 
         ///
         /// Defines the implementation of an EAP method-specific function that obtains the EAP Single-Sign-On (SSO) credential input fields for an EAP method.
         ///
         /// \sa [EapPeerQueryCredentialInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363622.aspx)
         ///
+        /// \param[in ] hUserImpersonationToken     An impersonation token for the user whose credentials are to be requested and obtained.
+        /// \param[in ] dwFlags                     A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwConnectionDataSize        The size of the EAP SSO configuration data pointed to by \p pConnectionData, in bytes.
+        /// \param[in ] pConnectionData             A pointer to an opaque byte buffer that contains the EAP SSO configuration data BLOB.
+        /// \param[out] pEapConfigInputFieldsArray  A Pointer to a structure that contains the input fields to display to the supplicant user. The `pwszData` fields in the individual `EAP_CONFIG_INPUT_FIELD_DATA` elements are initialized to \c NULL.
+        ///
         virtual void query_credential_input_fields(
             _In_                                   HANDLE                       hUserImpersonationToken,
             _In_                                   DWORD                        dwFlags,
             _In_                                   DWORD                        dwConnectionDataSize,
             _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
-            _Inout_                                EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const;
+            _Out_                                  EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const;
 
         ///
         /// Defines the implementation of an EAP method function that obtains the user BLOB data provided in an interactive Single-Sign-On (SSO) UI raised on the supplicant.
         ///
         /// \sa [EapPeerQueryUserBlobFromCredentialInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb204697.aspx)
         ///
+        /// \param[in ] hUserImpersonationToken    An impersonation token for the user whose credentials are to be requested and obtained.
+        /// \param[in ] dwFlags                    A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwConnectionDataSize       The size of the EAP SSO configuration data pointed to by \p pConnectionData, in bytes.
+        /// \param[in ] pConnectionData            A pointer to an opaque byte buffer that contains the EAP SSO configuration data BLOB.
+        /// \param[in ] pEapConfigInputFieldArray  A pointer to a structure that contains the input fields to display to the supplicant user. The `pwszData` fields in the individual `EAP_CONFIG_INPUT_FIELD_DATA` elements are initialized to \c NULL.
+        /// \param[out] pdwUsersBlobSize           A pointer to a buffer that contains the size, in bytes, of the opaque user configuration data BLOB in \p ppUserBlob.
+        /// \param[out] ppUserBlob                 A pointer that contains the opaque user data BLOB.
+        ///
         virtual void query_user_blob_from_credential_input_fields(
             _In_                                   HANDLE                       hUserImpersonationToken,
             _In_                                   DWORD                        dwFlags,
             _In_                                   DWORD                        dwConnectionDataSize,
             _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
             _In_                             const EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldArray,
-            _Inout_                                DWORD                        *pdwUsersBlobSize,
-            _Inout_                                BYTE                         **ppUserBlob) const;
+            _Out_                                  DWORD                        *pdwUsersBlobSize,
+            _Out_                                  BYTE                         **ppUserBlob) const;
 
         ///
         /// Defines the implementation of an EAP method API that provides the input fields for interactive UI components to be raised on the supplicant.
         ///
         /// \sa [EapPeerQueryInteractiveUIInputFields function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb204695.aspx)
         ///
+        /// \param[in ] dwVersion              The version number of the API.
+        /// \param[in ] dwFlags                A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwUIContextDataSize    The size of the context data in \p pUIContextData, in bytes.
+        /// \param[in ] pUIContextData         A pointer to a BLOB that contains UI context data, represented as inner pointers to field data. The supplicant obtained these inner pointers from EAPHost run-time APIs.
+        /// \param[out] pEapInteractiveUIData  Pointer that receives a structure that contains configuration information for interactive UI components raised on an EAP supplicant.
+        ///
         virtual void query_interactive_ui_input_fields(
             _In_                                  DWORD                   dwVersion,
             _In_                                  DWORD                   dwFlags,
             _In_                                  DWORD                   dwUIContextDataSize,
             _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
-            _Inout_                               EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const;
+            _Out_                                 EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const;
 
         ///
         /// 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)
         ///
+        /// \param[in ] dwVersion                     The version number of the API.
+        /// \param[in ] dwFlags                       A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] dwUIContextDataSize           The size of the context data in \p pUIContextData, in bytes.
+        /// \param[in ] pUIContextData                A pointer to a BLOB that contains UI context data, represented as inner pointers to field data. The supplicant obtained these inner pointers from EAPHost run-time APIs.
+        /// \param[in ] pEapInteractiveUIData         Pointer with a structure that contains configuration information for interactive user interface components raised on an EAP supplicant.
+        /// \param[out] pdwDataFromInteractiveUISize  A pointer to a `DWORD` that specifies the size of the buffer pointed to by the \p ppDataFromInteractiveUI parameter, in bytes. If this value is not set to \c 0, then a pointer to a buffer of the size specified in this parameter must be supplied in the \p ppDataFromInteractiveUI parameter.
+        /// \param[out] ppDataFromInteractiveUI       A pointer that receives a credentials BLOB that can be used in authentication. The caller should free the inner pointers using the function \p EapPeerFreeMemory(), starting at the innermost pointer. If a non-NULL value is supplied for this parameter, meaning that an existing data BLOB is passed to it, the supplied data BLOB will be updated and returned in this parameter.
+        ///
         virtual void query_ui_blob_from_interactive_ui_input_fields(
             _In_                                  DWORD                   dwVersion,
             _In_                                  DWORD                   dwFlags,
             _In_                                  DWORD                   dwUIContextDataSize,
             _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
             _In_                            const EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
-            _Inout_                               DWORD                   *pdwDataFromInteractiveUISize,
-            _Inout_                               BYTE                    **ppDataFromInteractiveUI) const;
+            _Out_                                 DWORD                   *pdwDataFromInteractiveUISize,
+            _Out_                                 BYTE                    **ppDataFromInteractiveUI) const;
 
         /// \name Session management
         /// @{
@@ -689,6 +814,15 @@ namespace eap
         ///
         /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
         ///
+        /// \param[in] dwFlags                A combination of EAP flags that describe the new EAP authentication session behavior.
+        /// \param[in] pAttributeArray        A pointer to an array structure that specifies the EAP attributes of the entity to authenticate.
+        /// \param[in] hTokenImpersonateUser  Specifies a handle to the user impersonation token to use in this session.
+        /// \param[in] pConnectionData        Connection data specific to this method used to decide the user data returned from this API, where the user data depends on certain connection data configuration. When this parameter is NULL the method implementation should use default values for connection.
+        /// \param[in] dwConnectionDataSize   Specifies the size, in bytes, of the connection data buffer provided in \p pConnectionData.
+        /// \param[in] pUserData              A pointer to a byte buffer that contains the opaque user data BLOB.
+        /// \param[in] dwUserDataSize         Specifies the size in bytes of the user data buffer provided in \p pUserData.
+        /// \param[in] dwMaxSendPacketSize    Specifies the maximum size in bytes of an EAP packet sent during the session. If the method needs to send a packet larger than the maximum size, the method must accommodate fragmentation and reassembly.
+        ///
         /// \returns Session handle
         ///
         virtual EAP_SESSION_HANDLE begin_session(
@@ -706,38 +840,63 @@ namespace eap
         ///
         /// \sa [EapPeerEndSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363604.aspx)
         ///
+        /// \param[in] hSession  A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        ///
         virtual void end_session(_In_ EAP_SESSION_HANDLE hSession) = 0;
 
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
         ///
         /// Processes a packet received by EapHost from a supplicant.
         ///
         /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
         ///
+        /// \param[in] hSession              A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in] pReceivedPacket       Received packet data
+        /// \param[in] dwReceivedPacketSize  \p pReceivedPacket size in bytes
+        /// \param[in] pEapOutput            A pointer to a structure that contains the output of the packet process operation.
+        ///
         virtual void process_request_packet(
             _In_                                       EAP_SESSION_HANDLE  hSession,
             _In_bytecount_(dwReceivedPacketSize) const EapPacket           *pReceivedPacket,
             _In_                                       DWORD               dwReceivedPacketSize,
-            _Inout_                                    EapPeerMethodOutput *pEapOutput) = 0;
+            _Out_                                      EapPeerMethodOutput *pEapOutput) = 0;
 
         ///
         /// Obtains a response packet from the EAP method.
         ///
         /// \sa [EapPeerGetResponsePacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363610.aspx)
         ///
+        /// \param[in   ] hSession           A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[inout] pSendPacket        A pointer to a structure that contains the response packet.
+        /// \param[inout] pdwSendPacketSize  A pointer to a value that contains the size in bytes of the buffer allocated for the response packet. On return, this parameter receives a pointer to the actual size in bytes of \p pSendPacket.
+        ///
         virtual void get_response_packet(
             _In_                               EAP_SESSION_HANDLE hSession,
             _Inout_bytecap_(*dwSendPacketSize) EapPacket          *pSendPacket,
             _Inout_                            DWORD              *pdwSendPacketSize) = 0;
 
+        /// @}
+
         ///
         /// Obtains the result of an authentication session from the EAP method.
         ///
         /// \sa [EapPeerGetResult function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363611.aspx)
         ///
+        /// \param[in ] hSession  A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in ] reason    The reason code for the authentication result returned in \p pResult.
+        /// \param[out] pResult   A pointer to a structure that contains the authentication results.
+        ///
         virtual void get_result(
-            _In_    EAP_SESSION_HANDLE        hSession,
-            _In_    EapPeerMethodResultReason reason,
-            _Inout_ EapPeerMethodResult       *ppResult) = 0;
+            _In_  EAP_SESSION_HANDLE        hSession,
+            _In_  EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult) = 0;
+
+        /// \name User Interaction
+        /// @{
 
         ///
         /// Obtains the user interface context from the EAP method.
@@ -746,10 +905,14 @@ namespace eap
         ///
         /// \sa [EapPeerGetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363612.aspx)
         ///
+        /// \param[in ] hSession              A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[out] ppUIContextData       A pointer to an address that contains a byte buffer with the supplicant user interface context data from EAPHost.
+        /// \param[out] pdwUIContextDataSize  A pointer to a value that specifies the size of the user interface context data byte buffer returned in \p ppUIContextData.
+        ///
         virtual void get_ui_context(
-            _In_    EAP_SESSION_HANDLE hSession,
-            _Inout_ BYTE               **ppUIContextData,
-            _Inout_ DWORD              *pdwUIContextDataSize) = 0;
+            _In_  EAP_SESSION_HANDLE hSession,
+            _Out_ BYTE               **ppUIContextData,
+            _Out_ DWORD              *pdwUIContextDataSize) = 0;
 
         ///
         /// Provides a user interface context to the EAP method.
@@ -758,31 +921,50 @@ namespace eap
         ///
         /// \sa [EapPeerSetUIContext function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363626.aspx)
         ///
+        /// \param[in] hSession             A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in] pUIContextData       A pointer to an address that contains a byte buffer with the new supplicant UI context data to set on EAPHost.
+        /// \param[in] dwUIContextDataSize  \p pUIContextData size in bytes
+        /// \param[in] pEapOutput           A pointer to a structure that contains the output of the packet process operation.
+        ///
         virtual void set_ui_context(
             _In_                                  EAP_SESSION_HANDLE  hSession,
             _In_count_(dwUIContextDataSize) const BYTE                *pUIContextData,
             _In_                                  DWORD               dwUIContextDataSize,
-            _In_                            const EapPeerMethodOutput *pEapOutput) = 0;
+            _Out_                                 EapPeerMethodOutput *pEapOutput) = 0;
+
+        /// @}
+
+        /// \name EAP Response Attributes
+        /// @{
 
         ///
         /// Obtains an array of EAP response attributes from the EAP method.
         ///
         /// \sa [EapPeerGetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363609.aspx)
         ///
+        /// \param[in ] hSession  A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[out] pAttribs  A pointer to a structure that contains an array of EAP authentication response attributes for the supplicant.
+        ///
         virtual void get_response_attributes(
-            _In_    EAP_SESSION_HANDLE hSession,
-            _Inout_ EapAttributes      *pAttribs) = 0;
+            _In_  EAP_SESSION_HANDLE hSession,
+            _Out_ EapAttributes      *pAttribs) = 0;
 
         ///
         /// Provides an updated array of EAP response attributes to the EAP method.
         ///
         /// \sa [EapPeerSetResponseAttributes function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363625.aspx)
         ///
+        /// \param[in] hSession    A unique handle for this EAP authentication session on the EAPHost server. This handle is returned in the \p pSessionHandle parameter in a previous call to `EapPeerBeginSession()`.
+        /// \param[in] pAttribs    A pointer to a structure that contains an array of new EAP authentication response attributes to set for the supplicant on EAPHost.
+        /// \param[in] pEapOutput  A pointer to a structure that contains the output of the packet process operation.
+        ///
         virtual void set_response_attributes(
             _In_       EAP_SESSION_HANDLE  hSession,
             _In_ const EapAttributes       *pAttribs,
-            _Inout_    EapPeerMethodOutput *pEapOutput) = 0;
+            _Out_      EapPeerMethodOutput *pEapOutput) = 0;
 
         /// @}
     };
+
+    /// @}
 }

lib/EAPBase/src/Config.cpp

@@ -242,9 +242,9 @@ eap::config_method_with_cred::config_method_with_cred(_In_ module &mod, _In_ uns
 
 
 eap::config_method_with_cred::config_method_with_cred(_In_ const config_method_with_cred &other) :
-    m_use_cred   (other.m_use_cred                                            ),
-    m_cred       (other.m_cred ? (credentials*)other.m_cred->clone() : nullptr),
-    config_method(other                                                       )
+    m_use_cred   (other.m_use_cred                                                          ),
+    m_cred       (other.m_cred ? dynamic_cast<credentials*>(other.m_cred->clone()) : nullptr),
+    config_method(other                                                                     )
 {
 }
 
@@ -262,7 +262,7 @@ eap::config_method_with_cred& eap::config_method_with_cred::operator=(_In_ const
     if (this != &other) {
         (config_method&)*this = other;
         m_use_cred            = other.m_use_cred;
-        m_cred.reset(other.m_cred ? (credentials*)other.m_cred->clone() : nullptr);
+        m_cred.reset(other.m_cred ? dynamic_cast<credentials*>(other.m_cred->clone()) : nullptr);
     }
 
     return *this;
@@ -375,8 +375,8 @@ eap::config_provider::config_provider(_In_ const config_provider &other) :
     config              (other                     )
 {
     m_methods.reserve(other.m_methods.size());
-    for (vector<unique_ptr<config_method> >::const_iterator method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method)
-        m_methods.push_back(std::move(unique_ptr<config_method>(*method ? (config_method*)method->get()->clone() : nullptr)));
+    for (auto method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method)
+        m_methods.push_back(std::move(unique_ptr<config_method>(*method ? dynamic_cast<config_method*>(method->get()->clone()) : nullptr)));
 }
 
 
@@ -414,8 +414,8 @@ eap::config_provider& eap::config_provider::operator=(_In_ const config_provider
 
         m_methods.clear();
         m_methods.reserve(other.m_methods.size());
-        for (vector<unique_ptr<config_method> >::const_iterator method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method)
-            m_methods.push_back(std::move(unique_ptr<config_method>(*method ? (config_method*)method->get()->clone() : nullptr)));
+        for (auto method = other.m_methods.cbegin(), method_end = other.m_methods.cend(); method != method_end; ++method)
+            m_methods.push_back(std::move(unique_ptr<config_method>(*method ? dynamic_cast<config_method*>(method->get()->clone()) : nullptr)));
     }
 
     return *this;
@@ -519,7 +519,7 @@ void eap::config_provider::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pC
     if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:AuthenticationMethods"), bstr(L"AuthenticationMethods"), namespace_eapmetadata, pXmlElAuthenticationMethods)))
         throw com_runtime_error(hr, __FUNCTION__ " Error creating <AuthenticationMethods> element.");
 
-    for (vector<unique_ptr<config_method> >::const_iterator method = m_methods.cbegin(), method_end = m_methods.cend(); method != method_end; ++method) {
+    for (auto method = m_methods.cbegin(), method_end = m_methods.cend(); method != method_end; ++method) {
         // <AuthenticationMethod>
         com_obj<IXMLDOMElement> pXmlElAuthenticationMethod;
         if (FAILED(hr = eapxml::create_element(pDoc, bstr(L"AuthenticationMethod"), namespace_eapmetadata, pXmlElAuthenticationMethod)))
@@ -685,11 +685,12 @@ void eap::config_provider::operator>>(_Inout_ cursor_in &cursor)
     cursor >> m_lbl_alt_identity  ;
     cursor >> m_lbl_alt_password  ;
 
-    list<config_method>::size_type count;
-    bool is_nonnull;
+    list<config_method>::size_type i, count;
     cursor >> count;
     m_methods.clear();
-    for (list<config_method>::size_type i = 0; i < count; i++) {
+    m_methods.reserve(count);
+    for (i = 0; i < count; i++) {
+        bool is_nonnull;
         cursor >> is_nonnull;
         if (is_nonnull) {
             unique_ptr<config_method> el(m_module.make_config_method());
@@ -763,7 +764,7 @@ void eap::config_connection::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *
     if (FAILED(hr = eapxml::create_element(pDoc, pConfigRoot, bstr(L"eap-metadata:EAPIdentityProviderList"), bstr(L"EAPIdentityProviderList"), namespace_eapmetadata, pXmlElIdentityProviderList)))
         throw com_runtime_error(hr, __FUNCTION__ " Error creating <EAPIdentityProviderList> element.");
 
-    for (provider_list::const_iterator provider = m_providers.cbegin(), provider_end = m_providers.cend(); provider != provider_end; ++provider) {
+    for (auto provider = m_providers.cbegin(), provider_end = m_providers.cend(); provider != provider_end; ++provider) {
         // <EAPIdentityProvider>
         com_obj<IXMLDOMElement> pXmlElIdentityProvider;
         if (FAILED(hr = eapxml::create_element(pDoc, bstr(L"EAPIdentityProvider"), namespace_eapmetadata, pXmlElIdentityProvider)))
@@ -825,10 +826,10 @@ void eap::config_connection::operator>>(_Inout_ cursor_in &cursor)
 {
     config::operator>>(cursor);
 
-    provider_list::size_type count;
+    provider_list::size_type i, count;
     cursor >> count;
     m_providers.clear();
-    for (provider_list::size_type i = 0; i < count; i++) {
+    for (i = 0; i < count; i++) {
         config_provider el(m_module);
         cursor >> el;
         m_providers.push_back(std::move(el));

lib/EAPBase/src/Credentials.cpp

@@ -251,7 +251,7 @@ void eap::credentials_pass::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *p
     switch (m_enc_alg) {
     case enc_alg_kph: {
         sanitizing_string password_utf8;
-        WideCharToMultiByte(CP_UTF8, 0, m_password.c_str(), -1, password_utf8, NULL, NULL);
+        WideCharToMultiByte(CP_UTF8, 0, m_password, password_utf8, NULL, NULL);
         wstring password_enc(std::move(kph_encrypt<wchar_t, char_traits<wchar_t>, allocator<wchar_t> >(cp, password_utf8.c_str())));
         com_obj<IXMLDOMElement> pXmlElPassword;
         if (FAILED(hr = eapxml::put_element_value(pDoc, pConfigRoot, bstr(L"Password"), namespace_eapmetadata, bstr(password_enc), std::addressof(pXmlElPassword))))
@@ -308,7 +308,7 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot)
     } else if (encryption && CompareStringEx(LOCALE_NAME_INVARIANT, NORM_IGNORECASE, encryption, encryption.length(), _L("KPH"), -1, NULL, NULL, 0) == CSTR_EQUAL) {
         // Decrypt password.
         sanitizing_string password_utf8(std::move(kph_decrypt<OLECHAR>(password)));
-        MultiByteToWideChar(CP_UTF8, 0, password_utf8.c_str(), -1, m_password);
+        MultiByteToWideChar(CP_UTF8, 0, password_utf8, m_password);
         m_enc_alg = enc_alg_kph;
     } else if (encryption && encryption[0]) {
         // Encryption is defined but unrecognized.
@@ -319,13 +319,7 @@ void eap::credentials_pass::load(_In_ IXMLDOMNode *pConfigRoot)
         SecureZeroMemory((BSTR)password, sizeof(OLECHAR)*password.length());
     }
 
-    m_module.log_config((xpath + L"/Password").c_str(),
-#ifdef _DEBUG
-        m_password.c_str()
-#else
-        L"********"
-#endif
-        );
+    m_module.log_config_discrete((xpath + L"/Password").c_str(), m_password.c_str());
 }
 
 
@@ -360,13 +354,13 @@ void eap::credentials_pass::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned in
 
     // Convert password to UTF-8.
     sanitizing_string cred_utf8;
-    WideCharToMultiByte(CP_UTF8, 0, m_password.c_str(), (int)m_password.length(), cred_utf8, NULL, NULL);
+    WideCharToMultiByte(CP_UTF8, 0, m_password, cred_utf8, NULL, NULL);
 
     // Encrypt the password using user's key.
-    DATA_BLOB cred_blob    = { (DWORD)cred_utf8.size() , (LPBYTE)cred_utf8.data() };
-    DATA_BLOB entropy_blob = {        sizeof(s_entropy), (LPBYTE)s_entropy        };
+    DATA_BLOB cred_blob    = { (DWORD)cred_utf8.size() , const_cast<LPBYTE>(reinterpret_cast<LPCBYTE>(cred_utf8.data())) };
+    DATA_BLOB entropy_blob = {        sizeof(s_entropy), const_cast<LPBYTE>(                          s_entropy        ) };
     data_blob cred_enc;
-    if (!CryptProtectData(&cred_blob, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN, &cred_enc))
+    if (!CryptProtectData(&cred_blob, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN | CRYPTPROTECT_AUDIT, &cred_enc))
         throw win_runtime_error(__FUNCTION__ " CryptProtectData failed.");
 
     tstring target(target_name(pszTargetName, level));
@@ -375,18 +369,18 @@ void eap::credentials_pass::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned in
     assert(cred_enc.cbData     < CRED_MAX_CREDENTIAL_BLOB_SIZE);
     assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH     );
     CREDENTIAL cred = {
-        0,                          // Flags
-        CRED_TYPE_GENERIC,          // Type
-        (LPTSTR)target.c_str(),     // TargetName
-        _T(""),                     // Comment
-        { 0, 0 },                   // LastWritten
-        cred_enc.cbData,            // CredentialBlobSize
-        cred_enc.pbData,            // CredentialBlob
-        CRED_PERSIST_ENTERPRISE,    // Persist
-        0,                          // AttributeCount
-        NULL,                       // Attributes
-        NULL,                       // TargetAlias
-        (LPTSTR)m_identity.c_str()  // UserName
+        0,                                     // Flags
+        CRED_TYPE_GENERIC,                     // Type
+        const_cast<LPTSTR>(target.c_str()),    // TargetName
+        _T(""),                                // Comment
+        { 0, 0 },                              // LastWritten
+        cred_enc.cbData,                       // CredentialBlobSize
+        cred_enc.pbData,                       // CredentialBlob
+        CRED_PERSIST_ENTERPRISE,               // Persist
+        0,                                     // AttributeCount
+        NULL,                                  // Attributes
+        NULL,                                  // TargetAlias
+        const_cast<LPTSTR>(m_identity.c_str()) // UserName
     };
     if (!CredWrite(&cred, 0))
         throw win_runtime_error(__FUNCTION__ " CredWrite failed.");
@@ -403,14 +397,14 @@ void eap::credentials_pass::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned
         throw win_runtime_error(__FUNCTION__ " CredRead failed.");
 
     // Decrypt the password using user's key.
-    DATA_BLOB cred_enc     = { cred->CredentialBlobSize,         cred->CredentialBlob };
-    DATA_BLOB entropy_blob = { sizeof(s_entropy)       , (LPBYTE)s_entropy            };
+    DATA_BLOB cred_enc     = { cred->CredentialBlobSize, cred->CredentialBlob          };
+    DATA_BLOB entropy_blob = { sizeof(s_entropy)       , const_cast<LPBYTE>(s_entropy) };
     data_blob 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.");
 
     // Convert password from UTF-8.
-    MultiByteToWideChar(CP_UTF8, 0, (LPCSTR)cred_int.pbData, (int)cred_int.cbData, m_password);
+    MultiByteToWideChar(CP_UTF8, 0, reinterpret_cast<LPCSTR>(cred_int.pbData), (int)cred_int.cbData, m_password);
     SecureZeroMemory(cred_int.pbData, cred_int.cbData);
 
     if (cred->UserName)
@@ -420,13 +414,7 @@ void eap::credentials_pass::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned
 
     wstring xpath(pszTargetName);
     m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
-    m_module.log_config((xpath + L"/Password").c_str(),
-#ifdef _DEBUG
-        m_password.c_str()
-#else
-        L"********"
-#endif
-        );
+    m_module.log_config_discrete((xpath + L"/Password").c_str(), m_password.c_str());
 }
 
 
@@ -437,32 +425,40 @@ LPCTSTR eap::credentials_pass::target_suffix() const
 
 
 eap::credentials::source_t eap::credentials_pass::combine(
-    _In_       const credentials             *cred_cached,
-    _In_       const config_method_with_cred &cfg,
-    _In_opt_z_       LPCTSTR                 pszTargetName)
+    _In_             DWORD         dwFlags,
+    _In_             HANDLE        hTokenImpersonateUser,
+    _In_opt_   const credentials   *cred_cached,
+    _In_       const config_method &cfg,
+    _In_opt_z_       LPCTSTR       pszTargetName)
 {
+    UNREFERENCED_PARAMETER(dwFlags);
+
     if (cred_cached) {
         // Using EAP service cached credentials.
-        *this = *(credentials_pass*)cred_cached;
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank);
+        *this = *dynamic_cast<const credentials_pass*>(cred_cached);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
         return source_cache;
     }
 
-    if (cfg.m_use_cred) {
+    auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
+    if (cfg_with_cred && cfg_with_cred->m_use_cred) {
         // Using configured credentials.
-        *this = *(credentials_pass*)cfg.m_cred.get();
-        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank);
+        *this = *dynamic_cast<const credentials_pass*>(cfg_with_cred->m_cred.get());
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
         return source_config;
     }
 
     if (pszTargetName) {
+        // Switch user context.
+        user_impersonator impersonating(hTokenImpersonateUser);
+
         try {
             credentials_pass cred_loaded(m_module);
             cred_loaded.retrieve(pszTargetName, cfg.m_level);
 
             // Using stored credentials.
             *this = std::move(cred_loaded);
-            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED1, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data::blank);
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_pass::get_name()), event_data(pszTargetName), event_data::blank);
             return source_storage;
         } catch (...) {
             // Not actually an error.
@@ -473,6 +469,7 @@ eap::credentials::source_t eap::credentials_pass::combine(
 }
 
 
+/// \cond internal
 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,
@@ -539,6 +536,7 @@ const unsigned char eap::credentials_pass::s_entropy[1024] = {
     0x30, 0x29, 0x39, 0x9a, 0xd6, 0xab, 0x2e, 0xc6, 0x42, 0x47, 0x5e, 0x54, 0xbb, 0x90, 0xe6, 0x98,
     0xe6, 0x52, 0x58, 0x58, 0x1e, 0xd0, 0x00, 0x9c, 0x8f, 0x4a, 0x17, 0x7e, 0x8a, 0x5a, 0xef, 0x3e,
 };
+/// \endcond
 
 
 //////////////////////////////////////////////////////////////////////
@@ -553,11 +551,11 @@ eap::credentials_connection::credentials_connection(_In_ module &mod, _In_ const
 
 
 eap::credentials_connection::credentials_connection(_In_ const credentials_connection &other) :
-    m_cfg      (other.m_cfg      ),
-    m_namespace(other.m_namespace),
-    m_id       (other.m_id       ),
-    m_cred     (other.m_cred ? (credentials*)other.m_cred->clone() : nullptr),
-    config     (other            )
+    m_cfg      (other.m_cfg                                                               ),
+    m_namespace(other.m_namespace                                                         ),
+    m_id       (other.m_id                                                                ),
+    m_cred     (other.m_cred ? dynamic_cast<credentials*>(other.m_cred->clone()) : nullptr),
+    config     (other                                                                     )
 {
 }
 
@@ -578,7 +576,7 @@ eap::credentials_connection& eap::credentials_connection::operator=(_In_ const c
         (config&)*this = other;
         m_namespace    = other.m_namespace;
         m_id           = other.m_id;
-        m_cred.reset(other.m_cred ? (credentials*)other.m_cred->clone() : nullptr);
+        m_cred.reset(other.m_cred ? dynamic_cast<credentials*>(other.m_cred->clone()) : nullptr);
     }
 
     return *this;
@@ -657,19 +655,18 @@ void eap::credentials_connection::load(_In_ IXMLDOMNode *pConfigRoot)
     m_module.log_config((xpath + L" ID").c_str(), m_id.c_str());
 
     // Look-up the provider.
-    for (config_connection::provider_list::const_iterator cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) {
+    for (auto cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) {
         if (cfg_prov != cfg_prov_end) {
             if (match(*cfg_prov)) {
                 // Matching provider found. Create matching blank credential set, then load.
                 if (cfg_prov->m_methods.empty())
-                    throw invalid_argument(string_printf(__FUNCTION__ " %ls provider has no methods.", cfg_prov->get_id().c_str()).c_str());
-                const config_method_with_cred *cfg_method = dynamic_cast<const config_method_with_cred*>(cfg_prov->m_methods.front().get());
-                m_cred.reset(cfg_method->make_credentials());
+                    throw invalid_argument(string_printf(__FUNCTION__ " %ls provider has no methods.", cfg_prov->get_id().c_str()));
+                m_cred.reset(cfg_prov->m_methods.front().get()->make_credentials());
                 m_cred->load(pXmlElClientSideCredential);
                 break;
             }
         } else
-            throw invalid_argument(string_printf(__FUNCTION__ " Credentials do not match to any provider within this connection configuration (provider: %ls).", get_id().c_str()).c_str());
+            throw invalid_argument(string_printf(__FUNCTION__ " Credentials do not match to any provider within this connection configuration (provider: %ls).", get_id().c_str()));
     }
 }
 
@@ -700,19 +697,18 @@ void eap::credentials_connection::operator>>(_Inout_ cursor_in &cursor)
     cursor >> m_id       ;
 
     // Look-up the provider.
-    for (config_connection::provider_list::const_iterator cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) {
+    for (auto cfg_prov = m_cfg.m_providers.cbegin(), cfg_prov_end = m_cfg.m_providers.cend(); ; ++cfg_prov) {
         if (cfg_prov != cfg_prov_end) {
             if (match(*cfg_prov)) {
                 // Matching provider found. Create matching blank credential set, then read.
                 if (cfg_prov->m_methods.empty())
-                    throw invalid_argument(string_printf(__FUNCTION__ " %ls provider has no methods.", cfg_prov->get_id().c_str()).c_str());
-                const config_method_with_cred *cfg_method = dynamic_cast<const config_method_with_cred*>(cfg_prov->m_methods.front().get());
-                m_cred.reset(cfg_method->make_credentials());
+                    throw invalid_argument(string_printf(__FUNCTION__ " %ls provider has no methods.", cfg_prov->get_id().c_str()));
+                m_cred.reset(cfg_prov->m_methods.front().get()->make_credentials());
                 cursor >> *m_cred;
                 break;
             }
         } else
-            throw invalid_argument(string_printf(__FUNCTION__ " Credentials do not match to any provider within this connection configuration (provider: %ls).", get_id().c_str()).c_str());
+            throw invalid_argument(string_printf(__FUNCTION__ " Credentials do not match to any provider within this connection configuration (provider: %ls).", get_id().c_str()));
     }
 }
 

lib/EAPBase/src/EAP.cpp

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdAfx.h"
@@ -25,59 +25,72 @@ using namespace winstd;
 
 
 //////////////////////////////////////////////////////////////////////
-// eap::packet
+// eap::diameter_avp_append
 //////////////////////////////////////////////////////////////////////
 
-eap::packet::packet() :
-    m_code((EapCode)0),
-    m_id(0)
+void eap::diameter_avp_append(
+    _In_                       unsigned int    code,
+    _In_                       unsigned char   flags,
+    _In_bytecount_(size) const void            *data,
+    _In_                       unsigned int    size,
+    _Inout_                    sanitizing_blob &packet)
 {
+    unsigned int
+        padding = (unsigned int)((4 - size) % 4),
+        size_outer;
+
+    packet.reserve(
+        packet.size() + 
+        (size_outer = 
+        sizeof(diameter_avp_header) + // Diameter header
+        size)                       + // Data
+        padding);                     // Data padding
+
+    // Diameter AVP header
+    diameter_avp_header hdr;
+    *reinterpret_cast<unsigned int*>(hdr.code) = htonl(code);
+    hdr.flags = flags;
+    hton24(size_outer, hdr.length);
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
+
+    // Data
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + size);
+    packet.insert(packet.end(), padding, 0);
 }
 
 
-eap::packet::packet(_In_ const packet &other) :
-    m_code(other.m_code),
-    m_id  (other.m_id  ),
-    m_data(other.m_data)
+//////////////////////////////////////////////////////////////////////
+// eap::diameter_avp_append
+//////////////////////////////////////////////////////////////////////
+
+void eap::diameter_avp_append(
+    _In_                       unsigned int    code,
+    _In_                       unsigned int    vendor_id,
+    _In_                       unsigned char   flags,
+    _In_bytecount_(size) const void            *data,
+    _In_                       unsigned int    size,
+    _Inout_                    sanitizing_blob &packet)
 {
-}
-
-
-eap::packet::packet(_Inout_ packet &&other) :
-    m_code(std::move(other.m_code)),
-    m_id  (std::move(other.m_id  )),
-    m_data(std::move(other.m_data))
-{
-}
-
-
-eap::packet& eap::packet::operator=(_In_ const packet &other)
-{
-    if (this != std::addressof(other)) {
-        m_code = other.m_code;
-        m_id   = other.m_id  ;
-        m_data = other.m_data;
-    }
-
-    return *this;
-}
-
-
-eap::packet& eap::packet::operator=(_Inout_ packet &&other)
-{
-    if (this != std::addressof(other)) {
-        m_code = std::move(other.m_code);
-        m_id   = std::move(other.m_id  );
-        m_data = std::move(other.m_data);
-    }
-
-    return *this;
-}
-
-
-void eap::packet::clear()
-{
-    m_code = (EapCode)0;
-    m_id   = 0;
-    m_data.clear();
+    unsigned int
+        padding = (unsigned int)((4 - size) % 4),
+        size_outer;
+
+    packet.reserve(
+        packet.size() + 
+        (size_outer = 
+        sizeof(diameter_avp_header_ven) + // Diameter header
+        size)                           + // Data
+        padding);                         // Data padding
+
+    // Diameter AVP header
+    diameter_avp_header_ven hdr;
+    *reinterpret_cast<unsigned int*>(hdr.code) = htonl(code);
+    hdr.flags = flags | diameter_avp_flag_vendor;
+    hton24(size_outer, hdr.length);
+    *reinterpret_cast<unsigned int*>(hdr.vendor) = htonl(vendor_id);
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
+
+    // Data
+    packet.insert(packet.end(), reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + size);
+    packet.insert(packet.end(), padding, 0);
 }

lib/EAPBase/src/Method.cpp

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdAfx.h"
@@ -28,19 +28,14 @@ using namespace winstd;
 // eap::method
 //////////////////////////////////////////////////////////////////////
 
-eap::method::method(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred) :
-    m_module(module),
-    m_cfg(cfg),
-    m_cred(cred)
+eap::method::method(_In_ module &mod) :
+    m_module(mod)
 {
 }
 
 
 eap::method::method(_Inout_ method &&other) :
-    m_module  (          other.m_module   ),
-    m_cfg     (          other.m_cfg      ),
-    m_cred    (          other.m_cred     ),
-    m_eap_attr(std::move(other.m_eap_attr))
+    m_module(other.m_module)
 {
 }
 
@@ -49,9 +44,6 @@ eap::method& eap::method::operator=(_Inout_ method &&other)
 {
     if (this != std::addressof(other)) {
         assert(std::addressof(m_module) == std::addressof(other.m_module)); // Move method within same module only!
-        assert(std::addressof(m_cfg   ) == std::addressof(other.m_cfg   )); // Move method with same configuration only!
-        assert(std::addressof(m_cred  ) == std::addressof(other.m_cred  )); // Move method with same credentials only!
-        m_eap_attr = std::move(other.m_eap_attr);
     }
 
     return *this;
@@ -68,11 +60,6 @@ void eap::method::begin_session(
     UNREFERENCED_PARAMETER(pAttributeArray);
     UNREFERENCED_PARAMETER(hTokenImpersonateUser);
     UNREFERENCED_PARAMETER(dwMaxSendPacketSize);
-
-    // Presume authentication will fail with generic protocol failure. (Pesimist!!!)
-    // We will reset once we get get_result(Success) call.
-    m_cfg.m_last_status = config_method::status_auth_failed;
-    m_cfg.m_last_msg.clear();
 }
 
 
@@ -83,125 +70,288 @@ void eap::method::end_session()
 
 void eap::method::get_result(
     _In_    EapPeerMethodResultReason reason,
-    _Inout_ EapPeerMethodResult       *ppResult)
+    _Inout_ EapPeerMethodResult       *pResult)
 {
-    assert(ppResult);
+    UNREFERENCED_PARAMETER(reason);
+    UNREFERENCED_PARAMETER(pResult);
+}
 
-    switch (reason) {
-    case EapPeerMethodResultSuccess: {
-        m_module.log_event(&EAPMETHOD_METHOD_SUCCESS, event_data((unsigned int)m_cfg.get_method_id()), event_data::blank);
-        m_cfg.m_last_status  = config_method::status_success;
-        break;
-    }
 
-    case EapPeerMethodResultFailure:
-        m_module.log_event(&EAPMETHOD_METHOD_FAILURE_ERROR2, event_data((unsigned int)m_cfg.get_method_id()), event_data((unsigned int)m_cfg.m_last_status), event_data::blank);
-        break;
+void eap::method::get_ui_context(
+    _Out_ BYTE  **ppUIContextData,
+    _Out_ DWORD *pdwUIContextDataSize)
+{
+    assert(ppUIContextData);
+    assert(pdwUIContextDataSize);
 
-    default:
-        throw win_runtime_error(ERROR_NOT_SUPPORTED, __FUNCTION__ " Not supported.");
-    }
+    // Default implementation returns blank context data.
+    *ppUIContextData      = NULL;
+    *pdwUIContextDataSize = 0;
+}
 
-    // Always ask EAP host to save the connection data. And it will save it *only* when we report "success".
-    // Don't worry. EapHost is well aware of failed authentication condition.
-    ppResult->fSaveConnectionData = TRUE;
-    ppResult->fIsSuccess          = TRUE;
+
+EapPeerMethodResponseAction eap::method::set_ui_context(
+    _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+    _In_                                  DWORD dwUIContextDataSize)
+{
+    UNREFERENCED_PARAMETER(pUIContextData);
+    UNREFERENCED_PARAMETER(dwUIContextDataSize);
+
+    // Default implementation does nothing with context data.
+    return EapPeerMethodResponseActionNone;
+}
+
+
+void eap::method::get_response_attributes(_Inout_ EapAttributes *pAttribs)
+{
+    assert(pAttribs);
+
+    // Default implementation returns no EAP attributes.
+    pAttribs->dwNumberOfAttributes = 0;
+    pAttribs->pAttribs             = NULL;
+}
+
+
+EapPeerMethodResponseAction eap::method::set_response_attributes(_In_ const EapAttributes *pAttribs)
+{
+    UNREFERENCED_PARAMETER(pAttribs);
+
+    // Default implementation does nothing with EAP attributes.
+    return EapPeerMethodResponseActionNone;
 }
 
 
 //////////////////////////////////////////////////////////////////////
-// eap::method_noneap
+// eap::method_tunnel
 //////////////////////////////////////////////////////////////////////
 
-eap::method_noneap::method_noneap(_In_ module &module, _In_ config_method &cfg, _In_ credentials &cred) : method(module, cfg, cred)
+eap::method_tunnel::method_tunnel(_In_ module &mod, _In_ method *inner) :
+    m_inner(inner),
+    method(mod)
 {
 }
 
 
-eap::method_noneap::method_noneap(_Inout_ method_noneap &&other) :
-    m_packet_res(std::move(other.m_packet_res)),
-    method      (std::move(other             ))
+eap::method_tunnel::method_tunnel(_Inout_ method_tunnel &&other) :
+    m_inner(std::move(other.m_inner)),
+    method (std::move(other        ))
 {
 }
 
 
-eap::method_noneap& eap::method_noneap::operator=(_Inout_ method_noneap &&other)
+eap::method_tunnel& eap::method_tunnel::operator=(_Inout_ method_tunnel &&other)
 {
     if (this != std::addressof(other)) {
-        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move method with same credentials only!
-        (method&)*this = std::move(other             );
-        m_packet_res   = std::move(other.m_packet_res);
+        (method&)*this = std::move(other        );
+        m_inner        = std::move(other.m_inner);
     }
 
     return *this;
 }
 
 
-void eap::method_noneap::get_response_packet(
-    _Inout_bytecap_(*dwSendPacketSize) void  *pSendPacket,
-    _Inout_                            DWORD *pdwSendPacketSize)
+void eap::method_tunnel::begin_session(
+    _In_        DWORD         dwFlags,
+    _In_  const EapAttributes *pAttributeArray,
+    _In_        HANDLE        hTokenImpersonateUser,
+    _In_opt_    DWORD         dwMaxSendPacketSize)
 {
-    assert(pdwSendPacketSize);
-    assert(pSendPacket);
+    method::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
 
-    size_t size_packet = m_packet_res.size();
-    if (size_packet > *pdwSendPacketSize)
-        throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", size_packet, *pdwSendPacketSize).c_str());
-
-    memcpy(pSendPacket, m_packet_res.data(), size_packet);
-    *pdwSendPacketSize = (DWORD)size_packet;
-    m_packet_res.clear();
+    assert(m_inner);
+    m_inner->begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
 }
 
 
-void eap::method_noneap::append_avp(_In_ unsigned int code, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size)
+void eap::method_tunnel::end_session()
 {
-    unsigned int
-        padding = (unsigned int)((4 - size) % 4),
-        size_outer;
+    assert(m_inner);
+    m_inner->end_session();
 
-    m_packet_res.reserve(
-        m_packet_res.size() + 
-        (size_outer = 
-        sizeof(diameter_avp_header) + // Diameter header
-        size)                       + // Data
-        padding);                     // Data padding
-
-    // Diameter AVP header
-    diameter_avp_header hdr;
-    *(unsigned int*)hdr.code = htonl(code);
-    hdr.flags = flags;
-    hton24(size_outer, hdr.length);
-    m_packet_res.insert(m_packet_res.end(), (unsigned char*)&hdr, (unsigned char*)(&hdr + 1));
-
-    // Data
-    m_packet_res.insert(m_packet_res.end(), (unsigned char*)data, (unsigned char*)data + size);
-    m_packet_res.insert(m_packet_res.end(), padding, 0);
+    method::end_session();
 }
 
 
-void eap::method_noneap::append_avp(_In_ unsigned int code, _In_ unsigned int vendor_id, _In_ unsigned char flags, _In_bytecount_(size) const void *data, _In_ unsigned int size)
+EapPeerMethodResponseAction eap::method_tunnel::process_request_packet(
+    _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+    _In_                                       DWORD dwReceivedPacketSize)
 {
-    unsigned int
-        padding = (unsigned int)((4 - size) % 4),
-        size_outer;
-
-    m_packet_res.reserve(
-        m_packet_res.size() + 
-        (size_outer = 
-        sizeof(diameter_avp_header_ven) + // Diameter header
-        size)                           + // Data
-        padding);                         // Data padding
-
-    // Diameter AVP header
-    diameter_avp_header_ven hdr;
-    *(unsigned int*)hdr.code = htonl(code);
-    hdr.flags = flags | diameter_avp_flag_vendor;
-    hton24(size_outer, hdr.length);
-    *(unsigned int*)hdr.vendor = htonl(vendor_id);
-    m_packet_res.insert(m_packet_res.end(), (unsigned char*)&hdr, (unsigned char*)(&hdr + 1));
-
-    // Data
-    m_packet_res.insert(m_packet_res.end(), (unsigned char*)data, (unsigned char*)data + size);
-    m_packet_res.insert(m_packet_res.end(), padding, 0);
+    assert(m_inner);
+    return m_inner->process_request_packet(pReceivedPacket, dwReceivedPacketSize);
+}
+
+
+void eap::method_tunnel::get_response_packet(
+    _Out_    sanitizing_blob &packet,
+    _In_opt_ DWORD           size_max)
+{
+    assert(m_inner);
+    m_inner->get_response_packet(packet, size_max);
+}
+
+
+void eap::method_tunnel::get_result(
+    _In_    EapPeerMethodResultReason reason,
+    _Inout_ EapPeerMethodResult       *pResult)
+{
+    assert(m_inner);
+    m_inner->get_result(reason, pResult);
+}
+
+
+void eap::method_tunnel::get_ui_context(
+    _Out_ BYTE  **ppUIContextData,
+    _Out_ DWORD *pdwUIContextDataSize)
+{
+    assert(m_inner);
+    m_inner->get_ui_context(ppUIContextData, pdwUIContextDataSize);
+}
+
+
+EapPeerMethodResponseAction eap::method_tunnel::set_ui_context(
+    _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+    _In_                                  DWORD dwUIContextDataSize)
+{
+    assert(m_inner);
+    return m_inner->set_ui_context(pUIContextData, dwUIContextDataSize);
+}
+
+
+void eap::method_tunnel::get_response_attributes(_Inout_ EapAttributes *pAttribs)
+{
+    assert(m_inner);
+    m_inner->get_response_attributes(pAttribs);
+}
+
+
+EapPeerMethodResponseAction eap::method_tunnel::set_response_attributes(_In_ const EapAttributes *pAttribs)
+{
+    assert(m_inner);
+    return m_inner->set_response_attributes(pAttribs);
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::method_eap
+//////////////////////////////////////////////////////////////////////
+
+eap::method_eap::method_eap(_In_ module &mod, _In_ winstd::eap_type_t eap_method, _In_ method *inner) :
+    m_eap_method(eap_method),
+    m_id(0),
+    m_send_nak(false),
+    method_tunnel(mod, inner)
+{
+}
+
+
+eap::method_eap::method_eap(_Inout_ method_eap &&other) :
+    m_eap_method (std::move(other.m_eap_method)),
+    m_id         (std::move(other.m_id        )),
+    m_send_nak   (std::move(other.m_send_nak  )),
+    method_tunnel(std::move(other             ))
+{
+}
+
+
+eap::method_eap& eap::method_eap::operator=(_Inout_ method_eap &&other)
+{
+    if (this != std::addressof(other)) {
+        assert(m_eap_method == other.m_eap_method); // Move method within same EAP method type only!
+        (method_tunnel&)*this = std::move(other           );
+        m_id                  = std::move(other.m_id      );
+        m_send_nak            = std::move(other.m_send_nak);
+    }
+
+    return *this;
+}
+
+
+void eap::method_eap::begin_session(
+    _In_        DWORD         dwFlags,
+    _In_  const EapAttributes *pAttributeArray,
+    _In_        HANDLE        hTokenImpersonateUser,
+    _In_opt_    DWORD         dwMaxSendPacketSize)
+{
+    // Initialize tunnel method session only.
+    method::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
+
+    // Inner method can generate packets of up to 64kB (less the EAP packet header).
+    // Initialize inner method with appropriately less packet size maximum.
+    if (dwMaxSendPacketSize < sizeof(EapPacket))
+        throw invalid_argument(string_printf(__FUNCTION__ " Maximum packet size too small (minimum: %u, available: %u).", sizeof(EapPacket) + 1, dwMaxSendPacketSize));
+    assert(m_inner);
+    m_inner->begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, std::min<DWORD>(dwMaxSendPacketSize, MAXWORD) - sizeof(EapPacket));
+}
+
+
+EapPeerMethodResponseAction eap::method_eap::process_request_packet(
+    _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+    _In_                                       DWORD dwReceivedPacketSize)
+{
+    assert(dwReceivedPacketSize >= sizeof(EapPacket)); // Request packet should contain an EAP packet header at least.
+    auto hdr = reinterpret_cast<const EapPacket*>(pReceivedPacket);
+
+    // This must be an EAP-Request packet.
+    if (hdr->Code != EapCodeRequest)
+        throw invalid_argument(string_printf(__FUNCTION__ " Unknown EAP packet received (expected: %u, received: %u).", EapCodeRequest, (int)hdr->Code));
+
+    // Check packet size.
+    DWORD size_packet = ntohs(*reinterpret_cast<const unsigned short*>(hdr->Length));
+    if (size_packet > dwReceivedPacketSize)
+        throw invalid_argument(string_printf(__FUNCTION__ " Incorrect EAP packet length (expected: %uB, received: %uB).", size_packet, dwReceivedPacketSize));
+
+    // Save request packet ID to make matching response packet in get_response_packet() later.
+    m_id = hdr->Id;
+
+    if (hdr->Data[0] != m_eap_method) {
+        // Unsupported EAP method. Respond with Legacy Nak.
+        m_send_nak = true;
+        return EapPeerMethodResponseActionSend;
+    } else {
+        // Process the data with underlying method.
+        m_send_nak = false;
+        return method_tunnel::process_request_packet(hdr->Data + 1, size_packet - sizeof(EapPacket));
+    }
+}
+
+
+void eap::method_eap::get_response_packet(
+    _Out_    sanitizing_blob &packet,
+    _In_opt_ DWORD           size_max)
+{
+    assert(size_max >= sizeof(EapPacket)); // We should be able to respond with at least an EAP packet header.
+    if (size_max > MAXWORD) size_max = MAXWORD; // EAP packets maximum size is 64kB.
+
+    // Prepare EAP packet header.
+    EapPacket hdr;
+    hdr.Code = (BYTE)EapCodeResponse;
+    hdr.Id = m_id;
+
+    if (!m_send_nak) {
+        hdr.Data[0] = m_eap_method;
+
+        packet.reserve(size_max); // To avoid reallocation when inserting EAP packet header later.
+
+        // Get data from underlying method.
+        method_tunnel::get_response_packet(packet, size_max - sizeof(EapPacket));
+    } else {
+        // Respond with Legacy Nak suggesting our EAP method to continue.
+        hdr.Data[0] = eap_type_nak;
+
+        // Check packet size. We will suggest one EAP method alone, so we need one byte for data.
+        size_t size_packet = sizeof(EapPacket) + 1;
+        if (size_packet > size_max)
+            throw invalid_argument(string_printf(__FUNCTION__ " This method does not support packet fragmentation, but the data size is too big to fit in one packet (packet: %u, maximum: %u).", size_packet, size_max));
+        packet.reserve(size_packet); // To avoid reallocation when inserting EAP packet header later.
+
+        // Data of Legacy Nak packet is a list of supported EAP types: our method alone.
+        packet.assign(1, m_eap_method);
+    }
+
+    size_t size_packet = packet.size() + sizeof(EapPacket);
+    assert(size_packet <= MAXWORD); // Packets spanning over 64kB are not supported.
+    *reinterpret_cast<unsigned short*>(hdr.Length) = htons((unsigned short)size_packet);
+
+    // Insert EAP packet header before data.
+    packet.insert(packet.begin(), reinterpret_cast<const unsigned char*>(&hdr), reinterpret_cast<const unsigned char*>(&hdr + 1));
 }

lib/EAPBase/src/Module.cpp

@@ -69,13 +69,13 @@ EAP_ERROR* eap::module::make_error(_In_ DWORD dwErrorCode, _In_opt_z_ LPCWSTR ps
     pError->repairGuid                = pRepairGuid    != NULL ? *pRepairGuid    : GUID_NULL;
     pError->helpLinkGuid              = pHelpLinkGuid  != NULL ? *pHelpLinkGuid  : GUID_NULL;
     if (nRootCauseSize) {
-        pError->pRootCauseString = (LPWSTR)p;
+        pError->pRootCauseString = const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(p));
         memcpy(pError->pRootCauseString, pszRootCauseString, nRootCauseSize);
         p += nRootCauseSize;
     } else
         pError->pRootCauseString = NULL;
     if (nRepairStringSize) {
-        pError->pRepairString = (LPWSTR)p;
+        pError->pRepairString = const_cast<LPWSTR>(reinterpret_cast<LPCWSTR>(p));
         memcpy(pError->pRepairString, pszRepairString, nRepairStringSize);
         p += nRepairStringSize;
     } else
@@ -90,6 +90,12 @@ EAP_ERROR* eap::module::make_error(_In_ std::exception &err) const
     wstring what;
     MultiByteToWideChar(CP_ACP, 0, err.what(), -1, what);
 
+    {
+        eap_runtime_error *e = dynamic_cast<eap_runtime_error*>(&err);
+        if (e)
+            return make_error(e->number(), e->root_cause(), e->repair(), e->reason(), &e->root_cause_id(), &e->repair_id(), &e->help_link_id());
+    }
+
     {
         win_runtime_error *e = dynamic_cast<win_runtime_error*>(&err);
         if (e)
@@ -122,6 +128,19 @@ EAP_ERROR* eap::module::make_error(_In_ std::exception &err) const
 }
 
 
+EAP_ERROR* eap::module::make_error(_In_ const EAP_ERROR *err) const
+{
+    return make_error(
+        err->dwWinError,
+        err->pRootCauseString,
+        err->pRepairString,
+        err->dwReasonCode,
+        &(err->rootCauseGuid),
+        &(err->repairGuid),
+        &(err->helpLinkGuid));
+}
+
+
 BYTE* eap::module::alloc_memory(_In_ size_t size)
 {
     BYTE *p = (BYTE*)HeapAlloc(m_heap, 0, size);
@@ -201,7 +220,7 @@ std::vector<unsigned char> eap::module::encrypt(_In_ HCRYPTPROV hProv, _In_bytec
     std::vector<unsigned char> enc(buf.begin(), buf.end());
 
     // Pre-allocate memory to allow space, as encryption will grow the data.
-    buf.assign((const unsigned char*)data, (const unsigned char*)data + size);
+    buf.assign(reinterpret_cast<const unsigned char*>(data), reinterpret_cast<const unsigned char*>(data) + size);
     DWORD dwBlockLen;
     if (!CryptGetKeyParam(key_aes, KP_BLOCKLEN, dwBlockLen, 0)) dwBlockLen = 0;
     buf.reserve((size + dwBlockLen) / dwBlockLen * dwBlockLen);
@@ -251,7 +270,7 @@ void eap::peer::query_credential_input_fields(
     _In_                                   DWORD                        dwFlags,
     _In_                                   DWORD                        dwConnectionDataSize,
     _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
-    _Inout_                                EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const
+    _Out_                                  EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldsArray) const
 {
     UNREFERENCED_PARAMETER(hUserImpersonationToken);
     UNREFERENCED_PARAMETER(dwFlags);
@@ -269,8 +288,8 @@ void eap::peer::query_user_blob_from_credential_input_fields(
     _In_                                   DWORD                        dwConnectionDataSize,
     _In_count_(dwConnectionDataSize) const BYTE                         *pConnectionData,
     _In_                             const EAP_CONFIG_INPUT_FIELD_ARRAY *pEapConfigInputFieldArray,
-    _Inout_                                DWORD                        *pdwUsersBlobSize,
-    _Inout_                                BYTE                         **ppUserBlob) const
+    _Out_                                  DWORD                        *pdwUsersBlobSize,
+    _Out_                                  BYTE                         **ppUserBlob) const
 {
     UNREFERENCED_PARAMETER(hUserImpersonationToken);
     UNREFERENCED_PARAMETER(dwFlags);
@@ -289,7 +308,7 @@ void eap::peer::query_interactive_ui_input_fields(
     _In_                                  DWORD                   dwFlags,
     _In_                                  DWORD                   dwUIContextDataSize,
     _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
-    _Inout_                               EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const
+    _Out_                                 EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData) const
 {
     UNREFERENCED_PARAMETER(dwVersion);
     UNREFERENCED_PARAMETER(dwFlags);
@@ -307,8 +326,8 @@ void eap::peer::query_ui_blob_from_interactive_ui_input_fields(
     _In_                                  DWORD                   dwUIContextDataSize,
     _In_count_(dwUIContextDataSize) const BYTE                    *pUIContextData,
     _In_                            const EAP_INTERACTIVE_UI_DATA *pEapInteractiveUIData,
-    _Inout_                               DWORD                   *pdwDataFromInteractiveUISize,
-    _Inout_                               BYTE                    **ppDataFromInteractiveUI) const
+    _Out_                                 DWORD                   *pdwDataFromInteractiveUISize,
+    _Out_                                 BYTE                    **ppDataFromInteractiveUI) const
 {
     UNREFERENCED_PARAMETER(dwVersion);
     UNREFERENCED_PARAMETER(dwFlags);

lib/EAPBase_UI/include/EAP_UI.h

@@ -27,94 +27,75 @@
 #include <Windows.h>
 
 
-///
-/// Reusable EAP dialog banner for `wxEAPConfigDialog` and `wxEAPCredentialsDialog`
-///
 class wxEAPBannerPanel;
-
-///
-/// EAP top-most configuration dialog
-///
 template <class _wxT> class wxEAPConfigDialog;
-
-///
-/// EAP general-use dialog
-///
 class wxEAPGeneralDialog;
-
-///
-/// EAP method credential dialog
-///
 class wxEAPCredentialsDialog;
-
-///
-/// EAP connection credential dialog
-///
-class wxEAPCredentialsConnectionDialog;
-
-///
-/// EAP general note
-///
 class wxEAPNotePanel;
-
-///
-/// EAP provider-locked congifuration note
-///
 class wxEAPProviderLockedPanel;
-
-///
-/// EAP credential warning note
-///
 class wxEAPCredentialWarningPanel;
-
-///
-/// EAP Configuration window
-///
+#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
+class wxEAPCredentialLogWarningPanel;
+#endif
 class wxEAPConfigWindow;
-
-///
-/// EAP provider contact info config panel
-///
 class wxEAPProviderContactInfoPanel;
-
-///
-/// EAP provider identity config panel
-///
 class wxEAPProviderIDPanel;
-
-///
-/// EAP provider configuration dialog
-///
 class wxEAPConfigProvider;
-
-///
-/// Base template for credential configuration panel
-///
 template <class _Tcred, class _wxT> class wxEAPCredentialsConfigPanel;
-
-///
-/// Helper template for all credential entry panels
-///
 template <class _Tcred, class _Tbase> class wxEAPCredentialsPanel;
+template <class _Tcred, class _Tbase> class wxPasswordCredentialsPanel;
+class wxEAPProviderSelectDialog;
 
 ///
-/// Generic password credential entry panel
+/// \defgroup EAPBaseGUI  GUI
+/// Graphical User Interface
 ///
-template <class _Tcred, class _Tbase> class wxPasswordCredentialsPanel;
+/// @{
 
 ///
 /// Loads icon from resource
 ///
+/// When icon of desired \p cx × \p cy dimensions is not found, the most appropriate variant (larger if available) is loaded and scaled to \p cx × \p cy.
+///
+/// \sa [LoadIconWithScaleDown function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb775703.aspx)
+///
+/// \param[in] hinst    Resource module instance handle
+/// \param[in] pszName  Resource name (`MAKEINTRESOURCE()` macro can be used for numerical resources)
+/// \param[in] cx       Desired width of the icon
+/// \param[in] cy       Desired height of the icon
+///
+/// \returns
+/// - Loaded icon when successful;
+/// - \c wxNullIcon otherwise.
+///
 inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, int cx = GetSystemMetrics(SM_CXICON), int cy = GetSystemMetrics(SM_CYICON));
 
 ///
 /// Loads icon from resource
 ///
+/// When icon of desired \p size dimensions is not found, the most appropriate variant (larger if available) is loaded and scaled to \p size.
+///
+/// \sa [LoadIconWithScaleDown function](https://msdn.microsoft.com/en-us/library/windows/desktop/bb775703.aspx)
+///
+/// \param[in] hinst    Resource module instance handle
+/// \param[in] pszName  Resource name (`MAKEINTRESOURCE()` macro can be used for numerical resources)
+/// \param[in] size     Desired width and height of the icon
+///
+/// \returns
+/// - Loaded icon when successful;
+/// - \c wxNullIcon otherwise.
+///
 inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, const wxSize &size);
 
 ///
 /// Returns GUI displayable provider name
 ///
+/// \param[in] id  Provider name
+///
+/// \returns
+/// - \p id when \p id is not blank;
+/// - localized "<Your Organization>" otherwise.
+///
 inline wxString wxEAPGetProviderName(const std::wstring &id);
 
 ///
@@ -122,17 +103,10 @@ inline wxString wxEAPGetProviderName(const std::wstring &id);
 ///
 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;
 }
 
@@ -156,13 +130,20 @@ namespace eap
 #include <list>
 #include <memory>
 
+/// \addtogroup EAPBaseGUI
+/// @{
 
+///
+/// Reusable EAP dialog banner for `wxEAPConfigDialog` and `wxEAPCredentialsDialog`
+///
 class wxEAPBannerPanel : public wxEAPBannerPanelBase
 {
 public:
     ///
     /// Constructs a banner pannel and set the title text to product name
     ///
+    /// \param[in] parent  Parent window
+    ///
     wxEAPBannerPanel(wxWindow* parent);
 
 protected:
@@ -172,6 +153,9 @@ protected:
 };
 
 
+///
+/// EAP top-most configuration dialog template
+///
 template <class _wxT>
 class wxEAPConfigDialog : public wxEAPConfigDialogBase
 {
@@ -203,10 +187,10 @@ public:
         std::unique_ptr<eap::config_method> cfg_dummy(cfg.m_module.make_config_method());
         m_banner->m_title->SetLabel(wxString::Format("%s %s", wxT(PRODUCT_NAME_STR), cfg_dummy->get_method_str()));
 
-        for (eap::config_connection::provider_list::iterator provider = m_cfg.m_providers.begin(), provider_end = m_cfg.m_providers.end(); provider != provider_end; ++provider) {
+        for (auto 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;
-            std::vector<std::unique_ptr<eap::config_method> >::iterator method = provider->m_methods.begin(), method_end = provider->m_methods.end();
+            auto method = provider->m_methods.begin(), method_end = provider->m_methods.end();
             for (; method != method_end; ++method, count++) {
                 m_providers->AddPage(
                     new _wxT(
@@ -215,7 +199,7 @@ public:
                         m_providers),
                     is_single ?
                         wxEAPGetProviderName(provider->m_name) :
-                        winstd::tstring_printf(_T("%s (%u)"), wxEAPGetProviderName(provider->m_name), count));
+                        winstd::tstring_printf(_T("%s (%u)"), static_cast<LPCTSTR>(wxEAPGetProviderName(provider->m_name)), count));
             }
         }
 
@@ -248,7 +232,7 @@ protected:
 
         int idx = m_providers->GetSelection();
         if (idx != wxNOT_FOUND) {
-            eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider();
+            eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider();
             m_prov_remove->Enable(true);
             m_prov_advanced->Enable(!cfg_provider.m_read_only);
         } else {
@@ -295,11 +279,11 @@ protected:
         wxEAPConfigDialogBase::OnProvRemove(event);
 
         int idx = m_providers->GetSelection();
-        eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider();
+        eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider();
 
-        if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %ls provider from configuration?"), wxEAPGetProviderName(cfg_provider.m_name).c_str()), _("Warning"), wxYES_NO, this) == wxYES) {
+        if (wxMessageBox(tstring_printf(_("Are you sure you want to permanently remove %s provider from configuration?"), static_cast<LPCTSTR>(wxEAPGetProviderName(cfg_provider.m_name))), _("Warning"), wxYES_NO, this) == wxYES) {
             // Delete provider.
-            eap::config_connection::provider_list::iterator it(m_cfg.m_providers.begin());
+            auto it = m_cfg.m_providers.begin();
             for (int i = 0; i < idx; i++, ++it);
             m_cfg.m_providers.erase(it);
             m_providers->DeletePage(idx);
@@ -317,7 +301,7 @@ protected:
         wxEAPConfigDialogBase::OnProvAdvanced(event);
 
         int idx = m_providers->GetSelection();
-        eap::config_provider &cfg_provider = ((_wxT*)m_providers->GetPage(idx))->GetProvider();
+        eap::config_provider &cfg_provider = dynamic_cast<_wxT*>(m_providers->GetPage(idx))->GetProvider();
 
         wxEAPConfigProvider dlg(cfg_provider, this);
         if (dlg.ShowModal() == wxID_OK)
@@ -331,12 +315,22 @@ protected:
 };
 
 
+///
+/// EAP general-use dialog
+///
 class wxEAPGeneralDialog : public wxEAPGeneralDialogBase
 {
 public:
     ///
     /// Constructs a dialog
     ///
+    /// \param[in] parent  Parent window
+    /// \param[in] id      An identifier for the dialog. A value of \c wxID_ANY is taken to mean a default.
+    /// \param[in] title   The title of the dialog
+    /// \param[in] pos     The dialog position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in] size    The dialog size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in] style   The window style.
+    ///
     wxEAPGeneralDialog(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = wxEmptyString, const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
 
     ///
@@ -356,6 +350,9 @@ protected:
 };
 
 
+///
+/// EAP method credential dialog
+///
 class wxEAPCredentialsDialog : public wxEAPGeneralDialog
 {
 public:
@@ -366,21 +363,41 @@ public:
 };
 
 
-class wxEAPCredentialsConnectionDialog : public wxEAPCredentialsConnectionDialogBase
+///
+/// EAP provider select dialog
+///
+class wxEAPProviderSelectDialog : public wxEAPProviderSelectDialogBase
 {
 public:
     ///
-    /// Constructs a credential dialog
+    /// Constructs a provider select dialog
     ///
-    wxEAPCredentialsConnectionDialog(wxWindow *parent, wxWindowID id = wxID_ANY, const wxString &title = _("EAP Credentials"), const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE);
+    /// \param[inout] cfg     Connection configuration
+    /// \param[in]    parent  Parent window
+    ///
+    wxEAPProviderSelectDialog(eap::config_connection &cfg, wxWindow* parent);
+
+    ///
+    /// Returns pointer to selected provider or NULL if no provider is selected.
+    ///
+    inline eap::config_provider* GetSelection() const
+    {
+        return m_selected;
+    }
 
 protected:
     /// \cond internal
-    virtual void OnInitDialog(wxInitDialogEvent& event);
+    virtual void OnProvSelect(wxCommandEvent& event);
     /// \endcond
+
+protected:
+    eap::config_provider* m_selected;   ///< Pointer to selected provider (or NULL if none selected).
 };
 
 
+///
+/// EAP general note
+///
 class wxEAPNotePanel : public wxEAPNotePanelBase
 {
 public:
@@ -420,16 +437,19 @@ protected:
     /// \endcond
 
 protected:
-    wxStaticText *m_provider_notice;
-    wxStaticText *m_help_web_label;
-    wxHyperlinkCtrl *m_help_web_value;
-    wxStaticText *m_help_email_label;
-    wxHyperlinkCtrl *m_help_email_value;
-    wxStaticText *m_help_phone_label;
-    wxHyperlinkCtrl *m_help_phone_value;
+    wxStaticText *m_provider_notice;        ///< Identity provider notice
+    wxStaticText *m_help_web_label;         ///< Helpdesk URL label
+    wxHyperlinkCtrl *m_help_web_value;      ///< Helpdesk URL
+    wxStaticText *m_help_email_label;       ///< Helpdesk e-mail label
+    wxHyperlinkCtrl *m_help_email_value;    ///< Helpdesk e-mail
+    wxStaticText *m_help_phone_label;       ///< Helpdesk phone number label
+    wxHyperlinkCtrl *m_help_phone_value;    ///< Helpdesk phone number
 };
 
 
+///
+/// EAP provider-locked congifuration note
+///
 class wxEAPProviderLockedPanel : public wxEAPNotePanel
 {
 public:
@@ -440,6 +460,9 @@ public:
 };
 
 
+///
+/// EAP credential warning note
+///
 class wxEAPCredentialWarningPanel : public wxEAPNotePanel
 {
 public:
@@ -450,6 +473,23 @@ public:
 };
 
 
+///
+/// EAP credential logging enabled warning note
+///
+#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
+class wxEAPCredentialLogWarningPanel : public wxEAPNotePanel
+{
+public:
+    ///
+    /// Constructs a notice pannel and set the title text
+    ///
+    wxEAPCredentialLogWarningPanel(wxWindow* parent);
+};
+#endif
+
+///
+/// EAP Configuration window
+///
 class wxEAPConfigWindow : public wxScrolledWindow
 {
 public:
@@ -457,7 +497,7 @@ public:
     /// Constructs a configuration window
     ///
     /// \param[in]    prov    Provider configuration data
-    /// \param[inout] cfg     Configuration data
+    /// \param[inout] cfg     Method configuration data
     /// \param[in]    parent  Parent window
     ///
     wxEAPConfigWindow(eap::config_provider &prov, eap::config_method &cfg, wxWindow* parent);
@@ -468,8 +508,21 @@ public:
     virtual ~wxEAPConfigWindow();
 
 public:
-    inline eap::config_provider& GetProvider() const { return m_prov; }
-    inline eap::config_method  & GetConfig  () const { return m_cfg ; }
+    ///
+    /// Returns reference to configuration provider
+    ///
+    inline eap::config_provider& GetProvider() const
+    {
+        return m_prov;
+    }
+
+    ///
+    /// Returns reference to method configuration
+    ///
+    inline eap::config_method& GetConfig() const
+    {
+        return m_cfg;
+    }
 
 protected:
     /// \cond internal
@@ -482,6 +535,9 @@ protected:
 };
 
 
+///
+/// EAP provider contact info config panel
+///
 class wxEAPProviderContactInfoPanel : public wxEAPProviderContactInfoPanelBase
 {
 public:
@@ -506,6 +562,9 @@ protected:
 };
 
 
+///
+/// EAP provider identity config panel
+///
 class wxEAPProviderIDPanel : public wxEAPProviderIDPanelBase
 {
 public:
@@ -528,6 +587,9 @@ protected:
 };
 
 
+///
+/// EAP provider lock config panel
+///
 class wxEAPProviderLockPanel : public wxEAPProviderLockPanelBase
 {
 public:
@@ -550,6 +612,9 @@ protected:
 };
 
 
+///
+/// EAP provider configuration dialog
+///
 class wxEAPConfigProvider : public wxEAPGeneralDialog
 {
 public:
@@ -558,6 +623,11 @@ public:
     ///
     /// \param[inout] prov    Provider configuration data
     /// \param[in]    parent  Parent window
+    /// \param[in]    id      An identifier for the dialog. A value of \c wxID_ANY is taken to mean a default.
+    /// \param[in]    title   The title of the dialog
+    /// \param[in]    pos     The dialog position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in]    size    The dialog size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in]    style   The window style.
     ///
     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);
 
@@ -569,6 +639,9 @@ protected:
 };
 
 
+///
+/// Base template for credential configuration panel
+///
 template <class _Tcred, class _wxT>
 class wxEAPCredentialsConfigPanel : public wxEAPCredentialsConfigPanelBase
 {
@@ -577,8 +650,9 @@ public:
     /// Constructs a credential configuration panel
     ///
     /// \param[in]    prov    Provider configuration data
-    /// \param[inout] cfg     Configuration data
+    /// \param[inout] cfg     Method configuration data
     /// \param[in]    parent  Parent window
+    /// \param[in]    method  Method name to display
     ///
     wxEAPCredentialsConfigPanel(const eap::config_provider &prov, eap::config_method_with_cred &cfg, wxWindow *parent, const wxString &method = wxEmptyString) :
         m_prov(prov),
@@ -741,9 +815,7 @@ protected:
         wxEAPCredentialsConfigPanelBase::OnSetConfig(event);
 
         wxEAPCredentialsDialog dlg(m_prov, this);
-
         _wxT *panel = new _wxT(m_prov, m_cfg, m_cred_config, &dlg, true);
-
         dlg.AddContent(panel);
         if (dlg.ShowModal() == wxID_OK)
             UpdateConfigIdentity();
@@ -811,23 +883,21 @@ private:
 };
 
 
+///
+/// Helper template for all credential entry panels
+///
 template <class _Tcred, class _Tbase>
 class wxEAPCredentialsPanel : public _Tbase
 {
-private:
-    /// \cond internal
-    typedef wxEAPCredentialsPanel<_Tcred, _Tbase> _Tthis;
-    /// \endcond
-
 public:
     ///
     /// Constructs a credentials panel
     ///
-    /// \param[in]    prov        Provider configuration data
-    /// \param[in]    cfg         Configuration data
-    /// \param[inout] cred        Credentials data
-    /// \param[in]    parent      Parent window
-    /// \param[in]    is_config   Is this panel used to config credentials?
+    /// \param[in]    prov       Provider configuration data
+    /// \param[in]    cfg        Method configuration data
+    /// \param[inout] cred       Credentials data
+    /// \param[in]    parent     Parent window
+    /// \param[in]    is_config  Is this panel used to config credentials?
     ///
     wxEAPCredentialsPanel(const eap::config_provider &prov, const eap::config_method_with_cred &cfg, _Tcred &cred, wxWindow* parent, bool is_config = false) :
         m_prov(prov),
@@ -844,12 +914,20 @@ public:
             m_remember = NULL;
     }
 
+    ///
+    /// (Un)checks "Remember credentials" checkbox
+    ///
+    /// \param[in] val  If \c true, checkbox is checked; otherwise cleared
+    ///
     virtual void SetRemember(bool val)
     {
         if (m_remember)
             m_remember->SetValue(val);
     }
 
+    ///
+    /// Returns \c true if "Remember credentials" checkbox is checked
+    ///
     virtual bool GetRemember() const
     {
         return m_remember ?
@@ -866,6 +944,9 @@ protected:
 };
 
 
+///
+/// Generic password credential entry panel
+///
 template <class _Tcred, class _Tbase>
 class wxPasswordCredentialsPanel : public wxEAPCredentialsPanel<_Tcred, _Tbase>
 {
@@ -874,7 +955,7 @@ public:
     /// Constructs a password credentials panel
     ///
     /// \param[in]    prov       Provider configuration data
-    /// \param[in]    cfg        Configuration data
+    /// \param[in]    cfg        Method configuration data
     /// \param[inout] cred       Credentials data
     /// \param[in]    parent     Parent window
     /// \param[in]    is_config  Is this panel used to config credentials?
@@ -955,6 +1036,8 @@ private:
     bool m_password_set;
 };
 
+/// @}
+
 
 inline wxIcon wxLoadIconFromResource(HINSTANCE hinst, PCWSTR pszName, int cx, int cy)
 {
@@ -994,56 +1077,69 @@ inline void wxInitializeConfig()
 }
 
 
-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
 {
+    /// \addtogroup EAPBaseGUI
+    /// @{
+
+    ///
+    /// Base class to enable single instance of the same dialog (master) return result to multiple threads (slaves)
+    ///
     class monitor_ui
     {
     public:
+        ///
+        /// Constructs a UI monitor
+        ///
         monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid);
+
+        ///
+        /// Destructs the UI monitor
+        ///
         virtual ~monitor_ui();
 
+        ///
+        /// Sets pop-up window handle
+        ///
+        /// \param[in] hwnd  Handle of window to set as a new pop-up
+        ///
         void set_popup(_In_ HWND hwnd);
+
+        ///
+        /// Notifies all slaves waiting for this master and send them result data
+        ///
+        /// \param[in] data  Pointer to result data
+        /// \param[in] size  \p data size in bytes
+        ///
         void release_slaves(_In_bytecount_(size) const void *data, _In_ size_t size) const;
 
+        ///
+        /// Returns true if this is a master
+        ///
         inline bool is_master() const
         {
             return m_is_master;
         }
 
+        ///
+        /// Returns true if this is a slave
+        ///
         inline bool is_slave() const
         {
             return !is_master();
         }
 
+        ///
+        /// Returns the data master send
+        ///
         inline const std::vector<unsigned char>& master_data() const
         {
             return m_data;
         }
 
     protected:
+        /// \cond internal
+
         virtual LRESULT winproc(
             _In_ UINT   msg,
             _In_ WPARAM wparam,
@@ -1055,6 +1151,8 @@ namespace eap
             _In_ WPARAM wparam,
             _In_ LPARAM lparam);
 
+        /// \endcond
+
     protected:
         bool m_is_master;                   ///< Is this monitor master?
         HWND m_hwnd;                        ///< Message window handle
@@ -1066,4 +1164,6 @@ namespace eap
         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/Module.h

@@ -20,11 +20,6 @@
 
 namespace eap
 {
-    ///
-    /// EAP UI peer base abstract class
-    ///
-    /// A group of methods all EAP UI peers must or should implement.
-    ///
     class peer_ui;
 }
 
@@ -35,6 +30,14 @@ namespace eap
 
 namespace eap
 {
+    /// \addtogroup EAPBaseModule
+    /// @{
+
+    ///
+    /// EAP UI peer base abstract class
+    ///
+    /// A group of methods all EAP UI peers must or should implement.
+    ///
     class peer_ui : public module
     {
     public:
@@ -50,11 +53,16 @@ namespace eap
         ///
         /// \sa [EapPeerConfigXml2Blob function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363602.aspx)
         ///
+        /// \param[in ] dwFlags                   A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] pConfigRoot               Pointer to the XML configuration to be converted.
+        /// \param[out] pConnectionDataOut        A pointer to a pointer to a byte buffer that contains the configuration data converted from XML. The configuration data is created inside the EapHostConfig Schema element. The buffer is of size \p pdwConnectionDataOutSize. After consuming the data, this memory must be freed by calling \p EapPeerFreeMemory().
+        /// \param[out] pdwConnectionDataOutSize  A pointer to the size, in bytes, of the configuration BLOB in \p pConnectionDataOut.
+        ///
         virtual void config_xml2blob(
-            _In_    DWORD       dwFlags,
-            _In_    IXMLDOMNode *pConfigRoot,
-            _Inout_ BYTE        **pConnectionDataOut,
-            _Inout_ DWORD       *pdwConnectionDataOutSize) = 0;
+            _In_  DWORD       dwFlags,
+            _In_  IXMLDOMNode *pConfigRoot,
+            _Out_ BYTE        **pConnectionDataOut,
+            _Out_ DWORD       *pdwConnectionDataOutSize) = 0;
 
         ///
         /// Converts the configuration BLOB to XML.
@@ -63,6 +71,12 @@ namespace eap
         ///
         /// \sa [EapPeerConfigBlob2Xml function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363601.aspx)
         ///
+        /// \param[in] dwFlags               A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in] pConnectionData       A pointer to a buffer that contains the configuration BLOB to convert. The buffer is of size \p dwConnectionDataSize.
+        /// \param[in] dwConnectionDataSize  The size, in bytes, of the configuration BLOB in \p pConnectionData.
+        /// \param[in] pDoc                  A pointer to a pointer to an XML document that contains the converted configuration. If the EAP method does not support the \p EapPeerConfigBlob2Xml() function, the XML document will contain the \p ConfigBlob node with the BLOB in string form. The EAP method should create configuration inside the EapHostConfig Schema configuration element.
+        /// \param[in] pConfigRoot           Configuration root XML node
+        ///
         virtual void config_blob2xml(
             _In_                                   DWORD           dwFlags,
             _In_count_(dwConnectionDataSize) const BYTE            *pConnectionData,
@@ -75,18 +89,34 @@ namespace eap
         ///
         /// \sa [EapPeerInvokeConfigUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363614.aspx)
         ///
+        /// \param[in ] hwndParent                A handle to the parent window which will spawn the connection configuration user interface dialog.
+        /// \param[in ] pConnectionDataIn         A pointer to a buffer that contains the configuration BLOB to convert. The buffer is of size \p dwConnectionDataInSize.
+        /// \param[in ] dwConnectionDataInSize    The size, in bytes, of the configuration BLOB in \p pConnectionDataIn.
+        /// \param[out] ppConnectionDataOut       Receives a pointer to a pointer that contains a byte buffer with the user-configured connection data.
+        /// \param[out] pdwConnectionDataOutSize  Receives a pointer to the size, in bytes, of the \p ppConnectionDataOut parameter.
+        ///
         virtual void invoke_config_ui(
             _In_                                     HWND  hwndParent,
             _In_count_(dwConnectionDataInSize) const BYTE  *pConnectionDataIn,
             _In_                                     DWORD dwConnectionDataInSize,
-            _Inout_                                  BYTE  **ppConnectionDataOut,
-            _Inout_                                  DWORD *pdwConnectionDataOutSize) = 0;
+            _Out_                                    BYTE  **ppConnectionDataOut,
+            _Out_                                    DWORD *pdwConnectionDataOutSize) = 0;
 
         ///
         /// Raises a custom interactive user interface dialog to obtain user identity information for the EAP method on the client.
         ///
         /// \sa [EapPeerInvokeIdentityUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363615.aspx)
         ///
+        /// \param[in ] hwndParent            A handle to the parent window which will spawn the interactive user interface dialog to obtain the identity data. Can be \c NULL.
+        /// \param[in ] dwFlags               A combination of EAP flags that describe the EAP authentication session behavior.
+        /// \param[in ] pConnectionData       A pointer to a buffer that contains the configuration BLOB to convert. The buffer is of size \p dwConnectionDataSize.
+        /// \param[in ] dwConnectionDataSize  The size, in bytes, of the configuration BLOB in \p pConnectionData.
+        /// \param[in ] pUserData             A pointer to the user data specific to this authentication used to pre-populate the user data. When this API is called for the first time, or when a new authentication session starts, this parameter is \c NULL. Otherwise, set this parameter to the `pUserData` member of the structure pointed to by the \p pResult parameter received by `EapPeerGetResult()`.
+        /// \param[in ] dwUserDataSize        Specifies the size, in bytes, of the user identity data returned in \p pUserData.
+        /// \param[out] ppUserDataOut         A pointer to the pointer of the returned user data. The data is passed to `EapPeerBeginSession()` as input \p pUserData.
+        /// \param[out] pdwUserDataOutSize    Specifies the size, in bytes, of the \p ppUserDataOut buffer.
+        /// \param[out] ppwszIdentity         A pointer to the returned user identity. The pointer will be included in the identity response packet and returned to the server.
+        ///
         virtual void invoke_identity_ui(
             _In_                                   HWND   hwndParent,
             _In_                                   DWORD  dwFlags,
@@ -94,15 +124,21 @@ namespace eap
             _In_                                   DWORD  dwConnectionDataSize,
             _In_count_(dwUserDataSize)       const BYTE   *pUserData,
             _In_                                   DWORD  dwUserDataSize,
-            _Inout_                                BYTE   **ppUserDataOut,
-            _Inout_                                DWORD  *pdwUserDataOutSize,
-            _Inout_                                LPWSTR *ppwszIdentity) = 0;
+            _Out_                                  BYTE   **ppUserDataOut,
+            _Out_                                  DWORD  *pdwUserDataOutSize,
+            _Out_                                  LPWSTR *ppwszIdentity) = 0;
 
         ///
         /// Raises a custom interactive user interface dialog for the EAP method on the client.
         ///
         /// \sa [EapPeerInvokeInteractiveUI function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363616.aspx)
         ///
+        /// \param[in ] hwndParent                    A handle to the parent window which will spawn the interactive user interface dialog.
+        /// \param[in ] pUIContextData                A pointer to an opaque byte buffer that contains the context data used to create the user interface dialog.
+        /// \param[in ] dwUIContextDataSize           The size, in bytes, of the user interface context data specified by \p pUIContextData.
+        /// \param[out] ppDataFromInteractiveUI       A pointer to the address of an opaque byte buffer that contains data obtained from the interactive user interface dialog.
+        /// \param[out] pdwDataFromInteractiveUISize  A pointer to the size, in bytes, of the data returned in \p ppDataFromInteractiveUI.
+        ///
         virtual void invoke_interactive_ui(
             _In_                                  HWND  hwndParent,
             _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
@@ -110,4 +146,6 @@ namespace eap
             _Inout_                               BYTE  **ppDataFromInteractiveUI,
             _Inout_                               DWORD *pdwDataFromInteractiveUISize) = 0;
     };
+
+    /// @}
 }

lib/EAPBase_UI/include/wxEAP_UIBase.h

@@ -1,26 +1,23 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    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
@@ -28,12 +25,28 @@ class wxEAPCredentialsPanelBase;
 #include <wx/panel.h>
 
 
+///
+/// \defgroup EAPBaseGUI  GUI
+/// Graphical User Interface
+///
+/// @{
+
+///
+/// Base class for all credential entry panel that must provide "Remember" credentials checkbox
+///
 class wxEAPCredentialsPanelBase : public wxPanel
 {
 public:
     ///
     /// Constructs a wxPanel with "Remember" credentials checkbox
     ///
+    /// \param[in] parent  The parent window
+    /// \param[in] winid   An identifier for the panel. \c wxID_ANY is taken to mean a default.
+    /// \param[in] pos     The panel position. The value \c wxDefaultPosition indicates a default position, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in] size    The panel size. The value \c wxDefaultSize indicates a default size, chosen by either the windowing system or wxWidgets, depending on platform.
+    /// \param[in] style   The window style. See `wxPanel`.
+    /// \param[in] name    Window name
+    ///
     wxEAPCredentialsPanelBase(wxWindow *parent,
             wxWindowID winid = wxID_ANY,
             const wxPoint& pos = wxDefaultPosition,
@@ -43,6 +56,17 @@ public:
     {
     }
 
+    ///
+    /// (Un)checks "Remember credentials" checkbox
+    ///
+    /// \param[in] val  If \c true, checkbox is checked; otherwise cleared
+    ///
     virtual void SetRemember(bool val) = 0;
+
+    ///
+    /// Returns \c true if "Remember credentials" checkbox is checked
+    ///
     virtual bool GetRemember() const = 0;
 };
+
+/// @}

lib/EAPBase_UI/res/wxEAP_UI.cpp

@@ -607,3 +607,43 @@ wxEAPProviderLockPanelBase::wxEAPProviderLockPanelBase( wxWindow* parent, wxWind
 wxEAPProviderLockPanelBase::~wxEAPProviderLockPanelBase()
 {
 }
+
+wxEAPProviderSelectDialogBase::wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxDialog( parent, id, title, pos, size, style )
+{
+	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+	
+	wxBoxSizer* sb_content;
+	sb_content = new wxBoxSizer( wxVERTICAL );
+	
+	m_banner = new wxEAPBannerPanel( this );
+	
+	sb_content->Add( m_banner, 0, wxEXPAND|wxBOTTOM, 5 );
+	
+	m_providers = new wxBoxSizer( wxVERTICAL );
+	
+	m_providers->SetMinSize( wxSize( 350,-1 ) ); 
+	
+	sb_content->Add( m_providers, 1, wxEXPAND|wxALL, 5 );
+	
+	m_buttons = new wxStdDialogButtonSizer();
+	m_buttonsCancel = new wxButton( this, wxID_CANCEL );
+	m_buttons->AddButton( m_buttonsCancel );
+	m_buttons->Realize();
+	
+	sb_content->Add( m_buttons, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	this->SetSizer( sb_content );
+	this->Layout();
+	sb_content->Fit( this );
+	
+	// Connect Events
+	this->Connect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) );
+}
+
+wxEAPProviderSelectDialogBase::~wxEAPProviderSelectDialogBase()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_INIT_DIALOG, wxInitDialogEventHandler( wxEAPProviderSelectDialogBase::OnInitDialog ) );
+	
+}

lib/EAPBase_UI/res/wxEAP_UI.fbp

@@ -5139,5 +5139,196 @@
                 </object>
             </object>
         </object>
+        <object class="Dialog" expanded="1">
+            <property name="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="center"></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"></property>
+            <property name="name">wxEAPProviderSelectDialogBase</property>
+            <property name="pos"></property>
+            <property name="size"></property>
+            <property name="style">wxDEFAULT_DIALOG_STYLE</property>
+            <property name="subclass"></property>
+            <property name="title">EAP Identity Provider</property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style"></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"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnHibernate"></event>
+            <event name="OnIconize"></event>
+            <event name="OnIdle"></event>
+            <event name="OnInitDialog">OnInitDialog</event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI"></event>
+            <object class="wxBoxSizer" expanded="1">
+                <property name="minimum_size"></property>
+                <property name="name">sb_content</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND|wxBOTTOM</property>
+                    <property name="proportion">0</property>
+                    <object class="CustomControl" expanded="1">
+                        <property name="BottomDockable">1</property>
+                        <property name="LeftDockable">1</property>
+                        <property name="RightDockable">1</property>
+                        <property name="TopDockable">1</property>
+                        <property name="aui_layer"></property>
+                        <property name="aui_name"></property>
+                        <property name="aui_position"></property>
+                        <property name="aui_row"></property>
+                        <property name="best_size"></property>
+                        <property name="bg"></property>
+                        <property name="caption"></property>
+                        <property name="caption_visible">1</property>
+                        <property name="center_pane">0</property>
+                        <property name="class">wxEAPBannerPanel</property>
+                        <property name="close_button">1</property>
+                        <property name="construction">m_banner = new wxEAPBannerPanel( this );&#x0A;</property>
+                        <property name="context_help"></property>
+                        <property name="context_menu">1</property>
+                        <property name="declaration">wxEAPBannerPanel *m_banner;</property>
+                        <property name="default_pane">0</property>
+                        <property name="dock">Dock</property>
+                        <property name="dock_fixed">0</property>
+                        <property name="docking">Left</property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="floatable">1</property>
+                        <property name="font"></property>
+                        <property name="gripper">0</property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="include">class wxEAPBannerPanel;</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_banner</property>
+                        <property name="pane_border">1</property>
+                        <property name="pane_position"></property>
+                        <property name="pane_size"></property>
+                        <property name="permission">protected</property>
+                        <property name="pin_button">1</property>
+                        <property name="pos"></property>
+                        <property name="resize">Resizable</property>
+                        <property name="settings"></property>
+                        <property name="show">1</property>
+                        <property name="size">-1,-1</property>
+                        <property name="subclass">; ../include/EAP_UI.h</property>
+                        <property name="toolbar_pane">0</property>
+                        <property name="tooltip"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND|wxALL</property>
+                    <property name="proportion">1</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size">350,-1</property>
+                        <property name="name">m_providers</property>
+                        <property name="orient">wxVERTICAL</property>
+                        <property name="permission">protected</property>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND|wxALL</property>
+                    <property name="proportion">0</property>
+                    <object class="wxStdDialogButtonSizer" expanded="1">
+                        <property name="Apply">0</property>
+                        <property name="Cancel">1</property>
+                        <property name="ContextHelp">0</property>
+                        <property name="Help">0</property>
+                        <property name="No">0</property>
+                        <property name="OK">0</property>
+                        <property name="Save">0</property>
+                        <property name="Yes">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="name">m_buttons</property>
+                        <property name="permission">protected</property>
+                        <event name="OnApplyButtonClick"></event>
+                        <event name="OnCancelButtonClick"></event>
+                        <event name="OnContextHelpButtonClick"></event>
+                        <event name="OnHelpButtonClick"></event>
+                        <event name="OnNoButtonClick"></event>
+                        <event name="OnOKButtonClick"></event>
+                        <event name="OnSaveButtonClick"></event>
+                        <event name="OnYesButtonClick"></event>
+                    </object>
+                </object>
+            </object>
+        </object>
     </object>
 </wxFormBuilder_Project>

lib/EAPBase_UI/res/wxEAP_UI.h

@@ -290,4 +290,28 @@ class wxEAPProviderLockPanelBase : public wxPanel
 	
 };
 
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEAPProviderSelectDialogBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEAPProviderSelectDialogBase : public wxDialog 
+{
+	private:
+	
+	protected:
+		wxEAPBannerPanel *m_banner;
+		wxBoxSizer* m_providers;
+		wxStdDialogButtonSizer* m_buttons;
+		wxButton* m_buttonsCancel;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxEAPProviderSelectDialogBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("EAP Identity Provider"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_DIALOG_STYLE ); 
+		~wxEAPProviderSelectDialogBase();
+	
+};
+
 #endif //__WXEAP_UI_H__

lib/EAPBase_UI/src/EAP_UI.cpp

@@ -30,10 +30,12 @@ wxEAPBannerPanel::wxEAPBannerPanel(wxWindow* parent) : wxEAPBannerPanelBase(pare
 }
 
 
+/// \cond internal
 bool wxEAPBannerPanel::AcceptsFocusFromKeyboard() const
 {
     return false;
 }
+/// \endcond
 
 
 //////////////////////////////////////////////////////////////////////
@@ -79,6 +81,7 @@ void wxEAPGeneralDialog::AddContent(wxPanel *content)
 }
 
 
+/// \cond internal
 void wxEAPGeneralDialog::OnInitDialog(wxInitDialogEvent& event)
 {
     wxEAPGeneralDialogBase::OnInitDialog(event);
@@ -86,6 +89,7 @@ void wxEAPGeneralDialog::OnInitDialog(wxInitDialogEvent& event)
     for (wxSizerItemList::compatibility_iterator panel = m_panels->GetChildren().GetFirst(); panel; panel = panel->GetNext())
         panel->GetData()->GetWindow()->GetEventHandler()->ProcessEvent(event);
 }
+/// \endcond
 
 
 //////////////////////////////////////////////////////////////////////
@@ -96,47 +100,11 @@ wxEAPCredentialsDialog::wxEAPCredentialsDialog(const eap::config_provider &prov,
     wxEAPGeneralDialog(parent, id, title, pos, size, style)
 {
     // Set banner title.
-    m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_name).c_str()));
-}
+    m_banner->m_title->SetLabel(wxString::Format(_("%s Credentials"), wxEAPGetProviderName(prov.m_name)));
 
-
-//////////////////////////////////////////////////////////////////////
-// wxEAPCredentialsConnectionDialog
-//////////////////////////////////////////////////////////////////////
-
-wxEAPCredentialsConnectionDialog::wxEAPCredentialsConnectionDialog(wxWindow *parent, wxWindowID id, const wxString &title, const wxPoint &pos, const wxSize &size, long style) :
-    wxEAPCredentialsConnectionDialogBase(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)));
+#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
+    AddContent(new wxEAPCredentialLogWarningPanel(this));
 #endif
-
-    // Set banner title.
-    m_banner->m_title->SetLabel(_("EAP Credentials"));
-
-    m_buttonsOK->SetDefault();
-}
-
-
-void wxEAPCredentialsConnectionDialog::OnInitDialog(wxInitDialogEvent& event)
-{
-    wxEAPCredentialsConnectionDialogBase::OnInitDialog(event);
-
-    // Forward the event to child panels.
-    for (wxWindowList::compatibility_iterator provider = m_providers->GetChildren().GetFirst(); provider; provider = provider->GetNext()) {
-        wxWindow *prov = wxDynamicCast(provider->GetData(), wxWindow);
-        if (prov)
-            prov->GetEventHandler()->ProcessEvent(event);
-    }
 }
 
 
@@ -157,6 +125,8 @@ wxEAPNotePanel::wxEAPNotePanel(wxWindow* parent) :
 }
 
 
+/// \cond internal
+
 bool wxEAPNotePanel::AcceptsFocusFromKeyboard() const
 {
     return m_help_web_value || m_help_email_value || m_help_phone_label;
@@ -216,6 +186,8 @@ void wxEAPNotePanel::CreateContactFields(const eap::config_provider &prov)
     }
 }
 
+/// \endcond
+
 
 //////////////////////////////////////////////////////////////////////
 // wxEAPProviderLockedPanel
@@ -263,6 +235,27 @@ wxEAPCredentialWarningPanel::wxEAPCredentialWarningPanel(const eap::config_provi
 }
 
 
+//////////////////////////////////////////////////////////////////////
+// wxEAPCredentialWarningPanel
+//////////////////////////////////////////////////////////////////////
+
+#ifdef __DANGEROUS__LOG_CONFIDENTIAL_DATA
+wxEAPCredentialLogWarningPanel::wxEAPCredentialLogWarningPanel(wxWindow* parent) : wxEAPNotePanel(parent)
+{
+    // Load and set icon.
+    winstd::library lib_shell32;
+    if (lib_shell32.load(_T("imageres.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+        m_note_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(105)));
+
+    m_note_label->SetLabel(wxString::Format(_("The %s version installed on this computer logs credentials in visible and easy to read way."), wxT(PRODUCT_NAME_STR)) + " " +
+        _("Please, reconsider necessity to enter your credentials."));
+    m_note_label->Wrap(449);
+
+    this->Layout();
+}
+#endif
+
+
 //////////////////////////////////////////////////////////////////////
 // wxEAPConfigWindow
 //////////////////////////////////////////////////////////////////////
@@ -286,6 +279,7 @@ wxEAPConfigWindow::~wxEAPConfigWindow()
 }
 
 
+/// \cond internal
 void wxEAPConfigWindow::OnInitDialog(wxInitDialogEvent& event)
 {
     // Call TransferDataToWindow() manually, as wxScrolledWindow somehow skips that.
@@ -293,6 +287,7 @@ void wxEAPConfigWindow::OnInitDialog(wxInitDialogEvent& event)
 
     event.Skip();
 }
+/// \endcond
 
 
 //////////////////////////////////////////////////////////////////////
@@ -310,6 +305,8 @@ wxEAPProviderContactInfoPanel::wxEAPProviderContactInfoPanel(eap::config_provide
 }
 
 
+/// \cond internal
+
 bool wxEAPProviderContactInfoPanel::TransferDataToWindow()
 {
     m_provider_name ->SetValue(m_prov.m_name      );
@@ -333,6 +330,8 @@ bool wxEAPProviderContactInfoPanel::TransferDataFromWindow()
     return true;
 }
 
+/// \endcond
+
 
 //////////////////////////////////////////////////////////////////////
 // wxEAPProviderIDPanel
@@ -349,6 +348,8 @@ wxEAPProviderIDPanel::wxEAPProviderIDPanel(eap::config_provider &prov, wxWindow*
 }
 
 
+/// \cond internal
+
 bool wxEAPProviderIDPanel::TransferDataToWindow()
 {
     m_provider_namespace->SetStringSelection(m_prov.m_namespace);
@@ -368,6 +369,8 @@ bool wxEAPProviderIDPanel::TransferDataFromWindow()
     return true;
 }
 
+/// \endcond
+
 
 //////////////////////////////////////////////////////////////////////
 // wxEAPProviderLockPanel
@@ -384,6 +387,8 @@ wxEAPProviderLockPanel::wxEAPProviderLockPanel(eap::config_provider &prov, wxWin
 }
 
 
+/// \cond internal
+
 bool wxEAPProviderLockPanel::TransferDataToWindow()
 {
     m_provider_lock->SetValue(m_prov.m_read_only);
@@ -401,6 +406,8 @@ bool wxEAPProviderLockPanel::TransferDataFromWindow()
     return true;
 }
 
+/// \endcond
+
 
 //////////////////////////////////////////////////////////////////////
 // wxEAPConfigProvider
@@ -426,6 +433,41 @@ wxEAPConfigProvider::wxEAPConfigProvider(eap::config_provider &prov, wxWindow *p
 }
 
 
+//////////////////////////////////////////////////////////////////////
+// wxEAPProviderSelectDialog
+//////////////////////////////////////////////////////////////////////
+
+wxEAPProviderSelectDialog::wxEAPProviderSelectDialog(eap::config_connection &cfg, wxWindow *parent) :
+    m_selected(NULL),
+    wxEAPProviderSelectDialogBase(parent)
+{
+    // Set banner title.
+    std::unique_ptr<eap::config_method> cfg_dummy(cfg.m_module.make_config_method());
+    m_banner->m_title->SetLabel(wxString::Format("%s %s", wxT(PRODUCT_NAME_STR), cfg_dummy->get_method_str()));
+
+    for (auto prov = cfg.m_providers.cbegin(), prov_end = cfg.m_providers.cend(); prov != prov_end; ++prov) {
+        wxCommandLinkButton *btn = new wxCommandLinkButton(this, wxID_ANY, wxEAPGetProviderName(prov->m_name));
+        m_providers->Add(btn, 0, wxALL|wxEXPAND, 5);
+
+        btn->Connect(wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(wxEAPProviderSelectDialog::OnProvSelect), new wxVariant((void*)&*prov), this);
+    }
+
+    this->Layout();
+    this->GetSizer()->Fit(this);
+}
+
+
+/// \cond internal
+void wxEAPProviderSelectDialog::OnProvSelect(wxCommandEvent& event)
+{
+    // Set selected provider and dismiss dialog.
+    m_selected = static_cast<eap::config_provider*>(dynamic_cast<const wxVariant*>(event.GetEventUserData())->GetVoidPtr());
+    this->EndModal(wxID_OK);
+    event.Skip();
+}
+/// \endcond
+
+
 using namespace std;
 using namespace winstd;
 
@@ -455,7 +497,7 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
     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());
+    HWND hwnd_master = FindWindowEx(HWND_MESSAGE, NULL, reinterpret_cast<LPCTSTR>(wnd_class), guid_str.c_str());
     if (hwnd_master) {
         // Another monitor is already running.
         m_is_master = false;
@@ -484,18 +526,18 @@ eap::monitor_ui::monitor_ui(_In_ HINSTANCE module, _In_ const GUID &guid) :
     }
 
     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
+        0,                                    // dwExStyle
+        reinterpret_cast<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.
@@ -528,7 +570,7 @@ void eap::monitor_ui::release_slaves(_In_bytecount_(size) const void *data, _In_
 {
     assert(!size || data);
 
-    for (list<HWND>::const_iterator slave = m_slaves.begin(), slave_end = m_slaves.end(); slave != slave_end; ++slave) {
+    for (auto slave = m_slaves.cbegin(), slave_end = m_slaves.cend(); slave != slave_end; ++slave) {
         // Get slave's PID.
         DWORD pid_slave;
         GetWindowThreadProcessId(*slave, &pid_slave);
@@ -551,6 +593,8 @@ void eap::monitor_ui::release_slaves(_In_bytecount_(size) const void *data, _In_
 }
 
 
+/// \cond internal
+
 LRESULT eap::monitor_ui::winproc(
     _In_ UINT   msg,
     _In_ WPARAM wparam,
@@ -575,7 +619,7 @@ LRESULT eap::monitor_ui::winproc(
     } else if (msg == s_msg_finish) {
         // Master finished.
         assert(!m_is_master);
-        m_data.assign((const unsigned char*)lparam, (const unsigned char*)lparam + wparam);
+        m_data.assign(reinterpret_cast<const unsigned char*>(lparam), reinterpret_cast<const unsigned char*>(lparam) + wparam);
 
         // Finish slave too.
         DestroyWindow(m_hwnd);
@@ -614,6 +658,8 @@ LRESULT CALLBACK eap::monitor_ui::winproc(
     }
 }
 
+/// \endcond
+
 
 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/EAPBase_UI/src/Module.cpp

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "StdAfx.h"

lib/EAPBase_UI/src/StdAfx.h

@@ -24,3 +24,5 @@
 
 #include "../include/EAP_UI.h"
 #include "../include/Module.h"
+
+#include <wx/commandlinkbutton.h>

lib/EapHost/build/.gitignore

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

lib/EapHost/build/EapHost.props

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

lib/EapHost/build/EapHost.vcxproj

@@ -0,0 +1,106 @@
+<?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>{B385EC2B-C3F4-48BB-9BAC-8B996DE7F754}</ProjectGuid>
+    <RootNamespace>EapHost</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
+    <Import Project="EapHost.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="EapHost.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="EapHost.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="EapHost.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemGroup>
+    <ClInclude Include="..\include\Config.h" />
+    <ClInclude Include="..\include\Credentials.h" />
+    <ClInclude Include="..\include\Method.h" />
+    <ClInclude Include="..\src\StdAfx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\Config.cpp" />
+    <ClCompile Include="..\src\Credentials.cpp" />
+    <ClCompile Include="..\src\Method.cpp" />
+    <ClCompile Include="..\src\StdAfx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
+      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

lib/EapHost/build/EapHost.vcxproj.filters

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

lib/EapHost/include/Config.h

@@ -0,0 +1,143 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <sal.h>
+
+namespace eap
+{
+    class config_method_eaphost;
+}
+
+#pragma once
+
+#include "../../EAPBase/include/Config.h"
+
+#include <Windows.h>
+#include <sal.h>
+#include <tchar.h>
+
+
+namespace eap
+{
+    /// \addtogroup EAPBaseConfig
+    /// @{
+
+    ///
+    /// EapHost peer method configuration
+    ///
+    class config_method_eaphost : public config_method
+    {
+    public:
+        ///
+        /// Constructs configuration
+        ///
+        /// \param[in] mod    EAP module to use for global services
+        /// \param[in] level  Config level (0=outer, 1=inner, 2=inner-inner...)
+        ///
+        config_method_eaphost(_In_ module &mod, _In_ unsigned int level);
+
+        ///
+        /// Copies configuration
+        ///
+        /// \param[in] other  Configuration to copy from
+        ///
+        config_method_eaphost(_In_ const config_method_eaphost &other);
+
+        ///
+        /// Moves configuration
+        ///
+        /// \param[in] other  Configuration to move from
+        ///
+        config_method_eaphost(_Inout_ config_method_eaphost &&other);
+
+        ///
+        /// Copies configuration
+        ///
+        /// \param[in] other  Configuration to copy from
+        ///
+        /// \returns Reference to this object
+        ///
+        config_method_eaphost& operator=(_In_ const config_method_eaphost &other);
+
+        ///
+        /// Moves configuration
+        ///
+        /// \param[in] other  Configuration to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        config_method_eaphost& operator=(_Inout_ config_method_eaphost &&other);
+
+        virtual config* clone() const;
+
+        /// \name XML management
+        /// @{
+        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
+        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
+        /// @}
+
+        /// \name BLOB management
+        /// @{
+        virtual void operator<<(_Inout_ cursor_out &cursor) const;
+        virtual size_t get_pk_size() const;
+        virtual void operator>>(_Inout_ cursor_in &cursor);
+        /// @}
+
+        virtual winstd::eap_type_t get_method_id() const;
+        virtual const wchar_t* get_method_str() const;
+
+        ///
+        /// @copydoc eap::config_method::make_credentials()
+        /// \returns This implementation always returns `eap::credentials_eaphost` type of credentials
+        ///
+        virtual credentials* make_credentials() const;
+
+        ///
+        /// Returns method EAP_METHOD_TYPE
+        ///
+        inline const EAP_METHOD_TYPE& get_type() const
+        {
+            return m_type;
+        }
+
+        ///
+        /// Set method EAP_METHOD_TYPE
+        ///
+        inline void set_type(_In_ const EAP_METHOD_TYPE &type)
+        {
+            m_type = type;
+            update_type();
+        }
+
+    protected:
+        /// \cond internal
+        void update_type();
+        /// \endcond
+
+    protected:
+        EAP_METHOD_TYPE m_type;     ///< EapHost method type: (EAP type, vendor ID, vendor type, author ID) tuple
+        std::wstring m_type_str;    ///< EAP method type as a string
+
+    public:
+        sanitizing_blob m_cfg_blob; ///< Method configuration BLOB
+    };
+
+    /// @}
+}

lib/EapHost/include/Credentials.h

@@ -0,0 +1,154 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include <sal.h>
+
+namespace eap
+{
+    class credentials_eaphost;
+}
+
+#pragma once
+
+#include "Config.h"
+
+#include "../../EAPBase/include/Credentials.h"
+
+#include <WinStd/Crypt.h>
+
+#include <Windows.h>
+#include <vector>
+
+
+namespace eap
+{
+    /// \addtogroup EAPBaseCred
+    /// @{
+
+    ///
+    /// EapHost peer method credentials
+    ///
+    class credentials_eaphost : public credentials
+    {
+    public:
+        ///
+        /// Constructs credentials
+        ///
+        /// \param[in] mod  EAP module to use for global services
+        ///
+        credentials_eaphost(_In_ module &mod);
+
+        ///
+        /// Copies credentials
+        ///
+        /// \param[in] other  Credentials to copy from
+        ///
+        credentials_eaphost(_In_ const credentials_eaphost &other);
+
+        ///
+        /// Moves credentials
+        ///
+        /// \param[in] other  Credentials to move from
+        ///
+        credentials_eaphost(_Inout_ credentials_eaphost &&other);
+
+        ///
+        /// Copies credentials
+        ///
+        /// \param[in] other  Credentials to copy from
+        ///
+        /// \returns Reference to this object
+        ///
+        credentials_eaphost& operator=(_In_ const credentials_eaphost &other);
+
+        ///
+        /// Moves credentials
+        ///
+        /// \param[in] other  Credentials to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        credentials_eaphost& operator=(_Inout_ credentials_eaphost &&other);
+
+        virtual config* clone() const;
+        virtual void clear();
+        virtual bool empty() const;
+
+        /// \name XML management
+        /// @{
+        virtual void save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const;
+        virtual void load(_In_ IXMLDOMNode *pConfigRoot);
+        /// @}
+
+        /// \name BLOB management
+        /// @{
+        virtual void operator<<(_Inout_ cursor_out &cursor) const;
+        virtual size_t get_pk_size() const;
+        virtual void operator>>(_Inout_ cursor_in &cursor);
+        /// @}
+
+        /// \name Storage
+        /// @{
+        virtual void store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const;
+        virtual void retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level);
+
+        ///
+        /// @copydoc eap::credentials::target_suffix()
+        /// \returns This implementation always returns `_T("BLOB")`
+        ///
+        virtual LPCTSTR target_suffix() const;
+        /// @}
+
+        ///
+        /// Combine credentials in the following order:
+        ///
+        /// 1. Cached credentials
+        /// 2. Configured credentials (if \p cfg is derived from `config_method_with_cred`)
+        /// 3. Stored credentials
+        ///
+        /// \param[in] dwFlags                A combination of [EAP flags](https://msdn.microsoft.com/en-us/library/windows/desktop/bb891975.aspx) that describe the EAP authentication session behavior
+        /// \param[in] hTokenImpersonateUser  Impersonation token for a logged-on user to collect user-related information
+        /// \param[in] cred_cached            Cached credentials (optional, can be \c NULL, must be `credentials_eaphost*` type)
+        /// \param[in] cfg                    Method configuration (unused, as must be as config_method_eaphost is not derived from `config_method_with_cred`)
+        /// \param[in] pszTargetName          The name in Windows Credential Manager to retrieve credentials from (optional, can be \c NULL)
+        ///
+        /// \returns
+        /// - \c source_cache   Credentials were obtained from EapHost cache
+        /// - \c source_config  Credentials were set by method configuration
+        /// - \c source_storage Credentials were loaded from Windows Credential Manager
+        ///
+        virtual source_t combine(
+            _In_             DWORD         dwFlags,
+            _In_             HANDLE        hTokenImpersonateUser,
+            _In_opt_   const credentials   *cred_cached,
+            _In_       const config_method &cfg,
+            _In_opt_z_       LPCTSTR       pszTargetName);
+
+    public:
+        sanitizing_blob m_cred_blob;                ///< Credentials BLOB
+
+    private:
+        /// \cond internal
+        static const unsigned char s_entropy[1024];
+        /// \endcond
+    };
+
+    /// @}
+}

lib/EapHost/include/Method.h

@@ -0,0 +1,157 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+namespace eap
+{
+    class method_eaphost;
+}
+
+
+#pragma once
+
+#include "Config.h"
+#include "Credentials.h"
+
+#include "../../EAPBase/include/Method.h"
+
+
+namespace eap
+{
+    /// \addtogroup EAPBaseMethod
+    /// @{
+
+    ///
+    /// EapHost peer method
+    ///
+    /// A wrapper class to provide system installed 3rd party EAP methods integration.
+    ///
+    class method_eaphost : public method
+    {
+        WINSTD_NONCOPYABLE(method_eaphost)
+
+    public:
+        ///
+        /// Constructs an EAP method
+        ///
+        /// \param[in] mod   EAP module to use for global services
+        /// \param[in] cfg   Method configuration
+        /// \param[in] cred  User credentials
+        ///
+        method_eaphost(_In_ module &mod, _In_ config_method_eaphost &cfg, _In_ credentials_eaphost &cred);
+
+        ///
+        /// Moves an EAP method
+        ///
+        /// \param[in] other  EAP method to move from
+        ///
+        method_eaphost(_Inout_ method_eaphost &&other);
+
+        ///
+        /// Moves an EAP method
+        ///
+        /// \param[in] other  EAP method to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        method_eaphost& operator=(_Inout_ method_eaphost &&other);
+
+        /// \name Session management
+        /// @{
+
+        virtual void begin_session(
+            _In_        DWORD         dwFlags,
+            _In_  const EapAttributes *pAttributeArray,
+            _In_        HANDLE        hTokenImpersonateUser,
+            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
+
+        virtual void end_session();
+
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize);
+
+        virtual void get_response_packet(
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD);
+
+        /// @}
+
+        virtual void get_result(
+            _In_   EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult);
+
+        /// \name User Interaction
+        /// @{
+
+        virtual void get_ui_context(
+            _Out_ BYTE  **ppUIContextData,
+            _Out_ DWORD *pdwUIContextDataSize);
+
+        virtual EapPeerMethodResponseAction set_ui_context(
+            _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+            _In_                                  DWORD dwUIContextDataSize);
+
+        /// @}
+
+        /// \name EAP Response Attributes
+        /// @{
+
+        virtual void get_response_attributes(_Out_ EapAttributes *pAttribs);
+
+        virtual EapPeerMethodResponseAction set_response_attributes(_In_ const EapAttributes *pAttribs);
+
+        /// @}
+
+    protected:
+        ///
+        /// Converts EapHost peer action to output structure.
+        ///
+        /// \param[in] action  EapHost peer action
+        ///
+        /// \returns EAP method output action
+        ///
+        inline EapPeerMethodResponseAction action_h2p(_In_ EapHostPeerResponseAction action)
+        {
+            switch (action) {
+                case EapHostPeerResponseDiscard            : return EapPeerMethodResponseActionDiscard ;
+                case EapHostPeerResponseSend               : return EapPeerMethodResponseActionSend    ;
+                case EapHostPeerResponseResult             : return EapPeerMethodResponseActionResult  ;
+                case EapHostPeerResponseInvokeUi           : return EapPeerMethodResponseActionInvokeUI;
+                case EapHostPeerResponseRespond            : return EapPeerMethodResponseActionRespond ;
+                case EapHostPeerResponseStartAuthentication: return EapPeerMethodResponseActionDiscard ; // The session could not be found. So the supplicant either needs to start session again with the same packet or discard the packet.
+                case EapHostPeerResponseNone               : return EapPeerMethodResponseActionNone    ;
+                default                                    : throw std::invalid_argument(winstd::string_printf(__FUNCTION__ " Unknown action (%u).", action));
+            }
+        }
+
+    protected:
+        config_method_eaphost &m_cfg;   ///< Method configuration
+        credentials_eaphost &m_cred;    ///< Method user credentials
+
+        EAP_SESSIONID m_session_id;     ///< EAP session ID
+    };
+
+    /// @}
+}

lib/EapHost/src/Config.cpp

@@ -0,0 +1,211 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "StdAfx.h"
+
+using namespace std;
+using namespace winstd;
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::config_method_eaphost
+//////////////////////////////////////////////////////////////////////
+
+eap::config_method_eaphost::config_method_eaphost(_In_ module &mod, _In_ unsigned int level) :
+    config_method(mod, level),
+    m_type_str(L"EapHost")
+{
+    memset(&m_type, 0, sizeof(EAP_METHOD_TYPE));
+}
+
+
+eap::config_method_eaphost::config_method_eaphost(_In_ const config_method_eaphost &other) :
+    m_type       (other.m_type    ),
+    m_type_str   (other.m_type_str),
+    m_cfg_blob   (other.m_cfg_blob),
+    config_method(other           )
+{
+}
+
+
+eap::config_method_eaphost::config_method_eaphost(_Inout_ config_method_eaphost &&other) :
+    m_type       (std::move(other.m_type    )),
+    m_type_str   (std::move(other.m_type_str)),
+    m_cfg_blob   (std::move(other.m_cfg_blob)),
+    config_method(std::move(other           ))
+{
+}
+
+
+eap::config_method_eaphost& eap::config_method_eaphost::operator=(_In_ const config_method_eaphost &other)
+{
+    if (this != &other) {
+        (config_method&)*this = other;
+        m_type                = other.m_type;
+        m_type_str            = other.m_type_str;
+        m_cfg_blob            = other.m_cfg_blob;
+    }
+
+    return *this;
+}
+
+
+eap::config_method_eaphost& eap::config_method_eaphost::operator=(_Inout_ config_method_eaphost &&other)
+{
+    if (this != &other) {
+        (config_method&&)*this = std::move(other           );
+        m_type                 = std::move(other.m_type    );
+        m_type_str             = std::move(other.m_type_str);
+        m_cfg_blob             = std::move(other.m_cfg_blob);
+    }
+
+    return *this;
+}
+
+
+eap::config* eap::config_method_eaphost::clone() const
+{
+    return new config_method_eaphost(*this);
+}
+
+
+void eap::config_method_eaphost::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
+{
+    assert(pDoc);
+    assert(pConfigRoot);
+
+    config_method::save(pDoc, pConfigRoot);
+
+    // Convert configuration BLOB to XML using EapHost (and ultimately method peer's EapPeerConfigBlob2Xml).
+    com_obj<IXMLDOMDocument2> pConfigDoc;
+    eap_error error;
+    DWORD dwResult = EapHostPeerConfigBlob2Xml(0, m_type, (DWORD)m_cfg_blob.size(), const_cast<BYTE*>(m_cfg_blob.data()), &pConfigDoc, &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        HRESULT hr;
+
+        com_obj<IXMLDOMElement> pXmlElConfigDoc;
+        if (FAILED(hr = pConfigDoc->get_documentElement(&pXmlElConfigDoc)))
+            throw com_runtime_error(hr, __FUNCTION__ " Error getting XML document element.");
+
+        // Insert method configuration into our XML configuration.
+        if (FAILED(hr = pConfigRoot->appendChild(pXmlElConfigDoc, NULL)))
+            throw com_runtime_error(hr, __FUNCTION__ " Error appending configuration document element.");
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerConfigBlob2Xml failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerConfigBlob2Xml failed.");
+}
+
+
+void eap::config_method_eaphost::load(_In_ IXMLDOMNode *pConfigRoot)
+{
+    assert(pConfigRoot);
+
+    config_method::load(pConfigRoot);
+
+    // <EapHostConfig>
+    winstd::com_obj<IXMLDOMElement> pXmlElEapHostConfig;
+    if (SUCCEEDED(eapxml::select_element(pConfigRoot, winstd::bstr(L"eaphostconfig:EapHostConfig"), pXmlElEapHostConfig))) {
+        // Convert configuration XML to BLOB using EapHost (and ultimately method peer's EapPeerConfigXml2Blob).
+        DWORD cfg_data_size = 0;
+        eap_blob cfg_data;
+        eap_error error;
+        DWORD dwResult = EapHostPeerConfigXml2Blob(0, pXmlElEapHostConfig, &cfg_data_size, &cfg_data._Myptr, &m_type, &error._Myptr);
+        if (dwResult == ERROR_SUCCESS) {
+            update_type();
+            const BYTE *_cfg_data = cfg_data.get();
+            m_cfg_blob.assign(_cfg_data, _cfg_data + cfg_data_size);
+        } else if (error)
+            throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerConfigXml2Blob failed.");
+        else
+            throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerConfigXml2Blob failed.");
+    }
+}
+
+
+void eap::config_method_eaphost::operator<<(_Inout_ cursor_out &cursor) const
+{
+    config_method::operator<<(cursor);
+    cursor << m_type    ;
+    cursor << m_cfg_blob;
+}
+
+
+size_t eap::config_method_eaphost::get_pk_size() const
+{
+    return
+        config_method::get_pk_size() +
+        pksizeof(m_type    ) +
+        pksizeof(m_cfg_blob);
+}
+
+
+void eap::config_method_eaphost::operator>>(_Inout_ cursor_in &cursor)
+{
+    config_method::operator>>(cursor);
+    cursor >> m_type    ; update_type();
+    cursor >> m_cfg_blob;
+}
+
+
+eap_type_t eap::config_method_eaphost::get_method_id() const
+{
+    return (eap_type_t)m_type.eapType.type;
+}
+
+
+const wchar_t* eap::config_method_eaphost::get_method_str() const
+{
+    return m_type_str.c_str();
+}
+
+
+eap::credentials* eap::config_method_eaphost::make_credentials() const
+{
+    return new credentials_eaphost(m_module);
+}
+
+
+/// \cond internal
+void eap::config_method_eaphost::update_type()
+{
+    // Query registry for EAP method name and save it to m_type_str.
+    // get_method_str() can return pointer to static string only, therefore we need to have the method name ready in advance.
+    reg_key key;
+    if (key.open(HKEY_LOCAL_MACHINE,
+            m_type.dwAuthorId   == 0   ? tstring_printf(_T("SYSTEM\\CurrentControlSet\\services\\RasMan\\PPP\\EAP\\%u"            ),                    m_type.eapType.type                                                        ).c_str() : // Legacy EAP method (RasMan)
+            m_type.eapType.type == 254 ? tstring_printf(_T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods\\%u\\%u\\%u\\%u"), m_type.dwAuthorId, m_type.eapType.type, m_type.eapType.dwVendorId, m_type.eapType.dwVendorType).c_str() : // EapHost Expanded Type Peer
+                                         tstring_printf(_T("SYSTEM\\CurrentControlSet\\services\\EapHost\\Methods\\%u\\%u"        ), m_type.dwAuthorId, m_type.eapType.type                                                        ).c_str(),  // EapHost Peer
+            0,
+            KEY_READ) &&
+        RegLoadMUIStringW(key,
+            m_type.dwAuthorId == 0 ? L"FriendlyName" :
+                                     L"PeerFriendlyName",
+            m_type_str,
+            0,
+            NULL) == ERROR_SUCCESS)
+        return;
+
+    // Query failed. Provide generic name.
+         if (m_type.dwAuthorId   == 0  ) sprintf(m_type_str, L"RasMan-%u"          ,                    m_type.eapType.type                                                        );
+    else if (m_type.eapType.type == 254) sprintf(m_type_str, L"EapHost-%u-%u-%u-%u", m_type.dwAuthorId, m_type.eapType.type, m_type.eapType.dwVendorId, m_type.eapType.dwVendorType);
+    else                                 sprintf(m_type_str, L"EapHost-%u-%u"      , m_type.dwAuthorId, m_type.eapType.type                                                        );
+}
+/// \endcond

lib/EapHost/src/Credentials.cpp

@@ -0,0 +1,379 @@
+/*
+    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, "Eappprxy.lib")
+
+using namespace std;
+using namespace winstd;
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::credentials_eaphost
+//////////////////////////////////////////////////////////////////////
+
+eap::credentials_eaphost::credentials_eaphost(_In_ module &mod) : credentials(mod)
+{
+}
+
+
+eap::credentials_eaphost::credentials_eaphost(_In_ const credentials_eaphost &other) :
+    m_cred_blob(other.m_cred_blob),
+    credentials(other            )
+{
+}
+
+
+eap::credentials_eaphost::credentials_eaphost(_Inout_ credentials_eaphost &&other) :
+    m_cred_blob(std::move(other.m_cred_blob)),
+    credentials(std::move(other            ))
+{
+}
+
+
+eap::credentials_eaphost& eap::credentials_eaphost::operator=(_In_ const credentials_eaphost &other)
+{
+    if (this != &other) {
+        (credentials&)*this = other;
+        m_cred_blob         = other.m_cred_blob;
+    }
+
+    return *this;
+}
+
+
+eap::credentials_eaphost& eap::credentials_eaphost::operator=(_Inout_ credentials_eaphost &&other)
+{
+    if (this != &other) {
+        (credentials&)*this = std::move(other);
+        m_cred_blob         = std::move(other.m_cred_blob);
+    }
+
+    return *this;
+}
+
+
+eap::config* eap::credentials_eaphost::clone() const
+{
+    return new credentials_eaphost(*this);
+}
+
+
+void eap::credentials_eaphost::clear()
+{
+    credentials::clear();
+    m_cred_blob.clear();
+}
+
+
+bool eap::credentials_eaphost::empty() const
+{
+    return m_cred_blob.empty();
+}
+
+
+void eap::credentials_eaphost::save(_In_ IXMLDOMDocument *pDoc, _In_ IXMLDOMNode *pConfigRoot) const
+{
+    assert(pDoc);
+    assert(pConfigRoot);
+
+    credentials::save(pDoc, pConfigRoot);
+
+    HRESULT hr;
+
+    // <Credentials>
+    if (FAILED(hr = eapxml::put_element_base64(pDoc, pConfigRoot, bstr(L"Credentials"), namespace_eapmetadata, m_cred_blob.data(), m_cred_blob.size())))
+        throw com_runtime_error(hr, __FUNCTION__ " Error creating <Credentials> element.");
+}
+
+
+void eap::credentials_eaphost::load(_In_ IXMLDOMNode *pConfigRoot)
+{
+    assert(pConfigRoot);
+    HRESULT hr;
+
+    credentials::load(pConfigRoot);
+
+    std::wstring xpath(eapxml::get_xpath(pConfigRoot));
+
+    m_cred_blob.clear();
+    if (FAILED(hr = eapxml::get_element_base64(pConfigRoot, bstr(L"eap-metadata:Credentials"), m_cred_blob)))
+        throw com_runtime_error(hr, __FUNCTION__ " Error reading <Credentials> element.");
+
+    m_module.log_config_discrete((xpath + L"/Credentials").c_str(), m_cred_blob.data(), (ULONG)m_cred_blob.size());
+}
+
+
+void eap::credentials_eaphost::operator<<(_Inout_ cursor_out &cursor) const
+{
+    credentials::operator<<(cursor);
+    cursor << m_cred_blob;
+}
+
+
+size_t eap::credentials_eaphost::get_pk_size() const
+{
+    return
+        credentials::get_pk_size() +
+        pksizeof(m_cred_blob);
+}
+
+
+void eap::credentials_eaphost::operator>>(_Inout_ cursor_in &cursor)
+{
+    credentials::operator>>(cursor);
+    cursor >> m_cred_blob;
+}
+
+
+void eap::credentials_eaphost::store(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level) const
+{
+    assert(pszTargetName);
+
+    data_blob cred_enc;
+    if (!m_cred_blob.empty()) {
+        // Encrypt credentials BLOB using user's key.
+        DATA_BLOB cred_blob    = { (DWORD)m_cred_blob.size(), const_cast<LPBYTE>(m_cred_blob.data()) };
+        DATA_BLOB entropy_blob = {        sizeof(s_entropy) , const_cast<LPBYTE>(s_entropy)          };
+        if (!CryptProtectData(&cred_blob, NULL, &entropy_blob, NULL, NULL, CRYPTPROTECT_UI_FORBIDDEN | CRYPTPROTECT_AUDIT, &cred_enc))
+            throw win_runtime_error(__FUNCTION__ " CryptProtectData failed.");
+    }
+
+    tstring target(target_name(pszTargetName, level));
+
+    // Write credentials.
+    assert(cred_enc.cbData     < CRED_MAX_CREDENTIAL_BLOB_SIZE);
+    assert(m_identity.length() < CRED_MAX_USERNAME_LENGTH     );
+    CREDENTIAL cred = {
+        0,                                     // Flags
+        CRED_TYPE_GENERIC,                     // Type
+        const_cast<LPTSTR>(target.c_str()),    // TargetName
+        _T(""),                                // Comment
+        { 0, 0 },                              // LastWritten
+        cred_enc.cbData,                       // CredentialBlobSize
+        cred_enc.pbData,                       // CredentialBlob
+        CRED_PERSIST_ENTERPRISE,               // Persist
+        0,                                     // AttributeCount
+        NULL,                                  // Attributes
+        NULL,                                  // TargetAlias
+        const_cast<LPTSTR>(m_identity.c_str()) // UserName
+    };
+    if (!CredWrite(&cred, 0))
+        throw win_runtime_error(__FUNCTION__ " CredWrite failed.");
+}
+
+
+void eap::credentials_eaphost::retrieve(_In_z_ LPCTSTR pszTargetName, _In_ unsigned int level)
+{
+    // Read credentials.
+    unique_ptr<CREDENTIAL, CredFree_delete<CREDENTIAL> > cred;
+    if (!CredRead(target_name(pszTargetName, level).c_str(), CRED_TYPE_GENERIC, 0, (PCREDENTIAL*)&cred))
+        throw win_runtime_error(__FUNCTION__ " CredRead failed.");
+
+    if (cred->CredentialBlobSize) {
+        // Decrypt the credentials BLOB using user's key.
+        DATA_BLOB cred_enc     = { cred->CredentialBlobSize, cred->CredentialBlob          };
+        DATA_BLOB entropy_blob = { sizeof(s_entropy)       , const_cast<LPBYTE>(s_entropy) };
+        data_blob 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.");
+
+        m_cred_blob.assign(cred_int.pbData, cred_int.pbData + cred_int.cbData);
+        SecureZeroMemory(cred_int.pbData, cred_int.cbData);
+    } else
+        m_cred_blob.clear();
+
+    if (cred->UserName)
+        m_identity = cred->UserName;
+    else
+        m_identity.clear();
+
+    wstring xpath(pszTargetName);
+    m_module.log_config((xpath + L"/Identity").c_str(), m_identity.c_str());
+    m_module.log_config_discrete((xpath + L"/Credentials").c_str(), m_cred_blob.data(), (ULONG)m_cred_blob.size());
+}
+
+
+LPCTSTR eap::credentials_eaphost::target_suffix() const
+{
+    return _T("BLOB");
+}
+
+
+eap::credentials::source_t eap::credentials_eaphost::combine(
+    _In_             DWORD         dwFlags,
+    _In_             HANDLE        hTokenImpersonateUser,
+    _In_opt_   const credentials   *cred_cached,
+    _In_       const config_method &cfg,
+    _In_opt_z_       LPCTSTR       pszTargetName)
+{
+    // When cached credentials are available, EapHost calls EapPeerGetIdentity() anyway.
+    // This allows each peer to decide to reuse or drop cached credentials itself.
+    // To mimic that behaviour, we do the same:
+    // 1. Retrieve credentials from cache, store, or configuration
+    // 2. Call EapHostPeerGetIdentity()
+    source_t src = source_unknown;
+
+    if (cred_cached) {
+        // Using EAP service cached credentials.
+        *this = *dynamic_cast<const credentials_eaphost*>(cred_cached);
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CACHED2, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), event_data::blank);
+        src = source_cache;
+    }
+
+    // Note: Currently we do not provide credential storage for EapHost methods within configuration.
+    // EapHost credentials will never get loaded from configuration, since config_method_eaphost is config_method based, not config_method_with_cred.
+    // The code is kept (and maintained) for consistency with another methods, if we choose to provide that feature at a later time.
+    if (src == source_unknown) {
+        auto cfg_with_cred = dynamic_cast<const config_method_with_cred*>(&cfg);
+        if (cfg_with_cred && cfg_with_cred->m_use_cred) {
+            // Using configured credentials.
+            *this = *dynamic_cast<const credentials_eaphost*>(cfg_with_cred->m_cred.get());
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_CONFIG2, event_data((unsigned int)cfg.get_method_id()), event_data(credentials_eaphost::get_name()), event_data(pszTargetName), event_data::blank);
+            src = source_config;
+        }
+    }
+
+    if (src == source_unknown && pszTargetName) {
+        // Switch user context.
+        user_impersonator impersonating(hTokenImpersonateUser);
+
+        try {
+            credentials_eaphost cred_loaded(m_module);
+            cred_loaded.retrieve(pszTargetName, cfg.m_level);
+
+            // Using stored credentials.
+            *this = std::move(cred_loaded);
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_STORED2, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), event_data::blank);
+            src = source_storage;
+        } catch (...) {
+            // Not actually an error.
+        }
+    }
+
+    auto cfg_eaphost = dynamic_cast<const config_method_eaphost*>(&cfg);
+    BOOL fInvokeUI = FALSE;
+    DWORD cred_data_size = 0;
+    eap_blob_runtime cred_data;
+    unique_ptr<WCHAR[], EapHostPeerFreeRuntimeMemory_delete> identity;
+    eap_error error; // MSDN says to use EapHostPeerFreeErrorMemory()/eap_error, but given the context of execution, eap_error_runtime might be the right choice.
+    DWORD dwResult = EapHostPeerGetIdentity(
+        0,
+        dwFlags,
+        cfg_eaphost->get_type(),
+        (DWORD)cfg_eaphost->m_cfg_blob.size(), cfg_eaphost->m_cfg_blob.data(),
+        src != source_unknown ? (DWORD)m_cred_blob.size() : 0, src != source_unknown ? m_cred_blob.data() : NULL,
+        hTokenImpersonateUser,
+        &fInvokeUI,
+        &cred_data_size, &cred_data._Myptr,
+        &identity._Myptr,
+        &error._Myptr,
+        NULL);
+    if (dwResult == ERROR_SUCCESS) {
+        if (identity && !fInvokeUI) {
+            // Inner EAP method provided identity and does not require additional UI prompt.
+            m_identity = identity.get();
+            m_cred_blob.assign(cred_data.get(), cred_data.get() + cred_data_size);
+            SecureZeroMemory(cred_data.get(), cred_data_size);
+            m_module.log_event(&EAPMETHOD_TRACE_EVT_CRED_EAPHOST, event_data((unsigned int)cfg.get_method_id()), event_data(get_name()), event_data(pszTargetName), event_data::blank);
+            return source_lower;
+        } else
+            SecureZeroMemory(cred_data.get(), cred_data_size);
+    } else if (error) {
+        // An EAP error in inner EAP method occurred.
+        m_module.log_error(error.get());
+    } else {
+        // A runtime error in inner EAP method occurred.
+        m_module.log_event(&EAPMETHOD_TRACE_EVT_WIN_ERROR, event_data((unsigned int)dwResult), event_data(__FUNCTION__ " EapHostPeerGetIdentity failed."), event_data::blank);
+    }
+
+    return source_unknown;
+}
+
+
+/// \cond internal
+const unsigned char eap::credentials_eaphost::s_entropy[1024] = {
+    0xe6, 0x01, 0x7b, 0x5f, 0xe5, 0x32, 0xee, 0x8c, 0x57, 0x41, 0x52, 0x95, 0xab, 0xe5, 0x65, 0xdd,
+    0xb3, 0x12, 0x7c, 0xcb, 0xdb, 0x37, 0x03, 0x76, 0xfc, 0x53, 0x4a, 0xf9, 0x3f, 0xf1, 0xd8, 0x7e,
+    0x60, 0x9a, 0x49, 0x93, 0xeb, 0x2e, 0x18, 0xd0, 0xfb, 0x40, 0xa9, 0x95, 0x66, 0x8a, 0xdd, 0x99,
+    0x51, 0x1c, 0xfb, 0x73, 0xa9, 0x7c, 0x31, 0x2b, 0xe6, 0x54, 0x61, 0x64, 0x25, 0x86, 0x36, 0xd4,
+    0xde, 0xc8, 0x6d, 0x3e, 0x6f, 0x47, 0x40, 0x6f, 0xd6, 0x5b, 0xe2, 0x0c, 0x92, 0x16, 0xe2, 0xdc,
+    0x45, 0x2f, 0x44, 0xf4, 0x87, 0x64, 0x6d, 0x4e, 0x5c, 0x24, 0x8a, 0x10, 0xb1, 0x2f, 0xa7, 0xe3,
+    0x7d, 0x60, 0x98, 0x1c, 0xd4, 0x8d, 0xbb, 0x27, 0xb9, 0x02, 0xb1, 0x4a, 0x49, 0xd9, 0x80, 0xe1,
+    0x7d, 0x20, 0xac, 0xba, 0x12, 0x23, 0x67, 0x28, 0x9e, 0xe8, 0xb6, 0x27, 0x4a, 0x90, 0x47, 0xcf,
+    0x92, 0x00, 0xde, 0x95, 0xeb, 0x23, 0x3b, 0x0d, 0x5e, 0x08, 0xe9, 0x45, 0x42, 0x7a, 0x6a, 0x73,
+    0xbb, 0x44, 0xfb, 0x92, 0xc0, 0x24, 0xe2, 0x41, 0xdf, 0x97, 0xb9, 0x02, 0xd4, 0xfd, 0x75, 0x72,
+    0x99, 0x6d, 0xbc, 0xf8, 0x20, 0xa4, 0x25, 0x99, 0x5b, 0xb6, 0xfe, 0xf9, 0x1e, 0x4c, 0x02, 0x81,
+    0xe8, 0xb7, 0x5f, 0x5f, 0x01, 0xbc, 0xa3, 0xf6, 0xef, 0x8e, 0x28, 0x9d, 0x20, 0x80, 0xc1, 0xb2,
+    0xd5, 0x80, 0x44, 0x8d, 0xf3, 0x01, 0x71, 0x3c, 0x0c, 0xb8, 0xc1, 0x0f, 0xc4, 0x79, 0x5a, 0x4d,
+    0xd3, 0xd6, 0xe8, 0x6d, 0xe2, 0x6c, 0x50, 0x49, 0x54, 0x27, 0x9b, 0x2f, 0xf2, 0x79, 0xbd, 0xa3,
+    0x25, 0xa5, 0x2c, 0x5c, 0x62, 0x89, 0x13, 0xc3, 0x81, 0x31, 0xdd, 0x31, 0x61, 0x43, 0xce, 0xa6,
+    0x67, 0x63, 0x25, 0xa4, 0xd0, 0xa7, 0x4c, 0x6c, 0x51, 0x7b, 0xaf, 0x8e, 0xdb, 0xaf, 0x77, 0xeb,
+    0x31, 0xfc, 0xb2, 0xdb, 0xc1, 0x89, 0x6a, 0xa8, 0x5e, 0xae, 0xf4, 0xff, 0x55, 0x84, 0xb0, 0x62,
+    0x5f, 0x41, 0xde, 0x43, 0x97, 0x2c, 0xe8, 0x86, 0xbe, 0x94, 0xb6, 0xb3, 0x08, 0x38, 0x32, 0xc6,
+    0x71, 0x10, 0x5c, 0x82, 0x6c, 0x5d, 0x31, 0x5b, 0x09, 0xd7, 0x92, 0x14, 0xab, 0xcf, 0x8d, 0xc7,
+    0xc3, 0xdd, 0x2f, 0xef, 0x20, 0x6e, 0x84, 0x4d, 0xb5, 0x9a, 0x44, 0xac, 0x3f, 0xe4, 0x30, 0xa7,
+    0x7a, 0xff, 0xe3, 0xf6, 0x90, 0xa9, 0xeb, 0xca, 0x49, 0x52, 0x89, 0xd6, 0xca, 0x7b, 0xf2, 0x68,
+    0xda, 0xe0, 0x88, 0xb0, 0xa2, 0x47, 0xbc, 0x81, 0x2e, 0x58, 0xe0, 0x48, 0xac, 0x6f, 0xf3, 0x66,
+    0xd1, 0xa7, 0xd6, 0xda, 0x16, 0x88, 0x69, 0x46, 0x95, 0x5f, 0x35, 0x0c, 0x8d, 0x50, 0xbc, 0x27,
+    0xdb, 0xc5, 0x49, 0x9a, 0xf4, 0x4a, 0x7a, 0x03, 0xad, 0xfc, 0x0f, 0x72, 0x5d, 0x6c, 0x62, 0x06,
+    0x48, 0x68, 0x75, 0x02, 0xbd, 0xdd, 0xf3, 0xb1, 0xa1, 0x20, 0x64, 0xaf, 0x6f, 0xf2, 0xc0, 0x8c,
+    0xe8, 0x3c, 0x58, 0x3b, 0xa7, 0x05, 0x2f, 0x4b, 0xef, 0x29, 0x8b, 0x6f, 0x64, 0x39, 0x03, 0x97,
+    0x8b, 0x91, 0x41, 0xbc, 0xa2, 0x02, 0xa9, 0x0c, 0x5c, 0x52, 0x32, 0xf3, 0xe5, 0x4d, 0x5b, 0x7d,
+    0xfe, 0x67, 0xe1, 0x82, 0x21, 0x9e, 0x83, 0xf3, 0xd1, 0x5e, 0x37, 0xd9, 0xc6, 0x38, 0x2d, 0x02,
+    0x1e, 0x18, 0xa3, 0x47, 0xcf, 0xad, 0x99, 0xe7, 0xe1, 0xc9, 0x86, 0x52, 0xdc, 0x18, 0xe7, 0x3b,
+    0x5f, 0x1d, 0xd8, 0x9c, 0xbe, 0xfb, 0x24, 0x09, 0xe9, 0x51, 0x02, 0x51, 0x01, 0xd4, 0xc5, 0x49,
+    0xb5, 0x87, 0xd4, 0x5f, 0x7c, 0xdc, 0xf9, 0xc7, 0x7a, 0xf5, 0xb7, 0x1e, 0x6d, 0xc9, 0xc1, 0x1f,
+    0x27, 0xd1, 0x77, 0x0e, 0xbb, 0xf8, 0x79, 0x48, 0x55, 0x73, 0x8e, 0xc9, 0x14, 0x8d, 0x6f, 0xf6,
+    0xe5, 0xbe, 0x6c, 0xff, 0xa4, 0x4a, 0xa9, 0x03, 0x08, 0xa2, 0xe4, 0xda, 0xcd, 0x8a, 0x83, 0x86,
+    0xbd, 0x6e, 0x99, 0xce, 0x98, 0x11, 0xfb, 0x2a, 0x17, 0xd6, 0x79, 0x80, 0x92, 0x11, 0x8d, 0xc4,
+    0x4a, 0xef, 0x97, 0xb8, 0x0c, 0x9d, 0xce, 0x2a, 0xda, 0xc9, 0x8f, 0xd9, 0x63, 0x89, 0xf0, 0x44,
+    0x94, 0x75, 0xbf, 0x69, 0x8a, 0xe2, 0x6d, 0x40, 0x75, 0x47, 0xd8, 0x4c, 0x91, 0x85, 0x8d, 0x51,
+    0xe6, 0xa2, 0x31, 0x13, 0xe5, 0x87, 0x59, 0xb0, 0xf3, 0x89, 0x51, 0xc1, 0xe0, 0xa7, 0xb4, 0x8f,
+    0x5e, 0xdd, 0x10, 0x80, 0xd8, 0x4a, 0x69, 0x93, 0x14, 0xf5, 0x2c, 0xef, 0xfb, 0xf0, 0xcb, 0x70,
+    0x72, 0x95, 0xb7, 0xec, 0xa4, 0x79, 0xa3, 0xa2, 0x44, 0xfa, 0x02, 0x9f, 0x2a, 0xbf, 0x8b, 0xe7,
+    0x87, 0xd4, 0xc2, 0x72, 0x46, 0xd4, 0xf7, 0x57, 0xbe, 0x9a, 0x4e, 0xd4, 0xb5, 0x0f, 0x8d, 0x46,
+    0x81, 0x6e, 0x1b, 0xe2, 0x85, 0x3b, 0x78, 0x78, 0x9f, 0xa1, 0xd7, 0x27, 0x2d, 0x92, 0x28, 0x62,
+    0x6d, 0xcd, 0xfe, 0x48, 0x18, 0x19, 0x6c, 0x61, 0x6c, 0x8b, 0xbe, 0xe5, 0xb0, 0xff, 0x80, 0x4d,
+    0x60, 0x71, 0x89, 0x79, 0x41, 0x08, 0x8e, 0x81, 0x84, 0x71, 0xb8, 0xcd, 0x00, 0x27, 0x37, 0xa2,
+    0xad, 0x47, 0xc5, 0x6a, 0xf9, 0xb3, 0x00, 0x67, 0x11, 0x60, 0x93, 0xd1, 0xe1, 0x89, 0x9f, 0xec,
+    0x92, 0xb4, 0x48, 0xa6, 0x11, 0x5f, 0xc1, 0x62, 0xb9, 0xd2, 0x3f, 0xb0, 0x4e, 0xd2, 0xdb, 0x1d,
+    0x80, 0xd6, 0x02, 0x82, 0x39, 0xb4, 0xbb, 0x3b, 0x51, 0x26, 0xb5, 0x0c, 0xb9, 0xff, 0x9a, 0x38,
+    0xa8, 0x49, 0x58, 0x70, 0xdd, 0xec, 0x71, 0x27, 0xec, 0x3c, 0x13, 0x8b, 0x2f, 0xf3, 0x38, 0xa8,
+    0x6e, 0xf2, 0xe2, 0xa0, 0xcd, 0xa4, 0x2a, 0x8b, 0xd4, 0xaa, 0x31, 0x83, 0x4c, 0xe6, 0x98, 0xf5,
+    0x11, 0xea, 0x40, 0xf9, 0x22, 0xf8, 0x30, 0x56, 0x58, 0xe6, 0xe2, 0x69, 0x49, 0xec, 0x50, 0xbf,
+    0x39, 0x10, 0x77, 0xa1, 0x54, 0xf8, 0x82, 0x19, 0x7b, 0xa2, 0xc0, 0x45, 0x25, 0x9a, 0xb0, 0xff,
+    0x3e, 0x7a, 0x61, 0xd6, 0xf4, 0xfb, 0xb9, 0x3a, 0x1e, 0x07, 0xee, 0xd4, 0xf2, 0x73, 0x98, 0x1b,
+    0xfa, 0xae, 0xe2, 0x3e, 0x5f, 0x5a, 0xd1, 0xda, 0x86, 0x48, 0xfd, 0x43, 0xf4, 0x97, 0x69, 0x58,
+    0x0e, 0xb8, 0xca, 0xd2, 0x65, 0xb9, 0x64, 0xdb, 0x2b, 0xe8, 0x26, 0x4c, 0x35, 0xc8, 0x86, 0x9a,
+    0xe7, 0xc1, 0x99, 0x39, 0x85, 0x87, 0xd9, 0x1c, 0x5d, 0xea, 0xa2, 0x6f, 0x5b, 0x81, 0x1a, 0x73,
+    0x08, 0xf8, 0xf3, 0x07, 0xcb, 0x9c, 0x32, 0x3a, 0x2c, 0x8b, 0x44, 0xe6, 0x48, 0x1e, 0x66, 0x1b,
+    0x5e, 0xe3, 0x54, 0xef, 0x68, 0xf7, 0x28, 0xf8, 0xd6, 0x16, 0xe5, 0xde, 0xb0, 0xbc, 0x2d, 0x15,
+    0xa0, 0x9f, 0xa6, 0x91, 0x4c, 0x1c, 0x91, 0xc9, 0xf2, 0x63, 0x32, 0xf2, 0xfb, 0xd9, 0x5e, 0x53,
+    0xd6, 0x72, 0x8c, 0x1b, 0xe5, 0xf1, 0x80, 0xcc, 0x21, 0xa9, 0x87, 0xaf, 0x64, 0x8d, 0x0f, 0xae,
+    0xe9, 0x0c, 0x31, 0x26, 0xa4, 0x72, 0x30, 0x8d, 0x0c, 0xfe, 0x5a, 0x25, 0x2d, 0x18, 0xe5, 0x39,
+    0xcc, 0x04, 0x56, 0xa3, 0x65, 0x84, 0x95, 0x43, 0x40, 0x94, 0x6d, 0x16, 0x15, 0x79, 0x35, 0xa1,
+    0x7f, 0x4b, 0x3e, 0x08, 0xf1, 0x53, 0xf2, 0xc6, 0x31, 0x7e, 0xb8, 0x29, 0x9b, 0xa4, 0xe9, 0x9d,
+    0x6b, 0x95, 0xae, 0x37, 0xdf, 0x1d, 0x8c, 0xea, 0xc2, 0x50, 0x14, 0x48, 0x05, 0xd0, 0xcd, 0xd1,
+    0x25, 0x25, 0x10, 0xa2, 0x85, 0x6f, 0x88, 0xe1, 0x22, 0x9d, 0xd2, 0xbe, 0x59, 0x88, 0x86, 0x20,
+    0x93, 0x6a, 0x44, 0xed, 0xc8, 0xee, 0x73, 0xe7, 0x1a, 0xc3, 0x16, 0x23, 0xff, 0x69, 0x8c, 0xd0,
+};
+/// \endcond

lib/EapHost/src/EapHost.cpp

@@ -22,27 +22,27 @@
 
 
 //////////////////////////////////////////////////////////////////////
-// eap::credentials_pap
+// eap::credentials_eaphost
 //////////////////////////////////////////////////////////////////////
 
-eap::credentials_pap::credentials_pap(_In_ module &mod) : credentials_pass(mod)
+eap::credentials_eaphost::credentials_eaphost(_In_ module &mod) : credentials_pass(mod)
 {
 }
 
 
-eap::credentials_pap::credentials_pap(_In_ const credentials_pap &other) :
+eap::credentials_eaphost::credentials_eaphost(_In_ const credentials_eaphost &other) :
     credentials_pass(other)
 {
 }
 
 
-eap::credentials_pap::credentials_pap(_Inout_ credentials_pap &&other) :
+eap::credentials_eaphost::credentials_eaphost(_Inout_ credentials_eaphost &&other) :
     credentials_pass(std::move(other))
 {
 }
 
 
-eap::credentials_pap& eap::credentials_pap::operator=(_In_ const credentials_pap &other)
+eap::credentials_eaphost& eap::credentials_eaphost::operator=(_In_ const credentials_eaphost &other)
 {
     if (this != &other)
         (credentials_pass&)*this = other;
@@ -51,7 +51,7 @@ eap::credentials_pap& eap::credentials_pap::operator=(_In_ const credentials_pap
 }
 
 
-eap::credentials_pap& eap::credentials_pap::operator=(_Inout_ credentials_pap &&other)
+eap::credentials_eaphost& eap::credentials_eaphost::operator=(_Inout_ credentials_eaphost &&other)
 {
     if (this != &other)
         (credentials_pass&&)*this = std::move(other);

lib/EapHost/src/Method.cpp

@@ -0,0 +1,289 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "StdAfx.h"
+
+using namespace std;
+using namespace winstd;
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::method_eaphost
+//////////////////////////////////////////////////////////////////////
+
+eap::method_eaphost::method_eaphost(_In_ module &mod, _In_ config_method_eaphost &cfg, _In_ credentials_eaphost &cred) :
+    m_cfg(cfg),
+    m_cred(cred),
+    m_session_id(0),
+    method(mod)
+{
+}
+
+
+eap::method_eaphost::method_eaphost(_Inout_ method_eaphost &&other) :
+    m_cfg       (          other.m_cfg        ),
+    m_cred      (          other.m_cred       ),
+    m_session_id(std::move(other.m_session_id)),
+    method      (std::move(other             ))
+{
+}
+
+
+eap::method_eaphost& eap::method_eaphost::operator=(_Inout_ method_eaphost &&other)
+{
+    if (this != std::addressof(other)) {
+        assert(std::addressof(m_cfg ) == std::addressof(other.m_cfg )); // Move method within same configuration only!
+        assert(std::addressof(m_cred) == std::addressof(other.m_cred)); // Move method within same credentials only!
+        (method&)*this = std::move(other             );
+        m_session_id   = std::move(other.m_session_id);
+    }
+
+    return *this;
+}
+
+
+void eap::method_eaphost::begin_session(
+    _In_        DWORD         dwFlags,
+    _In_  const EapAttributes *pAttributeArray,
+    _In_        HANDLE        hTokenImpersonateUser,
+    _In_opt_    DWORD         dwMaxSendPacketSize)
+{
+    method::begin_session(dwFlags, pAttributeArray, hTokenImpersonateUser, dwMaxSendPacketSize);
+
+    // Presume authentication will fail with generic protocol failure. (Pesimist!!!)
+    // We will reset once we get get_result(Success) call.
+    m_cfg.m_last_status = config_method::status_auth_failed;
+    m_cfg.m_last_msg.clear();
+
+    // Create EapHost peer session using available connection data (m_cfg) and user data (m_cred).
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerBeginSession(
+        dwFlags,
+        m_cfg.get_type(),
+        pAttributeArray,
+        hTokenImpersonateUser,
+        (DWORD)m_cfg.m_cfg_blob.size(),
+        m_cfg.m_cfg_blob.data(),
+        (DWORD)m_cred.m_cred_blob.size(),
+        m_cred.m_cred_blob.data(),
+        dwMaxSendPacketSize,
+        NULL, NULL, NULL,
+        &m_session_id,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // Session succesfully created.
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerBeginSession failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerBeginSession failed.");
+}
+
+
+void eap::method_eaphost::end_session()
+{
+    // End EapHost peer session.
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerEndSession(m_session_id, &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // Session successfuly ended.
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerEndSession failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerEndSession failed.");
+
+    method::end_session();
+}
+
+
+EapPeerMethodResponseAction eap::method_eaphost::process_request_packet(
+    _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+    _In_                                       DWORD dwReceivedPacketSize)
+{
+    assert(pReceivedPacket || dwReceivedPacketSize == 0);
+
+    // Let EapHost peer process the packet.
+    EapHostPeerResponseAction action;
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerProcessReceivedPacket(
+        m_session_id,
+        dwReceivedPacketSize,
+        reinterpret_cast<const BYTE*>(pReceivedPacket),
+        &action,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // Packet successfuly processed.
+        return action_h2p(action);
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerProcessReceivedPacket failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerProcessReceivedPacket failed.");
+}
+
+
+void eap::method_eaphost::get_response_packet(
+    _Out_    sanitizing_blob &packet,
+    _In_opt_ DWORD           size_max)
+{
+    // Let EapHost peer prepare response packet.
+    eap_blob_runtime _packet;
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerGetSendPacket(
+        m_session_id,
+        &size_max,
+        &_packet._Myptr,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // Packet successfuly prepared.
+        packet.assign(_packet.get(), _packet.get() + size_max);
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerGetSendPacket failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerGetSendPacket failed.");
+}
+
+
+void eap::method_eaphost::get_result(
+    _In_    EapPeerMethodResultReason reason,
+    _Inout_ EapPeerMethodResult       *pResult)
+{
+    // Let EapHost peer return result.
+    eap_error_runtime error;
+    EapHostPeerMethodResult result = {};
+    DWORD dwResult = EapHostPeerGetResult(
+        m_session_id,
+        EapHostPeerMethodResultFromMethod,
+        &result,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // Result successfuly returned.
+        method::get_result(reason, pResult);
+
+        pResult->dwFailureReasonCode = result.dwFailureReasonCode;
+        pResult->pAttribArray        = result.pAttribArray;
+
+        if (result.pEapError) {
+            // Transfer error to our module memory space.
+            pResult->pEapError = m_module.make_error(result.pEapError);
+            EapHostPeerFreeEapError(result.pEapError);
+            result.pEapError = NULL;
+        }
+
+        if (result.fSaveConnectionData) {
+            // Update configuration BLOB.
+            m_cfg.m_cfg_blob.assign(result.pConnectionData, result.pConnectionData + result.dwSizeofConnectionData);
+        }
+
+        if (result.fSaveUserData) {
+            // Update credentials BLOB.
+            m_cred.m_cred_blob.assign(result.pUserData, result.pUserData + result.dwSizeofUserData);
+        }
+
+        if (reason == EapPeerMethodResultSuccess)
+            m_cfg.m_last_status = config_method::status_success;
+
+        // Always ask EAP host to save the connection data. And it will save it *only* when we report "success".
+        // Don't worry. EapHost is well aware of failed authentication condition.
+        pResult->fSaveConnectionData = TRUE;
+        pResult->fIsSuccess          = TRUE;
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerGetResult failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerGetResult failed.");
+}
+
+
+void eap::method_eaphost::get_ui_context(
+    _Out_ BYTE  **ppUIContextData,
+    _Out_ DWORD *pdwUIContextDataSize)
+{
+    // Get EapHost peer UI context data.
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerGetUIContext(
+        m_session_id,
+        pdwUIContextDataSize,
+        ppUIContextData,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // UI context data successfuly returned.
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerGetUIContext failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerGetUIContext failed.");
+}
+
+
+EapPeerMethodResponseAction eap::method_eaphost::set_ui_context(
+    _In_count_(dwUIContextDataSize) const BYTE  *pUIContextData,
+    _In_                                  DWORD dwUIContextDataSize)
+{
+    // Set EapHost peer UI context data.
+    EapHostPeerResponseAction action;
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerSetUIContext(
+        m_session_id,
+        dwUIContextDataSize,
+        pUIContextData,
+        &action,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // UI context data successfuly returned.
+        return action_h2p(action);
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerSetUIContext failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerSetUIContext failed.");
+}
+
+
+void eap::method_eaphost::get_response_attributes(_Inout_ EapAttributes *pAttribs)
+{
+    // Get response attributes from EapHost peer.
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerGetResponseAttributes(
+        m_session_id,
+        pAttribs,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // Response attributes successfuly returned.
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerGetResponseAttributes failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerGetResponseAttributes failed.");
+}
+
+
+EapPeerMethodResponseAction eap::method_eaphost::set_response_attributes(_In_ const EapAttributes *pAttribs)
+{
+    // Set response attributes for EapHost peer.
+    EapHostPeerResponseAction action;
+    eap_error_runtime error;
+    DWORD dwResult = EapHostPeerSetResponseAttributes(
+        m_session_id,
+        pAttribs,
+        &action,
+        &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        // Response attributes successfuly set.
+        return action_h2p(action);
+    } else if (error)
+        throw eap_runtime_error(*error  , __FUNCTION__ " EapHostPeerGetResponseAttributes failed.");
+    else
+        throw win_runtime_error(dwResult, __FUNCTION__ " EapHostPeerGetResponseAttributes failed.");
+}

lib/EapHost/src/StdAfx.cpp

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

lib/EapHost/src/StdAfx.h

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

lib/EapHost_UI/build/.gitignore

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

lib/EapHost_UI/build/EapHost_UI.props

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

lib/EapHost_UI/build/EapHost_UI.vcxproj

@@ -0,0 +1,107 @@
+<?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>{13D2D8B5-F6AA-459D-B5F7-29B95DD9D583}</ProjectGuid>
+    <RootNamespace>EapHost_UI</RootNamespace>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Debug.props" />
+    <Import Project="EapHost_UI.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Debug.props" />
+    <Import Project="EapHost_UI.props" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\Win32.props" />
+    <Import Project="..\..\..\include\Release.props" />
+    <Import Project="EapHost_UI.props" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Project="..\..\..\include\x64.props" />
+    <Import Project="..\..\..\include\Release.props" />
+    <Import Project="EapHost_UI.props" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
+  <ItemGroup>
+    <ClInclude Include="..\include\EapHost_UI.h" />
+    <ClInclude Include="..\res\wxEapHost_UI.h" />
+    <ClInclude Include="..\src\StdAfx.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\res\wxEapHost_UI.cpp" />
+    <ClCompile Include="..\src\EapHost_UI.cpp" />
+    <ClCompile Include="..\src\StdAfx.cpp">
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
+      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Events\build\Events.vcxproj">
+      <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\res\wxEapHost_UI.fbp" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>

lib/EapHost_UI/build/EapHost_UI.vcxproj.filters

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

lib/EapHost_UI/include/EapHost_UI.h

@@ -0,0 +1,126 @@
+/*
+    Copyright 2015-2016 Amebis
+    Copyright 2016 GÉANT
+
+    This file is part of GÉANTLink.
+
+    GÉANTLink is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    GÉANTLink is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "../../EAPBase_UI/include/EAP_UI.h"
+#include "../../EapHost/include/Config.h"
+
+class wxEAPMethodTypeClientData;
+class wxEapHostMethodConfigPanel;
+class wxEapHostConfigPanel;
+
+/// \addtogroup EAPBaseGUI
+/// @{
+
+///
+/// EapHost peer method credential configuration panel
+///
+typedef wxEAPCredentialsConfigPanel<eap::credentials_pass, wxPasswordCredentialsPanel<eap::credentials_pass, wxPasswordCredentialsPanelBase> > wxEapHostCredentialsConfigPanel;
+
+/// @}
+
+#pragma once
+
+#include "../res/wxEapHost_UI.h"
+
+#include <wx/panel.h>
+#include <wx/stattext.h>
+
+#include <Windows.h>
+
+
+/// \addtogroup EAPBaseGUI
+/// @{
+
+///
+/// Helper class for auto-destroyable EAP_METHOD_TYPE used in wxWidget's item containers
+///
+class wxEAPMethodTypeClientData : public wxClientData
+{
+public:
+    ///
+    /// Constructs client data object with existing handle
+    ///
+    wxEAPMethodTypeClientData(const EAP_METHOD_TYPE &type, DWORD properties);
+
+public:
+    EAP_METHOD_TYPE m_type;             ///< EapHost method type
+    DWORD m_properties;                 ///< Method properties
+    eap::sanitizing_blob m_cfg_blob;    ///< Method configuration BLOB
+};
+
+
+///
+/// Inner EAP method config panel
+///
+class wxEapHostMethodConfigPanel : public wxEapHostMethodConfigPanelBase
+{
+public:
+    ///
+    /// Constructs an inner EAP method config panel
+    ///
+    /// \param[in   ] prov    Provider configuration data
+    /// \param[inout] cfg     Method configuration data
+    /// \param[in   ] parent  Parent window
+    ///
+    wxEapHostMethodConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow *parent);
+
+protected:
+    /// \cond internal
+    virtual bool TransferDataToWindow();
+    virtual bool TransferDataFromWindow();
+    virtual void OnUpdateUI(wxUpdateUIEvent& event);
+    virtual void OnSettings(wxCommandEvent& event);
+    /// \endcond
+
+protected:
+    eap::config_method_eaphost &m_cfg;   ///< Method configuration
+};
+
+
+///
+/// EapHost peer method configuration panel
+///
+class wxEapHostConfigPanel : public wxPanel
+{
+public:
+    ///
+    /// Constructs a configuration panel
+    ///
+    /// \param[in   ] prov    Provider configuration data
+    /// \param[inout] cfg     Method configuration data
+    /// \param[in   ] parent  Parent window
+    ///
+    wxEapHostConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow* parent);
+
+    ///
+    /// Destructs the configuration panel
+    ///
+    virtual ~wxEapHostConfigPanel();
+
+protected:
+    /// \cond internal
+    virtual void OnInitDialog(wxInitDialogEvent& event);
+    /// \endcond
+
+protected:
+    wxEapHostMethodConfigPanel *m_method; ///< Method configuration panel
+};
+
+/// @}

lib/EapHost_UI/res/wxEapHost_UI.cpp

@@ -0,0 +1,67 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#include <StdAfx.h>
+
+#include "wxEapHost_UI.h"
+
+///////////////////////////////////////////////////////////////////////////
+
+wxEapHostMethodConfigPanelBase::wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
+{
+	wxStaticBoxSizer* sb_method;
+	sb_method = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Inner EAP Method") ), wxVERTICAL );
+	
+	wxBoxSizer* sb_method_horiz;
+	sb_method_horiz = new wxBoxSizer( wxHORIZONTAL );
+	
+	m_method_icon = new wxStaticBitmap( sb_method->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
+	sb_method_horiz->Add( m_method_icon, 0, wxALL, 5 );
+	
+	wxBoxSizer* sb_method_vert;
+	sb_method_vert = new wxBoxSizer( wxVERTICAL );
+	
+	m_method_label = new wxStaticText( sb_method->GetStaticBox(), wxID_ANY, _("Select and configure inner EAP method"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_method_label->Wrap( 440 );
+	sb_method_vert->Add( m_method_label, 0, wxALL|wxEXPAND, 5 );
+	
+	wxBoxSizer* sb_method_inner;
+	sb_method_inner = new wxBoxSizer( wxHORIZONTAL );
+	
+	wxArrayString m_methodChoices;
+	m_method = new wxChoice( sb_method->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_methodChoices, 0 );
+	m_method->SetSelection( 0 );
+	sb_method_inner->Add( m_method, 1, wxRIGHT|wxEXPAND, 5 );
+	
+	m_settings = new wxButton( sb_method->GetStaticBox(), wxID_ANY, _("&Settings"), wxDefaultPosition, wxDefaultSize, 0 );
+	sb_method_inner->Add( m_settings, 0, 0, 5 );
+	
+	
+	sb_method_vert->Add( sb_method_inner, 0, wxEXPAND|wxALL, 5 );
+	
+	
+	sb_method_horiz->Add( sb_method_vert, 1, wxEXPAND, 5 );
+	
+	
+	sb_method->Add( sb_method_horiz, 1, wxEXPAND, 5 );
+	
+	
+	this->SetSizer( sb_method );
+	this->Layout();
+	
+	// Connect Events
+	this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEapHostMethodConfigPanelBase::OnUpdateUI ) );
+	m_settings->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEapHostMethodConfigPanelBase::OnSettings ), NULL, this );
+}
+
+wxEapHostMethodConfigPanelBase::~wxEapHostMethodConfigPanelBase()
+{
+	// Disconnect Events
+	this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( wxEapHostMethodConfigPanelBase::OnUpdateUI ) );
+	m_settings->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( wxEapHostMethodConfigPanelBase::OnSettings ), NULL, this );
+	
+}

lib/EapHost_UI/res/wxEapHost_UI.fbp

@@ -0,0 +1,465 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<wxFormBuilder_Project>
+    <FileVersion major="1" minor="13" />
+    <object class="Project" expanded="1">
+        <property name="class_decoration">; </property>
+        <property name="code_generation">C++</property>
+        <property name="disconnect_events">1</property>
+        <property name="disconnect_mode">source_name</property>
+        <property name="disconnect_php_events">0</property>
+        <property name="disconnect_python_events">0</property>
+        <property name="embedded_files_path">.</property>
+        <property name="encoding">UTF-8</property>
+        <property name="event_generation">connect</property>
+        <property name="file">wxEapHost_UI</property>
+        <property name="first_id">1000</property>
+        <property name="help_provider">none</property>
+        <property name="internationalize">1</property>
+        <property name="name">wxEapHost_UI</property>
+        <property name="namespace"></property>
+        <property name="path">.</property>
+        <property name="precompiled_header">#include &lt;StdAfx.h&gt;</property>
+        <property name="relative_path">1</property>
+        <property name="skip_lua_events">1</property>
+        <property name="skip_php_events">1</property>
+        <property name="skip_python_events">1</property>
+        <property name="ui_table">UI</property>
+        <property name="use_enum">1</property>
+        <property name="use_microsoft_bom">1</property>
+        <object class="Panel" expanded="1">
+            <property name="aui_managed">0</property>
+            <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
+            <property name="bg"></property>
+            <property name="context_help"></property>
+            <property name="context_menu">1</property>
+            <property name="enabled">1</property>
+            <property name="event_handler">impl_virtual</property>
+            <property name="fg"></property>
+            <property name="font"></property>
+            <property name="hidden">0</property>
+            <property name="id">wxID_ANY</property>
+            <property name="maximum_size"></property>
+            <property name="minimum_size"></property>
+            <property name="name">wxEapHostMethodConfigPanelBase</property>
+            <property name="pos"></property>
+            <property name="size">500,-1</property>
+            <property name="subclass"></property>
+            <property name="tooltip"></property>
+            <property name="window_extra_style"></property>
+            <property name="window_name"></property>
+            <property name="window_style">wxTAB_TRAVERSAL</property>
+            <event name="OnAuiFindManager"></event>
+            <event name="OnAuiPaneButton"></event>
+            <event name="OnAuiPaneClose"></event>
+            <event name="OnAuiPaneMaximize"></event>
+            <event name="OnAuiPaneRestore"></event>
+            <event name="OnAuiRender"></event>
+            <event name="OnChar"></event>
+            <event name="OnEnterWindow"></event>
+            <event name="OnEraseBackground"></event>
+            <event name="OnInitDialog"></event>
+            <event name="OnKeyDown"></event>
+            <event name="OnKeyUp"></event>
+            <event name="OnKillFocus"></event>
+            <event name="OnLeaveWindow"></event>
+            <event name="OnLeftDClick"></event>
+            <event name="OnLeftDown"></event>
+            <event name="OnLeftUp"></event>
+            <event name="OnMiddleDClick"></event>
+            <event name="OnMiddleDown"></event>
+            <event name="OnMiddleUp"></event>
+            <event name="OnMotion"></event>
+            <event name="OnMouseEvents"></event>
+            <event name="OnMouseWheel"></event>
+            <event name="OnPaint"></event>
+            <event name="OnRightDClick"></event>
+            <event name="OnRightDown"></event>
+            <event name="OnRightUp"></event>
+            <event name="OnSetFocus"></event>
+            <event name="OnSize"></event>
+            <event name="OnUpdateUI">OnUpdateUI</event>
+            <object class="wxStaticBoxSizer" expanded="1">
+                <property name="id">wxID_ANY</property>
+                <property name="label">Inner EAP Method</property>
+                <property name="minimum_size"></property>
+                <property name="name">sb_method</property>
+                <property name="orient">wxVERTICAL</property>
+                <property name="permission">none</property>
+                <event name="OnUpdateUI"></event>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="wxBoxSizer" expanded="1">
+                        <property name="minimum_size"></property>
+                        <property name="name">sb_method_horiz</property>
+                        <property name="orient">wxHORIZONTAL</property>
+                        <property name="permission">none</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticBitmap" expanded="1">
+                                <property name="BottomDockable">1</property>
+                                <property name="LeftDockable">1</property>
+                                <property name="RightDockable">1</property>
+                                <property name="TopDockable">1</property>
+                                <property name="aui_layer"></property>
+                                <property name="aui_name"></property>
+                                <property name="aui_position"></property>
+                                <property name="aui_row"></property>
+                                <property name="best_size"></property>
+                                <property name="bg"></property>
+                                <property name="bitmap">Load From Icon Resource; ; [32; 32]</property>
+                                <property name="caption"></property>
+                                <property name="caption_visible">1</property>
+                                <property name="center_pane">0</property>
+                                <property name="close_button">1</property>
+                                <property name="context_help"></property>
+                                <property name="context_menu">1</property>
+                                <property name="default_pane">0</property>
+                                <property name="dock">Dock</property>
+                                <property name="dock_fixed">0</property>
+                                <property name="docking">Left</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="floatable">1</property>
+                                <property name="font"></property>
+                                <property name="gripper">0</property>
+                                <property name="hidden">0</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="max_size"></property>
+                                <property name="maximize_button">0</property>
+                                <property name="maximum_size"></property>
+                                <property name="min_size"></property>
+                                <property name="minimize_button">0</property>
+                                <property name="minimum_size"></property>
+                                <property name="moveable">1</property>
+                                <property name="name">m_method_icon</property>
+                                <property name="pane_border">1</property>
+                                <property name="pane_position"></property>
+                                <property name="pane_size"></property>
+                                <property name="permission">protected</property>
+                                <property name="pin_button">1</property>
+                                <property name="pos"></property>
+                                <property name="resize">Resizable</property>
+                                <property name="show">1</property>
+                                <property name="size"></property>
+                                <property name="subclass"></property>
+                                <property name="toolbar_pane">0</property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxEXPAND</property>
+                            <property name="proportion">1</property>
+                            <object class="wxBoxSizer" expanded="1">
+                                <property name="minimum_size"></property>
+                                <property name="name">sb_method_vert</property>
+                                <property name="orient">wxVERTICAL</property>
+                                <property name="permission">none</property>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxALL|wxEXPAND</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxStaticText" expanded="1">
+                                        <property name="BottomDockable">1</property>
+                                        <property name="LeftDockable">1</property>
+                                        <property name="RightDockable">1</property>
+                                        <property name="TopDockable">1</property>
+                                        <property name="aui_layer"></property>
+                                        <property name="aui_name"></property>
+                                        <property name="aui_position"></property>
+                                        <property name="aui_row"></property>
+                                        <property name="best_size"></property>
+                                        <property name="bg"></property>
+                                        <property name="caption"></property>
+                                        <property name="caption_visible">1</property>
+                                        <property name="center_pane">0</property>
+                                        <property name="close_button">1</property>
+                                        <property name="context_help"></property>
+                                        <property name="context_menu">1</property>
+                                        <property name="default_pane">0</property>
+                                        <property name="dock">Dock</property>
+                                        <property name="dock_fixed">0</property>
+                                        <property name="docking">Left</property>
+                                        <property name="enabled">1</property>
+                                        <property name="fg"></property>
+                                        <property name="floatable">1</property>
+                                        <property name="font"></property>
+                                        <property name="gripper">0</property>
+                                        <property name="hidden">0</property>
+                                        <property name="id">wxID_ANY</property>
+                                        <property name="label">Select and configure inner EAP method</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_method_label</property>
+                                        <property name="pane_border">1</property>
+                                        <property name="pane_position"></property>
+                                        <property name="pane_size"></property>
+                                        <property name="permission">protected</property>
+                                        <property name="pin_button">1</property>
+                                        <property name="pos"></property>
+                                        <property name="resize">Resizable</property>
+                                        <property name="show">1</property>
+                                        <property name="size"></property>
+                                        <property name="style"></property>
+                                        <property name="subclass"></property>
+                                        <property name="toolbar_pane">0</property>
+                                        <property name="tooltip"></property>
+                                        <property name="window_extra_style"></property>
+                                        <property name="window_name"></property>
+                                        <property name="window_style"></property>
+                                        <property name="wrap">440</property>
+                                        <event name="OnChar"></event>
+                                        <event name="OnEnterWindow"></event>
+                                        <event name="OnEraseBackground"></event>
+                                        <event name="OnKeyDown"></event>
+                                        <event name="OnKeyUp"></event>
+                                        <event name="OnKillFocus"></event>
+                                        <event name="OnLeaveWindow"></event>
+                                        <event name="OnLeftDClick"></event>
+                                        <event name="OnLeftDown"></event>
+                                        <event name="OnLeftUp"></event>
+                                        <event name="OnMiddleDClick"></event>
+                                        <event name="OnMiddleDown"></event>
+                                        <event name="OnMiddleUp"></event>
+                                        <event name="OnMotion"></event>
+                                        <event name="OnMouseEvents"></event>
+                                        <event name="OnMouseWheel"></event>
+                                        <event name="OnPaint"></event>
+                                        <event name="OnRightDClick"></event>
+                                        <event name="OnRightDown"></event>
+                                        <event name="OnRightUp"></event>
+                                        <event name="OnSetFocus"></event>
+                                        <event name="OnSize"></event>
+                                        <event name="OnUpdateUI"></event>
+                                    </object>
+                                </object>
+                                <object class="sizeritem" expanded="1">
+                                    <property name="border">5</property>
+                                    <property name="flag">wxEXPAND|wxALL</property>
+                                    <property name="proportion">0</property>
+                                    <object class="wxBoxSizer" expanded="1">
+                                        <property name="minimum_size"></property>
+                                        <property name="name">sb_method_inner</property>
+                                        <property name="orient">wxHORIZONTAL</property>
+                                        <property name="permission">none</property>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag">wxRIGHT|wxEXPAND</property>
+                                            <property name="proportion">1</property>
+                                            <object class="wxChoice" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="choices"></property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="max_size"></property>
+                                                <property name="maximize_button">0</property>
+                                                <property name="maximum_size"></property>
+                                                <property name="min_size"></property>
+                                                <property name="minimize_button">0</property>
+                                                <property name="minimum_size"></property>
+                                                <property name="moveable">1</property>
+                                                <property name="name">m_method</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="selection">0</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnChar"></event>
+                                                <event name="OnChoice"></event>
+                                                <event name="OnEnterWindow"></event>
+                                                <event name="OnEraseBackground"></event>
+                                                <event name="OnKeyDown"></event>
+                                                <event name="OnKeyUp"></event>
+                                                <event name="OnKillFocus"></event>
+                                                <event name="OnLeaveWindow"></event>
+                                                <event name="OnLeftDClick"></event>
+                                                <event name="OnLeftDown"></event>
+                                                <event name="OnLeftUp"></event>
+                                                <event name="OnMiddleDClick"></event>
+                                                <event name="OnMiddleDown"></event>
+                                                <event name="OnMiddleUp"></event>
+                                                <event name="OnMotion"></event>
+                                                <event name="OnMouseEvents"></event>
+                                                <event name="OnMouseWheel"></event>
+                                                <event name="OnPaint"></event>
+                                                <event name="OnRightDClick"></event>
+                                                <event name="OnRightDown"></event>
+                                                <event name="OnRightUp"></event>
+                                                <event name="OnSetFocus"></event>
+                                                <event name="OnSize"></event>
+                                                <event name="OnUpdateUI"></event>
+                                            </object>
+                                        </object>
+                                        <object class="sizeritem" expanded="1">
+                                            <property name="border">5</property>
+                                            <property name="flag"></property>
+                                            <property name="proportion">0</property>
+                                            <object class="wxButton" expanded="1">
+                                                <property name="BottomDockable">1</property>
+                                                <property name="LeftDockable">1</property>
+                                                <property name="RightDockable">1</property>
+                                                <property name="TopDockable">1</property>
+                                                <property name="aui_layer"></property>
+                                                <property name="aui_name"></property>
+                                                <property name="aui_position"></property>
+                                                <property name="aui_row"></property>
+                                                <property name="best_size"></property>
+                                                <property name="bg"></property>
+                                                <property name="caption"></property>
+                                                <property name="caption_visible">1</property>
+                                                <property name="center_pane">0</property>
+                                                <property name="close_button">1</property>
+                                                <property name="context_help"></property>
+                                                <property name="context_menu">1</property>
+                                                <property name="default">0</property>
+                                                <property name="default_pane">0</property>
+                                                <property name="dock">Dock</property>
+                                                <property name="dock_fixed">0</property>
+                                                <property name="docking">Left</property>
+                                                <property name="enabled">1</property>
+                                                <property name="fg"></property>
+                                                <property name="floatable">1</property>
+                                                <property name="font"></property>
+                                                <property name="gripper">0</property>
+                                                <property name="hidden">0</property>
+                                                <property name="id">wxID_ANY</property>
+                                                <property name="label">&amp;Settings</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_settings</property>
+                                                <property name="pane_border">1</property>
+                                                <property name="pane_position"></property>
+                                                <property name="pane_size"></property>
+                                                <property name="permission">protected</property>
+                                                <property name="pin_button">1</property>
+                                                <property name="pos"></property>
+                                                <property name="resize">Resizable</property>
+                                                <property name="show">1</property>
+                                                <property name="size"></property>
+                                                <property name="style"></property>
+                                                <property name="subclass"></property>
+                                                <property name="toolbar_pane">0</property>
+                                                <property name="tooltip"></property>
+                                                <property name="validator_data_type"></property>
+                                                <property name="validator_style">wxFILTER_NONE</property>
+                                                <property name="validator_type">wxDefaultValidator</property>
+                                                <property name="validator_variable"></property>
+                                                <property name="window_extra_style"></property>
+                                                <property name="window_name"></property>
+                                                <property name="window_style"></property>
+                                                <event name="OnButtonClick">OnSettings</event>
+                                                <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>
+                                </object>
+                            </object>
+                        </object>
+                    </object>
+                </object>
+            </object>
+        </object>
+    </object>
+</wxFormBuilder_Project>

lib/EapHost_UI/res/wxEapHost_UI.h

@@ -0,0 +1,57 @@
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Jun 17 2015)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __WXEAPHOST_UI_H__
+#define __WXEAPHOST_UI_H__
+
+#include <wx/artprov.h>
+#include <wx/xrc/xmlres.h>
+#include <wx/intl.h>
+#include <wx/bitmap.h>
+#include <wx/image.h>
+#include <wx/icon.h>
+#include <wx/statbmp.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/choice.h>
+#include <wx/button.h>
+#include <wx/sizer.h>
+#include <wx/statbox.h>
+#include <wx/panel.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class wxEapHostMethodConfigPanelBase
+///////////////////////////////////////////////////////////////////////////////
+class wxEapHostMethodConfigPanelBase : public wxPanel 
+{
+	private:
+	
+	protected:
+		wxStaticBitmap* m_method_icon;
+		wxStaticText* m_method_label;
+		wxChoice* m_method;
+		wxButton* m_settings;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
+		virtual void OnSettings( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		wxEapHostMethodConfigPanelBase( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,-1 ), long style = wxTAB_TRAVERSAL ); 
+		~wxEapHostMethodConfigPanelBase();
+	
+};
+
+#endif //__WXEAPHOST_UI_H__

lib/EapHost_UI/src/EapHost_UI.cpp

@@ -0,0 +1,179 @@
+/*
+    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, "Eappcfg.lib")
+
+
+//////////////////////////////////////////////////////////////////////
+// wxEapHostMethodConfigPanel
+//////////////////////////////////////////////////////////////////////
+
+wxEAPMethodTypeClientData::wxEAPMethodTypeClientData(const EAP_METHOD_TYPE &type, DWORD properties) :
+    m_type(type),
+    m_properties(properties)
+{
+}
+
+
+//////////////////////////////////////////////////////////////////////
+// wxEapHostMethodConfigPanel
+//////////////////////////////////////////////////////////////////////
+
+wxEapHostMethodConfigPanel::wxEapHostMethodConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow *parent) :
+    m_cfg(cfg),
+    wxEapHostMethodConfigPanelBase(parent)
+{
+    UNREFERENCED_PARAMETER(prov);
+
+    // Load and set icon.
+    winstd::library lib_shell32;
+    if (lib_shell32.load(_T("shell32.dll"), NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE))
+        m_method_icon->SetIcon(wxLoadIconFromResource(lib_shell32, MAKEINTRESOURCE(175)));
+
+    winstd::eap_method_info_array methods;
+    winstd::eap_error error;
+    DWORD dwResult = EapHostPeerGetMethods(&methods, &error._Myptr);
+    if (dwResult == ERROR_SUCCESS) {
+        for (DWORD i = 0; i < methods.dwNumberOfMethods; i++)
+            m_method->Append(methods.pEapMethods[i].pwszFriendlyName, new wxEAPMethodTypeClientData(methods.pEapMethods[i].eaptype, methods.pEapMethods[i].eapProperties));
+    } else if (error)
+        wxLogError(_("Enumerating EAP methods failed (error %u, %s, %s)."), error->dwWinError, error->pRootCauseString, error->pRepairString);
+    else
+        wxLogError(_("Enumerating EAP methods failed (error %u)."), dwResult);
+}
+
+
+/// \cond internal
+
+bool wxEapHostMethodConfigPanel::TransferDataToWindow()
+{
+    if (m_method->HasClientObjectData()) {
+        // Find configured method and set its selection and configuration BLOB.
+        for (unsigned int i = 0, n = m_method->GetCount(); i < n; i++) {
+            wxEAPMethodTypeClientData *data = dynamic_cast<wxEAPMethodTypeClientData*>(m_method->GetClientObject(i));
+            if (data->m_type == m_cfg.get_type()) {
+                m_method->SetSelection(i);
+                data->m_cfg_blob = m_cfg.m_cfg_blob;
+            }
+        }
+    }
+
+    return wxEapHostMethodConfigPanelBase::TransferDataToWindow();
+}
+
+
+bool wxEapHostMethodConfigPanel::TransferDataFromWindow()
+{
+    wxCHECK(wxEapHostMethodConfigPanelBase::TransferDataFromWindow(), false);
+
+    int sel = m_method->GetSelection();
+    const wxEAPMethodTypeClientData *data =
+        sel != wxNOT_FOUND && m_method->HasClientObjectData() ?
+            dynamic_cast<const wxEAPMethodTypeClientData*>(m_method->GetClientObject(sel)) :
+            NULL;
+    if (data) {
+        // Save method selection and configuration.
+        m_cfg.set_type(data->m_type);
+        m_cfg.m_cfg_blob = data->m_cfg_blob;
+    }
+
+    return true;
+}
+
+
+void wxEapHostMethodConfigPanel::OnUpdateUI(wxUpdateUIEvent& event)
+{
+    wxEapHostMethodConfigPanelBase::OnUpdateUI(event);
+
+    int sel = m_method->GetSelection();
+    const wxEAPMethodTypeClientData *data =
+        sel != wxNOT_FOUND && m_method->HasClientObjectData() ?
+            dynamic_cast<const wxEAPMethodTypeClientData*>(m_method->GetClientObject(sel)) :
+            NULL;
+    m_settings->Enable(data && (data->m_properties & eapPropSupportsConfig));
+}
+
+
+void wxEapHostMethodConfigPanel::OnSettings(wxCommandEvent& event)
+{
+    wxEapHostMethodConfigPanelBase::OnSettings(event);
+
+    int sel = m_method->GetSelection();
+    wxEAPMethodTypeClientData *data =
+        sel != wxNOT_FOUND && m_method->HasClientObjectData() ?
+            dynamic_cast<wxEAPMethodTypeClientData*>(m_method->GetClientObject(sel)) :
+            NULL;
+    if (data && (data->m_properties & eapPropSupportsConfig)) {
+        DWORD cfg_data_size = 0;
+        winstd::eap_blob cfg_data;
+        winstd::eap_error error;
+        DWORD dwResult = EapHostPeerInvokeConfigUI(GetHWND(), 0, data->m_type, (DWORD)data->m_cfg_blob.size(), data->m_cfg_blob.data(), &cfg_data_size, &cfg_data._Myptr, &error._Myptr);
+        if (dwResult == ERROR_SUCCESS) {
+            const BYTE *_cfg_data = cfg_data.get();
+            data->m_cfg_blob.assign(_cfg_data, _cfg_data + cfg_data_size);
+        } else if (dwResult == ERROR_CANCELLED) {
+            // Not really an error.
+        } else if (error)
+            wxLogError(_("Configuring EAP method failed (error %u, %s, %s)."), error->dwWinError, error->pRootCauseString, error->pRepairString);
+        else
+            wxLogError(_("Configuring EAP method failed (error %u)."), dwResult);
+    }
+}
+
+/// \endcond
+
+
+//////////////////////////////////////////////////////////////////////
+// wxEapHostConfigPanel
+//////////////////////////////////////////////////////////////////////
+
+wxEapHostConfigPanel::wxEapHostConfigPanel(const eap::config_provider &prov, eap::config_method_eaphost &cfg, wxWindow* parent) : wxPanel(parent)
+{
+    wxBoxSizer* sb_content;
+    sb_content = new wxBoxSizer( wxVERTICAL );
+
+    m_method = new wxEapHostMethodConfigPanel(prov, cfg, this);
+    sb_content->Add(m_method, 0, wxEXPAND, 5);
+
+    this->SetSizer(sb_content);
+    this->Layout();
+
+    // Connect Events
+    this->Connect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEapHostConfigPanel::OnInitDialog));
+}
+
+
+wxEapHostConfigPanel::~wxEapHostConfigPanel()
+{
+    // Disconnect Events
+    this->Disconnect(wxEVT_INIT_DIALOG, wxInitDialogEventHandler(wxEapHostConfigPanel::OnInitDialog));
+}
+
+
+/// \cond internal
+void wxEapHostConfigPanel::OnInitDialog(wxInitDialogEvent& event)
+{
+    // Forward the event to child panels.
+    if (m_method)
+        m_method->GetEventHandler()->ProcessEvent(event);
+}
+/// \endcond

lib/EapHost_UI/src/StdAfx.cpp

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

lib/EapHost_UI/src/StdAfx.h

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

lib/MSCHAPv2/include/Config.h

@@ -22,10 +22,8 @@
 
 namespace eap
 {
-    ///
-    /// MSCHAPv2 configuration
-    ///
     class config_method_mschapv2;
+    class config_method_eapmschapv2;
 }
 
 #pragma once
@@ -39,6 +37,12 @@ namespace eap
 
 namespace eap
 {
+    /// \addtogroup EAPBaseConfig
+    /// @{
+
+    ///
+    /// MSCHAPv2 configuration
+    ///
     class config_method_mschapv2 : public config_method_with_cred
     {
     public:
@@ -82,28 +86,88 @@ namespace eap
         ///
         config_method_mschapv2& operator=(_Inout_ config_method_mschapv2 &&other);
 
-        ///
-        /// Clones configuration
-        ///
-        /// \returns Pointer to cloned configuration
-        ///
         virtual config* clone() const;
 
         ///
-        /// Returns EAP method type of this configuration
-        ///
-        /// \returns `eap::type_mschapv2`
+        /// @copydoc eap::config_method::get_method_id()
+        /// \returns This implementation always returns `winstd::eap_type_legacy_mschapv2`
         ///
         virtual winstd::eap_type_t get_method_id() const;
 
         ///
-        /// Returns a string \c L"MSCHAPv2"
+        /// @copydoc eap::config_method::get_method_str()
+        /// \returns This implementation always returns `L"MSCHAPv2"`
         ///
         virtual const wchar_t* get_method_str() const;
 
         ///
-        /// Creates a blank set of credentials suitable for this method
+        /// @copydoc eap::config_method::make_credentials()
+        /// \returns This implementation always returns `eap::credentials_pass` type of credentials
         ///
         virtual credentials* make_credentials() const;
     };
+
+
+    ///
+    /// EAP-MSCHAPv2 configuration
+    ///
+    class config_method_eapmschapv2 : public config_method_mschapv2
+    {
+    public:
+        ///
+        /// Constructs configuration
+        ///
+        /// \param[in] mod    EAP module to use for global services
+        /// \param[in] level  Config level (0=outer, 1=inner, 2=inner-inner...)
+        ///
+        config_method_eapmschapv2(_In_ module &mod, _In_ unsigned int level);
+
+        ///
+        /// Copies configuration
+        ///
+        /// \param[in] other  Configuration to copy from
+        ///
+        config_method_eapmschapv2(_In_ const config_method_eapmschapv2 &other);
+
+        ///
+        /// Moves configuration
+        ///
+        /// \param[in] other  Configuration to move from
+        ///
+        config_method_eapmschapv2(_Inout_ config_method_eapmschapv2 &&other);
+
+        ///
+        /// Copies configuration
+        ///
+        /// \param[in] other  Configuration to copy from
+        ///
+        /// \returns Reference to this object
+        ///
+        config_method_eapmschapv2& operator=(_In_ const config_method_eapmschapv2 &other);
+
+        ///
+        /// Moves configuration
+        ///
+        /// \param[in] other  Configuration to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        config_method_eapmschapv2& operator=(_Inout_ config_method_eapmschapv2 &&other);
+
+        virtual config* clone() const;
+
+        ///
+        /// @copydoc eap::config_method::get_method_id()
+        /// \returns This implementation always returns `winstd::eap_type_mschapv2`
+        ///
+        virtual winstd::eap_type_t get_method_id() const;
+
+        ///
+        /// @copydoc eap::config_method::get_method_str()
+        /// \returns This implementation always returns `L"EAP-MSCHAPv2"`
+        ///
+        virtual const wchar_t* get_method_str() const;
+    };
+
+    /// @}
 }

lib/MSCHAPv2/include/MSCHAPv2.h

@@ -1,21 +1,21 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <WinStd/Crypt.h>
@@ -23,30 +23,19 @@
 
 namespace eap
 {
-    ///
-    /// MSCHAPv2 Challenge
-    ///
-    struct challenge_mschapv2;
+    enum chap_packet_code_t;
+    struct WINSTD_NOVTABLE chap_header;
+    struct WINSTD_NOVTABLE challenge_mschapv2;
+    struct WINSTD_NOVTABLE challenge_hash;
+    struct WINSTD_NOVTABLE nt_password_hash;
+    struct WINSTD_NOVTABLE nt_response;
+    struct WINSTD_NOVTABLE authenticator_response;
 
     ///
-    /// MSCHAPv2 Challenge Hash
+    /// \defgroup MSCHAPv2  MSCHAPv2
+    /// Microsoft Challenge-Handshake Authentication Protocol (version 2)
     ///
-    struct challenge_hash;
-
-    ///
-    /// NT-Password Hash
-    ///
-    struct nt_password_hash;
-
-    ///
-    /// NT-Response
-    ///
-    struct nt_response;
-
-    ///
-    /// Authenticator Response
-    ///
-    struct authenticator_response;
+    /// @{
 
     ///
     /// Creates DES encryption key with given plaintext key
@@ -55,7 +44,11 @@ namespace eap
     /// \param[in] key   The key (without parity bits)
     /// \param[in] size  Size of \p key (maximum 7B)
     ///
+    /// \returns DES encryption key
+    ///
     winstd::crypt_key create_des_key(_In_ HCRYPTPROV cp, _In_count_(size) const unsigned char *key, _In_ size_t size);
+
+    /// @}
 }
 
 #pragma once
@@ -65,10 +58,41 @@ namespace eap
 
 namespace eap
 {
+    /// \addtogroup MSCHAPv2
+    /// @{
+
+    ///
+    /// CHAP packet codes
+    ///
+    #pragma warning(suppress: 4480)
+    enum chap_packet_code_t : unsigned char {
+        chap_packet_code_challenge            = 1, ///< Challenge
+        chap_packet_code_response             = 2, ///< Response
+        chap_packet_code_success              = 3, ///< Success
+        chap_packet_code_failure              = 4, ///< Failure
+
+        mschapv2_packet_code_change_password  = 7, ///< Change password
+    };
+
+
 #pragma pack(push)
 #pragma pack(1)
 
-    struct __declspec(novtable) challenge_mschapv2 : public sanitizing_blob_xf<16>
+    ///
+    /// CHAP packet header base class
+    ///
+    struct WINSTD_NOVTABLE chap_header
+    {
+        chap_packet_code_t code;    ///< CHAP packet code
+        unsigned char ident;        ///< CHAP identifier
+        unsigned char length[2];    ///< CHAP packet length
+    };
+
+
+    ///
+    /// MSCHAPv2 Challenge
+    ///
+    struct WINSTD_NOVTABLE challenge_mschapv2 : public sanitizing_blob_xf<16>
     {
         ///
         /// Generates random challenge
@@ -79,7 +103,10 @@ namespace eap
     };
 
 
-    struct __declspec(novtable) challenge_hash : public sanitizing_blob_xf<8>
+    ///
+    /// MSCHAPv2 Challenge Hash
+    ///
+    struct WINSTD_NOVTABLE challenge_hash : public sanitizing_blob_xf<8>
     {
         ///
         /// Constructor
@@ -98,7 +125,7 @@ namespace eap
         ///
         challenge_hash(
             _In_         HCRYPTPROV         cp,
-            _In_   const challenge_mschapv2 &challenge_server,
+            _In_   const sanitizing_blob    &challenge_server,
             _In_   const challenge_mschapv2 &challenge_client,
             _In_z_ const char               *username);
 
@@ -120,7 +147,10 @@ namespace eap
     };
 
 
-    struct __declspec(novtable) nt_password_hash : public sanitizing_blob_xf<16>
+    ///
+    /// NT-Password Hash
+    ///
+    struct WINSTD_NOVTABLE nt_password_hash : public sanitizing_blob_xf<16>
     {
         ///
         /// Constructor
@@ -169,7 +199,10 @@ namespace eap
     };
 
 
-    struct __declspec(novtable) nt_response : public sanitizing_blob_xf<24>
+    ///
+    /// NT-Response
+    ///
+    struct WINSTD_NOVTABLE nt_response : public sanitizing_blob_xf<24>
     {
         ///
         /// Constructor
@@ -189,7 +222,7 @@ namespace eap
         ///
         nt_response(
             _In_         HCRYPTPROV         cp,
-            _In_   const challenge_mschapv2 &challenge_server,
+            _In_   const sanitizing_blob    &challenge_server,
             _In_   const challenge_mschapv2 &challenge_client,
             _In_z_ const char               *username,
             _In_z_ const wchar_t            *password);
@@ -212,7 +245,10 @@ namespace eap
     };
 
 
-    struct __declspec(novtable) authenticator_response : public sanitizing_blob_xf<20>
+    ///
+    /// Authenticator Response
+    ///
+    struct WINSTD_NOVTABLE authenticator_response : public sanitizing_blob_xf<20>
     {
         ///
         /// Constructor
@@ -233,7 +269,7 @@ namespace eap
         ///
         authenticator_response(
             _In_         HCRYPTPROV         cp,
-            _In_   const challenge_mschapv2 &challenge_server,
+            _In_   const sanitizing_blob    &challenge_server,
             _In_   const challenge_mschapv2 &challenge_client,
             _In_z_ const char               *username,
             _In_z_ const wchar_t            *password,
@@ -257,4 +293,6 @@ namespace eap
     };
 
 #pragma pack(pop)
+
+    /// @}
 }

lib/MSCHAPv2/include/Method.h

@@ -1,29 +1,28 @@
-/*
+/*
     Copyright 2015-2016 Amebis
-    Copyright 2016 G<EFBFBD>ANT
+    Copyright 2016 GÉANT
 
-    This file is part of G<EFBFBD>ANTLink.
+    This file is part of GÉANTLink.
 
-    G<EFBFBD>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
     the Free Software Foundation, either version 3 of the License, or
     (at your option) any later version.
 
-    G<EFBFBD>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
     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<EFBFBD>ANTLink. If not, see <http://www.gnu.org/licenses/>.
+    along with GÉANTLink. If not, see <http://www.gnu.org/licenses/>.
 */
 
 namespace eap
 {
-    ///
-    /// MSCHAPv2 method
-    ///
+    class method_mschapv2_base;
     class method_mschapv2;
+    class method_mschapv2_diameter;
 }
 
 #pragma once
@@ -38,31 +37,137 @@ namespace eap
 
 namespace eap
 {
-    class method_mschapv2 : public method_noneap
+    /// \addtogroup EAPBaseMethod
+    /// @{
+
+    ///
+    /// MSCHAPv2 method base class
+    ///
+    class method_mschapv2_base : public method
+    {
+        WINSTD_NONCOPYABLE(method_mschapv2_base)
+
+    public:
+        ///
+        /// Constructs a MSCHAPv2 method
+        ///
+        /// \param[in] mod   MSCHAPv2 module to use for global services
+        /// \param[in] cfg   Method configuration
+        /// \param[in] cred  User credentials
+        ///
+        method_mschapv2_base(_In_ module &mod, _In_ config_method_mschapv2 &cfg, _In_ credentials_pass &cred);
+
+        ///
+        /// Moves a MSCHAPv2 method
+        ///
+        /// \param[in] other  MSCHAPv2 method to move from
+        ///
+        method_mschapv2_base(_Inout_ method_mschapv2_base &&other);
+
+        ///
+        /// Moves a MSCHAPv2 method
+        ///
+        /// \param[in] other  MSCHAPv2 method to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        method_mschapv2_base& operator=(_Inout_ method_mschapv2_base &&other);
+
+        /// \name Session management
+        /// @{
+
+        virtual void begin_session(
+            _In_        DWORD         dwFlags,
+            _In_  const EapAttributes *pAttributeArray,
+            _In_        HANDLE        hTokenImpersonateUser,
+            _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
+
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
+        virtual void get_response_packet(
+            _Out_    sanitizing_blob &packet,
+            _In_opt_ DWORD           size_max = MAXDWORD);
+
+        /// @}
+
+        virtual void get_result(
+            _In_  EapPeerMethodResultReason reason,
+            _Out_ EapPeerMethodResult       *pResult);
+
+    protected:
+        ///
+        /// Processes MSCHAPv2 success message
+        ///
+        /// \sa [Microsoft PPP CHAP Extensions, Version 2 (Chapter 5. Success Packet)](https://tools.ietf.org/html/rfc2759#section-5)
+        ///
+        /// \param[in] argv  List of message values
+        ///
+        void process_success(_In_ const std::list<std::string> &argv);
+
+        ///
+        /// Processes MSCHAPv2 error message
+        ///
+        /// \sa [Microsoft PPP CHAP Extensions, Version 2 (Chapter 6. Failure Packet)](https://tools.ietf.org/html/rfc2759#section-6)
+        ///
+        /// \param[in] argv  List of message values
+        ///
+        void process_error(_In_ const std::list<std::string> &argv);
+
+        ///
+        /// Splits MSCHAPv2 success or error messages
+        ///
+        /// \param[in] resp   MSCHAPv2 success or error message (i.e. "E=648 R=1 C=d86e0aa6cb5539e5fb31dd5dc5f6898c V=3 M=Password Expired")
+        /// \param[in] count  Number of characters in \p resp
+        ///
+        /// \returns A list of individual parts of \p resp message (i.e. ("E=648", "R=1", "C=d86e0aa6cb5539e5fb31dd5dc5f6898c", "V=3", "M=Password Expired"))
+        ///
+        static std::list<std::string> parse_response(_In_count_(count) const char *resp, _In_ size_t count);
+
+    protected:
+        config_method_mschapv2 &m_cfg;          ///< Method configuration
+        credentials_pass &m_cred;               ///< Method user credentials
+        winstd::crypt_prov m_cp;                ///< Cryptography provider for general services
+
+        sanitizing_blob m_challenge_server;     ///< MSCHAP server challenge
+        challenge_mschapv2 m_challenge_client;  ///< MSCHAP client challenge
+        unsigned char m_ident;                  ///< Ident
+        nt_response m_nt_resp;                  ///< NT-Response
+
+        sanitizing_blob m_packet_res;           ///< Response packet
+    };
+
+
+    ///
+    /// MSCHAPv2 method
+    ///
+    class method_mschapv2 : public method_mschapv2_base
     {
         WINSTD_NONCOPYABLE(method_mschapv2)
 
     public:
         ///
-        /// Constructs an EAP method
+        /// Constructs a MSCHAPv2 method
         ///
-        /// \param[in] mod   EAP module to use for global services
+        /// \param[in] mod   MSCHAPv2 module to use for global services
         /// \param[in] cfg   Method configuration
         /// \param[in] cred  User credentials
         ///
-        method_mschapv2(_In_ module &module, _In_ config_method_mschapv2 &cfg, _In_ credentials_pass &cred);
+        method_mschapv2(_In_ module &mod, _In_ config_method_mschapv2 &cfg, _In_ credentials_pass &cred);
 
         ///
-        /// Moves an EAP method
+        /// Moves a MSCHAPv2 method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  MSCHAPv2 method to move from
         ///
         method_mschapv2(_Inout_ method_mschapv2 &&other);
 
         ///
-        /// Moves an EAP method
+        /// Moves a MSCHAPv2 method
         ///
-        /// \param[in] other  EAP method to move from
+        /// \param[in] other  MSCHAPv2 method to move from
         ///
         /// \returns Reference to this object
         ///
@@ -71,26 +176,66 @@ namespace eap
         /// \name Packet processing
         /// @{
 
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize);
+
+        /// @}
+    };
+
+    /// @}
+
+
+    ///
+    /// MSCHAPv2 method over Diameter AVP (for use as inner EAP-TTLS)
+    ///
+    class method_mschapv2_diameter : public method_mschapv2_base
+    {
+        WINSTD_NONCOPYABLE(method_mschapv2_diameter)
+
+    public:
         ///
-        /// Starts an EAP authentication session on the peer EapHost using the EAP method.
+        /// Constructs a MSCHAPv2 method
         ///
-        /// \sa [EapPeerBeginSession function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363600.aspx)
+        /// \param[in] mod   MSCHAPv2 module to use for global services
+        /// \param[in] cfg   Method configuration
+        /// \param[in] cred  User credentials
         ///
+        method_mschapv2_diameter(_In_ module &mod, _In_ config_method_mschapv2 &cfg, _In_ credentials_pass &cred);
+
+        ///
+        /// Moves a MSCHAPv2 method
+        ///
+        /// \param[in] other  MSCHAPv2 method to move from
+        ///
+        method_mschapv2_diameter(_Inout_ method_mschapv2_diameter &&other);
+
+        ///
+        /// Moves a MSCHAPv2 method
+        ///
+        /// \param[in] other  MSCHAPv2 method to move from
+        ///
+        /// \returns Reference to this object
+        ///
+        method_mschapv2_diameter& operator=(_Inout_ method_mschapv2_diameter &&other);
+
+        /// \name Session management
+        /// @{
+
         virtual void begin_session(
             _In_        DWORD         dwFlags,
             _In_  const EapAttributes *pAttributeArray,
             _In_        HANDLE        hTokenImpersonateUser,
             _In_opt_    DWORD         dwMaxSendPacketSize = MAXDWORD);
 
-        ///
-        /// Processes a packet received by EapHost from a supplicant.
-        ///
-        /// \sa [EapPeerProcessRequestPacket function](https://msdn.microsoft.com/en-us/library/windows/desktop/aa363621.aspx)
-        ///
-        virtual void process_request_packet(
-            _In_bytecount_(dwReceivedPacketSize) const void                *pReceivedPacket,
-            _In_                                       DWORD               dwReceivedPacketSize,
-            _Inout_                                    EapPeerMethodOutput *pEapOutput);
+        /// @}
+
+        /// \name Packet processing
+        /// @{
+
+        virtual EapPeerMethodResponseAction process_request_packet(
+            _In_bytecount_(dwReceivedPacketSize) const void  *pReceivedPacket,
+            _In_                                       DWORD dwReceivedPacketSize);
 
         /// @}
 
@@ -105,44 +250,10 @@ namespace eap
         ///
         void process_packet(_In_bytecount_(size_pck) const void *pck, _In_ size_t size_pck);
 
-        ///
-        /// Processes MS-CHAP2-Success AVP
-        ///
-        /// \sa [Microsoft PPP CHAP Extensions, Version 2 (Chapter 5. Success Packet)](https://tools.ietf.org/html/rfc2759#section-5)
-        ///
-        /// \param[in] argv  List of message values
-        ///
-        void process_success(_In_ const std::list<std::string> &argv);
-
-        ///
-        /// Processes MS-CHAP-Error AVP
-        ///
-        /// \sa [Microsoft PPP CHAP Extensions, Version 2 (Chapter 6. Failure Packet)](https://tools.ietf.org/html/rfc2759#section-6)
-        ///
-        /// \param[in] argv  List of message values
-        ///
-        void process_error(_In_ const std::list<std::string> &argv);
-
-        ///
-        /// Splits MS-CHAP2-Success or MS-CHAP-Error messages
-        ///
-        /// \param[in] resp   MS-CHAP2-Success or MS-CHAP-Error message (i.e. "E=648 R=1 C=d86e0aa6cb5539e5fb31dd5dc5f6898c V=3 M=Password Expired")
-        /// \param[in] count  Number of characters in \p resp
-        ///
-        /// \returns A list of individual parts of \p resp message (i.e. ("E=648", "R=1", "C=d86e0aa6cb5539e5fb31dd5dc5f6898c", "V=3", "M=Password Expired"))
-        ///
-        static std::list<std::string> parse_response(_In_count_(count) const char *resp, _In_ size_t count);
-
     protected:
-        credentials_pass &m_cred;               ///< Method user credentials
-        winstd::crypt_prov m_cp;                ///< Cryptography provider for general services
-
-        challenge_mschapv2 m_challenge_server;  ///< MSCHAP server challenge
-        challenge_mschapv2 m_challenge_client;  ///< MSCHAP client challenge
-        unsigned char m_ident;                  ///< Ident
-        nt_response m_nt_resp;                  ///< NT-Response
-        bool m_success;                         ///< Did we receive MS-CHAP2-Success?
-
+        ///
+        /// Communication phase
+        ///
         enum {
             phase_unknown = -1,                 ///< Unknown phase
             phase_init = 0,                     ///< Send client challenge
@@ -150,4 +261,6 @@ namespace eap
             phase_finished,                     ///< Connection shut down
         } m_phase;                              ///< What phase is our communication at?
     };
+
+    /// @}
 }

lib/MSCHAPv2/src/Config.cpp

@@ -86,3 +86,60 @@ eap::credentials* eap::config_method_mschapv2::make_credentials() const
 {
     return new credentials_pass(m_module);
 }
+
+
+//////////////////////////////////////////////////////////////////////
+// eap::config_method_eapmschapv2
+//////////////////////////////////////////////////////////////////////
+
+eap::config_method_eapmschapv2::config_method_eapmschapv2(_In_ module &mod, _In_ unsigned int level) : config_method_mschapv2(mod, level)
+{
+}
+
+
+eap::config_method_eapmschapv2::config_method_eapmschapv2(_In_ const config_method_eapmschapv2 &other) :
+    config_method_mschapv2(other)
+{
+}
+
+
+eap::config_method_eapmschapv2::config_method_eapmschapv2(_Inout_ config_method_eapmschapv2 &&other) :
+    config_method_mschapv2(std::move(other))
+{
+}
+
+
+eap::config_method_eapmschapv2& eap::config_method_eapmschapv2::operator=(_In_ const config_method_eapmschapv2 &other)
+{
+    if (this != &other)
+        (config_method_mschapv2&)*this = other;
+
+    return *this;
+}
+
+
+eap::config_method_eapmschapv2& eap::config_method_eapmschapv2::operator=(_Inout_ config_method_eapmschapv2 &&other)
+{
+    if (this != &other)
+        (config_method_mschapv2&&)*this = std::move(other);
+
+    return *this;
+}
+
+
+eap::config* eap::config_method_eapmschapv2::clone() const
+{
+    return new config_method_eapmschapv2(*this);
+}
+
+
+eap_type_t eap::config_method_eapmschapv2::get_method_id() const
+{
+    return eap_type_mschapv2;
+}
+
+
+const wchar_t* eap::config_method_eapmschapv2::get_method_str() const
+{
+    return L"EAP-MSCHAPv2";
+}