1 files changed, 14 insertions, 422 deletions
diff --git a/NorthstarDLL/NorthstarDLL.vcxproj.filters b/NorthstarDLL/NorthstarDLL.vcxproj.filters
index d8437ba5..16e3fc87 100644
--- a/NorthstarDLL/NorthstarDLL.vcxproj.filters
+++ b/NorthstarDLL/NorthstarDLL.vcxproj.filters
@@ -46,9 +46,6 @@
     <Filter Include="Header Files\include\rapidjson\msinttypes">
       <UniqueIdentifier>{85aacdee-0f92-4ec4-b20c-0739c1175055}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Header Files\include\openssl">
-      <UniqueIdentifier>{4cb0dd89-5f16-4549-a864-34ca3075352a}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files\include\libcurl">
       <UniqueIdentifier>{ea1e17a6-40b7-4e1b-8edb-e9ae704ce604}</UniqueIdentifier>
     </Filter>
@@ -219,417 +216,6 @@
     <ClInclude Include="..\include\libcurl\include\curl\urlapi.h">
       <Filter>Header Files\include\libcurl</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\openssl\__DECC_INCLUDE_EPILOGUE.H">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\__DECC_INCLUDE_PROLOGUE.H">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\aes.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\asn1.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\asn1_mac.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\asn1err.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\asn1t.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\async.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\asyncerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\bio.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\bioerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\blowfish.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\bn.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\bnerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\buffer.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\buffererr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\camellia.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cast.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cmac.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cmp.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cmp_util.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cmperr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cms.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cmserr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\comp.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\comperr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\conf.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\conf_api.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\conferr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\configuration.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\conftypes.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\core.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\core_dispatch.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\core_names.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\core_object.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\crmf.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\crmferr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\crypto.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cryptoerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cryptoerr_legacy.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ct.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\cterr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\decoder.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\decodererr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\des.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\dh.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\dherr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\dsa.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\dsaerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\dtls1.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\e_os2.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ebcdic.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ec.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ecdh.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ecdsa.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ecerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\encoder.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\encodererr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\engine.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\engineerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\err.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ess.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\esserr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\evp.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\evperr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\fips_names.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\fipskey.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\hmac.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\http.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\httperr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\idea.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\kdf.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\kdferr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\lhash.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\macros.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\md2.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\md4.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\md5.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\mdc2.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\modes.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\obj_mac.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\objects.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\objectserr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ocsp.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ocsperr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\opensslconf.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\opensslv.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ossl_typ.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\param_build.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\params.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\pem.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\pem2.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\pemerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\pkcs7.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\pkcs7err.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\pkcs12.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\pkcs12err.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\prov_ssl.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\proverr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\provider.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\rand.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\randerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\rc2.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\rc4.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\rc5.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ripemd.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\rsa.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\rsaerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\safestack.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\seed.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\self_test.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\sha.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\srp.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\srtp.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ssl.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ssl2.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ssl3.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\sslerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\sslerr_legacy.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\stack.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\store.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\storeerr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\symhacks.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\tls1.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\trace.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ts.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\tserr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\txt_db.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\types.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\ui.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\uierr.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\whrlpool.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\x509.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\x509_vfy.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\x509err.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\x509v3.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
-    <ClInclude Include="..\include\openssl\x509v3err.h">
-      <Filter>Header Files\include\openssl</Filter>
-    </ClInclude>
     <ClInclude Include="..\include\rapidjson\allocators.h">
       <Filter>Header Files\include\rapidjson</Filter>
     </ClInclude>
@@ -1173,12 +759,18 @@
     <ClInclude Include="core\macros.h">
       <Filter>Header Files\core</Filter>
     </ClInclude>
-		<ClInclude Include="util\wininfo.h">
-    	<Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="util\utils.h">
       <Filter>Header Files\util</Filter>
     </ClInclude>
+    <ClInclude Include="..\include\libcurl\include\curl\header.h">
+      <Filter>Header Files\include\libcurl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\libcurl\include\curl\websockets.h">
+      <Filter>Header Files\include\libcurl</Filter>
+    </ClInclude>
+    <ClInclude Include="util\wininfo.h">
+      <Filter>Header Files\util</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\include\spdlog\fmt\bundled\LICENSE.rst">
@@ -1420,13 +1012,13 @@
     <ClCompile Include="core\sourceinterface.cpp">
       <Filter>Source Files\core</Filter>
     </ClCompile>
-    <ClCompile Include="util\wininfo.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="util\utils.cpp">
+      <Filter>Source Files\util</Filter>
     </ClCompile>
     <ClCompile Include="client\rejectconnectionfixes.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>Source Files\client</Filter>
     </ClCompile>
-    <ClCompile Include="util\utils.cpp">
+    <ClCompile Include="util\wininfo.cpp">
       <Filter>Source Files\util</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1435,4 +1027,4 @@
       <Filter>Source Files</Filter>
     </MASM>
   </ItemGroup>
-</Project>
+</Project>
+\ No newline at end of file