EAP modules divided to libraries

restena-sw · Jun 10, 2016 · cf7ca9c · cf7ca9c
1 parent 218aa18
commit cf7ca9c
Show file tree

Hide file tree

Showing 134 changed files with 6,712 additions and 4,280 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 /*.opensdf
 /*.suo
 /*.sdf
+/doc
 /ipch
diff --git a/CredWrite/CredWrite.props b/CredWrite/CredWrite.props
@@ -7,8 +7,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\EAPMethods\EAPMethodEvents\temp\EAPMethodEvents.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>EAPMETHOD_TYPE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\lib\Events\build\temp\Events.$(Platform).$(Configuration).$(PlatformToolset);..\lib\WinStd\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup />

diff --git a/CredWrite/CredWrite.rc b/CredWrite/CredWrite.rc
diff --git a/CredWrite/CredWrite.vcxproj b/CredWrite/CredWrite.vcxproj
@@ -86,8 +86,6 @@
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\EAPMethods\src\EAP.cpp" />
-    <ClCompile Include="..\EAPMethods\src\PAP.cpp" />
     <ClCompile Include="Main.cpp" />
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -100,9 +98,15 @@
     <ResourceCompile Include="CredWrite.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\EAPMethods\EAPMethodEvents\EAPMethodEvents.vcxproj">
+    <ProjectReference Include="..\lib\EAPBase\build\EAPBase.vcxproj">
+      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\lib\PAP\build\PAP.vcxproj">
+      <Project>{36b0cf8a-7794-46c3-8099-825ba962b4c7}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\lib\WinStd\build\WinStd.vcxproj">
       <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
     </ProjectReference>

diff --git a/CredWrite/CredWrite.vcxproj.filters b/CredWrite/CredWrite.vcxproj.filters
@@ -26,12 +26,6 @@
     <ClCompile Include="Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\EAPMethods\src\EAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\EAPMethods\src\PAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="CredWrite.rc">

diff --git a/CredWrite/Main.cpp b/CredWrite/Main.cpp
@@ -20,12 +20,10 @@
 
 #include "StdAfx.h"
 
-#pragma comment(lib, "Crypt32.lib")
-
 using namespace std;
 using namespace winstd;
 
-eap::module g_module;
+eap::module g_module(eap::type_undefined);
 
 
 static int CredWrite()

diff --git a/CredWrite/StdAfx.h b/CredWrite/StdAfx.h
@@ -20,17 +20,30 @@
 
 #pragma once
 
-#include "../include/Version.h"
-
-#include "../EAPMethods/include/EAP.h"
-#include "../EAPMethods/include/PAP.h"
+#include "../lib/PAP/include/Credentials.h"
+#include "../lib/EAPBase/include/Module.h"
 
+#include <WinStd/Common.h>
 #include <WinStd/Base64.h>
-#include <WinStd/Cred.h>
-#include <WinStd/Crypt.h>
 #include <WinStd/Win.h>
 
-#include <tchar.h>
 #include <Windows.h>
+#include <eaptypes.h> // Must include after <Windows.h>
+#include <tchar.h>
 
 #include <memory>
+
+//#include "../include/Version.h"
+//
+//#include "../EAPMethods/include/EAP.h"
+//#include "../EAPMethods/include/PAP.h"
+//
+//#include <WinStd/Base64.h>
+//#include <WinStd/Cred.h>
+//#include <WinStd/Crypt.h>
+//#include <WinStd/Win.h>
+//
+//#include <tchar.h>
+//#include <Windows.h>
+//
+//#include <memory>
diff --git a/EAPMethods/Doxyfile → Doxyfile b/EAPMethods/Doxyfile → Doxyfile
@@ -1,4 +1,4 @@
-# Doxyfile 1.8.7
+# Doxyfile 1.8.7
 
 # This file describes the settings to be used by the documentation system
 # doxygen (www.doxygen.org) for a project.
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING      = UTF-8
 # title of most generated pages and in a few other places.
 # The default value is: My Project.
 
-PROJECT_NAME           = "EAPModules"
+PROJECT_NAME           = "GÉANTLink"
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
 # could be handy for archiving the generated documentation or if some version
@@ -44,7 +44,7 @@ PROJECT_NUMBER         =
 # for a project that appears at the top of each page and should give viewer a
 # quick idea about the purpose of the project. Keep the description short.
 
-PROJECT_BRIEF          = "EAP Modules"
+PROJECT_BRIEF          = "EAP Supplicant for Windows"
 
 # With the PROJECT_LOGO tag one can specify an logo or icon that is included in
 # the documentation. The maximum height of the logo should not exceed 55 pixels
@@ -718,15 +718,15 @@ WARN_IF_UNDOCUMENTED   = YES
 # markup commands wrongly.
 # The default value is: YES.
 
-WARN_IF_DOC_ERROR      = YES
+WARN_IF_DOC_ERROR      = NO
 
 # 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
 # value. If set to NO doxygen will only warn about wrong or incomplete parameter
 # documentation, but not about the absence of documentation.
 # The default value is: NO.
 
-WARN_NO_PARAMDOC       = NO
+WARN_NO_PARAMDOC       = YES
 
 # The WARN_FORMAT tag determines the format of the warning messages that doxygen
 # can produce. The string should contain the $file, $line, and $text tags, which
@@ -789,7 +789,11 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = res
+EXCLUDE                = \
+	lib\EAPBase_UI\res \
+	lib\TLS_UI\res \
+	lib\TTLS_UI\res \
+	lib\WinStd
 
 # 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

diff --git a/EAPMethods/.gitignore b/EAPMethods/.gitignore
diff --git a/EAPMethods/EAPMethodEvents/EAPMethodEvents.props b/EAPMethods/EAPMethodEvents/EAPMethodEvents.props
diff --git a/EAPMethods/EAPTTLS/EAPTTLS.rc b/EAPMethods/EAPTTLS/EAPTTLS.rc
diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj
@@ -79,20 +79,10 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemGroup>
-    <ClInclude Include="..\include\EAP.h" />
-    <ClInclude Include="..\include\EAPSerial.h" />
-    <ClInclude Include="..\include\TLS.h" />
-    <ClInclude Include="..\include\TTLS.h" />
-    <ClInclude Include="..\include\EAPXML.h" />
-    <ClInclude Include="..\include\PAP.h" />
     <ClInclude Include="StdAfx.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\EAP.cpp" />
-    <ClCompile Include="..\src\TLS.cpp" />
-    <ClCompile Include="..\src\TTLS.cpp" />
     <ClCompile Include="..\src\Main.cpp" />
-    <ClCompile Include="..\src\PAP.cpp" />
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -104,12 +94,24 @@
     <ResourceCompile Include="EAPTTLS.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
+      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\EAPMethodEvents\EAPMethodEvents.vcxproj">
+    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\PAP\build\PAP.vcxproj">
+      <Project>{36b0cf8a-7794-46c3-8099-825ba962b4c7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TLS\build\TLS.vcxproj">
+      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
+      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\build\EAPMethod.def" />

diff --git a/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters b/EAPMethods/EAPTTLS/EAPTTLS.vcxproj.filters
@@ -18,24 +18,6 @@
     <ClInclude Include="StdAfx.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\TTLS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\PAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\EAPXML.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\TLS.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\EAP.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\EAPSerial.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="StdAfx.cpp">
@@ -44,18 +26,6 @@
     <ClCompile Include="..\src\Main.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\PAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\EAP.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\TLS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\TTLS.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="EAPTTLS.rc">

diff --git a/EAPMethods/EAPTTLS/StdAfx.h b/EAPMethods/EAPTTLS/StdAfx.h
@@ -20,31 +20,5 @@
 
 #pragma once
 
-#include "../../include/Version.h"
-
-#include "../include/EAP.h"
-#include "../include/EAPSerial.h"
-#include "../include/TLS.h"
-#include "../include/TTLS.h"
-#include "../include/EAPXML.h"
-#include "../include/PAP.h"
-
-#include <WinStd/Base64.h>
-#include <WinStd/Cred.h>
-#include <WinStd/Crypt.h>
-#include <WinStd/ETW.h>
-#include <WinStd/Hex.h>
-#include <WinStd/Win.h>
-
-#include <eaptypes.h>
-#include <eapmethodpeerapis.h>
-
-#include <Commctrl.h>
-#include <Msi.h>
-#include <tchar.h>
-#include <Shlwapi.h>
-#include <Windows.h>
-
-#include <EAPMethodETW.h>
-
-#pragma comment(lib, "Crypt32.lib")
+#include "../../lib/TTLS/include/Module.h"
+#include "../../lib/TTLS/include/Session.h"
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc b/EAPMethods/EAPTTLSUI/EAPTTLSUI.rc
diff --git a/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj b/EAPMethods/EAPTTLSUI/EAPTTLSUI.vcxproj
@@ -79,33 +79,10 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
   <ItemGroup>
-    <ClInclude Include="..\include\EAP.h" />
-    <ClInclude Include="..\include\EAPXML.h" />
-    <ClInclude Include="..\include\EAP_UI.h" />
-    <ClInclude Include="..\include\PAP_UI.h" />
-    <ClInclude Include="..\include\TLS.h" />
-    <ClInclude Include="..\include\TTLS.h" />
-    <ClInclude Include="..\include\TTLS_UI.h" />
-    <ClInclude Include="..\include\PAP.h" />
-    <ClInclude Include="..\include\TLS_UI.h" />
-    <ClInclude Include="..\res\wxEAP_UI.h" />
     <ClInclude Include="StdAfx.h" />
-    <ClInclude Include="..\res\wxTLS_UI.h" />
-    <ClInclude Include="..\res\wxTTLS_UI.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\res\wxEAP_UI.cpp" />
-    <ClCompile Include="..\res\wxTLS_UI.cpp" />
-    <ClCompile Include="..\res\wxTTLS_UI.cpp" />
-    <ClCompile Include="..\src\EAP.cpp" />
-    <ClCompile Include="..\src\PAP_UI.cpp" />
-    <ClCompile Include="..\src\TLS.cpp" />
-    <ClCompile Include="..\src\TTLS.cpp" />
-    <ClCompile Include="..\src\TTLS_UI.cpp" />
     <ClCompile Include="..\src\Main_UI.cpp" />
-    <ClCompile Include="..\src\PAP.cpp" />
-    <ClCompile Include="..\src\EAP_UI.cpp" />
-    <ClCompile Include="..\src\TLS_UI.cpp" />
     <ClCompile Include="StdAfx.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
@@ -117,18 +94,39 @@
     <ResourceCompile Include="EAPTTLSUI.rc" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
-      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    <ProjectReference Include="..\..\lib\EAPBase\build\EAPBase.vcxproj">
+      <Project>{ad6816a0-9600-4e01-8c49-39d03d1e791f}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\EAPBase_UI\build\EAPBase_UI.vcxproj">
+      <Project>{d4b54856-be1f-4937-a8f7-495125be76be}</Project>
     </ProjectReference>
-    <ProjectReference Include="..\EAPMethodEvents\EAPMethodEvents.vcxproj">
+    <ProjectReference Include="..\..\lib\Events\build\Events.vcxproj">
       <Project>{d63f24bd-92a0-4d6b-8b69-ed947e4d2b1b}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\lib\PAP\build\PAP.vcxproj">
+      <Project>{36b0cf8a-7794-46c3-8099-825ba962b4c7}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\PAP_UI\build\PAP_UI.vcxproj">
+      <Project>{3d309c2e-64ab-4bc4-a16d-468571a2bc1a}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TLS\build\TLS.vcxproj">
+      <Project>{4d40cb8a-812e-4f12-b23a-31af743878e8}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TLS_UI\build\TLS_UI.vcxproj">
+      <Project>{9a25c261-8ade-4938-8393-e857ef0e37e9}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TTLS\build\TTLS.vcxproj">
+      <Project>{ee0ef0d9-a475-4038-8637-5754724f65b0}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\TTLS_UI\build\TTLS_UI.vcxproj">
+      <Project>{42f0f0f4-c928-4860-a4e4-94991c2c3d90}</Project>
+    </ProjectReference>
+    <ProjectReference Include="..\..\lib\WinStd\build\WinStd.vcxproj">
+      <Project>{47399d91-7eb9-41de-b521-514ba5db0c43}</Project>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\build\EAPMethodUI.def" />
-    <None Include="..\res\wxEAP_UI.fbp" />
-    <None Include="..\res\wxTLS_UI.fbp" />
-    <None Include="..\res\wxTTLS_UI.fbp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">