openssl 1.1 support

Crypto/Crypto.progen

@@ -22,12 +22,12 @@ vc.project.linker.dependencies.release_static_mt = Crypt32.lib
 bits = ${vc.project.platform.bits}
 dirbits = ${vc.project.platform.bindir.suffix}
 openssl = ${vc.project.pocobase}\\openssl
-vc.project.prebuild.debug_shared = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
-vc.project.prebuild.debug_static_md = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*${bits}MDd.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
-vc.project.prebuild.debug_static_mt = xcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\debug\\*${bits}MTd.lib ..\\lib${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\debug\\*${bits}MTd.pdb ..\\lib${dirbits}\\* 1>nul\nexit 0
-vc.project.prebuild.release_shared = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
-vc.project.prebuild.release_static_md = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*${bits}MD.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
-vc.project.prebuild.release_static_mt = xcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\release\\*${bits}MT.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
+vc.project.prebuild.debug_shared = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*.lib ..\\lib${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*.pdb ..\\lib${dirbits}\\* 1>nul\nexit 0
+vc.project.prebuild.debug_static_md = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*.lib ..\\lib${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\debug\\*.pdb ..\\lib${dirbits}\\* 1>nul\nexit 0
+vc.project.prebuild.debug_static_mt = xcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\debug\\*.lib ..\\lib${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\debug\\*.pdb ..\\lib${dirbits}\\* 1>nul\nexit 0
+vc.project.prebuild.release_shared = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
+vc.project.prebuild.release_static_md = xcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*.dll ..\\bin${dirbits}\\* 1>nul\nxcopy /y ${openssl}\\VS_120\\win${bits}\\bin\\release\\*.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
+vc.project.prebuild.release_static_mt = xcopy /y ${openssl}\\VS_120\\win${bits}\\lib\\release\\*.lib ..\\lib${dirbits}\\* 1>nul\nexit 0
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite
 vc.solution.create = true

Crypto/Crypto_CE_VS90.vcproj

@@ -20,7 +20,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -99,7 +99,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -179,7 +179,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -245,7 +245,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -312,7 +312,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -378,7 +378,7 @@
 			CharacterSet="1">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool

Crypto/Crypto_VS90.vcproj

@@ -20,7 +20,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -91,7 +91,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -165,7 +165,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -223,7 +223,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -282,7 +282,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -340,7 +340,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool

Crypto/Crypto_WEC2013_vs110.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{dfa444ea-d828-4f53-bb72-bc28df30934f}</UniqueIdentifier>
+      <UniqueIdentifier>{52bb1c07-0123-4d4b-a865-972edee36722}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{eff875da-7db3-4aaa-9eb0-ce9d44a5196f}</UniqueIdentifier>
+      <UniqueIdentifier>{31e969ac-36b0-418a-bd14-accd7e08ed11}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{4286f389-2b20-4834-87c3-64ef736fbcd8}</UniqueIdentifier>
+      <UniqueIdentifier>{27741481-3aaf-4c1b-aabc-c1a2d32d7cf1}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{5374021e-f4d6-41f2-917f-f2968bcd969a}</UniqueIdentifier>
+      <UniqueIdentifier>{32596489-b14d-452c-a7eb-75e61e185a64}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{dd5e126e-c600-4924-bf2b-cf2685654e71}</UniqueIdentifier>
+      <UniqueIdentifier>{c1481ba9-ef59-405a-a98f-886317fe5add}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{605aa85b-e876-4d73-ac9b-ecc9cb6fe642}</UniqueIdentifier>
+      <UniqueIdentifier>{a0382ae9-023c-4255-9ddb-c68ef7d10b76}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{32bb879f-1bfd-4cbd-b8ed-038d8105b9e4}</UniqueIdentifier>
+      <UniqueIdentifier>{d5e3f158-b1df-4f77-8c1e-28f3de00a5ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{5514fa19-e7be-49f4-925f-673936ff1d68}</UniqueIdentifier>
+      <UniqueIdentifier>{31d45802-cfba-41ea-b431-259ee2b2670c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{e98b2d02-aff7-4439-9427-3e847dd4a81d}</UniqueIdentifier>
+      <UniqueIdentifier>{59aec99a-3482-4837-8e27-5c54472b532e}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{9e6414dc-b910-4a4e-9452-8d450d4b0813}</UniqueIdentifier>
+      <UniqueIdentifier>{bb2b0746-80fe-4ec8-9ae1-549ac7858c12}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{e23d9365-dd4c-4f33-9722-ffbe05127de1}</UniqueIdentifier>
+      <UniqueIdentifier>{0183a41c-99b5-405b-95ed-34088095ed92}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{ca8f048a-7e1a-4a4f-bf12-2b6a696d2310}</UniqueIdentifier>
+      <UniqueIdentifier>{04d9f7ea-b8cc-40a6-89e4-1e3ffbc042bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{8948ba96-8cfb-4207-ab6b-f025bee4c8b5}</UniqueIdentifier>
+      <UniqueIdentifier>{4446f563-5337-4b3c-9c5c-1d0111a78726}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{f0c253ba-71c2-4fd2-acd0-a26212204866}</UniqueIdentifier>
+      <UniqueIdentifier>{93b6e2fd-6373-4cea-a477-9a2221b055f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{7595732a-16f7-45c4-9fcb-0cb74ffcaf8e}</UniqueIdentifier>
+      <UniqueIdentifier>{ae040b15-9d99-4bde-9603-47888c692bf1}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{555b26b6-3021-4788-8d72-64dfa5b309b4}</UniqueIdentifier>
+      <UniqueIdentifier>{d3c021db-071f-47fd-aa29-6ecc60314d96}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{b80fd2cc-7eb6-4c0b-a5cf-1b266cff4637}</UniqueIdentifier>
+      <UniqueIdentifier>{f5df0fa6-8945-48f2-ad4b-b5d491c6926a}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{e27eaa4c-22ed-4f39-b075-cbb08a17bf59}</UniqueIdentifier>
+      <UniqueIdentifier>{157f6fca-8ffe-4dbd-8e93-ea0edc418d7b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_WEC2013_vs120.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{50f1e57e-6b32-4079-b9b3-c241045e149f}</UniqueIdentifier>
+      <UniqueIdentifier>{e45ec053-cca3-4a79-8175-33f573c34cea}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{ecf2d58e-e8c4-470a-85f0-f558f05797f0}</UniqueIdentifier>
+      <UniqueIdentifier>{1ee823f3-ec90-4f2b-b716-fd77409e31e6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{b3eaf269-9eec-493b-9227-67b14146e4f6}</UniqueIdentifier>
+      <UniqueIdentifier>{3cd5a7b7-18a2-4bb9-a142-4f9e1bb7974d}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{516a688f-bfc0-4d5d-bc88-0516a39b9eca}</UniqueIdentifier>
+      <UniqueIdentifier>{eaa74ab9-2fef-49bb-bbc0-445d2a535ba1}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{a5ce339e-6f09-4d85-8038-62f97099c959}</UniqueIdentifier>
+      <UniqueIdentifier>{6738ec6f-45d0-4601-9ee8-d6afb75b1b50}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{b4505989-828f-4c8b-988c-6111aac8755e}</UniqueIdentifier>
+      <UniqueIdentifier>{9a55b152-e285-465f-a49c-0ebcbf0fc259}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{a8453b35-8b8c-437d-92d6-89cef2ece09d}</UniqueIdentifier>
+      <UniqueIdentifier>{62e7c920-2331-4bce-8577-5baaf4869ca4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{71764835-bcf2-48d8-86d6-db068a7da898}</UniqueIdentifier>
+      <UniqueIdentifier>{d0990178-9b62-432b-b1b0-52e00aad4eed}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{a2fa667d-81b0-48c9-adb2-e8963f700162}</UniqueIdentifier>
+      <UniqueIdentifier>{5afde061-0635-4ee5-bb37-49373abb8047}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{8ab7631b-e32c-4fcb-ae2a-0704951e65d7}</UniqueIdentifier>
+      <UniqueIdentifier>{7dd2ac5e-077e-4d46-9ed6-9e027e249177}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{04bd348f-695d-44bc-9e16-25e6fdcb8187}</UniqueIdentifier>
+      <UniqueIdentifier>{0e5bb8da-d3ad-466d-9401-ecbbfc368736}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{89b0aab2-0413-473f-a8e1-f383751305cc}</UniqueIdentifier>
+      <UniqueIdentifier>{f0a0d9e9-a7a9-405b-9d5d-bc9e8dc20c88}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{8b3b57b2-9476-42fa-95e9-44f31dfc485d}</UniqueIdentifier>
+      <UniqueIdentifier>{0fb3924f-abaf-4684-861a-2ac829f6a4eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{c2eba5ba-7bb5-4ab1-9beb-796eab829ad5}</UniqueIdentifier>
+      <UniqueIdentifier>{662bd85d-7bc0-4b25-886a-5871a40c86a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{eff6c727-15cc-44b4-b58e-a806d2dd24f0}</UniqueIdentifier>
+      <UniqueIdentifier>{be859ee4-5319-447d-be53-649a16f1efec}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{38b054d1-5dff-44c2-add5-0ea4d6049b9e}</UniqueIdentifier>
+      <UniqueIdentifier>{ec747982-0297-414a-a843-306e09dbffd8}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{061dd915-4b5f-490f-bb16-a025d79278ce}</UniqueIdentifier>
+      <UniqueIdentifier>{b7ba2bdd-d975-48f6-9a3d-322d9d8ef6d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{26abe1dc-ea68-4dc3-8e12-c521a028c2a0}</UniqueIdentifier>
+      <UniqueIdentifier>{68842c89-396c-434f-b488-3843884e3c2d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs100.vcxproj

@@ -103,8 +103,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -141,8 +142,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -182,8 +183,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -212,7 +213,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -242,8 +243,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -272,8 +274,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_vs100.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{c24d0a01-7fad-4742-9227-8c7427aac7c5}</UniqueIdentifier>
+      <UniqueIdentifier>{a977af9e-1bac-4b93-bf5c-c4ec4336c136}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{9457f2f8-8fdc-41ee-b57a-37fc1edc9876}</UniqueIdentifier>
+      <UniqueIdentifier>{fab3ca62-e839-4b6c-aa0f-c4b3f427598e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{3bf44e1e-7018-414b-88bf-a48b43eb321f}</UniqueIdentifier>
+      <UniqueIdentifier>{86cb5ae4-5b64-466e-9764-bcd6f8c94973}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{057fd60a-0af2-4c14-b77f-c9d5e49f4d40}</UniqueIdentifier>
+      <UniqueIdentifier>{f962d40a-4a1d-4fee-910e-a55e6fb07d04}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{1bf447a6-d238-4074-8dd5-c64af9cadda0}</UniqueIdentifier>
+      <UniqueIdentifier>{77a658e6-c5e9-43a8-a712-7711465d0e6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{6dea2c1d-11cd-4fdb-a848-fcf6a0d45c7c}</UniqueIdentifier>
+      <UniqueIdentifier>{92be13a7-e1cd-441a-af3f-2213de352df9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{47bc0ff9-85ef-4a9d-a1de-310e414964ef}</UniqueIdentifier>
+      <UniqueIdentifier>{2f013d91-b647-47c0-9b16-166f34d6e07e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{2538c671-f9e3-4fa2-a21b-b132d0171ea6}</UniqueIdentifier>
+      <UniqueIdentifier>{1ab44f5d-3842-4534-bba5-e99c03ec8b31}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{135dc8f2-c326-42af-b409-163388e7358c}</UniqueIdentifier>
+      <UniqueIdentifier>{d7a265f0-8e93-48ca-9077-62e306cefa03}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{41abc44b-05de-4ccc-a145-39201de9fd3b}</UniqueIdentifier>
+      <UniqueIdentifier>{97818cfb-3c5a-404e-b3cf-946ff4a42fc5}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{b805b9b7-679c-4d2e-bad8-6cc7b5fb6305}</UniqueIdentifier>
+      <UniqueIdentifier>{cbf07881-058d-430d-a131-b82bad353d6d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{d4d0ff65-a184-46d6-904c-3eebac8093cb}</UniqueIdentifier>
+      <UniqueIdentifier>{8b6d93ad-d49c-4967-a3e8-904ff2ffcd5f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{f9d84476-6968-4662-9178-092e4f93dca7}</UniqueIdentifier>
+      <UniqueIdentifier>{c4673106-d048-4fea-9f0a-3e5d9046f7b8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{de3b14e0-309e-4363-b33a-53e22c2c5bcb}</UniqueIdentifier>
+      <UniqueIdentifier>{b84c5c96-499f-42b7-93c2-6aaccdd6b41d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{9c029bdf-558a-462a-9fba-f0dd3161a045}</UniqueIdentifier>
+      <UniqueIdentifier>{d71d4744-074c-43d4-9285-98d5b8cc8f33}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{59b4b2cf-7608-4052-90c5-50bbf58c9f65}</UniqueIdentifier>
+      <UniqueIdentifier>{a23bc548-a67b-4bbe-8d0d-a874fe85e556}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{a54cea68-0351-46d5-acb3-95ebb9ae1f5f}</UniqueIdentifier>
+      <UniqueIdentifier>{18d042a9-4ff8-46a4-8c7f-78ec4a2aeaef}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{ce451e73-29d7-4ef7-868e-bd6f29230811}</UniqueIdentifier>
+      <UniqueIdentifier>{98146d05-6b2b-4e70-a58d-5a3cb0612b0a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs110.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_vs110.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{fc79031a-125e-4d56-a65b-2682436d858f}</UniqueIdentifier>
+      <UniqueIdentifier>{0707f04b-926c-40e9-bb29-7c375b19f825}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{b17075b8-7f28-4422-aa5c-bf1d4a063a94}</UniqueIdentifier>
+      <UniqueIdentifier>{cabd421d-fb63-4995-bfad-1431a4c74a10}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{f6e1ab07-9a89-4546-a4b3-69b03ecc91b6}</UniqueIdentifier>
+      <UniqueIdentifier>{69b0240e-fa49-4236-9ba1-9531cd8f4a90}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{7b225db1-51bb-448b-8091-768f4bd1c26e}</UniqueIdentifier>
+      <UniqueIdentifier>{0fd96c3b-6595-4969-8d49-397e0c7229f7}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{3225e924-b68a-434d-a25e-41425862b283}</UniqueIdentifier>
+      <UniqueIdentifier>{e4235854-697b-4de0-8f88-f1b87b820cc4}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{b8200bae-b358-4b3a-9792-ad4297703d53}</UniqueIdentifier>
+      <UniqueIdentifier>{663012ce-b771-4112-a74c-356594d52bce}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{df6cd997-57da-44c0-87d4-a8464eb94e41}</UniqueIdentifier>
+      <UniqueIdentifier>{c58ffd91-543d-4086-8cd9-3fe51da9c2f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{849f8251-bb01-4325-bf75-861f39a1f7ec}</UniqueIdentifier>
+      <UniqueIdentifier>{b33cd251-ff70-43e4-b12d-a6d1966e4f6f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{fea84aba-13bd-4607-8c16-524e19f8b1e6}</UniqueIdentifier>
+      <UniqueIdentifier>{9ec6eced-eab2-412b-8cbf-82235b8718f4}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{9fe690cf-d173-45dd-a0e7-627932df9440}</UniqueIdentifier>
+      <UniqueIdentifier>{0570468f-f298-4bf4-a031-c10f06e52995}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{30f11329-4919-4f47-9c0d-3edc2b0efd62}</UniqueIdentifier>
+      <UniqueIdentifier>{fca6f3f2-7afb-433c-afc7-a20690ff50f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{ce0365f7-5b92-4574-b5c6-00afd7479ad7}</UniqueIdentifier>
+      <UniqueIdentifier>{a818f0fd-24f9-4ba2-bea5-1edb0a6b6d4e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{c3bf2e9f-9e66-48a5-a008-68d382a7a10c}</UniqueIdentifier>
+      <UniqueIdentifier>{7d9e0ed8-e804-4b3c-a810-06b8d4fe56ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{3a0ec51c-4d7d-428d-970a-f625ec58710f}</UniqueIdentifier>
+      <UniqueIdentifier>{8c538cf5-06e5-449f-977e-41ef5d52538a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{23caef59-202a-4650-959f-86891450ca5c}</UniqueIdentifier>
+      <UniqueIdentifier>{b599d6db-86a6-43af-a284-b53dda015875}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{3de6b7c7-d9fd-4165-8c78-4b77f3ec19e7}</UniqueIdentifier>
+      <UniqueIdentifier>{5ddfc64c-cf0c-45d0-a6d4-1f56ad3a95b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{75c998f1-635f-4829-a6ed-f39a1559fbbd}</UniqueIdentifier>
+      <UniqueIdentifier>{e49b21f4-33c9-457f-843f-ad0690264fb2}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{38102bdd-10f1-4971-9edc-bbc87d5ee797}</UniqueIdentifier>
+      <UniqueIdentifier>{72fba5c6-c2da-4a64-b0d3-a0b43f44201c}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs120.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_vs120.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{1cfaaf6a-6e0d-45cb-bb61-0829bc28dd13}</UniqueIdentifier>
+      <UniqueIdentifier>{3931bea2-66cf-4920-ba6a-326c7ae5b7e7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{811930c4-8952-4ce7-8c94-afeaa51411e4}</UniqueIdentifier>
+      <UniqueIdentifier>{c3b1a20f-48a6-4667-9b2c-4c6e78c9a76f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{90cc93a9-ff68-43e4-80e4-6907625cd3bc}</UniqueIdentifier>
+      <UniqueIdentifier>{19d80d89-53e5-428c-b9a6-a89f46f67c0f}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{256148d4-e436-4fe6-9462-7ece0906cfbc}</UniqueIdentifier>
+      <UniqueIdentifier>{732e1ee7-339f-4643-823a-03225c19c472}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{4462c18a-3682-472a-a44f-9cd677410b72}</UniqueIdentifier>
+      <UniqueIdentifier>{738ab6ed-4d25-45f3-affa-7923c359433f}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{f2416464-e492-4fb6-a987-7e293b1936f6}</UniqueIdentifier>
+      <UniqueIdentifier>{03dfc2e9-6221-4649-854f-bfa5d462bc2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{100a3533-6897-4396-8fd2-0fa2715320a5}</UniqueIdentifier>
+      <UniqueIdentifier>{255eaddd-972d-4bdb-9d0f-f9781db59297}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{ca811220-db50-46a7-b425-e9b050f8f6cc}</UniqueIdentifier>
+      <UniqueIdentifier>{c68fd959-ec4a-481a-b9b2-6eccfc1c1e95}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{74e33acb-cc99-4406-b54d-043dcc4c712a}</UniqueIdentifier>
+      <UniqueIdentifier>{0fa639ee-9bb6-408f-94e8-b115695f2a23}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{4e15f337-d67d-416a-ac91-d37623d15cb9}</UniqueIdentifier>
+      <UniqueIdentifier>{ec85d216-0deb-4f38-aa5a-1e1d97661a3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{88c01436-b5e5-48b5-b61e-b021aaea66ef}</UniqueIdentifier>
+      <UniqueIdentifier>{08e0bf2a-1628-4866-a2f2-0f3d77149ea1}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{b6a5200a-f9d5-4f3c-bcb5-ab37e64344bb}</UniqueIdentifier>
+      <UniqueIdentifier>{233c991b-6ad7-41e2-8ad3-f898849e072a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{8b7855fc-ec5f-4037-a14c-111ebbed9f17}</UniqueIdentifier>
+      <UniqueIdentifier>{e447b31c-8e8e-4410-873f-4d08ea3e6449}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{ae806b52-8fcc-42cd-8aae-bd6b2c306e2a}</UniqueIdentifier>
+      <UniqueIdentifier>{000007ec-80f8-4fe3-aa46-eae6e4a60b82}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{2e835ed0-98da-49f1-a29e-88fc417143a8}</UniqueIdentifier>
+      <UniqueIdentifier>{1f3cb5dc-984e-46cb-9dd8-7fd5bc7b4287}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{70d8c112-6a28-4cc5-abab-77bd34b751ef}</UniqueIdentifier>
+      <UniqueIdentifier>{4d5180db-e285-4119-b5e5-92f9d43b783b}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{a9cd3822-7c1a-4ac9-87b6-bf38154530b7}</UniqueIdentifier>
+      <UniqueIdentifier>{ae16be50-c4f8-4339-895f-67d61a58a09b}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{cf4fcd4c-8833-4ff6-9afb-d42d7c9a395c}</UniqueIdentifier>
+      <UniqueIdentifier>{1b001a04-c9c0-4163-bca9-e09d34b2ddd3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs140.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_vs140.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{fbefecfe-e1b8-4272-91c5-c1712f257466}</UniqueIdentifier>
+      <UniqueIdentifier>{4c50e169-8ef3-4900-8b79-8c2ddc091f8b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{af6ac1eb-376f-4ffb-85bb-e4ed846a0efb}</UniqueIdentifier>
+      <UniqueIdentifier>{9617c1f6-6600-4294-a71a-5c8107f4c2c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{920c7ae4-e866-4a00-8aaa-193c04fb198d}</UniqueIdentifier>
+      <UniqueIdentifier>{ede4c7e4-b31e-4769-a096-568920cba6b8}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{7e69ba5f-a073-4b98-82ac-47c2cfaf0fd2}</UniqueIdentifier>
+      <UniqueIdentifier>{dd118673-399e-4283-94e7-595e3605c5a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{0277c830-9c8b-491c-b08b-0e649d6f0f18}</UniqueIdentifier>
+      <UniqueIdentifier>{74978693-b0b2-4850-9393-f35f66377108}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{ac2d3033-18bf-44e5-a73a-b77c7c8c3651}</UniqueIdentifier>
+      <UniqueIdentifier>{6833a505-96c1-4b9b-b9d3-a6c189e28df8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{2df59f4b-2c84-4c4a-85ec-7f36dc167004}</UniqueIdentifier>
+      <UniqueIdentifier>{684a010f-7d52-4b12-8bd3-35f3867577a2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{d58730c6-b84d-45cb-b0de-92fb8b58cbe2}</UniqueIdentifier>
+      <UniqueIdentifier>{c146560c-e0f9-46da-95d7-65006aafdf99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{711c39bb-82f2-46f6-9a19-6aefb2362fe5}</UniqueIdentifier>
+      <UniqueIdentifier>{765044ed-6cab-4241-b791-f40226637a35}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{ab8b8bae-a100-4d60-bb78-def016bc3a7f}</UniqueIdentifier>
+      <UniqueIdentifier>{cf83236f-1e21-4657-bc3a-8ee015da5b03}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{046e4c64-8f19-4d28-bd3c-31db46211538}</UniqueIdentifier>
+      <UniqueIdentifier>{a4b2c506-4140-4f98-b606-35a94051583d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{8c21c715-c568-4623-b8bf-83dc7995971f}</UniqueIdentifier>
+      <UniqueIdentifier>{b2bbe5c4-44ba-49d5-b086-5e723c9cc18b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{a6756110-bd4b-4091-98c1-b49286460307}</UniqueIdentifier>
+      <UniqueIdentifier>{f502de52-76bc-4f7b-a36b-245c6821a0e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{c075bc9e-3d3d-41c8-8a37-acf1560a90f3}</UniqueIdentifier>
+      <UniqueIdentifier>{6774cd98-a457-43cd-8620-00f3195b6cd6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{42610355-fbbe-449b-8191-20da324ce05e}</UniqueIdentifier>
+      <UniqueIdentifier>{b02c4292-e944-4956-b2a8-540f8748d2b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{00d74096-b471-4c92-a200-6d6cb3fe0fa2}</UniqueIdentifier>
+      <UniqueIdentifier>{cf5537c5-7e99-4755-8912-09b87ee6a8b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{fa200180-1611-430f-85f8-bc4d7cecc8d7}</UniqueIdentifier>
+      <UniqueIdentifier>{79be748b-8c8b-47ab-99de-d9ca3a9eb031}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{be85dc86-e4ff-4f0e-8c5f-6253d9efe094}</UniqueIdentifier>
+      <UniqueIdentifier>{684d4fb6-01da-4e98-9cc1-190543f13c0d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs150.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.lib ..\lib\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\lib\debug\*32MTd.pdb ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\lib\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*32MT.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\lib\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\debug\*32MDd.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\debug\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.lib ..\lib\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\debug\*.pdb ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.dll ..\bin\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win32\bin\release\*32MD.lib ..\lib\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win32\bin\release\*.dll ..\bin\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win32\bin\release\*.lib ..\lib\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_vs150.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{59e0c7e5-8a65-4e04-ae8e-27d90d927e33}</UniqueIdentifier>
+      <UniqueIdentifier>{b44eee1f-a0b3-4f2d-b354-6ab4c3eee1b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{9c50c9fa-3432-405a-9396-f138fc2d086d}</UniqueIdentifier>
+      <UniqueIdentifier>{5fb33f31-2476-473d-a93c-ee375b6bf08d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{6dbdf680-8e62-4acf-9d3f-d612701053ae}</UniqueIdentifier>
+      <UniqueIdentifier>{91357e40-0927-4032-8d4d-00fdbfd8d23a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{6a8a6eb5-b385-4fc4-8318-b5e6e613a6c8}</UniqueIdentifier>
+      <UniqueIdentifier>{e11e384f-b3a1-4c55-9334-37937795bf21}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{ab123168-a535-4a6a-8bd4-2b1359041863}</UniqueIdentifier>
+      <UniqueIdentifier>{6644a355-a77a-47af-af4a-b76c1c03881c}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{bfa7b963-6df2-4f55-b73b-672dc5ac9809}</UniqueIdentifier>
+      <UniqueIdentifier>{746c45ba-9012-4d77-b4d7-30949fc8225a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{d72b2130-1c1c-40f6-8330-edf02c78a1f0}</UniqueIdentifier>
+      <UniqueIdentifier>{ba65a143-78fa-4f78-ba76-78b894ae6c58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{53704d11-de39-4d19-b2df-d53662816358}</UniqueIdentifier>
+      <UniqueIdentifier>{7ebb18f3-24c5-4ece-bd29-49dbb49e6b02}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{968b4b08-89e7-45ec-ad8b-7bc4334cde91}</UniqueIdentifier>
+      <UniqueIdentifier>{85fcc4c8-bf34-45a8-93c3-871e37c2e42c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{07e4c7f5-8998-4a47-b463-a6f0274b02bf}</UniqueIdentifier>
+      <UniqueIdentifier>{63e0ce8d-5396-44b4-a77f-b17d6eeffc35}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{37f56e15-dc52-4c28-a571-ce98e14e5b63}</UniqueIdentifier>
+      <UniqueIdentifier>{a152fd8d-b268-4df0-a4b7-9cf53f6f5d87}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{b6327327-f13c-4849-9369-795a98e4f959}</UniqueIdentifier>
+      <UniqueIdentifier>{35810b4f-8256-4579-9697-8731ddf71b93}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{132c45fe-7d91-4051-b8a8-3caef8a27b7c}</UniqueIdentifier>
+      <UniqueIdentifier>{485b4051-f20d-4c09-9879-deb4ab371c61}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{f58f5278-9490-4a59-a821-cd38782c1b9f}</UniqueIdentifier>
+      <UniqueIdentifier>{b65c7f07-16a4-4493-a337-4f30a1b22675}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{6e18660f-78d9-4100-a98d-c4c5bf3e8bcb}</UniqueIdentifier>
+      <UniqueIdentifier>{191ad27b-d600-4de3-965d-488cf95737d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{b56c5c11-eda6-4212-affd-037413bd04d7}</UniqueIdentifier>
+      <UniqueIdentifier>{b2c4b7b2-5aea-4fbd-8feb-a26a54b57f7f}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{865cafcf-91d6-484a-a7b7-f24185edbd39}</UniqueIdentifier>
+      <UniqueIdentifier>{33491ad2-a1dd-45df-92a5-130d10eab832}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{433fff9b-1f4f-45ab-97a5-6caec92a767f}</UniqueIdentifier>
+      <UniqueIdentifier>{a353a708-9f9e-4849-8989-14394eff38a1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs100.vcxproj

@@ -103,8 +103,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -141,8 +142,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -182,8 +183,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -212,7 +213,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -242,8 +243,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -272,8 +274,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_x64_vs100.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{86cfe8d6-8b57-446a-bb1f-b2515c8b1440}</UniqueIdentifier>
+      <UniqueIdentifier>{8688bbed-e99f-4a47-8651-ee0d89090e99}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{c282c27b-a31d-453a-8311-2c4877dcb826}</UniqueIdentifier>
+      <UniqueIdentifier>{d2df6231-23a1-42ae-ad27-7f24ffc5b2cb}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{b00db0ff-abb0-4bca-bcf9-bcdcfa83b365}</UniqueIdentifier>
+      <UniqueIdentifier>{9403b794-5192-41a9-bcc8-a2ebd2d1c3df}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{8e9ee556-8140-478e-bea0-66c92cf3f8c5}</UniqueIdentifier>
+      <UniqueIdentifier>{67fdc986-b33f-47b5-8d21-eb77f9347c3a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{eeebef5b-5340-4151-9f5b-59a9bf72ad37}</UniqueIdentifier>
+      <UniqueIdentifier>{9443f4aa-9000-4e8f-a144-20c995f3c01b}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{7b0ee7f6-968a-4073-a991-ffb856b780f0}</UniqueIdentifier>
+      <UniqueIdentifier>{3292af88-e6cf-49dd-bc3b-a897ee34f8c5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{d6522321-6003-4d31-b1d2-76a6101b6e02}</UniqueIdentifier>
+      <UniqueIdentifier>{9b5fc6c7-710b-484a-8dee-0b2fcd2c2797}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{8f27d29d-3f5d-44e7-ba56-e33a74b6e7f1}</UniqueIdentifier>
+      <UniqueIdentifier>{ceaa56ae-49c8-45de-96d8-c23b0d2cf653}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{52e3edfb-da53-4f9e-bec8-4fd2019729c7}</UniqueIdentifier>
+      <UniqueIdentifier>{56f57a2a-fbf8-433c-b3ac-837b89d17dca}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{4218ab29-a4d3-44f6-8bf7-ee7ecd686b9e}</UniqueIdentifier>
+      <UniqueIdentifier>{d06b995b-226c-4400-836a-81d994acd332}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{7aebc66a-3ad8-4673-9566-aa78401c9fee}</UniqueIdentifier>
+      <UniqueIdentifier>{3ee43923-139a-4e6d-b6fe-91dcf2c7551b}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{5edee4fb-49db-49e8-9711-3ce1a3e695bd}</UniqueIdentifier>
+      <UniqueIdentifier>{79bfb876-270d-4915-84c2-cbecc29f8a0d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{7b34acae-1430-40ce-bd54-6296ddd099a9}</UniqueIdentifier>
+      <UniqueIdentifier>{857507e1-433e-457f-bc0c-c6fa52572648}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{d1d14af0-221e-4a6e-b9a5-aa692eedb1ef}</UniqueIdentifier>
+      <UniqueIdentifier>{85b30b21-1fc5-4932-b12b-5dfd55f0c251}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{3e150c1d-e80b-4980-88a5-6bdaa301263f}</UniqueIdentifier>
+      <UniqueIdentifier>{9aa9fb56-961b-4b6f-8b50-73f2276cf7b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{b180b3d5-991d-49e6-852b-0de650942b2a}</UniqueIdentifier>
+      <UniqueIdentifier>{116bcfef-9c66-49b3-a2ea-678c22ba3343}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{05c2feb9-0664-46ea-b612-ef2a9bbe7c69}</UniqueIdentifier>
+      <UniqueIdentifier>{b366a9fe-1810-440c-b300-1625f14752ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{797dab42-34f9-443c-bb34-c276bfcc9025}</UniqueIdentifier>
+      <UniqueIdentifier>{882956a6-bb2f-4837-82ad-bba7db405401}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs110.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_x64_vs110.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{30227098-2c8e-44d9-a31e-9906ad17b46d}</UniqueIdentifier>
+      <UniqueIdentifier>{8d2d111a-fd95-43de-86b1-2000261b6bad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{7b465244-dbbb-4c15-bc42-c210c8c0d41f}</UniqueIdentifier>
+      <UniqueIdentifier>{8e879d09-e533-4e66-9290-7b01494e6cae}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{dfd1af1c-3841-4d20-8e81-6f2d3e66dfc9}</UniqueIdentifier>
+      <UniqueIdentifier>{7671961c-225d-4423-bda5-b9a38c127b7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{58af187b-4671-4688-8246-8e094cd77c72}</UniqueIdentifier>
+      <UniqueIdentifier>{8d7af12e-2b4a-43c1-80c9-dd4f6a30a1bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{6215373b-eb35-417b-9917-ba3ec2850d10}</UniqueIdentifier>
+      <UniqueIdentifier>{45a9e031-bb57-46d0-a4b4-5c62cbda7cc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{42d365bc-cb4a-4d04-b3f4-a5ecda8c5205}</UniqueIdentifier>
+      <UniqueIdentifier>{dcb3058e-e1c6-423c-bf95-f0934adf9c49}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{aa306d58-78bf-4281-ba9f-d1d5c650e987}</UniqueIdentifier>
+      <UniqueIdentifier>{b5f9c444-c598-44e4-9817-8cba24356129}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{c11cbc9c-552d-4e1c-8ca6-c93515bc6cd5}</UniqueIdentifier>
+      <UniqueIdentifier>{01898f93-b63b-4124-b631-a5d7d9b36b04}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{e389f9c5-866e-47d5-add5-b55754ba6a88}</UniqueIdentifier>
+      <UniqueIdentifier>{438a22cf-3d62-4d16-9319-6d2c54ec0517}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{60e60ef5-bc93-47df-ac76-aebb1ab7ef34}</UniqueIdentifier>
+      <UniqueIdentifier>{3938575a-924c-4fcc-9a3b-726b48a860ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{3a760d59-701e-4c7f-be8a-ecfea29327f1}</UniqueIdentifier>
+      <UniqueIdentifier>{18e5fde3-28ca-4f1b-86e3-6590f293e652}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{a5a3221e-2709-409f-8fcd-d2d2e58045ad}</UniqueIdentifier>
+      <UniqueIdentifier>{dbcbeefc-f9cc-4c1f-97f8-171ef463aac5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{5a3aa7b9-b7d4-4c9f-ac07-93369f88f5d6}</UniqueIdentifier>
+      <UniqueIdentifier>{2a6be19a-6ab3-4cd3-9351-fcc7023a4722}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{e0df7092-be13-4a50-9af2-1ab9ce33e609}</UniqueIdentifier>
+      <UniqueIdentifier>{f76a0271-67d5-48ee-9c8c-c8734f230f5f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{1487a274-9639-4232-b215-1845672b7aa3}</UniqueIdentifier>
+      <UniqueIdentifier>{f4cdfc97-b6f2-4d48-8e1a-d3cf745431e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{4effdb5c-762d-4a71-82cb-ff0819a457ad}</UniqueIdentifier>
+      <UniqueIdentifier>{68ab2af1-4781-474f-bbbc-d082521a20de}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{57073741-df3a-410d-885e-aa6d449eeb09}</UniqueIdentifier>
+      <UniqueIdentifier>{0f8679b3-02b5-461e-b4d1-7054f6416f85}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{5bb16653-715f-4be0-8b0c-6edc0d6fd19a}</UniqueIdentifier>
+      <UniqueIdentifier>{20b2e2be-14f4-4ae7-a9d7-6839f7b1d9ce}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs120.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_x64_vs120.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{ce824b27-6e37-4d15-b917-bf529b0bf7bb}</UniqueIdentifier>
+      <UniqueIdentifier>{5b64e6b9-e23c-4c4e-bb8f-37afd4fe4a3f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{5288274b-18dc-4e39-b175-b50a63e1fd9e}</UniqueIdentifier>
+      <UniqueIdentifier>{2dc6b067-c11b-4b4a-84fc-0765848859c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{fbfeeda6-a702-4f80-a2bd-bb3a3b5d2ba9}</UniqueIdentifier>
+      <UniqueIdentifier>{6a937147-f5c8-4daa-bc65-e57489ee7f95}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{7f58ad82-6cbe-4170-9ab7-fa50a35524d3}</UniqueIdentifier>
+      <UniqueIdentifier>{f151bfc1-954c-46b1-8fcf-46ef09d57088}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{64272ff8-00f5-492d-8a2f-122b09e1c90b}</UniqueIdentifier>
+      <UniqueIdentifier>{0ba67096-4fe0-428e-8bfe-4af27b0ef79e}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{8bc8d153-7f81-4ece-83ca-4aa92c2ba895}</UniqueIdentifier>
+      <UniqueIdentifier>{6c053337-5542-4df0-bf46-e633e162ac4b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{f2b8b87e-102c-44a9-98bb-58c44a879866}</UniqueIdentifier>
+      <UniqueIdentifier>{8fccac56-eb54-4b52-8c51-5e62b203defc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{9b2983cf-2801-41ad-8e47-fc4eafba0fb7}</UniqueIdentifier>
+      <UniqueIdentifier>{9aec1e27-aaad-4eb4-8a03-68042c4bde92}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{af9f2f2e-5ad8-42ad-ad18-af7d97477d49}</UniqueIdentifier>
+      <UniqueIdentifier>{f31f22e8-3fbc-4d7b-91b0-9db2236b3de1}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{23ce1197-fa24-4547-8047-bc05efe7e628}</UniqueIdentifier>
+      <UniqueIdentifier>{9cd96c79-1e7b-4f5c-9467-a515a13cd81b}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{bbdc29b4-2e3e-49b7-ac07-6122da8c4ec7}</UniqueIdentifier>
+      <UniqueIdentifier>{0ad89347-11c2-443e-93a8-9071f2f58722}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{b386798b-3ce9-496f-a4c0-1b2b9b9d72ee}</UniqueIdentifier>
+      <UniqueIdentifier>{7b877678-a1b8-43ff-8677-8baddde22ad0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{7361ef23-7d19-4080-9ebe-3af94dfdf667}</UniqueIdentifier>
+      <UniqueIdentifier>{95686c3e-c37d-4f88-95f1-1ba78ffe0d65}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{9d8d7c07-aaba-4c3b-bb3d-7af6ac06791d}</UniqueIdentifier>
+      <UniqueIdentifier>{200f4da9-dd9a-4520-b079-e269a2404f98}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{da009d06-2a12-47de-9b59-2945b1ca36f2}</UniqueIdentifier>
+      <UniqueIdentifier>{8ba56691-df39-494e-a539-3ace463bd049}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{78fe9fdb-3227-4990-b6f5-9fa523486022}</UniqueIdentifier>
+      <UniqueIdentifier>{5b52921a-4ae8-4ec8-b8ad-d5cee82a81e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{5dc70b59-0d5c-4c2a-b254-2754bcb881e3}</UniqueIdentifier>
+      <UniqueIdentifier>{b9e8ad66-bc0d-421d-9ddf-baa579126663}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{de20850f-60a6-4a0c-bf5f-ffd7456bbaa6}</UniqueIdentifier>
+      <UniqueIdentifier>{219aa11a-663e-4ff4-bbcd-360771ef004b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs140.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_x64_vs140.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{6e4051c8-5069-4345-b421-b65a27fd3631}</UniqueIdentifier>
+      <UniqueIdentifier>{d3e3bb6e-7f17-4916-b72b-789139289a6c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{8fd9c1c3-469d-48b0-a111-8fb1f0ef0a96}</UniqueIdentifier>
+      <UniqueIdentifier>{d9608685-6475-4c6e-824b-ba1f16e2e757}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{1a67ca41-19cf-4703-a390-6d0b5fbc5158}</UniqueIdentifier>
+      <UniqueIdentifier>{163f4e2c-f145-44b7-afd0-805c43701cf6}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{fb37b6d5-facd-4ffc-9d1f-b3b190d31b7a}</UniqueIdentifier>
+      <UniqueIdentifier>{e85669b0-79ff-45d6-801c-bc7c389ddb4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{8b2c3017-219c-41f6-99bb-19e1dcb6e42e}</UniqueIdentifier>
+      <UniqueIdentifier>{499cd9e7-ec7f-4b29-9d68-d3f6e9bf4e1f}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{632b62a6-503a-4443-9b51-75597f118ee0}</UniqueIdentifier>
+      <UniqueIdentifier>{2bf3cd12-ce7a-4426-86e3-058f981f1f53}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{8aea64b4-6094-4a4a-950a-2d16ede325ff}</UniqueIdentifier>
+      <UniqueIdentifier>{0df2f380-4822-4228-bb85-07bcc40cf596}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{1bac455c-4a73-429c-b03c-a2f59cdd9b38}</UniqueIdentifier>
+      <UniqueIdentifier>{e0c6d16c-b58f-449e-97e2-28d298fc65a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{861b0ee2-7aed-4ebd-8f6e-9f10d99ba946}</UniqueIdentifier>
+      <UniqueIdentifier>{48322480-e1cd-4074-897d-26b54f0130ab}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{c99955a7-6989-4130-9916-084467afec07}</UniqueIdentifier>
+      <UniqueIdentifier>{bca4443c-a903-49c7-9b01-06a7de2b337c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{31eac1c6-6760-4966-9b25-7a14ede469f8}</UniqueIdentifier>
+      <UniqueIdentifier>{5ee3c328-f00a-42ff-a995-36012968b9ba}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{fa6136ba-8c51-4c51-a8bf-037ab67df76d}</UniqueIdentifier>
+      <UniqueIdentifier>{5ebf8c52-a956-4d63-abe9-a8e1bf1e34b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{8f886582-7ae6-4bc4-a8b2-62d996b52e89}</UniqueIdentifier>
+      <UniqueIdentifier>{def09540-2932-496e-890c-12c82efb8942}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{5fa77495-38f0-4da5-b6ea-b84f96ae3806}</UniqueIdentifier>
+      <UniqueIdentifier>{363d9a54-9bba-48e2-9324-61ce6304ab52}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{803803b5-c3bf-4efc-86e2-0c9f28032e46}</UniqueIdentifier>
+      <UniqueIdentifier>{08be421c-277e-4686-827b-7a41ad332197}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{1add83bf-eaec-4676-88eb-c830151a7515}</UniqueIdentifier>
+      <UniqueIdentifier>{59774c4e-9080-4ac9-9a9f-86c978e7459d}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{3e90851c-1cda-402c-9674-16db05224925}</UniqueIdentifier>
+      <UniqueIdentifier>{4513247d-6b10-4505-8b68-61e33bd9be72}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{0bb38bb2-1263-48e9-9b60-4c97a55ea977}</UniqueIdentifier>
+      <UniqueIdentifier>{e3bb9603-6fe1-4c16-b21c-36be7e43305e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs150.vcxproj

@@ -121,8 +121,9 @@
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -156,8 +157,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -194,8 +195,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -222,7 +223,7 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -250,8 +251,9 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>
@@ -278,8 +280,8 @@ exit 0</Command>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
     <PreBuildEvent>
-      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul
-xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul
+      <Command>xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul
+xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul
 exit 0</Command>
     </PreBuildEvent>
     <ClCompile>

Crypto/Crypto_x64_vs150.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{1faab222-da48-4354-8283-92992d3ccf31}</UniqueIdentifier>
+      <UniqueIdentifier>{feb66efb-0308-45ad-b103-646a848a7194}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{961b7b0e-2f1f-4d27-b156-e3f4da8f7a8c}</UniqueIdentifier>
+      <UniqueIdentifier>{dfa8c684-98e3-44c6-8e7d-b5b64fb4c63d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{707c2ddb-f358-4452-b602-6ed5ec530cf9}</UniqueIdentifier>
+      <UniqueIdentifier>{f0376b48-442e-4aa8-b2ea-1643211a3a54}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{807f8938-1e6d-4506-b223-ed02c4a07c57}</UniqueIdentifier>
+      <UniqueIdentifier>{2b0e007e-0056-4709-b2b7-6d8ed4471344}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{336381ef-671f-4b98-bffb-738066c95239}</UniqueIdentifier>
+      <UniqueIdentifier>{17a9f69b-a3a8-48c3-b88f-0306585468d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{954bd574-21a8-4171-a6e8-e839f749091d}</UniqueIdentifier>
+      <UniqueIdentifier>{4d88fec1-35e4-4573-89b2-33587e529720}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{4b79b870-4ab0-4f5f-b270-6f017a2f5fb2}</UniqueIdentifier>
+      <UniqueIdentifier>{fed835ed-e760-4223-962e-191b98b57e90}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{a8b9aa67-b522-4e40-8035-901d9288700e}</UniqueIdentifier>
+      <UniqueIdentifier>{dbbd61d4-cf37-43e8-a0ad-e7999c5a3d70}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{567e010c-6e86-4747-a69a-46f66b43fb3e}</UniqueIdentifier>
+      <UniqueIdentifier>{dc70a372-7916-4c69-a0c7-1bf609dabbe0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{f419d792-92d8-4a46-8919-b58ec49154d3}</UniqueIdentifier>
+      <UniqueIdentifier>{d4dd7ead-0209-47f2-a9e3-d3bfb8211a1e}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{c60d8ac0-fb75-4238-b548-7e4df986c8b5}</UniqueIdentifier>
+      <UniqueIdentifier>{a09369f7-9eec-41da-b582-108347f2029f}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{0466822c-e00f-46b3-97d3-5fdf5003ea1d}</UniqueIdentifier>
+      <UniqueIdentifier>{b756ced0-b2ac-472f-bff6-31d7abef69e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{687367ce-bfda-4191-b96f-6dc4922cc44f}</UniqueIdentifier>
+      <UniqueIdentifier>{8987f04f-8f65-43fd-b4f3-049e8ee34f0e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{abc74a65-819b-400e-80f0-168b93143d5c}</UniqueIdentifier>
+      <UniqueIdentifier>{00e2008a-4dad-46bc-83c5-caf67879825b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{39f5c154-cd59-4433-8ca0-4f681b0079e6}</UniqueIdentifier>
+      <UniqueIdentifier>{eeb3c1de-3b29-48d3-a262-b62e19b35863}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{88e0de54-35e8-43d1-b69c-10f4eafe5db0}</UniqueIdentifier>
+      <UniqueIdentifier>{e3371425-03d9-4c64-ac23-ccbeafae4285}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{12c5ab15-1d35-471f-b5e9-f36a41f93ce5}</UniqueIdentifier>
+      <UniqueIdentifier>{8beef14d-9dc2-41bf-b30e-0c01f316bf77}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{7647103a-7c13-4996-aedd-e407a6057120}</UniqueIdentifier>
+      <UniqueIdentifier>{232b8ef0-340f-48c9-a4ef-668962c6bc53}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs90.vcproj

@@ -20,7 +20,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -91,7 +91,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -166,7 +166,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.lib ..\lib64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\lib\debug\*64MTd.pdb ..\lib64\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win64\lib\debug\*.lib ..\lib64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\lib\debug\*.pdb ..\lib64\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -225,7 +225,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win64\lib\release\*64MT.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win64\lib\release\*.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -285,7 +285,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\debug\*64MDd.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\debug\*.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\debug\*.lib ..\lib64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\debug\*.pdb ..\lib64\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool
@@ -344,7 +344,7 @@
 			CharacterSet="2">
 			<Tool
 				Name="VCPreBuildEventTool"
-				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\release\*64MD.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
+				CommandLine="xcopy /y ..\openssl\VS_120\win64\bin\release\*.dll ..\bin64\* 1&gt;nul&#xA;xcopy /y ..\openssl\VS_120\win64\bin\release\*.lib ..\lib64\* 1&gt;nul&#xA;exit 0"/>
 			<Tool
 				Name="VCCustomBuildTool"/>
 			<Tool

Crypto/include/Poco/Crypto/Crypto.h

@@ -101,13 +101,8 @@ enum RSAPaddingMode
 
 	#if !defined(POCO_NO_AUTOMATIC_LIBS)
 		#if !defined(POCO_EXTERNAL_OPENSSL)
-			#if defined (_DLL)
-				#pragma comment(lib, "libeay" POCO_PLATFORM_BITS "MD" POCO_DEBUG_POSTFIX ".lib")
-				#pragma comment(lib, "ssleay" POCO_PLATFORM_BITS "MD" POCO_DEBUG_POSTFIX ".lib")
-			#else
-				#pragma comment(lib, "libeay" POCO_PLATFORM_BITS "MT" POCO_DEBUG_POSTFIX ".lib")
-				#pragma comment(lib, "ssleay" POCO_PLATFORM_BITS "MT" POCO_DEBUG_POSTFIX ".lib")
-			#endif
+				#pragma comment(lib, "libcrypto.lib")
+				#pragma comment(lib, "libssl.lib")
 		#endif // POCO_EXTERNAL_OPENSSL
 		#if !defined(Crypto_EXPORTS)
 			#pragma comment(lib, "PocoCrypto" POCO_LIB_SUFFIX)

Crypto/include/Poco/Crypto/EVPPKey.h

@@ -121,8 +121,8 @@ public:
 private:
 	EVPPKey();
 
+	static int type(EVP_PKEY* pEVPPKey);
 	void newECKey(const char* group);
-
 	void duplicate(EVP_PKEY* pEVPPKey);
 
 	void setKey(ECKey* pKey);
@@ -247,14 +247,19 @@ private:
 // inlines
 //
 
-inline int EVPPKey::type() const
+inline int EVPPKey::type(EVP_PKEY* pEVPPKey)
 {
-	if (!_pEVPPKey) return NID_undef;
+	if (!pEVPPKey) return NID_undef;
 
-	return EVP_PKEY_type(_pEVPPKey->type);
+	return EVP_PKEY_type(EVP_PKEY_id(pEVPPKey));
 }
 
 
+inline int EVPPKey::type() const
+{
+	return type(_pEVPPKey);
+}
+
 inline bool EVPPKey::isSupported(int type) const
 {
 	return type == EVP_PKEY_EC || type == EVP_PKEY_RSA;

Crypto/samples/genrsakey/genrsakey.progen

@@ -11,9 +11,9 @@ vc.project.compiler.include = ${openssl}\\VS_120\\include;..\\..\\..\\Foundation
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib
-vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib
-vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib
-vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib
-vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib
+vc.project.linker.dependencies.debug_shared =
+vc.project.linker.dependencies.release_shared =
+vc.project.linker.dependencies.debug_static_md = Crypt32.lib
+vc.project.linker.dependencies.release_static_md = Crypt32.lib
+vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
+vc.project.linker.dependencies.release_static_mt = Crypt32.lib

Crypto/samples/genrsakey/genrsakey_CE_VS90.vcproj

@@ -57,7 +57,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\shared\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -130,7 +130,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\shared\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32mtd.lib ssleay32mtd.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_mt\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -280,7 +280,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32mt.lib ssleay32mt.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_mt\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -354,7 +354,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_md\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -430,7 +430,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_md\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"

Crypto/samples/genrsakey/genrsakey_VS90.vcproj

@@ -56,7 +56,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -127,7 +127,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -196,7 +196,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mtd.lib ssleay32mtd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_mt\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -267,7 +267,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mt.lib ssleay32mt.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_mt\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -336,7 +336,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_md\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -407,7 +407,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_md\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"

Crypto/samples/genrsakey/genrsakey_WEC2013_vs110.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{18dfb1d8-7103-430a-851a-5dd5ee008c3e}</UniqueIdentifier>
+      <UniqueIdentifier>{00a8228d-e39c-4a37-aaf1-807e5cbccfac}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{73676dcf-8d10-47da-9c91-14f446e3f3d3}</UniqueIdentifier>
+      <UniqueIdentifier>{3ff2a285-6a8c-425e-b3cf-440c8ec5e844}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_WEC2013_vs120.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{647609d5-6943-455b-a56b-a0409da32029}</UniqueIdentifier>
+      <UniqueIdentifier>{d569a013-bdeb-49ea-8509-0532a60249e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{5b358958-9ff0-44c4-b8e6-874ed4a3898c}</UniqueIdentifier>
+      <UniqueIdentifier>{c049f08d-f595-4d59-8845-c12dd04c796e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_vs100.vcxproj

@@ -126,7 +126,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -160,7 +160,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -192,7 +192,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -226,7 +226,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,7 +258,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -292,7 +292,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_vs100.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{321b5744-5842-4f9d-b59c-e8ef2004e159}</UniqueIdentifier>
+      <UniqueIdentifier>{36ff3342-810d-4ed9-b25c-5c431aebf654}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{30604d5a-afd2-4eb3-8fa4-b750a640cc85}</UniqueIdentifier>
+      <UniqueIdentifier>{e61afe37-4dd9-443f-8fb9-dab739ebf68e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_vs110.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{f7de773f-2dfa-46f8-a496-88626094a4b9}</UniqueIdentifier>
+      <UniqueIdentifier>{39e74eca-502b-4836-9d80-2cc5f20d7a8f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{704fc758-9cc7-4ea1-a9be-3f07e22b690e}</UniqueIdentifier>
+      <UniqueIdentifier>{831d93bc-b645-4216-ba59-80a0558c04f9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_vs120.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_vs120.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{289d3809-6fd8-45a5-8f50-24178e5d7973}</UniqueIdentifier>
+      <UniqueIdentifier>{b58772cc-fbb3-4f27-86c7-97c01a6b1044}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{71987181-1c04-4ac6-b84b-6a1e09981ef6}</UniqueIdentifier>
+      <UniqueIdentifier>{90bef24a-06c0-476d-9fbf-3874c07d9057}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_vs140.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_vs140.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{40be4015-88c4-4b44-af30-58982d55d4f5}</UniqueIdentifier>
+      <UniqueIdentifier>{fa018a48-1ad0-4e3f-8502-179dc1b31944}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{dcd4e812-7c5c-4a58-9a04-3c0eb308874e}</UniqueIdentifier>
+      <UniqueIdentifier>{32a6ce39-a5e2-473d-a9d2-654849bad11a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_vs150.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_vs150.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{ee78417e-45ff-47f6-992f-392546191f5c}</UniqueIdentifier>
+      <UniqueIdentifier>{f4add40d-c355-4e24-82ab-f34a63ca96c3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{cfb857fb-e43d-41a0-95af-6007f487276b}</UniqueIdentifier>
+      <UniqueIdentifier>{25cef9c9-42d8-4f8b-bb17-a9a37c7fba8d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj

@@ -126,7 +126,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -160,7 +160,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -192,7 +192,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -226,7 +226,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,7 +258,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -292,7 +292,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{0c3ae250-2e7c-4412-8c9e-c2e8ef13ae0b}</UniqueIdentifier>
+      <UniqueIdentifier>{f2203d86-cda1-4c9b-84d7-2c231caec44f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{ce5093b6-470e-4bd3-9d59-1290566e14b3}</UniqueIdentifier>
+      <UniqueIdentifier>{629cd3ae-7097-479b-8355-537df9d8a9fa}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{9af34413-9f6c-4fb8-b809-f859cee27d7e}</UniqueIdentifier>
+      <UniqueIdentifier>{d27fdd63-7956-4c98-8b60-871b90bd7885}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{390dd90b-f93a-4232-ba93-3b3306475b53}</UniqueIdentifier>
+      <UniqueIdentifier>{83a600ac-9c48-4434-bc97-7998d54a9394}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_x64_vs120.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{c5c58412-026e-4246-95fd-aa3c2937b2f6}</UniqueIdentifier>
+      <UniqueIdentifier>{f326b938-370c-4bba-b260-ad665eab332b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{3b66d27b-7a08-434c-8d9b-fba22fd7c582}</UniqueIdentifier>
+      <UniqueIdentifier>{17e31b03-7822-45c1-8c59-dcd071b33d30}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_x64_vs140.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_x64_vs140.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{5dc630ef-38a9-4c24-ad43-63228b96dc60}</UniqueIdentifier>
+      <UniqueIdentifier>{b47cb8fa-cae1-493c-b790-8077e0fb5397}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{d11e14e7-df49-495a-add0-eaa664892531}</UniqueIdentifier>
+      <UniqueIdentifier>{a0300c99-ede8-4088-b6d2-dc5accbe78ad}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj

@@ -142,7 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -173,7 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -202,7 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -233,7 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -262,7 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakeyd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -293,7 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\genrsakey.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

Crypto/samples/genrsakey/genrsakey_x64_vs150.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{13059810-e9c0-43f0-88bc-60ce0dd6a0c8}</UniqueIdentifier>
+      <UniqueIdentifier>{c928d079-6f52-4fe0-85c5-0749a1230364}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{a3be016b-efd3-46ca-acbb-64a44638693f}</UniqueIdentifier>
+      <UniqueIdentifier>{a229fad9-a87f-419a-ba01-c019918db8d2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/samples/genrsakey/genrsakey_x64_vs90.vcproj

@@ -56,7 +56,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="bin64\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -127,7 +127,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="bin64\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -196,7 +196,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mtd.lib ssleay32mtd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin64\static_mt\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -267,7 +267,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mt.lib ssleay32mt.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin64\static_mt\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -336,7 +336,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin64\static_md\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib64"
@@ -407,7 +407,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin64\static_md\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib64"

Crypto/src/EVPPKey.cpp

@@ -216,7 +216,8 @@ void EVPPKey::duplicate(EVP_PKEY* pEVPPKey)
 	if (!_pEVPPKey) throw NullPointerException("EVPPKey::duplicate(): "
 		"EVP_PKEY_new() returned null.");
 
-	switch (pEVPPKey->type)
+	int keyType = type(pEVPPKey);
+	switch (keyType)
 	{
 		case EVP_PKEY_RSA:
 		{
@@ -242,7 +243,7 @@ void EVPPKey::duplicate(EVP_PKEY* pEVPPKey)
 		}
 		default:
 			throw NotImplementedException("EVPPKey:duplicate(); Key type: " +
-				NumberFormatter::format(pEVPPKey->type));
+				NumberFormatter::format(keyType));
 	}
 }
 

Crypto/src/PKCS12Container.cpp

@@ -95,11 +95,11 @@ void PKCS12Container::load(PKCS12* pPKCS12, const std::string& password)
 				PKCS12_SAFEBAG* pBag = PKCS12_add_cert(&pBags, pCert);
 				if (pBag)
 				{
-					char*pBuffer = PKCS12_get_friendlyname(pBag);
+					char* pBuffer = PKCS12_get_friendlyname(pBag);
 					if(pBuffer)
 					{
 						_pkcsFriendlyname = pBuffer;
-						CRYPTO_free(pBuffer);
+						OPENSSL_free(pBuffer);
 					}else _pkcsFriendlyname.clear();
 					if(pBags) sk_PKCS12_SAFEBAG_pop_free(pBags, PKCS12_SAFEBAG_free);
 				}

Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{46556eeb-7811-46f0-91e0-45bc5f160d6f}</UniqueIdentifier>
+      <UniqueIdentifier>{5063e892-1d23-4169-8df3-ee5ccf6e76db}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{26afc65c-1c22-495f-89f5-3c0bf0ceae60}</UniqueIdentifier>
+      <UniqueIdentifier>{7860b730-fe11-480c-ab8d-0b1c72520545}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{358ed9dd-edc3-4fb7-b758-9a451d27d240}</UniqueIdentifier>
+      <UniqueIdentifier>{947b29e8-6db9-482a-aa69-db33bc534920}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{bb7e6d74-cd43-4005-8d4d-daf7f2631ea2}</UniqueIdentifier>
+      <UniqueIdentifier>{2c99c0de-37bd-41c3-8d4b-6192593b991a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{20170e7c-d1da-4c37-9df3-eb30bbb9768b}</UniqueIdentifier>
+      <UniqueIdentifier>{3ffb092d-28e3-4d4e-8fcf-5f35f59822f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{7c3b9bd2-7c52-4dcd-9e22-505a15292af9}</UniqueIdentifier>
+      <UniqueIdentifier>{3f1e5d22-8d4a-43da-8632-2c8bc96b9965}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{18ef32b1-0df5-43fb-8c02-d81009cd05e8}</UniqueIdentifier>
+      <UniqueIdentifier>{f4cf1914-90ad-44ac-ae5a-7024567b524b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{a3a70a84-8aca-4162-adfc-54e95307f7aa}</UniqueIdentifier>
+      <UniqueIdentifier>{af3536ab-0d20-46b4-a709-3940754bc53b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{0845c1aa-6e92-4586-ae4c-47e32f3d946a}</UniqueIdentifier>
+      <UniqueIdentifier>{4fac2833-ad7e-45de-8345-05776e4b17b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{4d14d116-77e4-463b-a237-d718afdd4184}</UniqueIdentifier>
+      <UniqueIdentifier>{193e4dce-1213-4e5b-8b94-1916aab2214a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{d99ba2ac-e516-4d30-a622-ef9a4eb40f58}</UniqueIdentifier>
+      <UniqueIdentifier>{38a8125e-3f73-43e3-88ae-e99185708f20}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{b82c4ba2-edc2-4218-9722-e4e7f809e546}</UniqueIdentifier>
+      <UniqueIdentifier>{61d828eb-b205-4cfd-bb7a-3761e664bc50}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{a89816a8-d50e-4c95-ad49-adb97317edcf}</UniqueIdentifier>
+      <UniqueIdentifier>{a68d1e9f-f7f7-4729-a4c7-9979f7dbc736}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{b414cf4c-b12c-4fc0-aa23-12239bfe20d7}</UniqueIdentifier>
+      <UniqueIdentifier>{91091d02-d2a9-48ac-9eb8-54b529be04c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{4e755f47-2baf-4f4f-9758-baa1c677e1b7}</UniqueIdentifier>
+      <UniqueIdentifier>{67ea7ed6-f9d2-4335-9559-b89d8eaf4d8d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{00dc5841-a94e-4ac4-bc60-510432487011}</UniqueIdentifier>
+      <UniqueIdentifier>{dd16d34e-f265-4233-92c0-13675222762a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_vs100.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{03ee92f9-49ca-439c-b4ec-7a853e6e7d5d}</UniqueIdentifier>
+      <UniqueIdentifier>{be7f9f0d-0401-4469-947b-3b20876c35a3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{e9ba8ee4-ac82-4bc4-87f7-1e1b34760a80}</UniqueIdentifier>
+      <UniqueIdentifier>{74dc9297-b8a4-47d8-aee0-2d4d064bc81d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{7b7e3115-64ee-4fce-aae3-8bff87a05fda}</UniqueIdentifier>
+      <UniqueIdentifier>{0fccd382-d1bf-498b-8f19-6e03253ba672}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{aa119ac6-1492-4529-8133-0045dcc191b3}</UniqueIdentifier>
+      <UniqueIdentifier>{874061e9-40d1-4254-a1e8-d09efb2edf41}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{41fbfb2e-6f5a-4527-aef1-a005493b3720}</UniqueIdentifier>
+      <UniqueIdentifier>{7b30c2c2-0dee-41c7-b4cc-1a5397ff669b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{8be7bf58-482a-4074-b27f-74c07dcc83ce}</UniqueIdentifier>
+      <UniqueIdentifier>{fd2f4e3e-c1df-474b-ad5c-c38084c7413e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{c6c4ed2d-2630-473e-a75b-2719845a1ce2}</UniqueIdentifier>
+      <UniqueIdentifier>{104dd86b-1515-4fd2-9ea0-02bd3db73c2a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{3454a18f-c9bb-4c8b-a45d-b2e5d861b13f}</UniqueIdentifier>
+      <UniqueIdentifier>{3b7aa9ee-7bb2-481c-b00b-c5bb429a2140}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_vs110.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{d4c4c525-b504-4ded-88d4-cd228fa6c77d}</UniqueIdentifier>
+      <UniqueIdentifier>{e873f8f7-b691-4125-9bee-9e1b4b7b0759}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{b09ae726-a9b9-4be4-9106-349588b990a8}</UniqueIdentifier>
+      <UniqueIdentifier>{29541721-2f6b-4ed7-94f8-23552b583e8b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{c39b1b72-381d-4554-8fc1-332ac87d58ea}</UniqueIdentifier>
+      <UniqueIdentifier>{76ed44d2-1aa6-470d-8b99-fb698084c8b7}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{890e47b8-c77c-495b-8279-a958078ff0da}</UniqueIdentifier>
+      <UniqueIdentifier>{a75f5843-715e-498e-a4c2-b52e5dec3c21}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{d9a7355e-7d73-4b67-aa2a-31e114719844}</UniqueIdentifier>
+      <UniqueIdentifier>{a4d29a0d-4f31-4875-93b4-923dddeaa4fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{11397398-057e-4d91-9432-91cee0515329}</UniqueIdentifier>
+      <UniqueIdentifier>{fc524cc2-8826-41ee-bf8e-dfd18fd0b1bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{de16a63a-f07d-41df-a41e-681ff7e55095}</UniqueIdentifier>
+      <UniqueIdentifier>{0bb100c4-837b-48fd-b1f9-05197a91f9b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{d0188b1f-d2ac-4199-8a97-403d84d4f0f8}</UniqueIdentifier>
+      <UniqueIdentifier>{f2136498-3cdd-4a17-a705-f26d3b2715fc}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_vs120.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{7ed78d2a-81aa-4087-9455-01af70d0b068}</UniqueIdentifier>
+      <UniqueIdentifier>{0bac9d30-5877-4894-ae8a-2fbd4f5c2ce7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{1323c161-5739-41d6-8a2e-43c3b3e42179}</UniqueIdentifier>
+      <UniqueIdentifier>{723dfaf9-7c28-4b3b-b6d5-9d87b431e6a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{65203332-5df8-44d4-984c-58ce752fbcf0}</UniqueIdentifier>
+      <UniqueIdentifier>{d0d89912-3a81-4712-9fb2-e675a5ae6225}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{fde5cca4-aa46-4a66-89ff-7a03cf8bc4b6}</UniqueIdentifier>
+      <UniqueIdentifier>{33a66a0e-e711-4ec6-a64a-09c2d4399979}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{cdde7947-38b7-4bec-8b25-1cb9cd87c015}</UniqueIdentifier>
+      <UniqueIdentifier>{ee2b1075-46a2-431d-94ad-6d469ffef8b4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{96f9cc0c-e46c-44b7-b099-0869398b8dd8}</UniqueIdentifier>
+      <UniqueIdentifier>{770a833f-6733-47c6-ae05-253d13e8bd99}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{9050c19e-19ac-467b-9cf5-9913954bcdfd}</UniqueIdentifier>
+      <UniqueIdentifier>{9a2426b1-9f56-46a0-8fd0-d599d57f242e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{b7f46e61-ed43-4856-aafc-f8b222f42a62}</UniqueIdentifier>
+      <UniqueIdentifier>{83f25ab0-546b-4cb5-be53-9c55202c16f2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_vs140.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{14020ef2-309e-4277-8181-d9bea8354ccb}</UniqueIdentifier>
+      <UniqueIdentifier>{a0d425f8-5ca7-4a7f-8761-9a33cc642847}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{bdb98106-9abc-4d31-8857-76dea760d695}</UniqueIdentifier>
+      <UniqueIdentifier>{983bb1a9-cbd4-42aa-8e1e-0a86a95add97}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{6c32eab7-7175-4c55-8a9b-4af8a2bc89d6}</UniqueIdentifier>
+      <UniqueIdentifier>{b508464e-9138-4214-bb98-5211f24568dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{1b7cb881-e0e9-46e5-85df-087a5d3f15dd}</UniqueIdentifier>
+      <UniqueIdentifier>{8ed7f50a-1ee5-4a0f-81ff-135abc3bd717}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{a851c1c8-b345-4195-8452-0efd066e47e6}</UniqueIdentifier>
+      <UniqueIdentifier>{f1adcd46-f39f-4863-b2f3-5560c8c53938}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{5100e0bc-edd3-4a25-a025-33e9e7fb2df8}</UniqueIdentifier>
+      <UniqueIdentifier>{d4b57edf-f1af-4aa3-82df-281f477b2ce7}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{c15d4710-a7e3-4b04-b3e6-3253e36125f1}</UniqueIdentifier>
+      <UniqueIdentifier>{76a5094c-a243-49dd-b0f2-d54c5cf93009}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{5dca9a06-4b57-4af3-8d33-7fcbeb6d9286}</UniqueIdentifier>
+      <UniqueIdentifier>{15636ccd-6f9e-4430-96b7-d9e18fdf739a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_vs150.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{7201278c-4cb6-4865-a53a-a88f307c0bff}</UniqueIdentifier>
+      <UniqueIdentifier>{d5d47b05-e8ba-4282-87c6-fd92b815f845}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{111af63a-4bba-45cc-9ed2-bbe995048dd8}</UniqueIdentifier>
+      <UniqueIdentifier>{03c085ef-2eec-4df6-b767-e7fda16817db}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{598e5080-6b9e-4afd-9d3b-62240c99add2}</UniqueIdentifier>
+      <UniqueIdentifier>{55fcc409-8363-491c-b850-3da41753dab7}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{38b81572-0ea6-4022-b367-76b90a0981ee}</UniqueIdentifier>
+      <UniqueIdentifier>{86f6f695-6f40-4c7c-9a5e-62e1dccd9d4f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{e20886ab-e51f-4166-9748-1a84f3f98361}</UniqueIdentifier>
+      <UniqueIdentifier>{6a21c15c-ad12-4142-91e7-09548a35d439}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{2fc4f887-b131-47b6-8608-c7baaf677877}</UniqueIdentifier>
+      <UniqueIdentifier>{b1c21527-5d89-4232-9231-4689ee96a5e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{a5abbda6-2698-4982-ad17-d8334191ffd7}</UniqueIdentifier>
+      <UniqueIdentifier>{83d6243d-da6f-4e42-ae37-92de71c27f36}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{c8408b45-76c4-4b51-99bb-f5af015cb6b9}</UniqueIdentifier>
+      <UniqueIdentifier>{a1ce577d-4ce8-4abc-8531-fb9a533048a9}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{49497c1d-dffe-4522-8260-3df52b440628}</UniqueIdentifier>
+      <UniqueIdentifier>{a3d56cd0-32a8-42a8-a293-cfed50374bcf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{2689803a-543a-4cd9-aefa-5821a8a88852}</UniqueIdentifier>
+      <UniqueIdentifier>{4dcc9b92-8139-4e9e-80af-0bcdbf42287a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{f239a6c3-597c-4543-adc5-16dcfad67b26}</UniqueIdentifier>
+      <UniqueIdentifier>{6f6e23b4-6693-49b4-8037-7d01e3e1688f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{bdf36fcd-886e-4c8f-b68e-c34d7d20d23a}</UniqueIdentifier>
+      <UniqueIdentifier>{bf1db45b-8d0f-436c-8cfc-0f11ab3eb8b8}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{9c0cb17f-d87b-4728-8feb-7b9a0aee4919}</UniqueIdentifier>
+      <UniqueIdentifier>{71177f30-669a-46be-986d-7929323342e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{1ecc67e5-e675-48b8-b70a-8563a78f116f}</UniqueIdentifier>
+      <UniqueIdentifier>{97cad33c-ee72-49b7-937c-aaec66ddcbcf}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{2ec2113c-c5dc-4fe6-893f-22f519ce7bb7}</UniqueIdentifier>
+      <UniqueIdentifier>{09d9ec58-61fd-423d-8592-fe593e2837a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{bb1b71b0-dbf8-4379-98e6-de0de529869d}</UniqueIdentifier>
+      <UniqueIdentifier>{58ce7a30-9e36-4868-8de4-447908e521f5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{24b608cd-8757-43b8-80c5-4230d7d6c918}</UniqueIdentifier>
+      <UniqueIdentifier>{7938ff64-d5a8-4833-b5da-36f5dac8ac26}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{686a133e-be58-400c-b745-937593e26a33}</UniqueIdentifier>
+      <UniqueIdentifier>{4fbfa487-60e5-477b-b11f-09aa55a13706}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{c2a27d76-2132-42ea-ae74-c9cf4d38307a}</UniqueIdentifier>
+      <UniqueIdentifier>{b277de34-3b38-4a30-a888-e87f7405951e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{ea2d8fcb-16cb-4c51-af81-f4ebb9a0ac1d}</UniqueIdentifier>
+      <UniqueIdentifier>{28790b7b-ab5a-4942-b76d-6c4f8b4bef30}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{d3d257de-a55e-4ac0-a3b4-9015f5fb5cd6}</UniqueIdentifier>
+      <UniqueIdentifier>{c2d06622-7064-4151-b9db-f03d88a3bb89}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{11e6c108-a5be-4361-9737-a418b3db0443}</UniqueIdentifier>
+      <UniqueIdentifier>{5363c10a-2185-4670-88e2-508a34bd6214}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{944b6b75-3951-48e6-81d5-6e596d074efc}</UniqueIdentifier>
+      <UniqueIdentifier>{0527de58-605d-4b9b-9243-5b27b52b2eba}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{09325e26-328b-4344-af22-d97cb694e7df}</UniqueIdentifier>
+      <UniqueIdentifier>{6cf03b86-f63b-4b1f-a8c1-f0b12c52a7eb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{a061d546-d72e-4961-a316-3cf8dbcb5655}</UniqueIdentifier>
+      <UniqueIdentifier>{7496f4ce-5ba7-4986-ad80-89d1c3818d19}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{b34a6835-cfa0-4b70-9ad0-e016c2326367}</UniqueIdentifier>
+      <UniqueIdentifier>{f7dcad61-b566-4e38-8b30-b8e165ccbdd4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{284c6999-1ff6-492f-ac2e-27acab9b7d8f}</UniqueIdentifier>
+      <UniqueIdentifier>{dcefcb72-b53f-47bc-a44c-a56b724257aa}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{518fc44c-07ac-48f8-a0c9-ff99ec2189e0}</UniqueIdentifier>
+      <UniqueIdentifier>{9e2197db-5527-4bf4-a49a-36379445d1a6}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{276ebad8-4a00-4781-96c8-0756278abc0b}</UniqueIdentifier>
+      <UniqueIdentifier>{b6c2afca-1f0a-4b78-a062-16df5ab35a28}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{1a0530d5-6aaf-41e4-aa98-bb0eb980fca1}</UniqueIdentifier>
+      <UniqueIdentifier>{06dca2cc-ef05-4c84-8e82-264904ed3c32}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{2e1305c5-ba9a-4d17-80fc-be8a146aacfe}</UniqueIdentifier>
+      <UniqueIdentifier>{ed2642f8-94a6-4234-a9e1-35b14edf4a90}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{42850228-9610-451c-8e04-f6223fb7b1ea}</UniqueIdentifier>
+      <UniqueIdentifier>{4f093996-2fe5-4f07-9a4c-950629963348}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{74dad025-af71-4fde-ac3d-27544bf916dd}</UniqueIdentifier>
+      <UniqueIdentifier>{7c178c08-3d41-4ef6-b2f9-f134868de748}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{4fa02c41-8d73-485d-88f3-0f591cc510e5}</UniqueIdentifier>
+      <UniqueIdentifier>{e3bed82d-16f7-432b-b925-907d0315ba39}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{3baafeff-c5ac-426f-b1c5-a57a32635f10}</UniqueIdentifier>
+      <UniqueIdentifier>{1de4b0fa-767f-4a8c-8c6f-684917ad5563}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{d3a878e2-667e-4ed0-bd49-053ef1bd635e}</UniqueIdentifier>
+      <UniqueIdentifier>{77f79756-e196-4af8-9930-115f8ce68545}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{7ede8457-2ebf-4f4d-ba5a-0d9608fa90a9}</UniqueIdentifier>
+      <UniqueIdentifier>{ed5e6df5-0a4a-46c7-984e-f51a6236059f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{7f6aa41d-ef90-44f9-95bf-a2a7a204da00}</UniqueIdentifier>
+      <UniqueIdentifier>{47c378d2-513b-45ed-b45a-f73fdbf55dd1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{790b91d0-7366-4deb-9697-eaa19dd693cc}</UniqueIdentifier>
+      <UniqueIdentifier>{2bdecc9f-0c46-4f08-9e2c-9c8ee0318fc1}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{347085f9-aaaa-4614-9f90-fc836e1c8147}</UniqueIdentifier>
+      <UniqueIdentifier>{9844fa91-a2d0-4fda-9707-034620bf00a6}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters

@@ -2,28 +2,28 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Crypto">
-      <UniqueIdentifier>{8f818b09-9274-43e1-9545-3eddf788c312}</UniqueIdentifier>
+      <UniqueIdentifier>{f19dfc0d-9858-4678-be8e-dfd3bcbf4dad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Header Files">
-      <UniqueIdentifier>{1be73e5a-46d0-4418-bd2a-420acada9853}</UniqueIdentifier>
+      <UniqueIdentifier>{c91a5bac-348c-4840-b9b5-e443a98b610e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Crypto\Source Files">
-      <UniqueIdentifier>{9c9dffac-bd98-4a06-8b6f-3cf54ef84e2a}</UniqueIdentifier>
+      <UniqueIdentifier>{fe3bdf6e-5f1e-421a-b45b-b6ad8c82fc84}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{92ea2fd3-a566-4d9a-9f32-0bfac7e2226c}</UniqueIdentifier>
+      <UniqueIdentifier>{033d434d-a633-4d2f-b600-6cb89b5b564b}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{c3219981-ee5a-4b6a-808d-dca462d005e9}</UniqueIdentifier>
+      <UniqueIdentifier>{6d496965-ef55-4cf5-a4f4-b107a7d11036}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{79e9cb0a-3e75-414f-95b2-4d7b64dc10f7}</UniqueIdentifier>
+      <UniqueIdentifier>{41d5fc5e-e5c2-4eba-8007-745f78d21928}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{26c593b1-9444-4437-9e0e-0171f1ba93a5}</UniqueIdentifier>
+      <UniqueIdentifier>{68dceee7-8e1e-4fe5-958f-5569affe053d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{c7d8fcf7-7209-456a-a836-5a1d80892fc1}</UniqueIdentifier>
+      <UniqueIdentifier>{ecd870ad-b55c-48be-a697-09c24f177a84}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL.progen

@@ -16,11 +16,11 @@ vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.share
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib
-vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib
-vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib
-vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib
-vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib
+vc.project.linker.dependencies.debug_shared =
+vc.project.linker.dependencies.release_shared =
+vc.project.linker.dependencies.debug_static_md = Crypt32.lib
+vc.project.linker.dependencies.release_static_md = Crypt32.lib
+vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
+vc.project.linker.dependencies.release_static_mt = Crypt32.lib
 vc.solution.create = true
 vc.solution.include = testsuite\\TestSuite

NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj

@@ -56,7 +56,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="ws2.lib iphlpapi.lib"
 				OutputFile="..\bin\$(PlatformName)\PocoNetSSLd.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib\$(PlatformName)"
@@ -136,7 +136,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="ws2.lib iphlpapi.lib"
 				OutputFile="..\bin\$(PlatformName)\PocoNetSSL.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib\$(PlatformName)"
@@ -583,12 +583,14 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|Digi JumpStart (ARMV4I)">
+				Name="debug_shared|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|Digi JumpStart (ARMV4I)">
+				Name="release_shared|Digi JumpStart (ARMV4I)"
+				ExcludedFromBuild="true">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>

NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{97a36cb0-de29-4538-8c6a-e956da68570f}</UniqueIdentifier>
+      <UniqueIdentifier>{bbe69b95-5af6-424c-81e9-6ac216c20dbe}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{9ff0ff90-bc2b-46cc-bfd4-766b73e5caa9}</UniqueIdentifier>
+      <UniqueIdentifier>{48d8a9de-f555-4761-8216-e8709aad00e8}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{fb00a2b2-49f4-4c62-8812-13a07c3777f6}</UniqueIdentifier>
+      <UniqueIdentifier>{fabf92ff-517b-4298-89c3-55c84b335f6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{401dddcc-ba74-4b79-a436-f6767ab31cbd}</UniqueIdentifier>
+      <UniqueIdentifier>{a57535f6-2df9-4008-9523-a0a3983be59f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{ceb4c777-2dc6-4271-9e9b-10ebf32d8883}</UniqueIdentifier>
+      <UniqueIdentifier>{834d604c-a495-4316-8df7-74dd084c9127}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{90046966-c3e0-4f70-a1ff-3d4a44aaa178}</UniqueIdentifier>
+      <UniqueIdentifier>{5fd4b1b8-c504-4ac9-847c-bf220b0b63c6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{283f95c9-767b-44e8-a15e-b5a8f17b0072}</UniqueIdentifier>
+      <UniqueIdentifier>{eb9433e6-8ab4-4d2c-8d90-90f74d475d34}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{1b503cbc-d7d8-47c5-baf6-ddef5f28a190}</UniqueIdentifier>
+      <UniqueIdentifier>{486d8a04-c16e-4653-845c-d01bde416c5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{440ea789-2577-4826-9b02-e9ab18b3e40d}</UniqueIdentifier>
+      <UniqueIdentifier>{f094d812-8086-4ca2-a141-284a98a1b5c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{3682a107-7f32-4a66-80b7-2b47b8bfbb0d}</UniqueIdentifier>
+      <UniqueIdentifier>{b0de0e8f-fecc-4ce1-98b6-61eaa38a0003}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{1cee71ae-f90d-4f28-9f9f-57a570a740cb}</UniqueIdentifier>
+      <UniqueIdentifier>{bc076b7f-ccc1-4b1d-83c6-d1e9a78ddd2f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{f24ba1c7-fe05-4a8c-a88e-260123206d00}</UniqueIdentifier>
+      <UniqueIdentifier>{85f82b4b-2c8f-4f45-9875-f14d673f2ac2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{e4493391-8dbe-412b-b1b3-a2f6c6605c37}</UniqueIdentifier>
+      <UniqueIdentifier>{a9f19913-4182-4f70-ac65-f39087a9631f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{4f55b6b1-56e8-4bbe-8077-8e525500aca1}</UniqueIdentifier>
+      <UniqueIdentifier>{6d9763a8-2252-44f2-b5a6-70577128bf02}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{254f4d16-6f3e-45ac-8a57-240dc25222c4}</UniqueIdentifier>
+      <UniqueIdentifier>{352ec88d-6189-4257-96fd-6316fa6e4a83}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{0bb4d7d6-6c52-4583-85fc-3cc4e2021848}</UniqueIdentifier>
+      <UniqueIdentifier>{60acc97f-7fe2-4d8f-9e98-3ce1b3e5c567}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{f73acc2d-ed56-4fda-bdd8-b634ede03534}</UniqueIdentifier>
+      <UniqueIdentifier>{0b770c41-7b41-4a36-9de0-0c9ca2bbebea}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{76e45153-97c4-49e5-88b6-47dee0585255}</UniqueIdentifier>
+      <UniqueIdentifier>{1fdd16bb-3702-420e-8cd8-a9eeaf3a0778}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{2cbfe46d-efa4-4ba2-bb17-ee20d029b341}</UniqueIdentifier>
+      <UniqueIdentifier>{3b221f53-337c-46f7-aa1d-0e373276624c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{855115d4-15e2-47c0-a011-94f6f85771b1}</UniqueIdentifier>
+      <UniqueIdentifier>{db450187-9532-4a15-8d25-f3c4e759cd89}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{a619412e-a166-432f-9a3f-a05f3d33c21f}</UniqueIdentifier>
+      <UniqueIdentifier>{6364a8b6-8508-47ea-980f-b82ea2d97356}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{b553b683-9b57-443c-b25e-2964e0f8f476}</UniqueIdentifier>
+      <UniqueIdentifier>{4e54184f-143b-4b6a-b424-36442f871b37}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{266aacb5-3f9a-48f2-916c-e28c06da2232}</UniqueIdentifier>
+      <UniqueIdentifier>{19a9a3f0-9249-4c51-befe-c61b7e5cfa9a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{eb9f1f88-1dba-4884-9c9b-5fa37b9e2495}</UniqueIdentifier>
+      <UniqueIdentifier>{d7e757a6-d4c3-4952-a24b-d36b35d8763f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj

@@ -122,7 +122,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSLd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -157,7 +157,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSL.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -270,7 +270,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\lib\PocoNetSSLmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
@@ -335,8 +335,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{fd15205c-e3b7-4593-b1f2-f31cc7ce7f4d}</UniqueIdentifier>
+      <UniqueIdentifier>{5a6669ed-8c1d-4db4-a2b4-9480e434d5a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{53775ed7-c131-49d1-a285-8901b1c44c00}</UniqueIdentifier>
+      <UniqueIdentifier>{675f4068-bf96-4ba8-bf66-e5d3826ade3f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{e0dbb2e3-60ad-44bf-8e6d-0aaac1f2b5c5}</UniqueIdentifier>
+      <UniqueIdentifier>{d5f1fc52-fd98-4dfb-9d69-545c3b83b845}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{40ddd5a5-5408-4fea-a7a6-cc433b316bc2}</UniqueIdentifier>
+      <UniqueIdentifier>{203a287a-9f3f-450e-8afb-5c566453e2f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{45d513f7-3ec2-4c17-94b1-4c3084261a1a}</UniqueIdentifier>
+      <UniqueIdentifier>{ef69e60e-2fe6-4091-8e6b-ef9eb833f61f}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{f5a56eca-929d-48d2-bd4d-25fc803d4847}</UniqueIdentifier>
+      <UniqueIdentifier>{30904aab-d1f7-4837-b9fa-50ba00aff622}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{2fd153bc-bf5c-45df-ab5d-c21b108bd387}</UniqueIdentifier>
+      <UniqueIdentifier>{c03a0aa5-752b-4b2e-9473-b9a6c8068dbc}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{d248028a-b480-483e-98d4-4526e5d26d7c}</UniqueIdentifier>
+      <UniqueIdentifier>{1e99af77-6948-4bed-8779-b8bc4b413f89}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{195ffbf6-ca80-4b55-af9a-d71403b07202}</UniqueIdentifier>
+      <UniqueIdentifier>{5568a786-d962-412f-bec5-ae8d407e977d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{b4cfe3cd-8a37-4d89-9d34-311348cf44b8}</UniqueIdentifier>
+      <UniqueIdentifier>{08d28d1a-7aac-4215-915f-205064858254}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{1349afaf-716c-4c1c-8bf3-d03d028346e8}</UniqueIdentifier>
+      <UniqueIdentifier>{224a4dcb-0771-4b3e-82fa-99d6fc5e041b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{809bd2f0-29f9-4d88-8411-c3d024a56550}</UniqueIdentifier>
+      <UniqueIdentifier>{43649207-7f47-481d-888d-7510e98ba777}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSLd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSL.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -274,7 +274,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\lib\PocoNetSSLmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
@@ -339,8 +339,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{a09c67b1-8cc2-4f7e-925c-da73edb56e26}</UniqueIdentifier>
+      <UniqueIdentifier>{bf8e19b0-50a4-4e0f-ae08-8a2bd09510e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{6ee04a28-685c-4b38-a878-6bc25efaaca4}</UniqueIdentifier>
+      <UniqueIdentifier>{6c8ba340-0ea3-40a2-a925-a1d10ebc047a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{56001dff-5b04-45f5-9d9a-6e9902b7c32f}</UniqueIdentifier>
+      <UniqueIdentifier>{c68b5a17-0bd3-4dbb-b366-742ffe3e4f93}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{adcb4fd3-4684-4438-9808-15e17f9742d2}</UniqueIdentifier>
+      <UniqueIdentifier>{d52b7ad8-2b25-40a4-8d73-cd0bf577c037}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{b1c86933-ff62-481d-a2ac-047dc9bde01b}</UniqueIdentifier>
+      <UniqueIdentifier>{fdc34cd0-731c-46a4-9736-8a82aa8b3e4c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{b66a3854-8989-4d55-85c0-5ae18334cc65}</UniqueIdentifier>
+      <UniqueIdentifier>{faf2ec3e-50f8-49df-a3c0-6ccbb16a2a55}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{7efa8f0b-aca7-445d-bfba-4540e92f45c5}</UniqueIdentifier>
+      <UniqueIdentifier>{b13089a8-0e1e-4c09-b91c-6888d1333576}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{644a609f-cd40-467d-a3ed-3325b6d2f5ad}</UniqueIdentifier>
+      <UniqueIdentifier>{acff279c-6de7-4c71-a3bd-e78bf48303c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{dd0f2057-2ae0-4679-8093-9905a85bfa40}</UniqueIdentifier>
+      <UniqueIdentifier>{14a2faef-da69-4a9d-80f3-46b10615ae03}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{93de06f9-795b-4673-91af-dec0ad317761}</UniqueIdentifier>
+      <UniqueIdentifier>{fe6622c1-d5ff-499a-a262-2e860eee19fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{3aaf0c13-4424-483c-8d2a-f79ef769f387}</UniqueIdentifier>
+      <UniqueIdentifier>{89cff992-38dc-4984-bf9c-f71523ebbf58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{633061b7-7d13-45e1-b9f3-f8d1ab9b67f7}</UniqueIdentifier>
+      <UniqueIdentifier>{3586d148-2e89-4001-96e9-4ad99856a887}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSLd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSL.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -274,7 +274,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\lib\PocoNetSSLmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
@@ -339,8 +339,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{beb2524d-12f3-4202-a6a1-2b989f074c45}</UniqueIdentifier>
+      <UniqueIdentifier>{1ca84729-391e-41dd-a64b-f9180acac278}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{8afcac42-d66f-4a14-9156-be3f046ef8b3}</UniqueIdentifier>
+      <UniqueIdentifier>{b12b49ff-0386-4fae-ada0-3fd209bbc77e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{7637c1e4-e2b2-4806-8e51-1d41bd795df5}</UniqueIdentifier>
+      <UniqueIdentifier>{81f1a558-fe8d-4ba3-8cc9-7639b3a42de3}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{6f883705-eb1e-44eb-ad51-bef041d84ee5}</UniqueIdentifier>
+      <UniqueIdentifier>{8fa61c04-4086-4218-be3f-dc5157b4be92}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{f51c49ca-2b5c-4202-997b-d074dc96aede}</UniqueIdentifier>
+      <UniqueIdentifier>{5aab2868-fdb3-4241-b628-71082775fd50}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{a1ca3a64-a4f6-442c-9a88-5d02175f261e}</UniqueIdentifier>
+      <UniqueIdentifier>{17a88aa1-9747-41b3-919c-da17b96c9f46}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{d95260a9-8800-40a6-beb6-c57a9c612812}</UniqueIdentifier>
+      <UniqueIdentifier>{3881be58-0367-4a2f-8529-bcae9beacaae}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{69711cad-9dcc-4350-b992-3231f2a6682a}</UniqueIdentifier>
+      <UniqueIdentifier>{f4bec5de-ad24-4016-ab2b-b623eea5fe5f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{7694aba8-812b-4772-927b-e0d3120ddb5d}</UniqueIdentifier>
+      <UniqueIdentifier>{479c3221-7b3a-40d8-aacb-58fc6f43f4fc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{be47db1f-028d-4307-b7de-66fa6efe4817}</UniqueIdentifier>
+      <UniqueIdentifier>{5b4234a7-35e5-47d5-a0c8-38372a8de151}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{4d4a1603-72c7-4089-8c00-d38fdd0dcce9}</UniqueIdentifier>
+      <UniqueIdentifier>{f8df08ee-eeda-48ee-b83b-9e8c67560410}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{da0310f0-af44-4367-8f38-8b3c0e576194}</UniqueIdentifier>
+      <UniqueIdentifier>{b67e5802-370f-47a0-bed5-0e860bf37562}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSLd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSL.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -274,7 +274,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\lib\PocoNetSSLmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
@@ -339,8 +339,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{f2f9f058-5e18-4040-ac72-a6bb95a1844b}</UniqueIdentifier>
+      <UniqueIdentifier>{d0b55ae3-9fe0-4d41-93ae-b97754b0451b}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{a62f9095-d3b7-4728-acf9-7db02c3bc83b}</UniqueIdentifier>
+      <UniqueIdentifier>{d2c045ae-a3c4-4016-84f4-dfd2482fad16}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{64875fd7-fb8a-40ff-960d-510482ac5a48}</UniqueIdentifier>
+      <UniqueIdentifier>{e3fafa40-7a4f-4587-8553-f5af7f39ab8e}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{eb7edf58-d59a-47f9-b16d-2a50b864b471}</UniqueIdentifier>
+      <UniqueIdentifier>{5c7dd578-eb2b-4598-9a8e-25d0c372e43a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{67c99594-957a-4665-a8fa-2dbd314bc4d1}</UniqueIdentifier>
+      <UniqueIdentifier>{55cd35ff-988a-4405-aa72-eb8803903088}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{2e159acf-39e8-4ed3-94e3-2a6c5c26a34c}</UniqueIdentifier>
+      <UniqueIdentifier>{ae38a71a-cf81-4276-8204-9c59f9a1c80c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{ebdc80f2-fea2-49d1-831a-b43b5c0f4a0b}</UniqueIdentifier>
+      <UniqueIdentifier>{2aa8315d-eaba-4df6-83de-4326d52a791f}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{461b2b6d-3759-4779-9883-5a9a59ee240b}</UniqueIdentifier>
+      <UniqueIdentifier>{915550dd-a87c-4b45-b1a8-5c7ea9087302}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{ab076706-3268-4573-8d43-e49dbf459728}</UniqueIdentifier>
+      <UniqueIdentifier>{5fb1ea0c-b155-4ee7-8dee-9ce0127e18ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{3a67a319-93d2-4213-99ff-b5092af413f8}</UniqueIdentifier>
+      <UniqueIdentifier>{c3a1b015-b449-4e81-b063-0db76a085f40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{1083833a-768f-4121-8416-17305a9e6473}</UniqueIdentifier>
+      <UniqueIdentifier>{bf61b8cc-d253-4046-8005-4f1b1e170dcd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{1df297e3-cda2-4fc0-be4b-4de301685f4b}</UniqueIdentifier>
+      <UniqueIdentifier>{9c101ef8-8c75-4ff5-ac04-13a8bb490c87}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSLd.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin\PocoNetSSL.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -274,7 +274,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\lib\PocoNetSSLmd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
@@ -339,8 +339,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{31b2823b-e78b-452c-b41f-b29b04f7e7e0}</UniqueIdentifier>
+      <UniqueIdentifier>{0a51b230-8129-4122-a5a8-216d2f873746}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{f5b60c06-3f22-40d2-b139-dcb709d5fc04}</UniqueIdentifier>
+      <UniqueIdentifier>{aae766ad-3e58-4f76-8091-433b15ce2e1a}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{1cd0419b-c19f-4e16-a9ae-73d2005a686b}</UniqueIdentifier>
+      <UniqueIdentifier>{fe871aa3-cc68-456e-a563-9c05ff693410}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{4ec25cc0-a2d1-4484-9072-9f0bedbfcaf6}</UniqueIdentifier>
+      <UniqueIdentifier>{89510ed0-95f8-4457-a890-894181635c3c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{e4730ba5-8965-41e9-a5ce-5a6000c8ef5c}</UniqueIdentifier>
+      <UniqueIdentifier>{89af9e99-9e3e-4698-8bfc-b9e147a7486c}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{97abdd09-2ea9-4769-8c0d-33c11a8ff669}</UniqueIdentifier>
+      <UniqueIdentifier>{4e03c94d-9871-4adf-ae26-fe6c47e14358}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{6662b528-622e-4fc2-ba00-3c76f4e3cb80}</UniqueIdentifier>
+      <UniqueIdentifier>{5a860f96-c0f9-40c5-82a8-438271f7c976}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{b22339b0-57d5-45b0-b6f3-835f9314128c}</UniqueIdentifier>
+      <UniqueIdentifier>{33895a56-32f9-4700-a339-6a01cced057e}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{483d9f53-833d-4fc1-96b1-972451d38d85}</UniqueIdentifier>
+      <UniqueIdentifier>{989ea802-cd91-4de7-ae92-72840e29eda6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{7dea8dea-d446-4fe9-8b1d-1bdb76fa532e}</UniqueIdentifier>
+      <UniqueIdentifier>{096ded12-c0d8-4d54-b330-cf21756adc53}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{e08689c7-8cd8-48a5-9c27-95949c962eac}</UniqueIdentifier>
+      <UniqueIdentifier>{e35940e2-8fb2-4bc6-9286-114ab53a0fee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{ec5b9214-3360-4db6-b963-0efc47382c8a}</UniqueIdentifier>
+      <UniqueIdentifier>{6dc3b803-0741-45ea-8329-9c05087a76a5}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj

@@ -56,7 +56,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="..\bin\PocoNetSSLd.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -128,7 +128,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="..\bin\PocoNetSSL.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -537,12 +537,14 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|Win32">
+				Name="debug_shared|Win32"
+				ExcludedFromBuild="true">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|Win32">
+				Name="release_shared|Win32"
+				ExcludedFromBuild="true">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj

@@ -122,7 +122,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64d.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -157,7 +157,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -333,8 +333,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{d00f0999-9b26-4c52-af7c-0e755e523bff}</UniqueIdentifier>
+      <UniqueIdentifier>{52a2ee01-5a00-4a7d-9dbd-1c8f838a6025}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{4f2570e7-9e18-4b4c-8ce7-aed3213714af}</UniqueIdentifier>
+      <UniqueIdentifier>{b677d8e8-32e5-4543-968e-8ac61aa177c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{c6f6f1f9-8c93-4e31-9140-1add3ca60eab}</UniqueIdentifier>
+      <UniqueIdentifier>{4ec9c770-626b-4eef-bb40-c916f74877cf}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{a574b4b1-aa3c-49cb-9715-3520e2dccc6c}</UniqueIdentifier>
+      <UniqueIdentifier>{92714946-d518-4866-9d79-ce6122ab2d98}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{19adb618-165d-45b4-9516-cf14b70f79e2}</UniqueIdentifier>
+      <UniqueIdentifier>{5e788533-7fe9-460e-be42-ddc209f817d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{39c31c98-a8be-4bd8-bb93-4f3211d212b4}</UniqueIdentifier>
+      <UniqueIdentifier>{3be1a316-c340-4b34-9434-3b8c7daede83}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{2dc54b25-5305-46f9-9378-5540214a99ec}</UniqueIdentifier>
+      <UniqueIdentifier>{93d3c7e4-14ee-4dab-892d-68eb6d5524f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{e28b6a70-eb04-443c-9946-a4cdf3856193}</UniqueIdentifier>
+      <UniqueIdentifier>{758ff982-b246-43db-9a6b-78d5ffaec1da}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{a8802651-7e49-42a8-9254-adfd8ab0f191}</UniqueIdentifier>
+      <UniqueIdentifier>{807067d0-619e-4610-97ac-02ac35c30b38}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{50f7a178-692c-4b8b-80bc-89bea8d601f0}</UniqueIdentifier>
+      <UniqueIdentifier>{4c07382a-cc5d-4c53-8c97-bb2249f20cf4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{826514df-c50b-45f4-b49e-c08b88964699}</UniqueIdentifier>
+      <UniqueIdentifier>{2dc0dc8a-0475-402f-90d8-b5adbc3574d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{9cf43cd3-abc2-485c-a238-8a8c2fde474f}</UniqueIdentifier>
+      <UniqueIdentifier>{e0560565-c0fb-4c33-bda0-47c11b26f41a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64d.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -337,8 +337,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{d6654b76-9b9e-4969-acaa-1561d887ada8}</UniqueIdentifier>
+      <UniqueIdentifier>{93013755-5121-4a85-bf16-b46d2f9aa6fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{f8325e28-403d-40e0-8ba7-06e813c76e9b}</UniqueIdentifier>
+      <UniqueIdentifier>{f45996e5-9d43-483b-a092-be20bb440cf6}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{54d1c373-c745-436c-8581-613e114d8aef}</UniqueIdentifier>
+      <UniqueIdentifier>{874ed155-5eb1-4e1a-986e-0a2aacd298b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{5a6c1a8c-c790-49c0-a3bf-58b2634c65f1}</UniqueIdentifier>
+      <UniqueIdentifier>{06f7904f-3106-4808-a691-2471b5f7e2f9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{146c1af7-e4c9-4896-92c7-772305c53ff5}</UniqueIdentifier>
+      <UniqueIdentifier>{f24f2dd5-a628-47f7-b142-af420d0eca2d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{19c903a6-1ed0-492b-851c-3891e840fbc4}</UniqueIdentifier>
+      <UniqueIdentifier>{8d107e75-b628-4233-8c94-41bad274c393}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{e006aef2-a2a9-4a51-a13d-79b7da24e63b}</UniqueIdentifier>
+      <UniqueIdentifier>{c9dcf39a-f0e7-47e4-b584-7bc6216932a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{0051dad1-5454-4cf1-abad-3bd2539b494f}</UniqueIdentifier>
+      <UniqueIdentifier>{543135a3-0c15-45af-b771-f2c8c6fb3957}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{72a7eec5-0581-4156-9bd9-c571fc6a142f}</UniqueIdentifier>
+      <UniqueIdentifier>{fd59b90b-b8bb-4a9e-af51-b7cc97696f70}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{e8f5c06b-1bf5-48f1-b11e-1d2077ea4314}</UniqueIdentifier>
+      <UniqueIdentifier>{7beb50cd-9c51-4f46-baa9-b827d2f85ca6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{73f0cb57-8156-4284-958c-c51f387f2fdd}</UniqueIdentifier>
+      <UniqueIdentifier>{f38c8a3f-ce26-44c1-8dc6-40101818153e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{c115eb91-54fa-41e0-b11f-0de815f44a38}</UniqueIdentifier>
+      <UniqueIdentifier>{7e073282-f58b-4e2e-abce-1e6bb1675c1d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64d.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -337,8 +337,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{8667411a-f251-43a0-ac7d-474b784a832f}</UniqueIdentifier>
+      <UniqueIdentifier>{35b2d4f2-16a9-46ac-8578-b2ac7729b06c}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{f7d71ef5-500a-4d3d-ac89-73e4d7132ce9}</UniqueIdentifier>
+      <UniqueIdentifier>{0eba5576-9565-4902-b491-ee8100c54200}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{ed5b0a69-c81e-4853-9749-f0d4ed52a619}</UniqueIdentifier>
+      <UniqueIdentifier>{670d25a5-a079-4a3d-a7be-44013202cb4a}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{e778a47f-788b-46ea-bd5e-5763b5fe7356}</UniqueIdentifier>
+      <UniqueIdentifier>{88752810-dfa2-4c21-9dfb-7caab9c2153b}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{3cf5c8de-f142-4edb-a092-53adc6e1cfa7}</UniqueIdentifier>
+      <UniqueIdentifier>{2d7fd378-ca96-4e88-8f1b-113becfcb2d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{810797cf-8333-46d5-84d1-2c972b38f9af}</UniqueIdentifier>
+      <UniqueIdentifier>{81df754d-963e-4a99-b3d3-23f6a97af001}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{36d60f56-58ce-4b40-97f0-07286721fab6}</UniqueIdentifier>
+      <UniqueIdentifier>{b7d35d8e-a037-4af5-96b3-b565490302a2}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{9b0bc2da-ab56-4b14-a296-579914c296a8}</UniqueIdentifier>
+      <UniqueIdentifier>{fe81fc65-6387-47a2-a4bb-dbed63a34273}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{8eb1b073-4a38-4120-806b-aeb4c5457462}</UniqueIdentifier>
+      <UniqueIdentifier>{b4a07c34-dde6-4fdd-aa25-d365579d1f61}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{b7ec12ec-b173-48ca-b9e9-f3702c079636}</UniqueIdentifier>
+      <UniqueIdentifier>{74a5a66b-bf2a-4f62-ad6a-d9f81d0c32b5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{f1620bb3-7c5b-4656-b500-a15f3eb6b739}</UniqueIdentifier>
+      <UniqueIdentifier>{e0760707-a2eb-4b29-b35b-d3cf5d5765c8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{af1282d0-909a-430d-90c9-77e382f12fbe}</UniqueIdentifier>
+      <UniqueIdentifier>{c564e2f3-ee41-4a5a-b193-2a51a0b32e7f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64d.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -337,8 +337,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{3b59c1e2-1eac-461b-a78c-1cce2e272d2d}</UniqueIdentifier>
+      <UniqueIdentifier>{2cd9f414-6d41-41d3-b115-3ab296d757cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{78f186a6-e0cf-4c6e-9ad9-7119fddfe6dc}</UniqueIdentifier>
+      <UniqueIdentifier>{90e92f06-c211-4389-9e1e-aee41ca56868}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{c11aaea5-40e4-433f-835f-dfc7309009e7}</UniqueIdentifier>
+      <UniqueIdentifier>{ea568c4e-8818-4d5e-9f7a-f768e9d4af4d}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{d6632b58-a33c-4cf3-841d-bc9f10d7dc1a}</UniqueIdentifier>
+      <UniqueIdentifier>{7dda6d0d-6d53-4c40-bd18-7904728b8445}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{784aa64f-70a1-4214-9d39-7957f14aab3d}</UniqueIdentifier>
+      <UniqueIdentifier>{f9321d1a-007e-483d-85d1-ee24d6600165}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{cc3b630c-ec5d-4e10-a60f-89b168a2a23c}</UniqueIdentifier>
+      <UniqueIdentifier>{6e6234df-6416-4a29-aafa-c06a5ff724e3}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{a3232364-9867-474a-87cc-257f81f4544d}</UniqueIdentifier>
+      <UniqueIdentifier>{533202f4-7630-4c4a-a0db-96eda365adcd}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{7efaeff3-5064-45ed-bd74-5a2f40902d37}</UniqueIdentifier>
+      <UniqueIdentifier>{9c57cdd3-6072-43cb-bccc-36e6cf6c2356}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{3c78f6e6-a957-4455-b0ef-22293369a308}</UniqueIdentifier>
+      <UniqueIdentifier>{b9f5dd0c-197b-487c-82f4-b2c7c14ccc43}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{409b830f-5121-4544-adc5-5d18c4286eb5}</UniqueIdentifier>
+      <UniqueIdentifier>{141699ea-06ff-47d3-b766-a420929dde3b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{14c6f716-44cb-4216-b821-965dfa4c8649}</UniqueIdentifier>
+      <UniqueIdentifier>{d8ff0f16-ad38-4580-8ec1-8e50ec593601}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{bba8f81c-128f-4995-a7f6-22e89b43b736}</UniqueIdentifier>
+      <UniqueIdentifier>{88a37437-ffe2-40fa-86dd-79b4c17ee98a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj

@@ -138,7 +138,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64d.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -170,7 +170,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\bin64\PocoNetSSL64.dll</OutputFile>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -337,8 +337,10 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters

@@ -2,40 +2,40 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="SSLCore">
-      <UniqueIdentifier>{d13eb8dd-4a3d-45b0-abfc-80ada1191213}</UniqueIdentifier>
+      <UniqueIdentifier>{ead87d86-e142-46a4-87e0-2b7bb56f8ce7}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Header Files">
-      <UniqueIdentifier>{751929fa-b189-4381-90b1-92f3977ad7ae}</UniqueIdentifier>
+      <UniqueIdentifier>{f82bf7f7-4e79-4a0f-a255-59cd8bf9a608}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLCore\Source Files">
-      <UniqueIdentifier>{e9d9d980-19b7-473b-8010-ccfd513fe39f}</UniqueIdentifier>
+      <UniqueIdentifier>{6c203dee-5870-4ebf-8048-6046d2c36561}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient">
-      <UniqueIdentifier>{6d9733ee-481e-4707-89a1-daa1887a0215}</UniqueIdentifier>
+      <UniqueIdentifier>{afd52afb-c733-4311-83cc-6d87d45ccf70}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Header Files">
-      <UniqueIdentifier>{ea1fa874-21e4-4b42-8851-0717b21d8dea}</UniqueIdentifier>
+      <UniqueIdentifier>{005abfc5-5d91-4797-8c6b-ef427579a003}</UniqueIdentifier>
     </Filter>
     <Filter Include="HTTPSClient\Source Files">
-      <UniqueIdentifier>{992085f2-e324-45b5-80de-2b78a6cf860a}</UniqueIdentifier>
+      <UniqueIdentifier>{eb4f58a1-e093-4173-9683-8e2342ab5374}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets">
-      <UniqueIdentifier>{82e97964-2513-4083-b059-bb7f7fb5f749}</UniqueIdentifier>
+      <UniqueIdentifier>{8fa16e67-cda9-4ba3-9cbd-883bf153e141}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Header Files">
-      <UniqueIdentifier>{af21b7c9-f011-4ef7-be78-a94b06b420b9}</UniqueIdentifier>
+      <UniqueIdentifier>{df7e3091-5142-4ba0-9fd0-17e0cdbfec39}</UniqueIdentifier>
     </Filter>
     <Filter Include="SSLSockets\Source Files">
-      <UniqueIdentifier>{7a6b48ee-93b4-4170-ae0e-e8541bf6cb99}</UniqueIdentifier>
+      <UniqueIdentifier>{59db76aa-4053-4d60-9ad9-59aaa7f7a3fd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail">
-      <UniqueIdentifier>{84ba40ae-1387-4ced-81a6-47daf31c4dbe}</UniqueIdentifier>
+      <UniqueIdentifier>{446f2413-877c-4a1d-9f02-6d4337873c76}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{1cfd537f-7057-4a62-ad8a-82dc15c5cfa2}</UniqueIdentifier>
+      <UniqueIdentifier>{d2b77c8d-389b-4786-9c09-61af546d920f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{2dab65a3-3471-4764-a756-b7e959a60f5f}</UniqueIdentifier>
+      <UniqueIdentifier>{c33b2e51-aa9e-4c53-b480-057f79ec9409}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj

@@ -56,7 +56,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="..\bin64\PocoNetSSL64d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -128,7 +128,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="..\bin64\PocoNetSSL64.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -542,12 +542,14 @@
 		<File
 			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|x64">
+				Name="debug_shared|x64"
+				ExcludedFromBuild="true">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|x64">
+				Name="release_shared|x64"
+				ExcludedFromBuild="true">
 				<Tool
 					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>

NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen

@@ -11,9 +11,9 @@ vc.project.compiler.include = ${openssl}\\VS_120\\include;..\\..\\..\\Foundation
 vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib
 vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib
-vc.project.linker.dependencies.debug_shared = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.release_shared = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.debug_static_md = libeay32mdd.lib ssleay32mdd.lib Crypt32.lib
-vc.project.linker.dependencies.release_static_md = libeay32md.lib ssleay32md.lib Crypt32.lib
-vc.project.linker.dependencies.debug_static_mt = libeay32mtd.lib ssleay32mtd.lib Crypt32.lib
-vc.project.linker.dependencies.release_static_mt = libeay32mt.lib ssleay32mt.lib Crypt32.lib
+vc.project.linker.dependencies.debug_shared =
+vc.project.linker.dependencies.release_shared =
+vc.project.linker.dependencies.debug_static_md = Crypt32.lib
+vc.project.linker.dependencies.release_static_md = Crypt32.lib
+vc.project.linker.dependencies.debug_static_mt = Crypt32.lib
+vc.project.linker.dependencies.release_static_mt = Crypt32.lib

NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_CE_vs90.vcproj

@@ -57,7 +57,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\shared\HTTPSTimeServerd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -130,7 +130,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\shared\HTTPSTimeServer.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -204,7 +204,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32mtd.lib ssleay32mtd.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_mt\HTTPSTimeServerd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -280,7 +280,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32mt.lib ssleay32mt.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_mt\HTTPSTimeServer.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -354,7 +354,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_md\HTTPSTimeServerd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -430,7 +430,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_md\HTTPSTimeServer.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"

NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_WEC2013_vs110.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Configuration Files">
-      <UniqueIdentifier>{8c2b2176-c671-4681-b8dc-5f7205450ce2}</UniqueIdentifier>
+      <UniqueIdentifier>{c7745ec2-7fea-44aa-b8a0-031876f0789e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{5153df15-ba1e-4fed-b229-0e8e23556977}</UniqueIdentifier>
+      <UniqueIdentifier>{9e1f2786-6656-4ed8-888e-c03b7c7a20d3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_WEC2013_vs120.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Configuration Files">
-      <UniqueIdentifier>{f6cae848-22e0-4e3b-bb30-a5960467d4e3}</UniqueIdentifier>
+      <UniqueIdentifier>{01ede1f2-775b-4c3d-bcc4-f8a39fc751d0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{c9d2cfcf-2caf-4092-8e99-feb972cbfafb}</UniqueIdentifier>
+      <UniqueIdentifier>{0625bfb9-da5f-42eb-8d9e-2495c4daf32a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs100.vcxproj

@@ -126,7 +126,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\HTTPSTimeServerd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -160,7 +160,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\HTTPSTimeServer.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -192,7 +192,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mtd.lib;ssleay32mtd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\HTTPSTimeServerd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -226,7 +226,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mt.lib;ssleay32mt.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\HTTPSTimeServer.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,7 +258,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\HTTPSTimeServerd.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -292,7 +292,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\HTTPSTimeServer.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs100.vcxproj.filters

@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Configuration Files">
-      <UniqueIdentifier>{c58be7d2-e10d-46f1-9be3-505bd2c3ecdf}</UniqueIdentifier>
+      <UniqueIdentifier>{c63e772d-3f53-4a6b-aed4-45f2810b6918}</UniqueIdentifier>
     </Filter>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{827b586d-42aa-4cee-8189-ace864771326}</UniqueIdentifier>
+      <UniqueIdentifier>{4ee2aa14-975e-40bf-8f66-42d6d323f68e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>