diff --git a/EAPMethods/MSIBuild.EAP-TTLS/.gitignore b/EAPMethods/MSIBuild.EAP-TTLS/.gitignore new file mode 100644 index 0000000..80ea676 --- /dev/null +++ b/EAPMethods/MSIBuild.EAP-TTLS/.gitignore @@ -0,0 +1,9 @@ +/*-1.idt +/*-2.idt +/*-2.idtx +/*.Binary-1 +/*.Binary-2 +/*.Icon-1 +/*.Icon-2 +/*.lst +/*.msm diff --git a/EAPMethods/MSIBuild.EAP-TTLS/Makefile b/EAPMethods/MSIBuild.EAP-TTLS/Makefile new file mode 100644 index 0000000..1d97009 Binary files /dev/null and b/EAPMethods/MSIBuild.EAP-TTLS/Makefile differ diff --git a/EAPMethods/MSIBuild/Makefile b/EAPMethods/MSIBuild/Makefile index b06ecb8..25a6ae9 100644 Binary files a/EAPMethods/MSIBuild/Makefile and b/EAPMethods/MSIBuild/Makefile differ diff --git a/EAPMethods/MSIBuild/MakefileEAPMethod.mak b/EAPMethods/MSIBuild/MakefileEAPMethod.mak new file mode 100644 index 0000000..68c0ca7 Binary files /dev/null and b/EAPMethods/MSIBuild/MakefileEAPMethod.mak differ diff --git a/EAPMethods/build/EAPTTLS.vcxproj b/EAPMethods/build/EAP-TTLS.vcxproj similarity index 97% rename from EAPMethods/build/EAPTTLS.vcxproj rename to EAPMethods/build/EAP-TTLS.vcxproj index ec47f04..b0c4295 100644 --- a/EAPMethods/build/EAPTTLS.vcxproj +++ b/EAPMethods/build/EAP-TTLS.vcxproj @@ -1,128 +1,128 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - {331B6077-E3E2-4867-B93E-9D3F57280DE7} - EAPTTLS - 10.0 - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - - - - - - - - - {b385ec2b-c3f4-48bb-9bac-8b996de7f754} - - - {114a70bb-8698-4a0c-8c90-58f22edd8129} - - - {86a6d6a0-4b7d-4134-be81-a5755c77584d} - - - {36b0cf8a-7794-46c3-8099-825ba962b4c7} - - - {4d40cb8a-812e-4f12-b23a-31af743878e8} - - - {ee0ef0d9-a475-4038-8637-5754724f65b0} - - - - - + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {331B6077-E3E2-4867-B93E-9D3F57280DE7} + EAP-TTLS + 10.0 + + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + true + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + true + + + + + + + + + + + + + + + + + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + + + + + + + + + {b385ec2b-c3f4-48bb-9bac-8b996de7f754} + + + {114a70bb-8698-4a0c-8c90-58f22edd8129} + + + {86a6d6a0-4b7d-4134-be81-a5755c77584d} + + + {36b0cf8a-7794-46c3-8099-825ba962b4c7} + + + {4d40cb8a-812e-4f12-b23a-31af743878e8} + + + {ee0ef0d9-a475-4038-8637-5754724f65b0} + + + + + \ No newline at end of file diff --git a/EAPMethods/build/EAPTTLS.vcxproj.filters b/EAPMethods/build/EAP-TTLS.vcxproj.filters similarity index 97% rename from EAPMethods/build/EAPTTLS.vcxproj.filters rename to EAPMethods/build/EAP-TTLS.vcxproj.filters index 1db74dd..dc8bd7e 100644 --- a/EAPMethods/build/EAPTTLS.vcxproj.filters +++ b/EAPMethods/build/EAP-TTLS.vcxproj.filters @@ -1,40 +1,40 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - Source Files - - - - - Resource Files - - - - - Source Files - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Header Files + + + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Source Files + + \ No newline at end of file diff --git a/EAPMethods/build/EAPTTLS_UI.vcxproj b/EAPMethods/build/EAP-TTLS_UI.vcxproj similarity index 97% rename from EAPMethods/build/EAPTTLS_UI.vcxproj rename to EAPMethods/build/EAP-TTLS_UI.vcxproj index fdac601..c438dda 100644 --- a/EAPMethods/build/EAPTTLS_UI.vcxproj +++ b/EAPMethods/build/EAP-TTLS_UI.vcxproj @@ -1,147 +1,147 @@ - - - - - Debug - ARM64 - - - Debug - Win32 - - - Debug - x64 - - - Release - ARM64 - - - Release - Win32 - - - Release - x64 - - - - {DD7A97CA-F18E-43B7-95C4-D06E6A291624} - EAPTTLS_UI - 10.0 - - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - - - DynamicLibrary - true - Unicode - v142 - true - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - - - DynamicLibrary - false - true - Unicode - v142 - true - - - - - - - - - - - - - - - - - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) - - - - - - - - - - - {b385ec2b-c3f4-48bb-9bac-8b996de7f754} - - - {13d2d8b5-f6aa-459d-b5f7-29b95dd9d583} - - - {114a70bb-8698-4a0c-8c90-58f22edd8129} - - - {34680813-3a52-46fb-b5a8-1e4bbf770855} - - - {86a6d6a0-4b7d-4134-be81-a5755c77584d} - - - {7af5b922-7c17-428a-97e0-09e3b41a684d} - - - {36b0cf8a-7794-46c3-8099-825ba962b4c7} - - - {3d309c2e-64ab-4bc4-a16d-468571a2bc1a} - - - {4d40cb8a-812e-4f12-b23a-31af743878e8} - - - {9a25c261-8ade-4938-8393-e857ef0e37e9} - - - {ee0ef0d9-a475-4038-8637-5754724f65b0} - - - {42f0f0f4-c928-4860-a4e4-94991c2c3d90} - - - - - - + + + + + Debug + ARM64 + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM64 + + + Release + Win32 + + + Release + x64 + + + + {DD7A97CA-F18E-43B7-95C4-D06E6A291624} + EAP-TTLS_UI + 10.0 + + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + + + DynamicLibrary + true + Unicode + v142 + true + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + + + DynamicLibrary + false + true + Unicode + v142 + true + + + + + + + + + + + + + + + + + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + EAPMETHOD_TYPE=21;%(PreprocessorDefinitions) + + + + + + + + + + + {b385ec2b-c3f4-48bb-9bac-8b996de7f754} + + + {13d2d8b5-f6aa-459d-b5f7-29b95dd9d583} + + + {114a70bb-8698-4a0c-8c90-58f22edd8129} + + + {34680813-3a52-46fb-b5a8-1e4bbf770855} + + + {86a6d6a0-4b7d-4134-be81-a5755c77584d} + + + {7af5b922-7c17-428a-97e0-09e3b41a684d} + + + {36b0cf8a-7794-46c3-8099-825ba962b4c7} + + + {3d309c2e-64ab-4bc4-a16d-468571a2bc1a} + + + {4d40cb8a-812e-4f12-b23a-31af743878e8} + + + {9a25c261-8ade-4938-8393-e857ef0e37e9} + + + {ee0ef0d9-a475-4038-8637-5754724f65b0} + + + {42f0f0f4-c928-4860-a4e4-94991c2c3d90} + + + + + + \ No newline at end of file diff --git a/EAPMethods/build/EAPTTLS_UI.vcxproj.filters b/EAPMethods/build/EAP-TTLS_UI.vcxproj.filters similarity index 97% rename from EAPMethods/build/EAPTTLS_UI.vcxproj.filters rename to EAPMethods/build/EAP-TTLS_UI.vcxproj.filters index d88e2f5..c1b97a6 100644 --- a/EAPMethods/build/EAPTTLS_UI.vcxproj.filters +++ b/EAPMethods/build/EAP-TTLS_UI.vcxproj.filters @@ -1,139 +1,139 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {e43059ae-37ac-4b28-84fb-18d1b3972b30} - po;pot - - - - - Header Files - - - - - Source Files - - - Source Files - - - - - Resource Files - - - - - Source Files - - - Resource Files\Localization - - - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - - Resource Files\Localization - - + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + {e43059ae-37ac-4b28-84fb-18d1b3972b30} + po;pot + + + + + Header Files + + + + + Source Files + + + Source Files + + + + + Resource Files + + + + + Source Files + + + Resource Files\Localization + + + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + + Resource Files\Localization + + \ No newline at end of file diff --git a/EAPMethods/res/EAPMethod.rc b/EAPMethods/res/EAPMethod.rc index 91f7c5d..b465a07 100644 Binary files a/EAPMethods/res/EAPMethod.rc and b/EAPMethods/res/EAPMethod.rc differ diff --git a/EAPMethods/res/EAPMethod_UI.rc b/EAPMethods/res/EAPMethod_UI.rc index 2badf3f..34585aa 100644 Binary files a/EAPMethods/res/EAPMethod_UI.rc and b/EAPMethods/res/EAPMethod_UI.rc differ diff --git a/GEANTLink.sln b/GEANTLink.sln index e30cfed..943f3d0 100644 --- a/GEANTLink.sln +++ b/GEANTLink.sln @@ -11,7 +11,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "EAP Methods", "EAP Methods", "{60BAAC3D-DC98-4C19-BC40-1A86963DE86C}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS", "EAPMethods\build\EAPTTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS", "EAPMethods\build\EAP-TTLS.vcxproj", "{331B6077-E3E2-4867-B93E-9D3F57280DE7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", "{E66A3FE1-4EE4-401F-8EAD-BE518B230393}" EndProject @@ -23,7 +23,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CredWrite", "CredWrite\Cred EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Events", "lib\Events\build\Events.vcxproj", "{D63F24BD-92A0-4D6B-8B69-ED947E4D2B1B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPTTLS_UI", "EAPMethods\build\EAPTTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAP-TTLS_UI", "EAPMethods\build\EAP-TTLS_UI.vcxproj", "{DD7A97CA-F18E-43B7-95C4-D06E6A291624}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EAPBase", "lib\EAPBase\build\EAPBase.vcxproj", "{AD6816A0-9600-4E01-8C49-39D03D1E791F}" EndProject diff --git a/Makefile b/Makefile index 0a52140..44e3cad 100644 Binary files a/Makefile and b/Makefile differ diff --git a/MakefileEAPMethod.mak b/MakefileEAPMethod.mak index b0d5ab3..fc95119 100644 Binary files a/MakefileEAPMethod.mak and b/MakefileEAPMethod.mak differ diff --git a/MakefilePlatCfg.mak b/MakefilePlatCfg.mak index 9c7d02f..f1dba06 100644 Binary files a/MakefilePlatCfg.mak and b/MakefilePlatCfg.mak differ diff --git a/README.md b/README.md index 5e60d9c..cda2fb6 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Before one can attempt to debug EAP DLLs, you should run `nmake register` from a Next, one must configure a network profile to actually use one of this product's EAP modules for the authentication. -EAP modules are divided into two DLLs: backend (i.e. _EAPTTLS.dll_) and GUI (i.e. _EAPTTLS_UI.dll_). +EAP modules are divided into two DLLs: backend (i.e. _EAP-TTLS.dll_) and GUI (i.e. _EAP-TTLS_UI.dll_). ##### Backend DLL diff --git a/include/MSIBuildCfg.mak b/include/MSIBuildCfg.mak index 61c57b0..c0da966 100644 Binary files a/include/MSIBuildCfg.mak and b/include/MSIBuildCfg.mak differ diff --git a/lib/TTLS_UI/src/Module.cpp b/lib/TTLS_UI/src/Module.cpp index 6f00d8f..9db2e1e 100644 --- a/lib/TTLS_UI/src/Module.cpp +++ b/lib/TTLS_UI/src/Module.cpp @@ -524,7 +524,7 @@ wxInitializerPeer::wxInitializerPeer(_In_ HINSTANCE instance, _In_opt_ HWND hwnd s_locale = new wxLocale; if (wxInitializeLocale(*s_locale)) { s_locale->AddCatalog(wxT("wxExtend") wxT(wxExtendVersion)); - s_locale->AddCatalog(wxT("EAPTTLS_UI")); + s_locale->AddCatalog(wxT("EAP-TTLS_UI")); } } diff --git a/output/locale/.gitignore b/output/locale/.gitignore index c98c6af..9b130e8 100644 --- a/output/locale/.gitignore +++ b/output/locale/.gitignore @@ -1,4 +1,4 @@ -*/EAPTTLS_UI.mo +*/EAP-TTLS_UI.mo */EventMonitor.mo */wxExtend*.mo */wxstd.mo