rename "cryptdll" project to "cryptopp"

fix compile errors on MSVC 2010


git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@497 57ff6487-cd31-0410-9ec3-f628ee90f5f0

6 files changed, 17 insertions, 132 deletions

diff --git a/cryptdll.vcproj b/cryptdll.vcproj
index a3ab06b..293fe0c 100755
--- a/cryptdll.vcproj
+++ b/cryptdll.vcproj
@@ -2,9 +2,9 @@
 <VisualStudioProject

 	ProjectType="Visual C++"

 	Version="8.00"

-	Name="cryptdll"

+	Name="cryptopp"

 	ProjectGUID="{EBD86293-69A9-456B-B814-916E12AA9BBF}"

-	RootNamespace="cryptdll"

+	RootNamespace="cryptopp"

 	SccLocalPath="."

 	>

 	<Platforms>

@@ -42,15 +42,12 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				PreprocessorDefinitions="NDEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\DLL_Release/cryptdll.tlb"

+				TypeLibraryName=".\DLL_Release/cryptopp.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -113,9 +110,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -143,15 +137,12 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				PreprocessorDefinitions="NDEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="3"

-				TypeLibraryName=".\DLL_Release/cryptdll.tlb"

+				TypeLibraryName=".\DLL_Release/cryptopp.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -214,9 +205,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -243,15 +231,12 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				PreprocessorDefinitions="_DEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="1"

-				TypeLibraryName=".\DLL_Debug/cryptdll.tlb"

+				TypeLibraryName=".\DLL_Debug/cryptopp.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -310,9 +295,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -339,15 +321,12 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				PreprocessorDefinitions="_DEBUG"

 				MkTypLibCompatible="true"

 				SuppressStartupBanner="true"

 				TargetEnvironment="3"

-				TypeLibraryName=".\DLL_Debug/cryptdll.tlb"

+				TypeLibraryName=".\DLL_Debug/cryptopp.tlb"

 				HeaderFileName=""

 			/>

 			<Tool

@@ -406,9 +385,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

diff --git a/cryptest.vcproj b/cryptest.vcproj
index f7e4a6e..03a5b88 100755
--- a/cryptest.vcproj
+++ b/cryptest.vcproj
@@ -39,9 +39,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\CTRelease/cryptest.tlb"

 				HeaderFileName=""

@@ -102,9 +99,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -129,9 +123,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 				TypeLibraryName=".\CTRelease/cryptest.tlb"

@@ -194,9 +185,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -221,9 +209,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\CT_DLL_Import_Release/cryptest.tlb"

 				HeaderFileName=""

@@ -286,9 +271,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -313,9 +295,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 				TypeLibraryName=".\CT_DLL_Import_Release/cryptest.tlb"

@@ -380,9 +359,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -406,9 +382,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\CT_DLL_Import_Debug/cryptest.tlb"

 				HeaderFileName=""

@@ -465,9 +438,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -491,9 +461,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 				TypeLibraryName=".\CT_DLL_Import_Debug/cryptest.tlb"

@@ -552,9 +519,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -578,9 +542,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\CTDebug/cryptest.tlb"

 				HeaderFileName=""

@@ -635,9 +596,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -661,9 +619,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 				TypeLibraryName=".\CTDebug/cryptest.tlb"

@@ -719,9 +674,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

diff --git a/cryptlib.vcproj b/cryptlib.vcproj
index aeeca76..0a118b1 100755
--- a/cryptlib.vcproj
+++ b/cryptlib.vcproj
@@ -38,9 +38,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 			/>

 			<Tool

@@ -110,9 +107,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 			/>

@@ -183,9 +177,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 			/>

 			<Tool

@@ -204,7 +195,6 @@
 				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -257,9 +247,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 			/>

@@ -279,7 +266,6 @@
 				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

@@ -331,9 +317,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 			/>

 			<Tool

@@ -399,9 +382,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 			/>

@@ -467,9 +447,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 			/>

 			<Tool

@@ -483,7 +460,6 @@
 				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="4"

 			/>

 			<Tool

@@ -535,9 +511,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 			/>

@@ -552,7 +525,6 @@
 				ProgramDataBaseFileName="$(OutDir)\vc80.pdb"

 				WarningLevel="3"

 				SuppressStartupBanner="true"

-				Detect64BitPortabilityProblems="true"

 				DebugInformationFormat="3"

 			/>

 			<Tool

diff --git a/dlltest.vcproj b/dlltest.vcproj
index 0bf11ff..1e697d1 100755
--- a/dlltest.vcproj
+++ b/dlltest.vcproj
@@ -38,9 +38,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\dlltest___Win32_Release/dlltest.tlb"

 				HeaderFileName=""

@@ -100,9 +97,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -127,9 +121,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 				TypeLibraryName=".\dlltest___Win32_Release/dlltest.tlb"

@@ -190,9 +181,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -216,9 +204,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TypeLibraryName=".\dlltest___Win32_Debug/dlltest.tlb"

 				HeaderFileName=""

@@ -275,9 +260,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

@@ -301,9 +283,6 @@
 				Name="VCXMLDataGeneratorTool"

 			/>

 			<Tool

-				Name="VCWebServiceProxyGeneratorTool"

-			/>

-			<Tool

 				Name="VCMIDLTool"

 				TargetEnvironment="3"

 				TypeLibraryName=".\dlltest___Win32_Debug/dlltest.tlb"

@@ -361,9 +340,6 @@
 				Name="VCAppVerifierTool"

 			/>

 			<Tool

-				Name="VCWebDeploymentTool"

-			/>

-			<Tool

 				Name="VCPostBuildEventTool"

 			/>

 		</Configuration>

diff --git a/pubkey.h b/pubkey.h
index bdf0035..3a3f3bc 100644
--- a/pubkey.h
+++ b/pubkey.h
@@ -240,7 +240,7 @@ public:
 		{
 			static HashIdentifier CRYPTOPP_API Lookup()
 			{
-				return HashIdentifier(NULL, 0);
+				return HashIdentifier((const byte *)NULL, 0);
 			}
 		};
 	};
diff --git a/zdeflate.cpp b/zdeflate.cpp
index bef0f7c..bdcd7ba 100644
--- a/zdeflate.cpp
+++ b/zdeflate.cpp
@@ -9,6 +9,11 @@
 #include "zdeflate.h"
 #include <functional>
 
+#if _MSC_VER >= 1600
+// for make_unchecked_array_iterator
+#include <iterator>
+#endif
+
 NAMESPACE_BEGIN(CryptoPP)
 
 using namespace std;
@@ -386,12 +391,16 @@ unsigned int Deflator::LongestMatch(unsigned int &bestMatch) const
 		{
 			assert(scan[2] == match[2]);
 			unsigned int len = (unsigned int)(
-#if defined(_STDEXT_BEGIN) && !(defined(_MSC_VER) && _MSC_VER < 1400) && !defined(_STLPORT_VERSION)
+#if defined(_STDEXT_BEGIN) && !(defined(_MSC_VER) && (_MSC_VER < 1400 || _MSC_VER >= 1600)) && !defined(_STLPORT_VERSION)
 				stdext::unchecked_mismatch
 #else
 				std::mismatch
 #endif
+#if _MSC_VER >= 1600
+				(stdext::make_unchecked_array_iterator(scan)+3, stdext::make_unchecked_array_iterator(scanEnd), stdext::make_unchecked_array_iterator(match)+3).first - stdext::make_unchecked_array_iterator(scan));
+#else
 				(scan+3, scanEnd, match+3).first - scan);
+#endif
 			assert(len != bestLength);
 			if (len > bestLength)
 			{