changes for 1.4.6 - see CHANGELOG

pocoproject · Jan 10, 2013 · 4914cb0 · 4914cb0
1 parent b9acb9f
commit 4914cb0
Show file tree

Hide file tree

Showing 114 changed files with 1,014 additions and 657 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,17 @@
 This is the changelog file for the POCO C++ Libraries.
 
+Release 1.4.6 (2013-01-10)
+==========================
+
+- changed FPEnvironment_DUMMY.h to include <cmath> instead of <math.h>
+- updated bundled SQLite to 3.7.15.1
+- fixed GH# 30: Poco::Path::home() throws
+- fixed SF Patch #120 The ExpireLRUCache does not compile with a tuple as key on VS2010
+- fixed SF# 603 count() is missing in HashMap
+- Crypto and NetSSL_OpenSSL project files now use OpenSSL *MD.lib library files for 
+  static_md builds. Previously, the DLL import libs were used.
+
+
 Release 1.4.5 (2012-11-19)
 ==========================
 
@@ -1782,4 +1794,4 @@ building the libraries.
 
 
 --
-$Id: //poco/1.4/dist/CHANGELOG#70 $
+$Id: //poco/1.4/dist/CHANGELOG#72 $
diff --git a/Crypto/Crypto.progen b/Crypto/Crypto.progen
@@ -15,8 +15,8 @@ vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.share
 vc.project.linker.dependencies = ws2_32.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 = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.release_static_md = 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.solution.create = true

diff --git a/Crypto/Crypto_vs100.vcxproj b/Crypto/Crypto_vs100.vcxproj
@@ -262,7 +262,7 @@
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>

diff --git a/Crypto/Crypto_vs100.vcxproj.filters b/Crypto/Crypto_vs100.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{122462ee-22e0-4861-9d6c-494934eb4af9}</UniqueIdentifier>
+      <UniqueIdentifier>{c9660b85-2c83-40eb-99f0-e69a38f1a92b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{11199af4-97e6-431f-91b9-8668e8822f35}</UniqueIdentifier>
+      <UniqueIdentifier>{cbe3007f-8f05-429f-873f-1df3c141bbf2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{b6eeed5b-65b9-4df8-bb88-5e22324731ae}</UniqueIdentifier>
+      <UniqueIdentifier>{151cd299-6196-4ef7-94cd-246db61705ff}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{158aea97-73f2-4351-b895-c3608b8e1ed0}</UniqueIdentifier>
+      <UniqueIdentifier>{e2445149-c261-4513-a2c7-6eb5f7e547e3}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{e42fd1ea-1eee-44b8-8b8b-1f78e885e9c7}</UniqueIdentifier>
+      <UniqueIdentifier>{8f50d7e0-d3d5-4466-a306-731e28ee4cc8}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{0d3fb5f8-5be0-41e8-aca7-a2ed944a0e68}</UniqueIdentifier>
+      <UniqueIdentifier>{7831270b-fc5a-4380-9cda-8bd326cfb0b7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{7fc31e26-f222-4a1f-a660-0cc1ca298bf1}</UniqueIdentifier>
+      <UniqueIdentifier>{9a46e623-c2f3-4c23-9c8b-860ec7a449a1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{6ef10a15-4dc2-4789-b7a1-135c7bfbe954}</UniqueIdentifier>
+      <UniqueIdentifier>{c0b460e8-85e7-4ff1-bb43-a858b46db925}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{398fc5fe-5957-411b-8819-0c8e6864b4fa}</UniqueIdentifier>
+      <UniqueIdentifier>{87ac1a2a-a9e8-493e-a975-2304d21da4bb}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{75847b09-5123-41b3-8978-7df3d49bccf8}</UniqueIdentifier>
+      <UniqueIdentifier>{223642be-78d1-45e8-8090-05f98dbc3ee2}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{ffd2ccca-ce56-436b-9fc5-951ff3873d7e}</UniqueIdentifier>
+      <UniqueIdentifier>{c5c38673-f9e9-4ef2-a3e7-dbfed527ad50}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{f96912a5-36a4-474d-be47-c77533517e6b}</UniqueIdentifier>
+      <UniqueIdentifier>{c78e0cd7-de03-48ee-a11a-5a3a5263a546}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{b3871cfe-f12b-4113-ae4f-e59ea5b59f4c}</UniqueIdentifier>
+      <UniqueIdentifier>{331743c5-a1f5-43b0-9a67-5f698db005c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{deb09316-ff92-407e-a4b8-3ca0d500c551}</UniqueIdentifier>
+      <UniqueIdentifier>{efa66197-a141-40fb-97df-6678bc08df79}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{a1065f3b-f5e7-4a68-b22e-fa7a21fa3816}</UniqueIdentifier>
+      <UniqueIdentifier>{0e12ae40-0dd9-4af8-a344-19782b19e4ea}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj
@@ -268,7 +268,7 @@
       <DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
     </ClCompile>
     <Lib>
-      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>

diff --git a/Crypto/Crypto_vs110.vcxproj.filters b/Crypto/Crypto_vs110.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{28f26c9c-246c-49a9-a4e8-b9e4e842713c}</UniqueIdentifier>
+      <UniqueIdentifier>{e84c1bca-9c3f-474f-bca9-5dffe59f1bd0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{0fd32ae5-c009-42b6-ba49-7d06d463fc44}</UniqueIdentifier>
+      <UniqueIdentifier>{dadf8254-1c0f-4330-9f45-27f214dde053}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{d0ce3d00-c8c9-4911-90e3-3b3d49cf0dfe}</UniqueIdentifier>
+      <UniqueIdentifier>{5af6f3b8-4128-4fa4-9327-b3e534c2e00d}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{9f443311-2834-47aa-92ba-8c96af3185c5}</UniqueIdentifier>
+      <UniqueIdentifier>{05493cdb-5288-41cf-82ed-5be6dcaa45bc}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{58db0296-03fe-4b52-a7cf-e57645054a89}</UniqueIdentifier>
+      <UniqueIdentifier>{ce588331-daff-437b-9d3e-9f5183d608ac}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{a248eb85-a32e-4837-bfbd-f020543ee08c}</UniqueIdentifier>
+      <UniqueIdentifier>{5a256767-71fe-4533-9469-4202d4c527c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{c4cb6b83-9a7c-46f8-9a65-b34972e07fa2}</UniqueIdentifier>
+      <UniqueIdentifier>{d83881b7-d926-4c11-8a22-35b3e4903742}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{0b408cec-a311-4ba1-92b1-0c83ed19b5d9}</UniqueIdentifier>
+      <UniqueIdentifier>{eb08b311-0287-41e9-8d17-0d0c443f7010}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{a395dbfa-cfbb-4dcf-95a2-886185b5b0ee}</UniqueIdentifier>
+      <UniqueIdentifier>{0f41c42d-5904-4023-b829-a7b9957233cb}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{d9e589c0-d40e-4bf7-91f7-79a6a23540ba}</UniqueIdentifier>
+      <UniqueIdentifier>{ffd38e17-1639-4fc9-bebb-1407de7416fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{13e93ae6-580d-474c-bb5a-13020bfc1493}</UniqueIdentifier>
+      <UniqueIdentifier>{d19b45b7-32da-4cc7-97a3-f0d1555844bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{1f68c50f-fcdc-45a5-ac39-c30f9a4ec43f}</UniqueIdentifier>
+      <UniqueIdentifier>{7448d7ab-fed1-4250-8af6-12cb22c351f8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{900f9813-13b5-439b-a6cb-d0bce8b7d0e7}</UniqueIdentifier>
+      <UniqueIdentifier>{89062091-96a1-4778-98f9-81de1ab2a212}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{2f42eb19-da71-4159-9b67-d507b1d6f13f}</UniqueIdentifier>
+      <UniqueIdentifier>{c93e7219-eef7-4168-a03a-8bc2980f78b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{2c837bad-5005-4e5f-a7c9-5020ee433a84}</UniqueIdentifier>
+      <UniqueIdentifier>{a8a4192d-6e77-4a96-8bf9-0308457fd967}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

diff --git a/Crypto/Crypto_x64_vs100.vcxproj.filters b/Crypto/Crypto_x64_vs100.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{af2f750b-1659-42c5-8a30-839ea85ed653}</UniqueIdentifier>
+      <UniqueIdentifier>{2fb236a7-4868-4496-9d00-79824c223590}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{8246c217-bae8-49ed-b58d-6ec49be447a4}</UniqueIdentifier>
+      <UniqueIdentifier>{f087f206-7fce-4f04-90ae-f781c7d1bac6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{e0191341-cfc6-42c5-888e-891c0e4e6ed0}</UniqueIdentifier>
+      <UniqueIdentifier>{6c4807b4-4f97-4ea2-b6dc-e017bd1c4eb4}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{82981ac8-32fa-491e-bc60-ec2c3469a1df}</UniqueIdentifier>
+      <UniqueIdentifier>{851babf4-3d22-434f-aa20-87d29071954e}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{7d0235d7-cb4d-4af0-8ee8-cd42a55072a7}</UniqueIdentifier>
+      <UniqueIdentifier>{339ff128-8f33-4dd1-850e-778be94dec32}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{5e93ff66-9793-4272-ae3e-e8b7a61bbf2f}</UniqueIdentifier>
+      <UniqueIdentifier>{f49522f6-7644-4b83-bb4e-7f4626e22ca9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{07d81c34-db83-4cf0-a295-ac75f13e2eb5}</UniqueIdentifier>
+      <UniqueIdentifier>{afceeaf3-7f9f-453d-84a3-cf13d420bc24}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{1316e38a-d39f-42f9-9e7e-81d1118a8701}</UniqueIdentifier>
+      <UniqueIdentifier>{8f600964-f605-4a5a-8868-7ec0805cfecc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{1747b400-7219-40ab-abd2-2614cdf742f7}</UniqueIdentifier>
+      <UniqueIdentifier>{32b98f2e-df61-4d39-aaf1-41db587fc26a}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{bc403538-bbae-4b7d-9557-559c3da09efc}</UniqueIdentifier>
+      <UniqueIdentifier>{d7ed3fe3-3aee-4d8d-92bb-87df70855885}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{58695cb3-2b6d-4395-af5a-056b924bca92}</UniqueIdentifier>
+      <UniqueIdentifier>{02760ea2-0a20-448b-a8c3-a8c894708e83}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{a9b725c6-82da-455d-a6b6-778ac5c5e571}</UniqueIdentifier>
+      <UniqueIdentifier>{fcce9bcd-0c91-4aaa-8fda-07a6634ab467}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{c96be967-a2cf-41af-8642-779848c03a1a}</UniqueIdentifier>
+      <UniqueIdentifier>{95ebcd11-f4a1-4a7c-b1ac-c548a6b5bd67}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{c0090957-6668-4c52-be2f-4490cfefa16a}</UniqueIdentifier>
+      <UniqueIdentifier>{074e8338-b68d-4a71-a42a-31e8e43de142}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{b1084e6b-1b8e-4c89-bd8f-db95bbb50d9d}</UniqueIdentifier>
+      <UniqueIdentifier>{b47dfa4c-7120-4782-942a-34aa469a1062}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

diff --git a/Crypto/Crypto_x64_vs110.vcxproj.filters b/Crypto/Crypto_x64_vs110.vcxproj.filters
@@ -2,49 +2,49 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{f2e1d9c1-86af-4719-a6d3-97b1a07e7518}</UniqueIdentifier>
+      <UniqueIdentifier>{184f42c5-5e80-4757-a7d4-2afb2996a5e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{72b01a65-35b1-458f-82eb-827fcaa4de12}</UniqueIdentifier>
+      <UniqueIdentifier>{107e046a-6f84-426a-89e3-1cc68e3d6ea2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{84644864-e386-4662-96ad-61a10d2e7e08}</UniqueIdentifier>
+      <UniqueIdentifier>{39225b79-8bb8-4a56-a4df-9c17ee5fc55a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{3d939d40-1010-46d6-b040-1aefcf1740d0}</UniqueIdentifier>
+      <UniqueIdentifier>{f30bf73d-61cb-4c6a-b533-cf3caf71e0aa}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{4573ecaf-e3f9-4532-b877-5ed2dda3962f}</UniqueIdentifier>
+      <UniqueIdentifier>{f092b5dc-a088-4758-a90b-dac9afc4d51a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{7a1ec107-824a-464f-8a02-b396c2206a15}</UniqueIdentifier>
+      <UniqueIdentifier>{6d239f32-e042-49b4-9e62-bea41d85a6d3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{fc563443-ef0e-4343-bc87-c840f8e98fe0}</UniqueIdentifier>
+      <UniqueIdentifier>{3a45c8a5-6dd5-4e82-a9d2-3b9ac6141f1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{46ce8424-9072-444e-9ed1-0ae7cf56c90c}</UniqueIdentifier>
+      <UniqueIdentifier>{eab7f5f6-8aac-48ce-be18-0bbba38d974b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{567dec6f-0df0-43a8-8db1-b359364ab94e}</UniqueIdentifier>
+      <UniqueIdentifier>{b204a7f0-243d-4b77-9db4-1141081b6f7c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{68b07af8-cc01-4f5f-bb07-a4fa0ca270d2}</UniqueIdentifier>
+      <UniqueIdentifier>{f5ba26c5-6ac1-4e8e-9366-d8b89a16e8e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{31d5970b-06fa-40c8-974c-b7df282f58c0}</UniqueIdentifier>
+      <UniqueIdentifier>{73a9b142-3d3f-438b-a4e8-700040bd05e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{bfad7bd9-2258-4171-84b9-af4d9c0f0014}</UniqueIdentifier>
+      <UniqueIdentifier>{e481a98c-9cf0-45c6-9c00-6c1cd0dc2b6e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{d6961d0b-52d7-440e-9f94-6aead4beacb5}</UniqueIdentifier>
+      <UniqueIdentifier>{20956f1a-9059-4558-8016-8e1f397c541d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{0b75fd59-1f75-4aeb-a15b-1c3d50cbb08f}</UniqueIdentifier>
+      <UniqueIdentifier>{34ae370f-0133-4c8a-9460-cb6e4cfe296c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{decc3d89-26a6-4754-97d4-fc62337923b2}</UniqueIdentifier>
+      <UniqueIdentifier>{aff3f381-dbe1-46b0-ab2f-ab7d8e3a3999}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

diff --git a/Crypto/samples/genrsakey/genrsakey.progen b/Crypto/samples/genrsakey/genrsakey.progen
@@ -12,7 +12,7 @@ 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 = libeay32.lib ssleay32.lib
-vc.project.linker.dependencies.release_static_md = 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
diff --git a/Crypto/samples/genrsakey/genrsakey_CE_VS90.vcproj b/Crypto/samples/genrsakey/genrsakey_CE_VS90.vcproj
@@ -349,7 +349,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="iphlpapi.lib libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_md\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"
@@ -424,7 +424,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE"
-				AdditionalDependencies="iphlpapi.lib libeay32.lib ssleay32.lib ws2.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2.lib iphlpapi.lib"
 				OutputFile="bin\$(PlatformName)\static_md\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib\$(PlatformName)"

diff --git a/Crypto/samples/genrsakey/genrsakey_VS71.vcproj b/Crypto/samples/genrsakey/genrsakey_VS71.vcproj
@@ -287,7 +287,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_md\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -349,7 +349,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_md\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"

diff --git a/Crypto/samples/genrsakey/genrsakey_VS80.vcproj b/Crypto/samples/genrsakey/genrsakey_VS80.vcproj
@@ -327,7 +327,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_md\genrsakeyd.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\..\lib"
@@ -396,7 +396,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32.lib ssleay32.lib ws2_32.lib iphlpapi.lib"
+				AdditionalDependencies="iphlpapi.lib winmm.lib libeay32md.lib ssleay32md.lib Crypt32.lib ws2_32.lib iphlpapi.lib"
 				OutputFile="bin\static_md\genrsakey.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\..\lib"