Skip to content
Browse files

changes for 1.4.6 - see CHANGELOG

  • Loading branch information...
1 parent b9acb9f commit 4914cb03c2f3e737b970b05f21e6a6a15a1007b0 @obiltschnig obiltschnig committed Jan 10, 2013
Showing with 1,014 additions and 657 deletions.
  1. +13 −1 CHANGELOG
  2. +2 −2 Crypto/Crypto.progen
  3. +1 −1 Crypto/Crypto_vs100.vcxproj
  4. +15 −15 Crypto/Crypto_vs100.vcxproj.filters
  5. +1 −1 Crypto/Crypto_vs110.vcxproj
  6. +15 −15 Crypto/Crypto_vs110.vcxproj.filters
  7. +15 −15 Crypto/Crypto_x64_vs100.vcxproj.filters
  8. +15 −15 Crypto/Crypto_x64_vs110.vcxproj.filters
  9. +2 −2 Crypto/samples/genrsakey/genrsakey.progen
  10. +2 −2 Crypto/samples/genrsakey/genrsakey_CE_VS90.vcproj
  11. +2 −2 Crypto/samples/genrsakey/genrsakey_VS71.vcproj
  12. +2 −2 Crypto/samples/genrsakey/genrsakey_VS80.vcproj
  13. +2 −2 Crypto/samples/genrsakey/genrsakey_VS90.vcproj
  14. +2 −2 Crypto/samples/genrsakey/genrsakey_vs100.vcxproj
  15. +2 −2 Crypto/samples/genrsakey/genrsakey_vs100.vcxproj.filters
  16. +2 −2 Crypto/samples/genrsakey/genrsakey_vs110.vcxproj
  17. +2 −2 Crypto/samples/genrsakey/genrsakey_vs110.vcxproj.filters
  18. +2 −2 Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj
  19. +2 −2 Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj.filters
  20. +2 −2 Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj
  21. +2 −2 Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj.filters
  22. +2 −2 Crypto/samples/genrsakey/genrsakey_x64_vs90.vcproj
  23. +2 −2 Crypto/testsuite/TestSuite.progen
  24. +2 −2 Crypto/testsuite/TestSuite_CE_VS90.vcproj
  25. +2 −2 Crypto/testsuite/TestSuite_VS71.vcproj
  26. +2 −2 Crypto/testsuite/TestSuite_VS80.vcproj
  27. +2 −2 Crypto/testsuite/TestSuite_VS90.vcproj
  28. +2 −2 Crypto/testsuite/TestSuite_vs100.vcxproj
  29. +8 −8 Crypto/testsuite/TestSuite_vs100.vcxproj.filters
  30. +2 −2 Crypto/testsuite/TestSuite_vs110.vcxproj
  31. +8 −8 Crypto/testsuite/TestSuite_vs110.vcxproj.filters
  32. +2 −2 Crypto/testsuite/TestSuite_x64_vs100.vcxproj
  33. +8 −8 Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters
  34. +2 −2 Crypto/testsuite/TestSuite_x64_vs110.vcxproj
  35. +8 −8 Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters
  36. +2 −2 Crypto/testsuite/TestSuite_x64_vs90.vcproj
  37. +3 −3 DLLVersion.rc
  38. +501 −259 Data/SQLite/src/sqlite3.c
  39. +31 −4 Data/SQLite/src/sqlite3.h
  40. +5 −3 Foundation/include/Poco/ExpireStrategy.h
  41. +10 −10 Foundation/include/Poco/FPEnvironment_DUMMY.h
  42. +7 −1 Foundation/include/Poco/HashMap.h
  43. +2 −1 Foundation/include/Poco/Path_WIN32.h
  44. +2 −1 Foundation/include/Poco/Path_WIN32U.h
  45. +2 −2 Foundation/include/Poco/Version.h
  46. +28 −3 Foundation/src/Path_WIN32.cpp
  47. +30 −3 Foundation/src/Path_WIN32U.cpp
  48. +2 −1 Foundation/testsuite/src/HashMapTest.cpp
  49. +4 −4 Net/include/Poco/Net/MulticastSocket.h
  50. +2 −2 NetSSL_OpenSSL/NetSSL_OpenSSL.progen
  51. +1 −1 NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj
  52. +12 −12 NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters
  53. +1 −1 NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj
  54. +12 −12 NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters
  55. +12 −12 NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters
  56. +12 −12 NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters
  57. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen
  58. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_CE_vs90.vcproj
  59. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs100.vcxproj
  60. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs100.vcxproj.filters
  61. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj
  62. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs110.vcxproj.filters
  63. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs71.vcproj
  64. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs80.vcproj
  65. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs90.vcproj
  66. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs100.vcxproj
  67. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs100.vcxproj.filters
  68. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj
  69. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs110.vcxproj.filters
  70. +2 −2 NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_x64_vs90.vcproj
  71. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail.progen
  72. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_CE_vs90.vcproj
  73. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_vs100.vcxproj
  74. +1 −1 NetSSL_OpenSSL/samples/Mail/Mail_vs100.vcxproj.filters
  75. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj
  76. +1 −1 NetSSL_OpenSSL/samples/Mail/Mail_vs110.vcxproj.filters
  77. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_vs71.vcproj
  78. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_vs80.vcproj
  79. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_vs90.vcproj
  80. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_x64_vs100.vcxproj
  81. +1 −1 NetSSL_OpenSSL/samples/Mail/Mail_x64_vs100.vcxproj.filters
  82. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj
  83. +1 −1 NetSSL_OpenSSL/samples/Mail/Mail_x64_vs110.vcxproj.filters
  84. +2 −2 NetSSL_OpenSSL/samples/Mail/Mail_x64_vs90.vcproj
  85. +2 −2 NetSSL_OpenSSL/samples/download/download.progen
  86. +2 −2 NetSSL_OpenSSL/samples/download/download_CE_vs90.vcproj
  87. +2 −2 NetSSL_OpenSSL/samples/download/download_vs100.vcxproj
  88. +1 −1 NetSSL_OpenSSL/samples/download/download_vs100.vcxproj.filters
  89. +2 −2 NetSSL_OpenSSL/samples/download/download_vs110.vcxproj
  90. +1 −1 NetSSL_OpenSSL/samples/download/download_vs110.vcxproj.filters
  91. +2 −2 NetSSL_OpenSSL/samples/download/download_vs71.vcproj
  92. +2 −2 NetSSL_OpenSSL/samples/download/download_vs80.vcproj
  93. +2 −2 NetSSL_OpenSSL/samples/download/download_vs90.vcproj
  94. +2 −2 NetSSL_OpenSSL/samples/download/download_x64_vs100.vcxproj
  95. +1 −1 NetSSL_OpenSSL/samples/download/download_x64_vs100.vcxproj.filters
  96. +2 −2 NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj
  97. +1 −1 NetSSL_OpenSSL/samples/download/download_x64_vs110.vcxproj.filters
  98. +2 −2 NetSSL_OpenSSL/samples/download/download_x64_vs90.vcproj
  99. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite.progen
  100. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj
  101. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj
  102. +17 −17 NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters
  103. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj
  104. +17 −17 NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters
  105. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_vs71.vcproj
  106. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_vs80.vcproj
  107. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj
  108. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj
  109. +17 −17 NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters
  110. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj
  111. +17 −17 NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters
  112. +2 −2 NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj
  113. +13 −0 doc/99100-ReleaseNotes.page
  114. +1 −1 libversion
View
14 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 $
View
4 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
View
2 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>
View
30 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>
View
2 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>
View
30 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>
View
30 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>
View
30 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>
View
4 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
View
4 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)"
View
4 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"
View
4 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"
View
4 Crypto/samples/genrsakey/genrsakey_VS90.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"
View
4 Crypto/samples/genrsakey/genrsakey_vs100.vcxproj
@@ -249,7 +249,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\genrsakeyd.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -281,7 +281,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\genrsakey.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
4 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>{8f2980b2-027e-482a-b288-0d5a747d3bfb}</UniqueIdentifier>
+ <UniqueIdentifier>{3a8d625a-ce8c-4d72-b43f-2a234e77945e}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
- <UniqueIdentifier>{d55454d9-44a0-4e42-90d5-5f55dc4ff881}</UniqueIdentifier>
+ <UniqueIdentifier>{aee1d95f-4ba7-4820-8eea-98ce95ded57a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/samples/genrsakey/genrsakey_vs110.vcxproj
@@ -255,7 +255,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\genrsakeyd.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -287,7 +287,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\genrsakey.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
4 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>{5e9057b7-3ca6-42a3-970a-5a7d083baec6}</UniqueIdentifier>
+ <UniqueIdentifier>{e68f7ace-85b9-463e-b088-7f947a4e992b}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
- <UniqueIdentifier>{48a16686-7cc0-49dd-a21a-c98630a5bbdd}</UniqueIdentifier>
+ <UniqueIdentifier>{464c6a8b-9948-406f-ad08-6676f3181766}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/samples/genrsakey/genrsakey_x64_vs100.vcxproj
@@ -249,7 +249,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\genrsakeyd.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -281,7 +281,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\genrsakey.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
4 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>{f2def33e-b2d0-4fd2-98d6-f0928d1595b2}</UniqueIdentifier>
+ <UniqueIdentifier>{aadd8096-48c2-4429-a4ab-592539a1d570}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
- <UniqueIdentifier>{b0dec713-68dc-4cf3-9113-447178e5b55e}</UniqueIdentifier>
+ <UniqueIdentifier>{3e927e4b-98ff-4e1f-9a94-5bd1dbeefbfc}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/samples/genrsakey/genrsakey_x64_vs110.vcxproj
@@ -255,7 +255,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\genrsakeyd.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -287,7 +287,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32.lib;ssleay32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>iphlpapi.lib;winmm.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\genrsakey.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
4 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>{cc32606b-ea9e-44ca-92f1-d3d0f5b703dc}</UniqueIdentifier>
+ <UniqueIdentifier>{1a6ca6c3-e2f3-469f-bb15-53966d0ad884}</UniqueIdentifier>
</Filter>
<Filter Include="Source Files">
- <UniqueIdentifier>{d76cea73-b47a-416f-a6b3-6e16d237ee75}</UniqueIdentifier>
+ <UniqueIdentifier>{3d5e13ae-ceb0-4bf0-9a34-27e56fec13af}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/samples/genrsakey/genrsakey_x64_vs90.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="bin64\static_md\genrsakeyd.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\..\lib64"
@@ -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="bin64\static_md\genrsakey.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\..\lib64"
View
4 Crypto/testsuite/TestSuite.progen
@@ -10,7 +10,7 @@ vc.project.compiler.include = ..\\..\\Foundation\\include
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
View
4 Crypto/testsuite/TestSuite_CE_VS90.vcproj
@@ -349,7 +349,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
- AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib ws2_32.lib iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib"
OutputFile="bin\$(PlatformName)\static_md\TestSuited.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib\$(PlatformName)"
@@ -424,7 +424,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/FORCE:MULTIPLE"
- AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmd.lib iphlpapi.lib ws2_32.lib iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib"
OutputFile="bin\$(PlatformName)\static_md\TestSuite.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib\$(PlatformName)"
View
4 Crypto/testsuite/TestSuite_VS71.vcproj
@@ -294,7 +294,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib"
OutputFile="bin\static_md\TestSuited.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib"
@@ -357,7 +357,7 @@
Name="VCCustomBuildTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib"
OutputFile="bin\static_md\TestSuite.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib"
View
4 Crypto/testsuite/TestSuite_VS80.vcproj
@@ -334,7 +334,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib"
OutputFile="bin\static_md\TestSuited.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib"
@@ -404,7 +404,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib"
OutputFile="bin\static_md\TestSuite.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib"
View
4 Crypto/testsuite/TestSuite_VS90.vcproj
@@ -334,7 +334,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib"
OutputFile="bin\static_md\TestSuited.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib"
@@ -404,7 +404,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib"
OutputFile="bin\static_md\TestSuite.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib"
View
4 Crypto/testsuite/TestSuite_vs100.vcxproj
@@ -257,7 +257,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -289,7 +289,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
16 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>{3c576fa6-43f1-4257-b544-47014f6ea0b5}</UniqueIdentifier>
+ <UniqueIdentifier>{70752fc1-f8db-4e84-8771-e7f91142a8f3}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Header Files">
- <UniqueIdentifier>{476b2193-113e-4904-b4f4-ae173ca8756e}</UniqueIdentifier>
+ <UniqueIdentifier>{4bb3e66a-efdc-48a4-af57-5ce55f8623a6}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Source Files">
- <UniqueIdentifier>{27423fab-1d98-4450-9949-6f154aafeddd}</UniqueIdentifier>
+ <UniqueIdentifier>{a5e5f12d-9630-4a27-85a1-b503666d19b8}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite">
- <UniqueIdentifier>{126dbf3e-5523-4d56-9ba4-61ee2fa7c269}</UniqueIdentifier>
+ <UniqueIdentifier>{f35231c6-4217-4fd1-ba87-37085145e286}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Header Files">
- <UniqueIdentifier>{074b9286-e4dc-49bc-9d21-0c7cc3e95d4d}</UniqueIdentifier>
+ <UniqueIdentifier>{a1066d61-3a13-416e-97e9-8fd964599961}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Source Files">
- <UniqueIdentifier>{4ed95f5d-2905-4aef-a741-0214a299634e}</UniqueIdentifier>
+ <UniqueIdentifier>{d952b013-311d-4122-ad58-be656196975d}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver">
- <UniqueIdentifier>{fb93910f-f80b-401c-9cde-6bc41b41d4a7}</UniqueIdentifier>
+ <UniqueIdentifier>{8235daec-41de-467e-8cc2-e970e82b8257}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver\Source Files">
- <UniqueIdentifier>{a2847809-161a-4477-aed9-7c1c54e352f5}</UniqueIdentifier>
+ <UniqueIdentifier>{e5e4c8d6-9a54-40d8-9fd3-0044a35aa14a}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/testsuite/TestSuite_vs110.vcxproj
@@ -263,7 +263,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -295,7 +295,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
16 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>{b47e5fca-ff80-4789-b2a7-816b78cb37ab}</UniqueIdentifier>
+ <UniqueIdentifier>{29136a0f-00b7-4fce-bdb3-7a2edf47abbc}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Header Files">
- <UniqueIdentifier>{68b67b4f-8e00-4c72-864b-9d82e0a724b9}</UniqueIdentifier>
+ <UniqueIdentifier>{69a0a85e-9498-4023-8869-3b093c13f791}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Source Files">
- <UniqueIdentifier>{95f8f289-a2d1-4cb3-96e7-3cc53956b2c5}</UniqueIdentifier>
+ <UniqueIdentifier>{f7f45a9f-47b4-4694-af5e-7009878f5ebe}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite">
- <UniqueIdentifier>{99012dff-b397-48b0-89b9-75bb587be5cd}</UniqueIdentifier>
+ <UniqueIdentifier>{0c9f19ae-9f50-4b32-88b5-799c1a8c6c8e}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Header Files">
- <UniqueIdentifier>{9da20fa6-dc51-4f7b-ba0c-b5f1f304d060}</UniqueIdentifier>
+ <UniqueIdentifier>{11a270d4-7dbe-4634-be18-e9b2260e636c}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Source Files">
- <UniqueIdentifier>{1ea2c43d-c081-4d5d-89b2-b7684ad8bb4c}</UniqueIdentifier>
+ <UniqueIdentifier>{652b684d-bcba-4e0f-bbe1-a4c6e4738ed2}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver">
- <UniqueIdentifier>{b596e26f-c33f-4812-b4ef-cd445725e949}</UniqueIdentifier>
+ <UniqueIdentifier>{84d29d84-898e-43e8-a168-0909cf05d0ba}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver\Source Files">
- <UniqueIdentifier>{e2d78c02-2584-4ce8-b56c-ae7569a06c84}</UniqueIdentifier>
+ <UniqueIdentifier>{f8b59d0f-4add-43b9-a0a6-8dd8f3d59f47}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/testsuite/TestSuite_x64_vs100.vcxproj
@@ -257,7 +257,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -289,7 +289,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
16 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>{1fd94e48-8e10-4911-8c1a-040aa1031681}</UniqueIdentifier>
+ <UniqueIdentifier>{b8c433e3-bd95-48e6-9eba-96cb855ece9f}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Header Files">
- <UniqueIdentifier>{6230455e-833f-4b3a-bba7-37a135688139}</UniqueIdentifier>
+ <UniqueIdentifier>{8093a787-9b1c-4bb3-9641-947f25e62e36}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Source Files">
- <UniqueIdentifier>{6e0f32c0-50df-4632-95d7-3583db87417d}</UniqueIdentifier>
+ <UniqueIdentifier>{ffab6f7c-5a0f-4880-b679-803874b4d9e3}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite">
- <UniqueIdentifier>{d8f79cf5-f868-48a1-967b-3e776e866172}</UniqueIdentifier>
+ <UniqueIdentifier>{0d1c8d80-b652-44b8-83d9-b3a51e486868}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Header Files">
- <UniqueIdentifier>{a299c232-c518-41c3-a661-2ed4e626bd68}</UniqueIdentifier>
+ <UniqueIdentifier>{c74c0344-4b5b-443f-8d0b-49a2c3cbf611}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Source Files">
- <UniqueIdentifier>{9687c9d2-7b5e-4035-bff1-e36a3542a4e7}</UniqueIdentifier>
+ <UniqueIdentifier>{bd6b6cdd-accd-44d9-971f-f724361239d9}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver">
- <UniqueIdentifier>{6adb9cef-f20d-42f6-ae13-c60979bdae9d}</UniqueIdentifier>
+ <UniqueIdentifier>{23bb52f6-9eaa-4770-9423-cdba2efc95db}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver\Source Files">
- <UniqueIdentifier>{3d91b954-16ac-46e5-8da8-fa775de28dc0}</UniqueIdentifier>
+ <UniqueIdentifier>{a9eec5ef-3fe9-4c04-8eb9-f2cca2a09882}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/testsuite/TestSuite_x64_vs110.vcxproj
@@ -263,7 +263,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32mdd.lib;ssleay32mdd.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -295,7 +295,7 @@
<DisableSpecificWarnings>%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
- <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;libeay32md.lib;ssleay32md.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
<AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
View
16 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>{360da092-03aa-4992-bd6a-97b453ed5321}</UniqueIdentifier>
+ <UniqueIdentifier>{14b501c4-9409-4943-8214-d5d52deecd8f}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Header Files">
- <UniqueIdentifier>{3b9a735a-bdd1-4394-909e-777918ba8465}</UniqueIdentifier>
+ <UniqueIdentifier>{afb6c75b-0f71-4743-a95c-9b52aebd63f2}</UniqueIdentifier>
</Filter>
<Filter Include="Crypto\Source Files">
- <UniqueIdentifier>{3c2466c1-b8e8-4bf4-b710-33600791a1e1}</UniqueIdentifier>
+ <UniqueIdentifier>{9bd59090-1339-48e1-90ec-a19c0b570db2}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite">
- <UniqueIdentifier>{2a0b2076-dd6d-4486-bf9b-8d3546d4bbd6}</UniqueIdentifier>
+ <UniqueIdentifier>{57c0735e-0e0d-4980-88c0-4a6f40855272}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Header Files">
- <UniqueIdentifier>{c1118909-b051-4a74-a136-7b0a44c0a41a}</UniqueIdentifier>
+ <UniqueIdentifier>{50cf4c68-b1c0-4b35-addf-4e0f1ebdd999}</UniqueIdentifier>
</Filter>
<Filter Include="_Suite\Source Files">
- <UniqueIdentifier>{702ffccc-4f9b-46a7-b00f-0dc70c51bd21}</UniqueIdentifier>
+ <UniqueIdentifier>{54d177cb-9074-4a17-8276-086b69108f78}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver">
- <UniqueIdentifier>{024f1b38-efb3-4cfa-8fdf-dcf065897ea0}</UniqueIdentifier>
+ <UniqueIdentifier>{3bbe7a79-6238-4aa4-95e9-f4f86c506aac}</UniqueIdentifier>
</Filter>
<Filter Include="_Driver\Source Files">
- <UniqueIdentifier>{ca38a7e5-c31b-498e-a09d-b8d489282f8e}</UniqueIdentifier>
+ <UniqueIdentifier>{46028ffd-ae87-4815-812b-8940f0420870}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
View
4 Crypto/testsuite/TestSuite_x64_vs90.vcproj
@@ -334,7 +334,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32mdd.lib ssleay32mdd.lib Crypt32.lib"
OutputFile="bin64\static_md\TestSuited.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="..\..\lib64"
@@ -404,7 +404,7 @@
Name="VCPreLinkEventTool"/>
<Tool
Name="VCLinkerTool"
- AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32.lib ssleay32.lib"
+ AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ws2_32.lib iphlpapi.lib libeay32md.lib ssleay32md.lib Crypt32.lib"
OutputFile="bin64\static_md\TestSuite.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="..\..\lib64"
View
6 DLLVersion.rc
@@ -4,8 +4,8 @@
#include "winres.h"
-#define POCO_VERSION 1,4,5,0
-#define POCO_VERSION_STR "1.4.5"
+#define POCO_VERSION 1,4,6,0
+#define POCO_VERSION_STR "1.4.6"
VS_VERSION_INFO VERSIONINFO
FILEVERSION POCO_VERSION
@@ -28,7 +28,7 @@ BEGIN
VALUE "FileDescription", "This file is part of the POCO C++ Libraries."
VALUE "FileVersion", POCO_VERSION_STR
VALUE "InternalName", "POCO"
- VALUE "LegalCopyright", "Copyright (C) 2006-2012, Applied Informatics Software Engineering GmbH and Contributors."
+ VALUE "LegalCopyright", "Copyright (C) 2004-2013, Applied Informatics Software Engineering GmbH and Contributors."
VALUE "ProductName", "POCO C++ Libraries - http://pocoproject.org"
VALUE "ProductVersion", POCO_VERSION_STR
END
View
760 Data/SQLite/src/sqlite3.c
@@ -1,6 +1,6 @@
/******************************************************************************
** This file is an amalgamation of many separate C source files from SQLite
-** version 3.7.15. By combining all the individual C code files into this
+** version 3.7.15.1. By combining all the individual C code files into this
** single large file, the entire code can be compiled as a single translation
** unit. This allows many compilers to do optimizations that would not be
** possible if the files were compiled separately. Performance improvements
@@ -673,9 +673,9 @@ extern "C" {
** [sqlite3_libversion_number()], [sqlite3_sourceid()],
** [sqlite_version()] and [sqlite_source_id()].
*/
-#define SQLITE_VERSION "3.7.15"
+#define SQLITE_VERSION "3.7.15.1"
#define SQLITE_VERSION_NUMBER 3007015
-#define SQLITE_SOURCE_ID "2012-11-09 21:40:02 5a3b07f0f5dfae7eea870303f52f37d6a17f1da2"
+#define SQLITE_SOURCE_ID "2012-12-19 20:39:10 6b85b767d0ff7975146156a99ad673f2c1a23318"
/*
** CAPI3REF: Run-Time Library Version Numbers
@@ -1423,7 +1423,6 @@ struct sqlite3_io_methods {
** compilation of the PRAGMA fails with an error. ^The [SQLITE_FCNTL_PRAGMA]
** file control occurs at the beginning of pragma statement analysis and so
** it is able to override built-in [PRAGMA] statements.
-** </ul>
**
** <li>[[SQLITE_FCNTL_BUSYHANDLER]]
** ^This file-control may be invoked by SQLite on the database file handle
@@ -1435,6 +1434,16 @@ struct sqlite3_io_methods {
** the array as the only argument. If it returns non-zero, then the operation
** should be retried. If it returns zero, the custom VFS should abandon the
** current operation.
+**
+** <li>[[SQLITE_FCNTL_TEMPFILENAME]]
+** ^Application can invoke this file-control to have SQLite generate a
+** temporary filename using the same algorithm that is followed to generate
+** temporary filenames for TEMP tables and other internal uses. The
+** argument should be a char** which will be filled with the filename
+** written into memory obtained from [sqlite3_malloc()]. The caller should
+** invoke [sqlite3_free()] on the result to avoid a memory leak.
+**
+** </ul>
*/
#define SQLITE_FCNTL_LOCKSTATE 1
#define SQLITE_GET_LOCKPROXYFILE 2
@@ -1451,6 +1460,7 @@ struct sqlite3_io_methods {
#define SQLITE_FCNTL_POWERSAFE_OVERWRITE 13
#define SQLITE_FCNTL_PRAGMA 14
#define SQLITE_FCNTL_BUSYHANDLER 15
+#define SQLITE_FCNTL_TEMPFILENAME 16
/*
** CAPI3REF: Mutex Handle
@@ -2148,7 +2158,7 @@ struct sqlite3_mem_methods {
** [SQLITE_USE_URI] symbol defined.
**
** [[SQLITE_CONFIG_COVERING_INDEX_SCAN]] <dt>SQLITE_CONFIG_COVERING_INDEX_SCAN
-** <dd> This option taks a single integer argument which is interpreted as
+** <dd> This option takes a single integer argument which is interpreted as
** a boolean in order to enable or disable the use of covering indices for
** full table scans in the query optimizer. The default setting is determined
** by the [SQLITE_ALLOW_COVERING_INDEX_SCAN] compile-time option, or is "on"
@@ -2164,6 +2174,22 @@ struct sqlite3_mem_methods {
** <dd> These options are obsolete and should not be used by new code.
** They are retained for backwards compatibility but are now no-ops.
** </dl>
+**
+** [[SQLITE_CONFIG_SQLLOG]]
+** <dt>SQLITE_CONFIG_SQLLOG
+** <dd>This option is only available if sqlite is compiled with the
+** SQLITE_ENABLE_SQLLOG pre-processor macro defined. The first argument should
+** be a pointer to a function of type void(*)(void*,sqlite3*,const char*, int).
+** The second should be of type (void*). The callback is invoked by the library
+** in three separate circumstances, identified by the value passed as the
+** fourth parameter. If the fourth parameter is 0, then the database connection
+** passed as the second argument has just been opened. The third argument
+** points to a buffer containing the name of the main database file. If the
+** fourth parameter is 1, then the SQL statement that the third parameter
+** points to has just been executed. Or, if the fourth parameter is 2, then
+** the connection being passed as the second parameter is being closed. The
+** third parameter is passed NULL In this case.
+** </dl>
*/
#define SQLITE_CONFIG_SINGLETHREAD 1 /* nil */
#define SQLITE_CONFIG_MULTITHREAD 2 /* nil */
@@ -2185,6 +2211,7 @@ struct sqlite3_mem_methods {
#define SQLITE_CONFIG_PCACHE2 18 /* sqlite3_pcache_methods2* */
#define SQLITE_CONFIG_GETPCACHE2 19 /* sqlite3_pcache_methods2* */
#define SQLITE_CONFIG_COVERING_INDEX_SCAN 20 /* int */
+#define SQLITE_CONFIG_SQLLOG 21 /* xSqllog, void* */
/*
** CAPI3REF: Database Connection Configuration Options
@@ -10194,19 +10221,7 @@ struct Column {
** structure. Conceptually, a collating sequence consists of a name and
** a comparison routine that defines the order of that sequence.
**
-** There may two separate implementations of the collation function, one
-** that processes text in UTF-8 encoding (CollSeq.xCmp) and another that
-** processes text encoded in UTF-16 (CollSeq.xCmp16), using the machine
-** native byte order. When a collation sequence is invoked, SQLite selects
-** the version that will require the least expensive encoding
-** translations, if any.
-**
-** The CollSeq.pUser member variable is an extra parameter that passed in
-** as the first argument to the UTF-8 comparison function, xCmp.
-** CollSeq.pUser16 is the equivalent for the UTF-16 comparison function,
-** xCmp16.
-**
-** If both CollSeq.xCmp and CollSeq.xCmp16 are NULL, it means that the
+** If CollSeq.xCmp is NULL, it means that the
** collating sequence is undefined. Indices built on an undefined
** collating sequence may not be read or written.
*/
@@ -10734,7 +10749,6 @@ struct Expr {
ExprList *pList; /* Function arguments or in "<expr> IN (<expr-list)" */
Select *pSelect; /* Used for sub-selects and "<expr> IN (<select>)" */
} x;
- CollSeq *pColl; /* The collation type of the column or 0 */
/* If the EP_Reduced flag is set in the Expr.flags mask, then no
** space is allocated for the fields below this point. An attempt to
@@ -10770,7 +10784,7 @@ struct Expr {
#define EP_VarSelect 0x0020 /* pSelect is correlated, not constant */
#define EP_DblQuoted 0x0040 /* token.z was originally in "..." */
#define EP_InfixFunc 0x0080 /* True for an infix function: LIKE, GLOB, etc */
-#define EP_ExpCollate 0x0100 /* Collating sequence specified explicitly */
+#define EP_Collate 0x0100 /* Tree contains a TK_COLLATE opeartor */
#define EP_FixedDest 0x0200 /* Result needed in a specific register */
#define EP_IntValue 0x0400 /* Integer value contained in u.iValue */
#define EP_xIsSelect 0x0800 /* x.pSelect is valid (otherwise x.pList is) */
@@ -11387,6 +11401,7 @@ struct AuthContext {
#define OPFLAG_TYPEOFARG 0x80 /* OP_Column only used for typeof() */
#define OPFLAG_BULKCSR 0x01 /* OP_Open** used to open bulk cursor */
#define OPFLAG_P2ISREG 0x02 /* P2 to OP_Open** is a register number */
+#define OPFLAG_PERMUTE 0x01 /* OP_Compare: use the permutation */
/*
* Each trigger present in the database schema is stored as an instance of
@@ -11559,6 +11574,10 @@ struct Sqlite3Config {
void (*xLog)(void*,int,const char*); /* Function for logging */
void *pLogArg; /* First argument to xLog() */
int bLocaltimeFault; /* True to fail localtime() calls */
+#ifdef SQLITE_ENABLE_SQLLOG
+ void(*xSqllog)(void*,sqlite3*,const char*, int);
+ void *pSqllogArg;
+#endif
};
/*
@@ -12074,8 +12093,9 @@ SQLITE_PRIVATE int sqlite3ReadSchema(Parse *pParse);
SQLITE_PRIVATE CollSeq *sqlite3FindCollSeq(sqlite3*,u8 enc, const char*,int);
SQLITE_PRIVATE CollSeq *sqlite3LocateCollSeq(Parse *pParse, const char*zName);
SQLITE_PRIVATE CollSeq *sqlite3ExprCollSeq(Parse *pParse, Expr *pExpr);
-SQLITE_PRIVATE Expr *sqlite3ExprSetColl(Expr*, CollSeq*);
-SQLITE_PRIVATE Expr *sqlite3ExprSetCollByToken(Parse *pParse, Expr*, Token*);
+SQLITE_PRIVATE Expr *sqlite3ExprAddCollateToken(Parse *pParse, Expr*, Token*);
+SQLITE_PRIVATE Expr *sqlite3ExprAddCollateString(Parse*,Expr*,const char*);
+SQLITE_PRIVATE Expr *sqlite3ExprSkipCollate(Expr*);
SQLITE_PRIVATE int sqlite3CheckCollSeq(Parse *, CollSeq *);
SQLITE_PRIVATE int sqlite3CheckObjectName(Parse *, const char *);
SQLITE_PRIVATE void sqlite3VdbeSetChanges(sqlite3 *, int);
@@ -12293,8 +12313,10 @@ SQLITE_PRIVATE int sqlite3FindInIndex(Parse *, Expr *, int*);
SQLITE_PRIVATE int sqlite3JournalOpen(sqlite3_vfs *, const char *, sqlite3_file *, int, int);
SQLITE_PRIVATE int sqlite3JournalSize(sqlite3_vfs *);
SQLITE_PRIVATE int sqlite3JournalCreate(sqlite3_file *);
+SQLITE_PRIVATE int sqlite3JournalExists(sqlite3_file *p);
#else
#define sqlite3JournalSize(pVfs) ((pVfs)->szOsFile)
+ #define sqlite3JournalExists(p) 1
#endif
SQLITE_PRIVATE void sqlite3MemJournalOpen(sqlite3_file *);
@@ -12565,6 +12587,10 @@ SQLITE_PRIVATE SQLITE_WSD struct Sqlite3Config sqlite3Config = {
0, /* xLog */
0, /* pLogArg */
0, /* bLocaltimeFault */
+#ifdef SQLITE_ENABLE_SQLLOG
+ 0, /* xSqllog */
+ 0 /* pSqllogArg */
+#endif
};
@@ -22688,6 +22714,13 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){
*/
#if SQLITE_OS_UNIX /* This file is used on unix only */
+/* Use posix_fallocate() if it is available
+*/
+#if !defined(HAVE_POSIX_FALLOCATE) \
+ && (_XOPEN_SOURCE >= 600 || _POSIX_C_SOURCE >= 200112L)
+# define HAVE_POSIX_FALLOCATE 1
+#endif
+
/*
** There are various methods for file locking used for concurrency
** control:
@@ -26424,6 +26457,9 @@ static void unixModeBit(unixFile *pFile, unsigned char mask, int *pArg){
}
}
+/* Forward declaration */
+static int unixGetTempname(int nBuf, char *zBuf);
+
/*
** Information and control of an open file handle.
*/
@@ -26461,6 +26497,14 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
*(char**)pArg = sqlite3_mprintf("%s", pFile->pVfs->zName);
return SQLITE_OK;
}
+ case SQLITE_FCNTL_TEMPFILENAME: {
+ char *zTFile = sqlite3_malloc( pFile->pVfs->mxPathname );
+ if( zTFile ){
+ unixGetTempname(pFile->pVfs->mxPathname, zTFile);
+ *(char**)pArg = zTFile;
+ }
+ return SQLITE_OK;
+ }
#ifdef SQLITE_DEBUG
/* The pager calls this method to signal that it has done
** a rollback and that the database is therefore unchanged and
@@ -27018,11 +27062,19 @@ static int unixShmMap(
** the requested memory region.
*/
if( !bExtend ) goto shmpage_out;
+#if defined(HAVE_POSIX_FALLOCATE) && HAVE_POSIX_FALLOCATE
+ if( osFallocate(pShmNode->h, sStat.st_size, nByte)!=0 ){
+ rc = unixLogError(SQLITE_IOERR_SHMSIZE, "fallocate",
+ pShmNode->zFilename);
+ goto shmpage_out;
+ }
+#else
if( robust_ftruncate(pShmNode->h, nByte) ){
rc = unixLogError(SQLITE_IOERR_SHMSIZE, "ftruncate",
pShmNode->zFilename);
goto shmpage_out;
}
+#endif
}
}
@@ -32742,6 +32794,9 @@ static void winModeBit(winFile *pFile, unsigned char mask, int *pArg){
}
}
+/* Forward declaration */
+static int getTempname(int nBuf, char *zBuf);
+
/*
** Control and query of the open file handle.
*/
@@ -32802,6 +32857,14 @@ static int winFileControl(sqlite3_file *id, int op, void *pArg){
}
return SQLITE_OK;
}
+ case SQLITE_FCNTL_TEMPFILENAME: {
+ char *zTFile = sqlite3_malloc( pFile->pVfs->mxPathname );
+ if( zTFile ){
+ getTempname(pFile->pVfs->mxPathname, zTFile);
+ *(char**)pArg = zTFile;
+ }
+ return SQLITE_OK;
+ }
}
return SQLITE_NOTFOUND;
}
@@ -33939,14 +34002,24 @@ static int winDelete(
&sAttrData) ){
attr = sAttrData.dwFileAttributes;
}else{
- rc = SQLITE_OK; /* Already gone? */
+ lastErrno = osGetLastError();
+ if( lastErrno==ERROR_FILE_NOT_FOUND || lastErrno==ERROR_PATH_NOT_FOUND ){
+ rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */
+ }else{
+ rc = SQLITE_ERROR;
+ }
break;
}
#else
attr = osGetFileAttributesW(zConverted);
#endif
if ( attr==INVALID_FILE_ATTRIBUTES ){
- rc = SQLITE_OK; /* Already gone? */
+ lastErrno = osGetLastError();
+ if( lastErrno==ERROR_FILE_NOT_FOUND || lastErrno==ERROR_PATH_NOT_FOUND ){
+ rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */
+ }else{
+ rc = SQLITE_ERROR;
+ }
break;
}
if ( attr&FILE_ATTRIBUTE_DIRECTORY ){
@@ -33968,7 +34041,12 @@ static int winDelete(
do {
attr = osGetFileAttributesA(zConverted);
if ( attr==INVALID_FILE_ATTRIBUTES ){
- rc = SQLITE_OK; /* Already gone? */
+ lastErrno = osGetLastError();
+ if( lastErrno==ERROR_FILE_NOT_FOUND || lastErrno==ERROR_PATH_NOT_FOUND ){
+ rc = SQLITE_IOERR_DELETE_NOENT; /* Already gone? */
+ }else{
+ rc = SQLITE_ERROR;
+ }
break;
}
if ( attr&FILE_ATTRIBUTE_DIRECTORY ){
@@ -33986,7 +34064,7 @@ static int winDelete(
} while(1);
}
#endif
- if( rc ){
+ if( rc && rc!=SQLITE_IOERR_DELETE_NOENT ){
rc = winLogError(SQLITE_IOERR_DELETE, lastErrno,
"winDelete", zFilename);
}else{
@@ -39180,12 +39258,13 @@ static int pager_end_transaction(Pager *pPager, int hasMaster){
** file should be closed and deleted. If this connection writes to
** the database file, it will do so using an in-memory journal.
*/
+ int bDelete = (!pPager->tempFile && sqlite3JournalExists(pPager->jfd));
assert( pPager->journalMode==PAGER_JOURNALMODE_DELETE
|| pPager->journalMode==PAGER_JOURNALMODE_MEMORY
|| pPager->journalMode==PAGER_JOURNALMODE_WAL
);
sqlite3OsClose(pPager->jfd);
- if( !pPager->tempFile ){
+ if( bDelete ){
rc = sqlite3OsDelete(pPager->pVfs, pPager->zJournal, 0);
}
}
@@ -40724,7 +40803,7 @@ SQLITE_PRIVATE void sqlite3PagerSetBusyhandler(
void **ap = (void **)&pPager->xBusyHandler;
assert( ((int(*)(void *))(ap[0]))==xBusyHandler );
assert( ap[1]==pBusyHandlerArg );
- sqlite3OsFileControl(pPager->fd, SQLITE_FCNTL_BUSYHANDLER, (void *)ap);
+ sqlite3OsFileControlHint(pPager->fd, SQLITE_FCNTL_BUSYHANDLER, (void *)ap);
}
}
@@ -58523,7 +58602,7 @@ SQLITE_PRIVATE Vdbe *sqlite3VdbeCreate(sqlite3 *db){
SQLITE_PRIVATE void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n, int isPrepareV2){
assert( isPrepareV2==1 || isPrepareV2==0 );
if( p==0 ) return;
-#ifdef SQLITE_OMIT_TRACE
+#if defined(SQLITE_OMIT_TRACE) && !defined(SQLITE_ENABLE_SQLLOG)
if( !isPrepareV2 ) return;
#endif
assert( p->zSql==0 );
@@ -59193,6 +59272,7 @@ SQLITE_PRIVATE void sqlite3VdbeChangeP4(Vdbe *p, int addr, const char *zP4, int
addr = p->nOp - 1;
}
pOp = &p->aOp[addr];
+ assert( pOp->p4type==P4_NOTUSED || pOp->p4type==P4_INT32 );
freeP4(db, pOp->p4type, pOp->p4.p);
pOp->p4.p = 0;
if( n==P4_INT32 ){
@@ -59335,22 +59415,18 @@ static char *displayP4(Op *pOp, char *zTemp, int nTemp){
i = sqlite3Strlen30(zTemp);
for(j=0; j<pKeyInfo->nField; j++){
CollSeq *pColl = pKeyInfo->aColl[j];
- if( pColl ){
- int n = sqlite3Strlen30(pColl->zName);
- if( i+n>nTemp-6 ){
- memcpy(&zTemp[i],",...",4);
- break;
- }
- zTemp[i++] = ',';
- if( pKeyInfo->aSortOrder[j] ){
- zTemp[i++] = '-';
- }
- memcpy(&zTemp[i], pColl->zName,n+1);
- i += n;
- }else if( i+4<nTemp-6 ){
- memcpy(&zTemp[i],",nil",4);
- i += 4;
+ const char *zColl = pColl ? pColl->zName : "nil";
+ int n = sqlite3Strlen30(zColl);
+ if( i+n>nTemp-6 ){
+ memcpy(&zTemp[i],",...",4);
+ break;
+ }
+ zTemp[i++] = ',';
+ if( pKeyInfo->aSortOrder[j] ){
+ zTemp[i++] = '-';
}
+ memcpy(&zTemp[i], zColl, n+1);
+ i += n;
}
zTemp[i++] = ')';
zTemp[i] = 0;
@@ -60796,6 +60872,27 @@ SQLITE_PRIVATE int sqlite3VdbeTransferError(Vdbe *p){
return rc;
}
+#ifdef SQLITE_ENABLE_SQLLOG
+/*
+** If an SQLITE_CONFIG_SQLLOG hook is registered and the VM has been run,
+** invoke it.
+*/
+static void vdbeInvokeSqllog(Vdbe *v){
+ if( sqlite3GlobalConfig.xSqllog && v->rc==SQLITE_OK && v->zSql && v->pc>=0 ){
+ char *zExpanded = sqlite3VdbeExpandSql(v, v->zSql);
+ assert( v->db->init.busy==0 );
+ if( zExpanded ){
+ sqlite3GlobalConfig.xSqllog(
+ sqlite3GlobalConfig.pSqllogArg, v->db, zExpanded, 1
+ );
+ sqlite3DbFree(v->db, zExpanded);
+ }
+ }
+}
+#else
+# define vdbeInvokeSqllog(x)
+#endif
+
/*
** Clean up a VDBE after execution but do not delete the VDBE just yet.
** Write any error messages into *pzErrMsg. Return the result code.
@@ -60823,6 +60920,7 @@ SQLITE_PRIVATE int sqlite3VdbeReset(Vdbe *p){
** instructions yet, leave the main database error information unchanged.
*/
if( p->pc>=0 ){
+ vdbeInvokeSqllog(p);
sqlite3VdbeTransferError(p);
sqlite3DbFree(db, p->zErrMsg);
p->zErrMsg = 0;
@@ -60929,7 +61027,7 @@ SQLITE_PRIVATE void sqlite3VdbeClearObject(sqlite3 *db, Vdbe *p){
sqlite3DbFree(db, p->zSql);
sqlite3DbFree(db, p->pFree);
#if defined(SQLITE_ENABLE_TREE_EXPLAIN)
- sqlite3DbFree(db, p->zExplain);
+ sqlite3_free(p->zExplain);
sqlite3DbFree(db, p->pExplain);
#endif
}
@@ -63718,7 +63816,9 @@ SQLITE_PRIVATE void sqlite3VdbeMemPrettyPrint(Mem *pMem, char *zBuf){
** Print the value of a register for tracing purposes:
*/
static void memTracePrint(FILE *out, Mem *p){
- if( p->flags & MEM_Null ){
+ if( p->flags & MEM_Invalid ){
+ fprintf(out, " undefined");
+ }else if( p->flags & MEM_Null ){
fprintf(out, " NULL");
}else if( (p->flags & (MEM_Int|MEM_Str))==(MEM_Int|MEM_Str) ){
fprintf(out, " si:%lld", p->u.i);
@@ -63991,6 +64091,7 @@ SQLITE_PRIVATE int sqlite3VdbeExec(
i64 nByte;
} ag;
struct OP_Remainder_stack_vars {
+ char bIntint; /* Started out as two integer operands */
int flags; /* Combined MEM_* flags from both inputs */
i64 iA; /* Integer value of left operand */
i64 iB; /* Integer value of right operand */
@@ -64900,6 +65001,9 @@ case OP_Copy: {
while( 1 ){
sqlite3VdbeMemShallowCopy(pOut, pIn1, MEM_Ephem);
Deephemeralize(pOut);
+#ifdef SQLITE_DEBUG
+ pOut->pScopyFrom = 0;
+#endif
REGISTER_TRACE(pOp->p2+pOp->p3-u.ae.n, pOut);
if( (u.ae.n--)==0 ) break;
pOut++;
@@ -65093,6 +65197,7 @@ case OP_Multiply: /* same as TK_STAR, in1, in2, out3 */
case OP_Divide: /* same as TK_SLASH, in1, in2, out3 */
case OP_Remainder: { /* same as TK_REM, in1, in2, out3 */
#if 0 /* local variables moved into u.ah */
+ char bIntint; /* Started out as two integer operands */
int flags; /* Combined MEM_* flags from both inputs */
i64 iA; /* Integer value of left operand */
i64 iB; /* Integer value of right operand */
@@ -65110,6 +65215,7 @@ case OP_Remainder: { /* same as TK_REM, in1, in2, out3 */
if( (pIn1->flags & pIn2->flags & MEM_Int)==MEM_Int ){
u.ah.iA = pIn1->u.i;
u.ah.iB = pIn2->u.i;
+ u.ah.bIntint = 1;
switch( pOp->opcode ){
case OP_Add: if( sqlite3AddInt64(&u.ah.iB,u.ah.iA) ) goto fp_math; break;
case OP_Subtract: if( sqlite3SubInt64(&u.ah.iB,u.ah.iA) ) goto fp_math; break;
@@ -65130,6 +65236,7 @@ case OP_Remainder: { /* same as TK_REM, in1, in2, out3 */
pOut->u.i = u.ah.iB;
MemSetTypeFlag(pOut, MEM_Int);
}else{
+ u.ah.bIntint = 0;
fp_math:
u.ah.rA = sqlite3VdbeRealValue(pIn1);
u.ah.rB = sqlite3VdbeRealValue(pIn2);
@@ -65161,7 +65268,7 @@ case OP_Remainder: { /* same as TK_REM, in1, in2, out3 */
}
pOut->r = u.ah.rB;
MemSetTypeFlag(pOut, MEM_Real);
- if( (u.ah.flags & MEM_Real)==0 ){
+ if( (u.ah.flags & MEM_Real)==0 && !u.ah.bIntint ){
sqlite3VdbeIntegerAffinity(pOut);
}
#endif
@@ -65722,9 +65829,9 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */
** Set the permutation used by the OP_Compare operator to be the array
** of integers in P4.
**
-** The permutation is only valid until the next OP_Permutation, OP_Compare,
-** OP_Halt, or OP_ResultRow. Typically the OP_Permutation should occur
-** immediately prior to the OP_Compare.
+** The permutation is only valid until the next OP_Compare that has
+** the OPFLAG_PERMUTE bit set in P5. Typically the OP_Permutation should
+** occur immediately prior to the OP_Compare.
*/
case OP_Permutation: {
assert( pOp->p4type==P4_INTARRAY );
@@ -65733,12 +65840,17 @@ case OP_Permutation: {
break;
}
-/* Opcode: Compare P1 P2 P3 P4 *
+/* Opcode: Compare P1 P2 P3 P4 P5
**
** Compare two vectors of registers in reg(P1)..reg(P1+P3-1) (call this
** vector "A") and in reg(P2)..reg(P2+P3-1) ("B"). Save the result of
** the comparison for use by the next OP_Jump instruct.
**
+** If P5 has the OPFLAG_PERMUTE bit set, then the order of comparison is
+** determined by the most recent OP_Permutation operator. If the
+** OPFLAG_PERMUTE bit is clear, then register are compared in sequential
+** order.
+**
** P4 is a KeyInfo structure that defines collating sequences and sort
** orders for the comparison. The permutation applies to registers
** only. The KeyInfo elements are used sequentially.
@@ -65759,6 +65871,7 @@ case OP_Compare: {
int bRev; /* True for DESCENDING sort order */
#endif /* local variables moved into u.al */
+ if( (pOp->p5 & OPFLAG_PERMUTE)==0 ) aPermute = 0;
u.al.n = pOp->p3;
u.al.pKeyInfo = pOp->p4.pKeyInfo;
assert( u.al.n>0 );
@@ -65904,8 +66017,6 @@ case OP_BitNot: { /* same as TK_BITNOT, in1, out2 */
**
** Check if OP_Once flag P1 is set. If so, jump to instruction P2. Otherwise,
** set the flag and fall through to the next instruction.
-**
-** See also: JumpOnce
*/
case OP_Once: { /* jump */
assert( pOp->p1<p->nOnceFlag );
@@ -67165,7 +67276,7 @@ case OP_OpenEphemeral: {
break;
}
-/* Opcode: OpenSorter P1 P2 * P4 *
+/* Opcode: SorterOpen P1 P2 * P4 *
**
** This opcode works like OP_OpenEphemeral except that it opens
** a transient index that is specifically designed to sort large
@@ -71950,6 +72061,16 @@ SQLITE_PRIVATE int sqlite3JournalCreate(sqlite3_file *p){
return createFile((JournalFile *)p);
}
+/*
+** The file-handle passed as the only argument is guaranteed to be an open
+** file. It may or may not be of class JournalFile. If the file is a
+** JournalFile, and the underlying file on disk has not yet been opened,
+** return 0. Otherwise, return 1.
+*/
+SQLITE_PRIVATE int sqlite3JournalExists(sqlite3_file *p){
+ return (p->pMethods!=&JournalFileMethods || ((JournalFile *)p)->pReal!=0);
+}
+
/*
** Return the number of bytes required to store a JournalFile that uses vfs
** pVfs to create the underlying on-disk files.
@@ -72435,6 +72556,15 @@ static void incrAggFunctionDepth(Expr *pExpr, int N){
** from the result in the result-set. We might fix this someday. Or
** then again, we might not...
**
+** If the reference is followed by a COLLATE operator, then make sure
+** the COLLATE operator is preserved. For example:
+**
+** SELECT a+b, c+d FROM t1 ORDER BY 1 COLLATE nocase;
+**
+** Should be transformed into:
+**
+** SELECT a+b, c+d FROM t1 ORDER BY (a+b) COLLATE nocase;
+**
** The nSubquery parameter specifies how many levels of subquery the
** alias is removed from the original expression. The usually value is
** zero but it might be more if the alias is contained within a subquery
@@ -72458,41 +72588,36 @@ static void resolveAlias(
assert( pOrig!=0 );
assert( pOrig->flags & EP_Resolved );
db = pParse->db;
+ pDup = sqlite3ExprDup(db, pOrig, 0);
+ if( pDup==0 ) return;
if( pOrig->op!=TK_COLUMN && zType[0]!='G' ){
- pDup = sqlite3ExprDup(db, pOrig, 0);
incrAggFunctionDepth(pDup, nSubquery);
pDup = sqlite3PExpr(pParse, TK_AS, pDup, 0, 0);
if( pDup==0 ) return;
if( pEList->a[iCol].iAlias==0 ){
pEList->a[iCol].iAlias = (u16)(++pParse->nAlias);
}
pDup->iTable = pEList->a[iCol].iAlias;
- }else if( ExprHasProperty(pOrig, EP_IntValue) || pOrig->u.zToken==0 ){
- pDup = sqlite3ExprDup(db, pOrig, 0);
- if( pDup==0 ) return;
- }else{
- char *zToken = pOrig->u.zToken;
- assert( zToken!=0 );
- pOrig->u.zToken = 0;
- pDup = sqlite3ExprDup(db, pOrig, 0);
- pOrig->u.zToken = zToken;
- if( pDup==0 ) return;
- assert( (pDup->flags & (EP_Reduced|EP_TokenOnly))==0 );
- pDup->flags2 |= EP2_MallocedToken;
- pDup->u.zToken = sqlite3DbStrDup(db, zToken);
}
- if( pExpr->flags & EP_ExpCollate ){
- pDup->pColl = pExpr->pColl;
- pDup->flags |= EP_ExpCollate;
+ if( pExpr->op==TK_COLLATE ){
+ pDup = sqlite3ExprAddCollateString(pParse, pDup, pExpr->u.zToken);
}
/* Before calling sqlite3ExprDelete(), set the EP_Static flag. This
** prevents ExprDelete() from deleting the Expr structure itself,
** allowing it to be repopulated by the memcpy() on the following line.
+ ** The pExpr->u.zToken might point into memory that will be freed by the
+ ** sqlite3DbFree(db, pDup) on the last line of this block, so be sure to
+ ** make a copy of the token before doing the sqlite3DbFree().
*/
ExprSetProperty(pExpr, EP_Static);
sqlite3ExprDelete(db, pExpr);
memcpy(pExpr, pDup, sizeof(*pExpr));
+ if( !ExprHasProperty(pExpr, EP_IntValue) && pExpr->u.zToken!=0 ){
+ assert( (pExpr->flags & (EP_Reduced|EP_TokenOnly))==0 );
+ pExpr->u.zToken = sqlite3DbStrDup(db, pExpr->u.zToken);
+ pExpr->flags2 |= EP2_MallocedToken;
+ }
sqlite3DbFree(db, pDup);
}
@@ -73179,7 +73304,7 @@ static int resolveCompoundOrderBy(
int iCol = -1;
Expr *pE, *pDup;
if( pItem->done ) continue;
- pE = pItem->pExpr;
+ pE = sqlite3ExprSkipCollate(pItem->pExpr);
if( sqlite3ExprIsInteger(pE, &iCol) ){
if( iCol<=0 || iCol>pEList->nExpr ){
resolveOutOfRangeError(pParse, "ORDER", i+1, pEList->nExpr);
@@ -73197,14 +73322,20 @@ static int resolveCompoundOrderBy(
}
}
if( iCol>0 ){
- CollSeq *pColl = pE->pColl;
- int flags = pE->flags & EP_ExpCollate;
+ /* Convert the ORDER BY term into an integer column number iCol,
+ ** taking care to preserve the COLLATE clause if it exists */
+ Expr *pNew = sqlite3Expr(db, TK_INTEGER, 0);
+ if( pNew==0 ) return 1;
+ pNew->flags |= EP_IntValue;
+ pNew->u.iValue = iCol;
+ if( pItem->pExpr==pE ){
+ pItem->pExpr = pNew;
+ }else{
+ assert( pItem->pExpr->op==TK_COLLATE );
+ assert( pItem->pExpr->pLeft==pE );
+ pItem->pExpr->pLeft = pNew;
+ }
sqlite3ExprDelete(db, pE);
- pItem->pExpr = pE = sqlite3Expr(db, TK_INTEGER, 0);
- if( pE==0 ) return 1;
- pE->pColl = pColl;
- pE->flags |= EP_IntValue | flags;
- pE->u.iValue = iCol;
pItem->iOrderByCol = (u16)iCol;
pItem->done = 1;
}else{
@@ -73309,11 +73440,11 @@ static int resolveOrderGroupBy(
pItem->iOrderByCol = (u16)iCol;
continue;
}
- if( sqlite3ExprIsInteger(pE, &iCol) ){
+ if( sqlite3ExprIsInteger(sqlite3ExprSkipCollate(pE), &iCol) ){
/* The ORDER BY term is an integer constant. Again, set the column
** number so that sqlite3ResolveOrderGroupBy() will convert the
** order-by term to a copy of the result-set expression */
- if( iCol<1 ){