You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2008/12/07 00:34:26 UTC

svn commit: r724055 [2/3] - in /xml/security/trunk/c: ./ Projects/VC6.0/xsec/xsec_lib/ Projects/VC7.0/Samples/simpleDecrypt/ Projects/VC7.0/Samples/simpleEncrypt/ Projects/VC7.0/Samples/simpleHMAC/ Projects/VC7.0/Samples/simpleValidate/ Projects/VC7.0/...

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/cipher/cipher.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/cipher/cipher.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/cipher/cipher.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/cipher/cipher.vcproj Sat Dec  6 15:34:24 2008
@@ -20,8 +20,8 @@
 	<Configurations>
 		<Configuration
 			Name="Debug|Win32"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/cipher.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -101,11 +101,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Debug|x64"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -122,17 +123,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
+				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -150,14 +150,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/cipher.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/cipher.pdb"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -185,12 +184,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug No Xalan|Win32"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Release|Win32"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -210,17 +208,19 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -233,12 +233,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/cipher.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/cipher.pdb"
 				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -267,9 +268,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release No Xalan|Win32"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Release|x64"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			CharacterSet="2"
@@ -288,6 +289,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -295,7 +297,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -316,14 +318,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/cipher.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -351,9 +353,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Debug No Xalan|Win32"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
@@ -373,13 +375,12 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_CONSOLE"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_CONSOLE"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -387,7 +388,7 @@
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -400,13 +401,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/cipher.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/cipher.pdb"
 				SubSystem="1"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -434,11 +435,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Debug No Xalan|x64"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -459,14 +461,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
+				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_CONSOLE"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -484,13 +484,12 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/cipher.exe"
-				LinkIncremental="1"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/cipher.pdb"
 				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -519,12 +518,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug No Xalan|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Release No Xalan|Win32"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -541,16 +539,17 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_CONSOLE"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				WarningLevel="3"
@@ -568,13 +567,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/cipher.exe"
-				LinkIncremental="2"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/cipher.pdb"
 				SubSystem="1"
-				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -603,8 +603,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release No Xalan|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="1"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			CharacterSet="2"
@@ -652,7 +652,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/cipher.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/siginf/siginf.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/siginf/siginf.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/siginf/siginf.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/siginf/siginf.vcproj Sat Dec  6 15:34:24 2008
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -233,7 +233,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -318,7 +318,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -484,7 +484,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -567,7 +567,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -652,7 +652,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/siginf.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/templatesign/templatesign.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/templatesign/templatesign.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/templatesign/templatesign.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/templatesign/templatesign.vcproj Sat Dec  6 15:34:24 2008
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -233,7 +233,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -318,7 +318,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -484,7 +484,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -567,7 +567,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -652,7 +652,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/templatesign.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/threadTest/threadTest.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/threadTest/threadTest.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/threadTest/threadTest.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/threadTest/threadTest.vcproj Sat Dec  6 15:34:24 2008
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -233,7 +233,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -318,7 +318,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -484,7 +484,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -567,7 +567,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -652,7 +652,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/threadTest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/txfmout/txfmout.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/txfmout/txfmout.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/txfmout/txfmout.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/txfmout/txfmout.vcproj Sat Dec  6 15:34:24 2008
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -233,7 +233,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -318,7 +318,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -484,7 +484,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -567,7 +567,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -652,7 +652,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/txfmout.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/xklient/xklient.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/xklient/xklient.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/xklient/xklient.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/xklient/xklient.vcproj Sat Dec  6 15:34:24 2008
@@ -65,7 +65,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -146,7 +146,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -228,7 +228,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -312,7 +312,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -393,7 +393,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -474,7 +474,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -556,7 +556,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -640,7 +640,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xklient.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/xsec_lib/xsec_lib.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/xsec_lib/xsec_lib.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/xsec_lib/xsec_lib.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/xsec_lib/xsec_lib.vcproj Sat Dec  6 15:34:24 2008
@@ -70,8 +70,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1D.dll"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				OutputFile="$(OutDir)/xsec_1_5D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/xsec_lib.pdb"
@@ -105,11 +105,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|Win32"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Debug|x64"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -128,17 +129,16 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
+				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
@@ -157,15 +157,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1.dll"
-				LinkIncremental="1"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				OutputFile="$(OutDir)/xsec_1_5D.dll"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/xsec_lib.pdb"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/xsec_1.lib"
-				TargetMachine="1"
+				ImportLibrary="$(OutDir)/xsec_1D.lib"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -193,12 +192,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug No Xalan|Win32"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Release|Win32"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -220,18 +218,20 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
+				DebugInformationFormat="3"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -244,13 +244,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1D.dll"
-				LinkIncremental="2"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				OutputFile="$(OutDir)/xsec_1_5.dll"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xsec_lib.pdb"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/xsec_1D.lib"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/xsec_1.lib"
 				TargetMachine="1"
 			/>
 			<Tool
@@ -279,9 +280,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release No Xalan|Win32"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Release|x64"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			CharacterSet="2"
@@ -302,6 +303,7 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
+				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
@@ -309,7 +311,7 @@
 				InlineFunctionExpansion="1"
 				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
+				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
 				StringPooling="true"
 				RuntimeLibrary="2"
 				EnableFunctionLevelLinking="true"
@@ -331,15 +333,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1.dll"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				OutputFile="$(OutDir)/xsec_1_5.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="$(OutDir)/xsec_1.lib"
-				TargetMachine="1"
+				TargetMachine="17"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -367,9 +369,9 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Debug No Xalan|Win32"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			UseOfMFC="0"
@@ -391,13 +393,12 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -406,7 +407,7 @@
 				PrecompiledHeaderThrough=""
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
+				DebugInformationFormat="4"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"
@@ -419,14 +420,14 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1D.dll"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
+				OutputFile="$(OutDir)/xsec_1_5D.dll"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/xsec_lib.pdb"
 				SubSystem="2"
 				ImportLibrary="$(OutDir)/xsec_1D.lib"
-				TargetMachine="17"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -454,11 +455,12 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Release|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Debug No Xalan|x64"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
+			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -481,14 +483,12 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				OmitFramePointers="true"
+				Optimization="0"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
-				StringPooling="true"
-				RuntimeLibrary="2"
-				EnableFunctionLevelLinking="true"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
@@ -507,14 +507,13 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1.dll"
-				LinkIncremental="1"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
+				OutputFile="$(OutDir)/xsec_1_5D.dll"
+				LinkIncremental="2"
 				GenerateDebugInformation="true"
+				ProgramDatabaseFile="$(OutDir)/xsec_lib.pdb"
 				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				ImportLibrary="$(OutDir)/xsec_1.lib"
+				ImportLibrary="$(OutDir)/xsec_1D.lib"
 				TargetMachine="17"
 			/>
 			<Tool
@@ -543,12 +542,11 @@
 			/>
 		</Configuration>
 		<Configuration
-			Name="Debug No Xalan|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			Name="Release No Xalan|Win32"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
-			UseOfMFC="0"
 			CharacterSet="2"
 			>
 			<Tool
@@ -567,16 +565,17 @@
 			/>
 			<Tool
 				Name="VCMIDLTool"
-				TargetEnvironment="3"
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				Optimization="0"
+				Optimization="2"
+				InlineFunctionExpansion="1"
+				OmitFramePointers="true"
 				AdditionalIncludeDirectories="../../../../include"
-				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_XSEC_DO_MEMDEBUG;WIN32;_DEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
+				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;NDEBUG;_WINDOWS;_USRDLL;XSEC_LIB_EXPORTS;PROJ_CANON;PROJ_DSIG"
+				StringPooling="true"
+				RuntimeLibrary="2"
+				EnableFunctionLevelLinking="true"
 				RuntimeTypeInfo="false"
 				UsePrecompiledHeader="0"
 				PrecompiledHeaderThrough=""
@@ -595,14 +594,15 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1D.dll"
-				LinkIncremental="2"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
+				OutputFile="$(OutDir)/xsec_1_5.dll"
+				LinkIncremental="1"
 				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(OutDir)/xsec_lib.pdb"
 				SubSystem="2"
-				ImportLibrary="$(OutDir)/xsec_1D.lib"
-				TargetMachine="17"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				ImportLibrary="$(OutDir)/xsec_1.lib"
+				TargetMachine="1"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -631,8 +631,8 @@
 		</Configuration>
 		<Configuration
 			Name="Release No Xalan|x64"
-            OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
-            IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
+			OutputDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)"
+			IntermediateDirectory="../../../../Build/$(PlatformName)/VC8/$(ConfigurationName)/obj"
 			ConfigurationType="2"
 			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC70.vsprops"
 			CharacterSet="2"
@@ -683,8 +683,8 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
-				OutputFile="$(OutDir)/xsec_1_4_1.dll"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
+				OutputFile="$(OutDir)/xsec_1_5.dll"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="2"
@@ -734,7 +734,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\..\..\src\canon\XSECCannon.cpp"
+				RelativePath="..\..\..\..\src\canon\XSECCanon.cpp"
 				>
 			</File>
 			<File

Modified: xml/security/trunk/c/Projects/VC8.0/xsec/xtest/xtest.vcproj
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/Projects/VC8.0/xsec/xtest/xtest.vcproj?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/Projects/VC8.0/xsec/xtest/xtest.vcproj (original)
+++ xml/security/trunk/c/Projects/VC8.0/xsec/xtest/xtest.vcproj Sat Dec  6 15:34:24 2008
@@ -67,7 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -150,7 +150,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib Xalan-C_1D.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -233,7 +233,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -318,7 +318,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib Xalan-C_1.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -401,7 +401,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -484,7 +484,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2D.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3D.lib crypt32.lib libeay32D.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -567,7 +567,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -652,7 +652,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="xerces-c_2.lib crypt32.lib libeay32.lib"
+				AdditionalDependencies="xerces-c_3.lib crypt32.lib libeay32.lib"
 				OutputFile="$(OutDir)/xtest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: xml/security/trunk/c/configure.ac
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/configure.ac?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/configure.ac (original)
+++ xml/security/trunk/c/configure.ac Sat Dec  6 15:34:24 2008
@@ -19,12 +19,12 @@
 
 # Process this file with autoconf to produce a configure script
 
-AC_INIT([[XML-Security-C]], [1.4.1], [security-dev@xml.apache.org], [xml-security-c])
+AC_INIT([[XML-Security-C]], [1.5], [security-dev@xml.apache.org], [xml-security-c])
 AC_CONFIG_AUX_DIR([config])
 
 # kick off automake
 
-AM_INIT_AUTOMAKE(xml-security-c, 1.4.1)
+AM_INIT_AUTOMAKE(xml-security-c, 1.5)
 sinclude(m4/acx_pthread.m4)
 AM_PROG_LIBTOOL
 
@@ -444,6 +444,31 @@
 
 # Find out some properties of the version of Xerces we have
 
+AC_MSG_CHECKING([whether Xerces is 64-bit clean])
+
+AC_TRY_RUN([#include <xercesc/util/XercesVersion.hpp>
+    int main(int argc, char **argv) {
+      if (XERCES_VERSION_MAJOR > 2)
+        return 1;
+      else
+        return 0;
+    }],
+    [AC_MSG_RESULT([yes])]
+    [AC_DEFINE(XSEC_XERCES_64BITSAFE)],
+    [AC_MSG_RESULT([no])])
+
+AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType])
+
+AC_TRY_COMPILE([#include <xercesc/framework/MemBufInputSource.hpp>],
+    [using namespace XERCES_CPP_NAMESPACE;
+      char buf[1024];
+      BinMemInputStream in(buf,1024);
+      in.getContentType();
+    ],
+    [AC_MSG_RESULT([yes])]
+    [AC_DEFINE(XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE)],
+    [AC_MSG_RESULT([no])])
+
 AC_MSG_CHECKING([whether Xerces XMLFormatter requires a version])
 
 AC_TRY_COMPILE([#include <xercesc/framework/XMLFormatter.hpp>

Modified: xml/security/trunk/c/lib/Makefile.am
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/lib/Makefile.am?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/lib/Makefile.am (original)
+++ xml/security/trunk/c/lib/Makefile.am Sat Dec  6 15:34:24 2008
@@ -72,7 +72,7 @@
   ../src/canon/XSECC14n20010315.cpp \
   ../src/canon/XSECXMLNSStack.cpp \
   ../src/canon/XSECCanon.hpp \
-  ../src/canon/XSECCannon.cpp
+  ../src/canon/XSECCanon.cpp
 
 # Signature
 

Modified: xml/security/trunk/c/src/canon/XSECC14n20010315.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/canon/XSECC14n20010315.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/canon/XSECC14n20010315.cpp (original)
+++ xml/security/trunk/c/src/canon/XSECC14n20010315.cpp Sat Dec  6 15:34:24 2008
@@ -554,10 +554,10 @@
 
 	*/
 
-	int len = input.sbStrlen();
+	xsecsize_t len = input.sbStrlen();
 	safeBuffer ret;
 
-	int i, j;
+	xsecsize_t i, j;
 	unsigned char c;
 
 	j = 0;
@@ -636,10 +636,10 @@
 
 	*/
 
-	int len = input.sbStrlen();
+	xsecsize_t len = input.sbStrlen();
 	safeBuffer ret;
 
-	int i, j;
+	xsecsize_t i, j;
 	unsigned char c;
 
 	j = 0;
@@ -912,7 +912,7 @@
 
 // This is the main worker function of this class
 
-int XSECC14n20010315::processNextNode() {
+xsecsize_t XSECC14n20010315::processNextNode() {
 
 	// The information currently in the buffer has all been used.  We now process the
 	// next node.

Modified: xml/security/trunk/c/src/canon/XSECC14n20010315.hpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/canon/XSECC14n20010315.hpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/canon/XSECC14n20010315.hpp (original)
+++ xml/security/trunk/c/src/canon/XSECC14n20010315.hpp Sat Dec  6 15:34:24 2008
@@ -121,7 +121,7 @@
 protected:
 
 	// Implementation of virtual function
-	int processNextNode();
+	xsecsize_t processNextNode();
 
 	// Test whether a name space is in the non-exclusive list
 	bool inNonExclNSList(safeBuffer &ns);

Copied: xml/security/trunk/c/src/canon/XSECCanon.cpp (from r697143, xml/security/trunk/c/src/canon/XSECCannon.cpp)
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/canon/XSECCanon.cpp?p2=xml/security/trunk/c/src/canon/XSECCanon.cpp&p1=xml/security/trunk/c/src/canon/XSECCannon.cpp&r1=697143&r2=724055&rev=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/canon/XSECCannon.cpp (original)
+++ xml/security/trunk/c/src/canon/XSECCanon.cpp Sat Dec  6 15:34:24 2008
@@ -68,15 +68,15 @@
 
 // Public Methods
 
-int XSECCanon::outputBuffer(unsigned char *outBuffer, int numBytes) {
+xsecsize_t XSECCanon::outputBuffer(unsigned char *outBuffer, xsecsize_t numBytes) {
 
 	// numBytes of data are required to be placed in outBuffer.
 
 	// Calculate amount left in buffer
 
-	int remaining = m_bufferLength - m_bufferPoint;
-	int bytesToGo = numBytes;
-	int i = 0;					// current point in outBuffer
+	xsecsize_t remaining = m_bufferLength - m_bufferPoint;
+	xsecsize_t bytesToGo = numBytes;
+	xsecsize_t i = 0;					// current point in outBuffer
 
 
 	// While we don't have enough, and have not completed - 

Propchange: xml/security/trunk/c/src/canon/XSECCanon.cpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xml/security/trunk/c/src/canon/XSECCanon.cpp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: xml/security/trunk/c/src/canon/XSECCanon.cpp
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: xml/security/trunk/c/src/canon/XSECCanon.hpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/canon/XSECCanon.hpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/canon/XSECCanon.hpp (original)
+++ xml/security/trunk/c/src/canon/XSECCanon.hpp Sat Dec  6 15:34:24 2008
@@ -57,7 +57,7 @@
 	XERCES_CPP_NAMESPACE_QUALIFIER DOMNode		* mp_startNode,	// Node to start processing from
 										*mp_nextNode;	// Next Node to be processeed
 	safeBuffer							m_buffer;		// Buffer holding parsed output
-	int									m_bufferLength,	// Length of input currently in buffer
+	xsecsize_t							m_bufferLength,	// Length of input currently in buffer
 										m_bufferPoint;	// Next "character" to copy out
 	bool								m_allNodesDone;	// Have we completed?
 
@@ -81,7 +81,7 @@
 	// outputBuffer is used by all canonicalisers to output the next numBytes bytes of
 	// canonicalised XML to the nominated buffer
 
-	int outputBuffer(unsigned char *outBuffer, int numBytes);
+	xsecsize_t outputBuffer(unsigned char *outBuffer, xsecsize_t numBytes);
 	
 	// setStartNode sets the starting point for the output if it is a sub-document 
 	// that needs canonicalisation and we want to re-start
@@ -92,7 +92,7 @@
 
 	// processNextNode is the pure virtual function that must be implemented by all canons
 
-	virtual int processNextNode() = 0;
+	virtual xsecsize_t processNextNode() = 0;
 
 };
 

Modified: xml/security/trunk/c/src/dsig/DSIGConstants.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/dsig/DSIGConstants.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/dsig/DSIGConstants.cpp (original)
+++ xml/security/trunk/c/src/dsig/DSIGConstants.cpp Sat Dec  6 15:34:24 2008
@@ -258,7 +258,7 @@
 	s_unicodeStrURIHMAC_SHA512 = XMLString::transcode(URI_ID_HMAC_SHA512);
 	s_unicodeStrURIXMLNS = XMLString::transcode(URI_ID_XMLNS);
 	s_unicodeStrURIMANIFEST = XMLString::transcode(URI_ID_MANIFEST);
-	
+
 	s_unicodeStrURI3DES_CBC	= XMLString::transcode(URI_ID_3DES_CBC);
 	s_unicodeStrURIAES128_CBC	= XMLString::transcode(URI_ID_AES128_CBC);
 	s_unicodeStrURIAES192_CBC	= XMLString::transcode(URI_ID_AES192_CBC);
@@ -298,7 +298,7 @@
 
 	XSEC_RELEASE_XMLCH(s_unicodeStrURISIGBASE);
 	XSEC_RELEASE_XMLCH(s_unicodeStrURISIGBASEMORE);
-	
+
 	XSEC_RELEASE_XMLCH(s_unicodeStrURISHA1);
 	XSEC_RELEASE_XMLCH(s_unicodeStrURISHA224);
 	XSEC_RELEASE_XMLCH(s_unicodeStrURISHA256);
@@ -395,8 +395,8 @@
 
 }
 
-bool XSECmapURIToSignatureMethods(const XMLCh * URI, 
-								  signatureMethod & sm, 
+bool XSECmapURIToSignatureMethods(const XMLCh * URI,
+								  signatureMethod & sm,
 								  hashMethod & hm) {
 
 
@@ -430,9 +430,8 @@
 	}
 
 	/* Check to see if we are one of the more exotic RSA signatures */
+	xsecsize_t cnt = XMLString::stringLen(DSIGConstants::s_unicodeStrURISIGBASEMORE);
 
-	unsigned int cnt = XMLString::stringLen(DSIGConstants::s_unicodeStrURISIGBASEMORE);
-	
 	if (XMLString::compareNString(URI, DSIGConstants::s_unicodeStrURISIGBASEMORE, cnt) == 0) {
 
 		// Have an "new" algorithm
@@ -440,7 +439,7 @@
 
 			// Some kind of HMAC
 			sm = SIGNATURE_HMAC;
-		
+
 			// Determine a trailing hash method
 			if (URI[cnt+4] != chDash)
 				return false;
@@ -464,14 +463,14 @@
 
 }
 
-bool XSECmapURIToHashMethod(const XMLCh * URI, 
+bool XSECmapURIToHashMethod(const XMLCh * URI,
 							hashMethod & hm) {
 
 
 	// Check this is a known prefix on the URI.
-	unsigned int blen = XMLString::stringLen(DSIGConstants::s_unicodeStrURISIGBASE);
-	unsigned int bmlen = XMLString::stringLen(DSIGConstants::s_unicodeStrURISIGBASEMORE);
-	unsigned int belen = XMLString::stringLen(DSIGConstants::s_unicodeStrURIXENC);
+	xsecsize_t blen = XMLString::stringLen(DSIGConstants::s_unicodeStrURISIGBASE);
+	xsecsize_t bmlen = XMLString::stringLen(DSIGConstants::s_unicodeStrURISIGBASEMORE);
+	xsecsize_t belen = XMLString::stringLen(DSIGConstants::s_unicodeStrURIXENC);
 	if (XMLString::compareNString(URI, DSIGConstants::s_unicodeStrURISIGBASE, blen) == 0) {
 
 		// This is actually cheating - this will return SHA256 (as an example), even if
@@ -497,7 +496,7 @@
 
 }
 
-bool XSECmapURIToCanonicalizationMethod(const XMLCh * URI, 
+bool XSECmapURIToCanonicalizationMethod(const XMLCh * URI,
 							canonicalizationMethod & cm) {
 
 	// Quick and dirty but inefficient

Modified: xml/security/trunk/c/src/dsig/DSIGReference.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/dsig/DSIGReference.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/dsig/DSIGReference.cpp (original)
+++ xml/security/trunk/c/src/dsig/DSIGReference.cpp Sat Dec  6 15:34:24 2008
@@ -493,14 +493,14 @@
 				 URI[12] == XERCES_CPP_NAMESPACE_QUALIFIER chOpenParen &&
 				 URI[13] == XERCES_CPP_NAMESPACE_QUALIFIER chSingleQuote) {
 			
-			unsigned int len = XMLString::stringLen(&URI[14]);
+			xsecsize_t len = XMLString::stringLen(&URI[14]);
 
 			XMLCh tmp[512];
 
 			if (len > 511)
 				len = 511;
 			
-			unsigned int j = 14, i = 0;
+			xsecsize_t j = 14, i = 0;
 			
 			// Have an ID
 			while (URI[j] != '\'') {

Modified: xml/security/trunk/c/src/enc/XSECCryptoUtils.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/enc/XSECCryptoUtils.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/enc/XSECCryptoUtils.cpp (original)
+++ xml/security/trunk/c/src/enc/XSECCryptoUtils.cpp Sat Dec  6 15:34:24 2008
@@ -80,12 +80,12 @@
 	inp[inputLen] = '\0';
 
 	uinput = XMLString::transcode((char *) inp);
-	unsigned int l = XMLString::stringLen(uinput);
+	xsecsize_t l = XMLString::stringLen(uinput);
 	uoutput = new XMLCh[l + 1];
 	ArrayJanitor<XMLCh> j_uinput(uinput);
 	ArrayJanitor<XMLCh> j_uoutput(uoutput);
 
-	unsigned int i, j;
+	xsecsize_t i, j;
 	j = 0;
 
 	XMLCh ch1;

Modified: xml/security/trunk/c/src/framework/XSECConfig.hpp.in
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/framework/XSECConfig.hpp.in?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/framework/XSECConfig.hpp.in (original)
+++ xml/security/trunk/c/src/framework/XSECConfig.hpp.in Sat Dec  6 15:34:24 2008
@@ -76,6 +76,14 @@
 
 #undef XSEC_XERCES_DOMENTITYINPUTENCODING
 
+/* 3.0 now 64-bit safe */
+
+#undef XSEC_XERCES_64BITSAFE 1
+
+/* 3.0 InputStream must expose content type */
+
+#undef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE 1
+
 /*
  * Find out the idiosyncracies of the version of Xalan we are using
  */

Modified: xml/security/trunk/c/src/framework/XSECDefs.hpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/framework/XSECDefs.hpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/framework/XSECDefs.hpp (original)
+++ xml/security/trunk/c/src/framework/XSECDefs.hpp Sat Dec  6 15:34:24 2008
@@ -57,6 +57,14 @@
 
 #include <xercesc/util/XercesDefs.hpp>
 
+// Define "sizes" of data to correspond to Xerces APIs
+#ifdef XSEC_XERCES_64BITSAFE
+    typedef XMLSize_t xsecsize_t;
+#else
+    typedef unsigned int xsecsize_t;
+#endif
+
+
 // --------------------------------------------------------------------------------
 //           Namespace Handling
 // --------------------------------------------------------------------------------

Modified: xml/security/trunk/c/src/framework/XSECW32Config.hpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/framework/XSECW32Config.hpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/framework/XSECW32Config.hpp (original)
+++ xml/security/trunk/c/src/framework/XSECW32Config.hpp Sat Dec  6 15:34:24 2008
@@ -37,8 +37,8 @@
  */
 
 #define XSEC_VERSION_MAJOR   1
-#define XSEC_VERSION_MEDIUM  4
-#define XSEC_VERSION_MINOR   1
+#define XSEC_VERSION_MEDIUM  5
+#define XSEC_VERSION_MINOR   0
 
 /*
  * Because we don't have a configure script, we need to rely on version
@@ -61,6 +61,14 @@
    encoding that was found in input document */
 
 #	define XSEC_XERCES_DOMENTITYINPUTENCODING 1
+
+/* 3.0 now 64-bit safe */
+
+#   define XSEC_XERCES_64BITSAFE 1
+
+/* 3.0 InputStream must expose content type */
+
+#   define XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE 1
 #endif
 
 #if (XERCES_VERSION_MAJOR == 3) || ((XERCES_VERSION_MAJOR == 2) && (XERCES_VERSION_MINOR >= 3))
@@ -103,7 +111,7 @@
  * Activate this #define if Xalan is not required (or desired)
  */
 
-// #define XSEC_NO_XALAN
+#define XSEC_NO_XALAN
 
 #if !defined (XSEC_NO_XALAN)
 

Modified: xml/security/trunk/c/src/framework/version.rc
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/framework/version.rc?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/framework/version.rc (original)
+++ xml/security/trunk/c/src/framework/version.rc Sat Dec  6 15:34:24 2008
@@ -54,8 +54,8 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,4,1,0
- PRODUCTVERSION 1,4,1,0
+ FILEVERSION 1,5,0,0
+ PRODUCTVERSION 1,5,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -73,22 +73,22 @@
             VALUE "Comments", "\0"
             VALUE "CompanyName", "The Apache Software Foundation\0"
             VALUE "FileDescription", "XML Security C++ Library\0"
-            VALUE "FileVersion", "1, 4, 1, 0\0"
+            VALUE "FileVersion", "1, 5, 0, 0\0"
 #ifdef _DEBUG
-            VALUE "InternalName", "xsec_1_4_1D\0"
+            VALUE "InternalName", "xsec_1_5D\0"
 #else
-            VALUE "InternalName", "xsec_1_4_1\0"
+            VALUE "InternalName", "xsec_1_5\0"
 #endif
             VALUE "LegalCopyright", "Copyright © 2002-2008 The Apache Software Foundation\0"
             VALUE "LegalTrademarks", "\0"
 #ifdef _DEBUG
-            VALUE "OriginalFilename", "xsec_1_4_1D.dll\0"
+            VALUE "OriginalFilename", "xsec_1_5D.dll\0"
 #else
-            VALUE "OriginalFilename", "xsec_1_4_1.dll\0"
+            VALUE "OriginalFilename", "xsec_1_5.dll\0"
 #endif
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "XML-Security-C - C++ XML Security Library\0"
-            VALUE "ProductVersion", "1, 4, 1, 0\0"
+            VALUE "ProductVersion", "1, 5, 0, 0\0"
             VALUE "SpecialBuild", "\0"
         END
     END

Modified: xml/security/trunk/c/src/samples/IOStreamOutputter.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/samples/IOStreamOutputter.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/samples/IOStreamOutputter.cpp (original)
+++ xml/security/trunk/c/src/samples/IOStreamOutputter.cpp Sat Dec  6 15:34:24 2008
@@ -142,7 +142,7 @@
     // -----------------------------------------------------------------------
 
     void writeChars(const   XMLByte* const  toWrite,
-                    const   unsigned int    count,
+                    const   xsecsize_t    count,
                             XMLFormatter * const formatter)
     {
         // Surprisingly, Solaris was the only platform on which
@@ -150,7 +150,7 @@
         // Without the cast, it was printing the pointer value in hex.
         // Quite annoying, considering every other platform printed
         // the string with the explicit cast to char* below.
-        cout.write((char *) toWrite, (int) count);
+        cout.write((char *) toWrite, count);
     };
 
 private:
@@ -174,7 +174,7 @@
     // Get the name and value out for convenience
     const XMLCh*   nodeName = toWrite->getNodeName();
     const XMLCh*   nodeValue = toWrite->getNodeValue();
-    unsigned long lent = XMLString::stringLen(nodeValue);
+    xsecsize_t lent = XMLString::stringLen(nodeValue);
 
     switch (toWrite->getNodeType())
     {
@@ -224,8 +224,8 @@
 
             // Output any attributes on this element
             DOMNamedNodeMap *attributes = toWrite->getAttributes();
-            int attrCount = attributes->getLength();
-            for (int i = 0; i < attrCount; i++)
+            XMLSize_t attrCount = attributes->getLength();
+            for (XMLSize_t i = 0; i < attrCount; i++)
             {
                 DOMNode  *attribute = attributes->item(i);
 
@@ -920,7 +920,7 @@
             encNameStr = aStr;
         }
     }
-    unsigned int lent = XMLString::stringLen(encNameStr);
+    xsecsize_t lent = XMLString::stringLen(encNameStr);
     gEncodingName = new XMLCh[lent + 1];
     XMLString::copyNString(gEncodingName, encNameStr, lent);
     gEncodingName[lent] = 0;

Modified: xml/security/trunk/c/src/samples/simpleDecrypt.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/samples/simpleDecrypt.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/samples/simpleDecrypt.cpp (original)
+++ xml/security/trunk/c/src/samples/simpleDecrypt.cpp Sat Dec  6 15:34:24 2008
@@ -128,10 +128,8 @@
 
 	MemBufInputSource* memIS = new MemBufInputSource ((const XMLByte*) letter, (unsigned int) strlen(letter), "XSECMem");
 
-	int errorCount = 0;
-
 	parser->parse(*memIS);
-    errorCount = parser->getErrorCount();
+    xsecsize_t errorCount = parser->getErrorCount();
     if (errorCount > 0) {
 		cerr << "Error parsing input document\n";
 		exit (1);

Modified: xml/security/trunk/c/src/samples/simpleValidate.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/samples/simpleValidate.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/samples/simpleValidate.cpp (original)
+++ xml/security/trunk/c/src/samples/simpleValidate.cpp Sat Dec  6 15:34:24 2008
@@ -135,7 +135,7 @@
 
 	MemBufInputSource* memIS = new MemBufInputSource ((const XMLByte*) docToValidate, (unsigned int) strlen(docToValidate), "XSECMem");
 
-	int errorCount = 0;
+	xsecsize_t errorCount = 0;
 
 	parser->parse(*memIS);
     errorCount = parser->getErrorCount();

Modified: xml/security/trunk/c/src/tools/c14n/c14n.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/c14n/c14n.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/c14n/c14n.cpp (original)
+++ xml/security/trunk/c/src/tools/c14n/c14n.cpp Sat Dec  6 15:34:24 2008
@@ -116,7 +116,7 @@
 	// Now parse out file
 
 	bool errorsOccured = false;
-	int errorCount = 0;
+	xsecsize_t errorCount = 0;
     try
     {
     	parser->parse(argv[argc-1]);
@@ -167,7 +167,7 @@
 	// canon.XPathSelectNodes("(/descendant-or-self::node() | /descendant-or-self::node()/attribute::* | /descendant-or-self::node()/namespace::*)[ self::ietf:e1 or (parent::ietf:e1 and not(self::text() or self::e2)) or count (id(\"E3\") | ancestor-or-self::node()) = count (ancestor-or-self::node())]");
 
 	char buffer[512];
-	int res = canon.outputBuffer((unsigned char *) buffer, 128);
+	xsecsize_t res = canon.outputBuffer((unsigned char *) buffer, 128);
 
 
 	while (res != 0) {

Modified: xml/security/trunk/c/src/tools/checksig/checksig.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/checksig/checksig.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/checksig/checksig.cpp (original)
+++ xml/security/trunk/c/src/tools/checksig/checksig.cpp Sat Dec  6 15:34:24 2008
@@ -333,7 +333,7 @@
 	// Now parse out file
 
 	bool errorsOccured = false;
-	int errorCount = 0;
+	xsecsize_t errorCount = 0;
     try
     {
     	parser->parse(filename);

Modified: xml/security/trunk/c/src/tools/cipher/cipher.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/cipher/cipher.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/cipher/cipher.cpp (original)
+++ xml/security/trunk/c/src/tools/cipher/cipher.cpp Sat Dec  6 15:34:24 2008
@@ -557,7 +557,7 @@
 
 		// Now parse out file
 
-		int errorCount = 0;
+		xsecsize_t errorCount = 0;
 		try
 		{
     		parser->parse(filename);
@@ -681,7 +681,7 @@
 				Janitor<XSECBinTXFMInputStream> j_bis(bis);
 	
 				XMLByte buf[1024];			
-				unsigned int read = bis->readBytes(buf, 1023);
+				xsecsize_t read = bis->readBytes(buf, 1023);
 				while (read > 0) {
 					formatTarget->writeChars(buf, read, NULL);
 					read = bis->readBytes(buf, 1023);

Modified: xml/security/trunk/c/src/tools/siginf/siginf.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/siginf/siginf.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/siginf/siginf.cpp (original)
+++ xml/security/trunk/c/src/tools/siginf/siginf.cpp Sat Dec  6 15:34:24 2008
@@ -204,8 +204,8 @@
 
 			if (atts != 0) {
 
-				unsigned int s = atts->getLength();
-				for (unsigned int i = 0 ; i < s; ++i) {
+				XMLSize_t s = atts->getLength();
+				for (XMLSize_t i = 0 ; i < s; ++i) {
 					levelSet(level);
 					cout << "Namespace : " << X2C(atts->item(i)->getNodeName()).str() <<
 						"=\"" << X2C(atts->item(i)->getNodeValue()).str() << "\"\n";
@@ -452,7 +452,7 @@
 	// Now parse out file
 
 	bool errorsOccured = false;
-	int errorCount = 0;
+	xsecsize_t errorCount = 0;
     try
     {
     	parser->parse(filename);

Modified: xml/security/trunk/c/src/tools/templatesign/templatesign.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/templatesign/templatesign.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/templatesign/templatesign.cpp (original)
+++ xml/security/trunk/c/src/tools/templatesign/templatesign.cpp Sat Dec  6 15:34:24 2008
@@ -210,7 +210,7 @@
     // -----------------------------------------------------------------------
 
     void writeChars(const   XMLByte* const  toWrite,
-                    const   unsigned int    count,
+                    const   xsecsize_t    count,
                             XMLFormatter * const formatter)
     {
         // Surprisingly, Solaris was the only platform on which
@@ -242,7 +242,7 @@
     // Get the name and value out for convenience
     const XMLCh*   nodeName = toWrite->getNodeName();
     const XMLCh*   nodeValue = toWrite->getNodeValue();
-    unsigned long lent = XMLString::stringLen(nodeValue);
+    xsecsize_t lent = XMLString::stringLen(nodeValue);
 
     switch (toWrite->getNodeType())
     {
@@ -292,8 +292,8 @@
 
             // Output any attributes on this element
             DOMNamedNodeMap *attributes = toWrite->getAttributes();
-            int attrCount = attributes->getLength();
-            for (int i = 0; i < attrCount; i++)
+            XMLSize_t attrCount = attributes->getLength();
+            for (XMLSize_t i = 0; i < attrCount; i++)
             {
                 DOMNode  *attribute = attributes->item(i);
 
@@ -1072,7 +1072,7 @@
 	// Now parse out file
 
 	bool errorsOccured = false;
-	int errorCount = 0;
+	xsecsize_t errorCount = 0;
     try
     {
     	parser->parse(argv[argc - 1]);
@@ -1327,7 +1327,7 @@
             encNameStr = aStr;
         }
     }
-    unsigned int lent = XMLString::stringLen(encNameStr);
+    xsecsize_t lent = XMLString::stringLen(encNameStr);
     gEncodingName = new XMLCh[lent + 1];
     XMLString::copyNString(gEncodingName, encNameStr, lent);
     gEncodingName[lent] = 0;

Modified: xml/security/trunk/c/src/tools/threadTest/threadtest.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/threadTest/threadtest.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/threadTest/threadtest.cpp (original)
+++ xml/security/trunk/c/src/tools/threadTest/threadtest.cpp Sat Dec  6 15:34:24 2008
@@ -103,23 +103,38 @@
 
 void outputDoc (DOMImplementation *impl, DOMDocument * doc) {
 
-	// Output a doc to stdout
-	DOMWriter         *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
+	XMLFormatTarget *formatTarget = new StdOutFormatTarget();
+
+    // Output a doc to stdout
+#if defined (XSEC_XERCES_DOMLSSERIALIZER)
+    // DOM L3 version as per Xerces 3.0 API
+    DOMLSSerializer   *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+
+    // Get the config so we can set up pretty printing
+    DOMConfiguration *dc = theSerializer->getDomConfig();
+    dc->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, true);
+
+    // Now create an output object to format to UTF-8
+    DOMLSOutput *theOutput = ((DOMImplementationLS*)impl)->createLSOutput();
+    Janitor<DOMLSOutput> j_theOutput(theOutput);
+
+    theOutput->setEncoding(MAKE_UNICODE_STRING("UTF-8"));
+    theOutput->setByteStream(formatTarget);
+    
+    theSerializer->write(doc, theOutput);
+#else
+    DOMWriter         *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
 
 	theSerializer->setEncoding(MAKE_UNICODE_STRING("UTF-8"));
 	if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true))
 		theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, true);
-
-
-	XMLFormatTarget *formatTarget = new StdOutFormatTarget();
-
 	theSerializer->writeNode(formatTarget, *doc);
-	
+#endif
+
 	cout << endl;
 
 	delete theSerializer;
 	delete formatTarget;
-
 }
 
 void addDocToQueue (DOMImplementation *impl, DOMDocument * doc) {
@@ -127,19 +142,36 @@
 	// Output a document to a memory buffer and add the buffer to
 	// the queue
 
+	MemBufFormatTarget *formatTarget = new MemBufFormatTarget();
+
+#if defined (XSEC_XERCES_DOMLSSERIALIZER)
+    // DOM L3 version as per Xerces 3.0 API
+    DOMLSSerializer   *theSerializer = ((DOMImplementationLS*)impl)->createLSSerializer();
+
+    // Get the config so we can set up pretty printing
+    DOMConfiguration *dc = theSerializer->getDomConfig();
+    dc->setParameter(XMLUni::fgDOMWRTFormatPrettyPrint, false);
+
+    // Now create an output object to format to UTF-8
+    DOMLSOutput *theOutput = ((DOMImplementationLS*)impl)->createLSOutput();
+    Janitor<DOMLSOutput> j_theOutput(theOutput);
+
+    theOutput->setEncoding(MAKE_UNICODE_STRING("UTF-8"));
+    theOutput->setByteStream(formatTarget);
+    
+    theSerializer->write(doc, theOutput);
+#else
 	DOMWriter         *theSerializer = ((DOMImplementationLS*)impl)->createDOMWriter();
 
 	theSerializer->setEncoding(MAKE_UNICODE_STRING("UTF-8"));
 	if (theSerializer->canSetFeature(XMLUni::fgDOMWRTFormatPrettyPrint, false))
 		theSerializer->setFeature(XMLUni::fgDOMWRTFormatPrettyPrint, false);
 
-
-	MemBufFormatTarget *formatTarget = new MemBufFormatTarget();
-
 	theSerializer->writeNode(formatTarget, *doc);
+#endif
 
 	// Copy to a new buffer
-	unsigned int len = formatTarget->getLen();
+	xsecsize_t len = formatTarget->getLen();
 	char * buf = new char [len + 1];
 	memcpy(buf, formatTarget->getRawBuffer(), len);
 	buf[len] = '\0';

Modified: xml/security/trunk/c/src/tools/txfmout/txfmout.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/txfmout/txfmout.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/txfmout/txfmout.cpp (original)
+++ xml/security/trunk/c/src/tools/txfmout/txfmout.cpp Sat Dec  6 15:34:24 2008
@@ -291,15 +291,13 @@
 		return;
 	
 	DSIGReference * ref;
-	int lstSz, i, sz;
+	unsigned int sz;
 	XSECBinTXFMInputStream * is;
 	unsigned char buf[1024];
 
-	lstSz = 0;
+    DSIGReferenceList::size_type lstSz = (int) lst->getSize();
 
-	lstSz = (int) lst->getSize();
-
-	for (i = 0; i < lstSz; ++i) {
+	for (DSIGReferenceList::size_type i = 0; i < lstSz; ++i) {
 
 		ref = lst->item(i);
 		if (refNum == -1 || theOutputter.getIndex() == refNum) {
@@ -318,14 +316,14 @@
 
 			if (is != 0) {
 
-				sz = is->readBytes(buf, 1023);
+				sz = (unsigned int) is->readBytes(buf, 1023);
 
 				while (sz != 0) {
 					
 					buf[sz] = '\0';
 					theOutputter.output(buf, sz);
 
-					sz = is->readBytes(buf, 1023);
+					sz = (unsigned int) is->readBytes(buf, 1023);
 
 				}
 
@@ -338,7 +336,7 @@
 	}
 
 	// Look for manifests
-	for (i = 0; i < lstSz; ++i) {
+	for (DSIGReferenceList::size_type i = 0; i < lstSz; ++i) {
 
 		ref = lst->item(i);
 
@@ -435,7 +433,7 @@
 	// Now parse out file
 
 	bool errorsOccured = false;
-	int errorCount = 0;
+	xsecsize_t errorCount = 0;
     try
     {
     	parser->parse(filename);
@@ -545,14 +543,14 @@
 			if (is != NULL) {
 
 				theOutputter.openSection();
-				sz = is->readBytes(buf, 1023);
+				sz = (unsigned int) is->readBytes(buf, 1023);
 
 				while (sz != 0) {
 					
 					buf[sz] = '\0';
 					theOutputter.output(buf, sz);
 	
-					sz = is->readBytes(buf, 1023);
+					sz = (unsigned int) is->readBytes(buf, 1023);
 
 				}
 				theOutputter.closeSection();

Modified: xml/security/trunk/c/src/tools/xklient/xklient.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/xklient/xklient.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/xklient/xklient.cpp (original)
+++ xml/security/trunk/c/src/tools/xklient/xklient.cpp Sat Dec  6 15:34:24 2008
@@ -4438,7 +4438,7 @@
 	}
 
 	bool errorsOccured = false;
-	int errorCount = 0;
+	xsecsize_t errorCount = 0;
     try
     {
     	parser->parse(inputFile);

Modified: xml/security/trunk/c/src/tools/xtest/xtest.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/tools/xtest/xtest.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/tools/xtest/xtest.cpp (original)
+++ xml/security/trunk/c/src/tools/xtest/xtest.cpp Sat Dec  6 15:34:24 2008
@@ -510,7 +510,7 @@
 #endif
 
 		// Copy to a new buffer
-		int len = formatTarget->getLen();
+		xsecsize_t len = formatTarget->getLen();
 		char * mbuf = new char [len + 1];
 		memcpy(mbuf, formatTarget->getRawBuffer(), len);
 		mbuf[len] = '\0';
@@ -1342,7 +1342,7 @@
 		cerr << endl << "Doc signed OK - Checking values against Known Good" << endl;
 
 		unsigned char buf[128];
-		int len;
+		xsecsize_t len;
 
 		/*
 		 * Validate the reference hash values from known good
@@ -1668,7 +1668,7 @@
 
 		cerr << "done ... comparing to known good ... ";
 
-		int bytesRead = is->readBytes(buf, 1024);
+		xsecsize_t bytesRead = is->readBytes(buf, 1024);
 		buf[bytesRead] = '\0';
 		if (strcmp((char *) buf, s_tstDecryptedString) == 0) {
 			cerr << "OK" << endl;

Modified: xml/security/trunk/c/src/transformers/TXFMC14n.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/transformers/TXFMC14n.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMC14n.cpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMC14n.cpp Sat Dec  6 15:34:24 2008
@@ -164,7 +164,7 @@
 
 		return 0;
 
-	return mp_c14n->outputBuffer(toFill, maxToFill);
+	return (unsigned int) mp_c14n->outputBuffer(toFill, maxToFill);
 
 }
 

Modified: xml/security/trunk/c/src/transformers/TXFMParser.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/transformers/TXFMParser.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMParser.cpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMParser.cpp Sat Dec  6 15:34:24 2008
@@ -114,10 +114,8 @@
 	parser.setCreateEntityReferenceNodes(true);
 	parser.setDoSchema(true);
 
-	int errorCount = 0;
-
 	parser.parse(is);
-    errorCount = parser.getErrorCount();
+    xsecsize_t errorCount = parser.getErrorCount();
     if (errorCount > 0)
 		throw XSECException(XSECException::XSLError, "Errors occured parsing BYTE STREAM");
 

Modified: xml/security/trunk/c/src/transformers/TXFMSB.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/transformers/TXFMSB.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMSB.cpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMSB.cpp Sat Dec  6 15:34:24 2008
@@ -114,7 +114,7 @@
 	if (toOutput <= maxToFill) {
 
 		memcpy((char *) toFill, &(sb.rawBuffer()[sbs - toOutput]), toOutput);
-		ret = toOutput;
+		ret = (unsigned int) toOutput;
 		toOutput = 0;
 
 		return ret;

Modified: xml/security/trunk/c/src/transformers/TXFMSB.hpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/transformers/TXFMSB.hpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMSB.hpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMSB.hpp Sat Dec  6 15:34:24 2008
@@ -36,8 +36,8 @@
 private:
 
 	safeBuffer	sb;			// SafeBuffer to use
-	unsigned int toOutput;	// Amount left to output
-	unsigned int sbs;		// Size of raw buffer
+	xsecsize_t toOutput;	// Amount left to output
+	xsecsize_t sbs;		    // Size of raw buffer
 
 public:
 

Modified: xml/security/trunk/c/src/transformers/TXFMURL.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/transformers/TXFMURL.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/transformers/TXFMURL.cpp (original)
+++ xml/security/trunk/c/src/transformers/TXFMURL.cpp Sat Dec  6 15:34:24 2008
@@ -122,7 +122,7 @@
 	if (done || is == NULL) return 0;
 
 	try {
-		ret = is->readBytes(toFill, maxToFill);
+		ret = (unsigned int) is->readBytes(toFill, maxToFill);
 	}
 	catch (NetAccessorException e) {
 

Modified: xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.cpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.cpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.cpp (original)
+++ xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.cpp Sat Dec  6 15:34:24 2008
@@ -24,7 +24,7 @@
  * $ID$
  *
  * $LOG$
- *					 
+ *
  */
 
 
@@ -72,21 +72,22 @@
 
 void XSECBinTXFMInputStream::reset(void) {}
 
-unsigned int XSECBinTXFMInputStream::curPos() const {
-
+#ifdef XSEC_XERCES_64BITSAFE
+XMLFilePos
+#else
+unsigned int
+#endif
+XSECBinTXFMInputStream::curPos() const {
 	return m_currentIndex;
-
 }
 
-unsigned int XSECBinTXFMInputStream::readBytes(XMLByte* const  toFill, 
-					   const unsigned int maxToRead) {
+xsecsize_t XSECBinTXFMInputStream::readBytes(XMLByte* const  toFill,
+					   const xsecsize_t maxToRead) {
 
 	if (m_done == true)
 		return 0;
 
-	unsigned int bytesRead;
-
-	bytesRead = mp_txfm->readBytes(toFill, maxToRead);
+	xsecsize_t bytesRead = mp_txfm->readBytes(toFill, maxToRead);
 
 	if (bytesRead == 0) {
 
@@ -109,3 +110,8 @@
 
 }
 
+#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
+const XMLCh* XSECBinTXFMInputStream::getContentType() const {
+    return NULL;
+}
+#endif

Modified: xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.hpp
URL: http://svn.apache.org/viewvc/xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.hpp?rev=724055&r1=724054&r2=724055&view=diff
==============================================================================
--- xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.hpp (original)
+++ xml/security/trunk/c/src/utils/XSECBinTXFMInputStream.hpp Sat Dec  6 15:34:24 2008
@@ -24,7 +24,7 @@
  * $ID$
  *
  * $LOG$
- *					 
+ *
  */
 
 
@@ -50,7 +50,7 @@
  * @brief BinInputSource wrapper for a TXFMChain.
  *
  * This class provides a wrapper for a TXFMChain.  It can be used to either provide
- * a nice interface to applications wishing to read the BYTESTREAM output of a 
+ * a nice interface to applications wishing to read the BYTESTREAM output of a
  * TXFM chain, or, as it is derived from BinInputStream, provide an input to the
  * Xerces Parser.
  *
@@ -89,7 +89,7 @@
 	/** @name Stream management methods */
 	//@{
 
-	/** 
+	/**
 	 * \brief Reset the stream.
 	 *
 	 * @note At this time simply deletes the TXFM chain - many TXFMs do not
@@ -109,7 +109,11 @@
 	 * @returns Bytes already returned.
 	 */
 
+#ifdef XSEC_XERCES_64BITSAFE
+    virtual XMLFilePos curPos() const;
+#else
     virtual unsigned int curPos() const;
+#endif
 
 	/**
 	 * \brief Retrieve the required number of bytes and return
@@ -125,10 +129,14 @@
 	 * @returns The number of bytes read or 0 if complete.
 	 */
 
-    virtual unsigned int readBytes(XMLByte* const  toFill, 
-		const unsigned int maxToRead);
+    virtual xsecsize_t readBytes(XMLByte* const  toFill,
+		const xsecsize_t maxToRead);
 
 
+#ifdef XSEC_XERCES_INPUTSTREAM_HAS_CONTENTTYPE
+    const XMLCh* getContentType() const;
+#endif
+
 private :
 
 	TXFMBase					* mp_txfm;			// End point of list
@@ -136,7 +144,7 @@
 	bool						m_deleteWhenDone;	// Do we delete?
 	bool						m_deleted;			// Have we deleted?
 	bool						m_done;				// Are we done?
-	unsigned int				m_currentIndex;		// How much read?
+    xsecsize_t				    m_currentIndex;		// How much read?
 
 };