diff --git a/trunk/c5/cryptdll.vcproj b/trunk/c5/cryptdll.vcproj index ab2853d7..c232bb74 100755 --- a/trunk/c5/cryptdll.vcproj +++ b/trunk/c5/cryptdll.vcproj @@ -1,166 +1,410 @@ + > + Name="Win32" + /> + + + + WholeProgramOptimization="1" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + OutputFile="$(OutDir)\cryptopp.dll" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)cryptopp.pdb" + OptimizeReferences="2" + BaseAddress="0x42900000" + ImportLibrary="$(TargetDir)cryptopp.lib" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + OutputFile="$(OutDir)\cryptopp.dll" + SuppressStartupBanner="true" + GenerateDebugInformation="true" + ProgramDatabaseFile="$(TargetDir)cryptopp.pdb" + OptimizeReferences="2" + BaseAddress="0x42900000" + ImportLibrary="$(TargetDir)cryptopp.lib" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -168,1053 +412,2251 @@ echo mac done > "$(OutDir)"\cryptopp.mac.done + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath="algebra.cpp" + > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="Release|Win32" + > + /> + Name="Debug|Win32" + > - - - - - + /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="Release|x64" + > + /> + Name="Debug|x64" + > + /> + RelativePath="algparam.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> - - - - + Name="Release|x64" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|x64" + > + BasicRuntimeChecks="3" + /> + RelativePath="asn.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|x64" + > + BasicRuntimeChecks="3" + /> + RelativePath="basecode.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|x64" + > + BasicRuntimeChecks="3" + /> + RelativePath="cbcmac.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|x64" + > + BasicRuntimeChecks="3" + /> - - + RelativePath="channels.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|x64" + > + BasicRuntimeChecks="3" + /> + RelativePath="cryptlib.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|x64" + > + BasicRuntimeChecks="3" + /> + RelativePath="des.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_MBCS;_USRDLL;CRYPTOPP_EXPORTS;CRYPTOPP_ENABLE_COMPLIANCE_WITH_FIPS_140_2=1;USE_PRECOMPILED_HEADERS;$(NoInherit)" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Filter=".h" + > + RelativePath="aes.h" + > + RelativePath="algebra.h" + > + RelativePath="algparam.h" + > + RelativePath="argnames.h" + > + RelativePath="asn.h" + > + RelativePath="basecode.h" + > + RelativePath="cbcmac.h" + > + RelativePath="channels.h" + > + RelativePath="config.h" + > + RelativePath="cryptlib.h" + > + RelativePath="des.h" + > + RelativePath="dh.h" + > + RelativePath="dll.h" + > + RelativePath="dsa.h" + > + RelativePath="ec2n.h" + > + RelativePath="eccrypto.h" + > + RelativePath="ecp.h" + > + RelativePath="emsa2.h" + > + RelativePath="eprecomp.h" + > + RelativePath="files.h" + > + RelativePath="filters.h" + > + RelativePath="fips140.h" + > + RelativePath="fltrimpl.h" + > + RelativePath="gf2n.h" + > + RelativePath="gfpcrypt.h" + > + RelativePath="hex.h" + > + RelativePath="hmac.h" + > + RelativePath="integer.h" + > + RelativePath="iterhash.h" + > + RelativePath="mdc.h" + > + RelativePath="misc.h" + > + RelativePath="modarith.h" + > + RelativePath="modes.h" + > + RelativePath="modexppc.h" + > + RelativePath="mqueue.h" + > + RelativePath="mqv.h" + > + RelativePath="nbtheory.h" + > + RelativePath="oaep.h" + > + RelativePath="oids.h" + > + RelativePath="osrng.h" + > + RelativePath="pch.h" + > + RelativePath="pkcspad.h" + > + RelativePath=".\pssr.h" + > + RelativePath="pubkey.h" + > + RelativePath="queue.h" + > + RelativePath="randpool.h" + > + RelativePath="rijndael.h" + > + RelativePath="rng.h" + > + RelativePath="rsa.h" + > + RelativePath=".\rw.h" + > + RelativePath="secblock.h" + > + RelativePath="seckey.h" + > + RelativePath="sha.h" + > + RelativePath="simple.h" + > + RelativePath="skipjack.h" + > + RelativePath="smartptr.h" + > + RelativePath="stdcpp.h" + > + RelativePath="strciphr.h" + > + RelativePath="trdlocal.h" + > + RelativePath="words.h" + > + RelativePath="cryptopp.rc" + > diff --git a/trunk/c5/cryptest.sln b/trunk/c5/cryptest.sln index 6d1602de..bf64aafa 100755 --- a/trunk/c5/cryptest.sln +++ b/trunk/c5/cryptest.sln @@ -1,4 +1,5 @@ -Microsoft Visual Studio Solution File, Format Version 8.00 +Microsoft Visual Studio Solution File, Format Version 9.00 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptdll", "cryptdll.vcproj", "{EBD86293-69A9-456B-B814-916E12AA9BBF}" ProjectSection(ProjectDependencies) = postProject {9EAFA456-89B4-4879-AD4F-C2C341184CF5} = {9EAFA456-89B4-4879-AD4F-C2C341184CF5} @@ -10,8 +11,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptest", "cryptest.vcproj EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "cryptlib.vcproj", "{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}" - ProjectSection(ProjectDependencies) = postProject - EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltest", "dlltest.vcproj", "{A7483CE8-2784-46CE-8CB8-8C0C1D27E232}" ProjectSection(ProjectDependencies) = postProject @@ -19,50 +18,83 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dlltest", "dlltest.vcproj", EndProjectSection EndProject Global - GlobalSection(SolutionConfiguration) = preSolution - Debug = Debug - DLL-Import Debug = DLL-Import Debug - DLL-Import Release = DLL-Import Release - Release = Release + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + DLL-Import Debug|Win32 = DLL-Import Debug|Win32 + DLL-Import Debug|x64 = DLL-Import Debug|x64 + DLL-Import Release|Win32 = DLL-Import Release|Win32 + DLL-Import Release|x64 = DLL-Import Release|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 EndGlobalSection - GlobalSection(ProjectConfiguration) = postSolution - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug.ActiveCfg = Debug|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug.ActiveCfg = Debug|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug.Build.0 = Debug|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release.ActiveCfg = Release|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release.Build.0 = Release|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release.ActiveCfg = Release|Win32 - {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release.Build.0 = Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug.ActiveCfg = Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug.Build.0 = Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug.ActiveCfg = DLL-Import Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug.Build.0 = DLL-Import Debug|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release.ActiveCfg = DLL-Import Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release.Build.0 = DLL-Import Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release.ActiveCfg = Release|Win32 - {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release.Build.0 = Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug.ActiveCfg = Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug.Build.0 = Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug.ActiveCfg = DLL-Import Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug.Build.0 = DLL-Import Debug|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release.ActiveCfg = DLL-Import Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release.Build.0 = DLL-Import Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release.ActiveCfg = Release|Win32 - {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release.Build.0 = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug.ActiveCfg = Debug|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug.ActiveCfg = Debug|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug.Build.0 = Debug|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release.ActiveCfg = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release.Build.0 = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release.ActiveCfg = Release|Win32 - {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release.Build.0 = Release|Win32 - {E58DEF35-2B67-4BBD-9F70-13A45474650F}.Debug.ActiveCfg = Debug|Win32 - {E58DEF35-2B67-4BBD-9F70-13A45474650F}.DLL-Import Debug.ActiveCfg = DLL-Import Debug|Win32 - {E58DEF35-2B67-4BBD-9F70-13A45474650F}.DLL-Import Release.ActiveCfg = DLL-Import Release|Win32 - {E58DEF35-2B67-4BBD-9F70-13A45474650F}.Release.ActiveCfg = Release|Win32 + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|Win32.ActiveCfg = Debug|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|Win32.Build.0 = Debug|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|x64.ActiveCfg = Debug|x64 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Debug|x64.Build.0 = Debug|x64 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Debug|x64.Build.0 = Debug|x64 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|Win32.Build.0 = Release|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|x64.ActiveCfg = Release|x64 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.DLL-Import Release|x64.Build.0 = Release|x64 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|Win32.ActiveCfg = Release|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|Win32.Build.0 = Release|Win32 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|x64.ActiveCfg = Release|x64 + {EBD86293-69A9-456B-B814-916E12AA9BBF}.Release|x64.Build.0 = Release|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|Win32.ActiveCfg = Debug|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|Win32.Build.0 = Debug|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|x64.ActiveCfg = Debug|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Debug|x64.Build.0 = Debug|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|Win32.ActiveCfg = Release|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|Win32.Build.0 = Release|Win32 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|x64.ActiveCfg = Release|x64 + {9EAFA456-89B4-4879-AD4F-C2C341184CF5}.Release|x64.Build.0 = Release|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.ActiveCfg = Debug|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|Win32.Build.0 = Debug|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.ActiveCfg = Debug|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Debug|x64.Build.0 = Debug|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.ActiveCfg = DLL-Import Debug|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|Win32.Build.0 = DLL-Import Debug|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.ActiveCfg = DLL-Import Debug|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Debug|x64.Build.0 = DLL-Import Debug|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.ActiveCfg = DLL-Import Release|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|Win32.Build.0 = DLL-Import Release|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.ActiveCfg = DLL-Import Release|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.DLL-Import Release|x64.Build.0 = DLL-Import Release|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.ActiveCfg = Release|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|Win32.Build.0 = Release|Win32 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.ActiveCfg = Release|x64 + {3423EC9A-52E4-4A4D-9753-EDEBC38785EF}.Release|x64.Build.0 = Release|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|Win32.ActiveCfg = Debug|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|Win32.Build.0 = Debug|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|x64.ActiveCfg = Debug|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Debug|x64.Build.0 = Debug|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|Win32.ActiveCfg = Debug|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|Win32.Build.0 = Debug|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|x64.ActiveCfg = Debug|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Debug|x64.Build.0 = Debug|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|Win32.ActiveCfg = Release|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|Win32.Build.0 = Release|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|x64.ActiveCfg = Release|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.DLL-Import Release|x64.Build.0 = Release|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|Win32.ActiveCfg = Release|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|Win32.Build.0 = Release|Win32 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|x64.ActiveCfg = Release|x64 + {A7483CE8-2784-46CE-8CB8-8C0C1D27E232}.Release|x64.Build.0 = Release|x64 EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - EndGlobalSection - GlobalSection(ExtensibilityAddIns) = postSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection EndGlobal diff --git a/trunk/c5/cryptest.vcproj b/trunk/c5/cryptest.vcproj index 2c18e09d..0cf74eb5 100755 --- a/trunk/c5/cryptest.vcproj +++ b/trunk/c5/cryptest.vcproj @@ -1,289 +1,725 @@ - + + SccLocalPath="." + > + Name="Win32" + /> + + + + WholeProgramOptimization="1" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> + Name="VCManagedResourceCompilerTool" + /> + + + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCWebDeploymentTool" + /> - - + Name="VCPostBuildEventTool" + /> + ATLMinimizesCRunTimeLibraryUsage="false" + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + - - - - - - - - - - - + HeaderFileName="" + /> + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + CommandLine="echo This configuration requires cryptopp.dll. echo You can build it yourself using the cryptdll project, or echo obtain a pre-built, FIPS 140-2 validated DLL. If you build it yourself echo the resulting DLL will not be considered FIPS validated echo unless it undergoes FIPS validation. " + /> + Name="VCLinkerTool" + AdditionalDependencies="Ws2_32.lib" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" + GenerateDebugInformation="true" + SubSystem="1" + OptimizeForWindows98="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -291,497 +727,1008 @@ echo unless it undergoes FIPS validation. + Filter=".dat" + > + RelativePath="3desval.dat" + > + RelativePath="3wayval.dat" + > + RelativePath="camellia.dat" + > + RelativePath="cast128v.dat" + > + RelativePath="cast256v.dat" + > + RelativePath="descert.dat" + > + RelativePath="dh1024.dat" + > + RelativePath="dh2048.dat" + > + RelativePath="diamond.dat" + > + RelativePath="dsa1024.dat" + > + RelativePath="dsa1024b.dat" + > + RelativePath="dsa512.dat" + > + RelativePath="elgc1024.dat" + > + RelativePath="esig1023.dat" + > + RelativePath="esig1536.dat" + > + RelativePath="esig2046.dat" + > + RelativePath="gostval.dat" + > + RelativePath="havalcer.dat" + > + RelativePath="ideaval.dat" + > + RelativePath="luc1024.dat" + > + RelativePath="luc2048.dat" + > + RelativePath="lucc1024.dat" + > + RelativePath="lucc512.dat" + > + RelativePath="lucd1024.dat" + > + RelativePath="lucd512.dat" + > + RelativePath="lucs1024.dat" + > + RelativePath="lucs512.dat" + > + RelativePath="marsval.dat" + > + RelativePath="mqv1024.dat" + > + RelativePath="mqv2048.dat" + > + RelativePath="nr1024.dat" + > + RelativePath="nr2048.dat" + > + RelativePath="rabi1024.dat" + > + RelativePath="rabi2048.dat" + > + RelativePath="rc2val.dat" + > + RelativePath="rc5val.dat" + > + RelativePath="rc6val.dat" + > + RelativePath="rijndael.dat" + > + RelativePath="rsa1024.dat" + > + RelativePath="rsa2048.dat" + > + RelativePath="rsa400pb.dat" + > + RelativePath="rsa400pv.dat" + > + RelativePath="rsa512a.dat" + > + RelativePath="rw1024.dat" + > + RelativePath="rw2048.dat" + > + RelativePath="saferval.dat" + > + RelativePath="serpentv.dat" + > + RelativePath="shacal2v.dat" + > + RelativePath="sharkval.dat" + > + RelativePath="skipjack.dat" + > + RelativePath="squareva.dat" + > + RelativePath="twofishv.dat" + > + RelativePath="usage.dat" + > + RelativePath="xtrdh171.dat" + > + RelativePath="xtrdh342.dat" + > + Filter=".cpp;.h" + > + RelativePath="adhoc.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|x64" + > + PreprocessorDefinitions="" + /> + Name="Debug|x64" + > + PreprocessorDefinitions="" + /> - - - - + RelativePath="bench.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|x64" + > + PreprocessorDefinitions="" + /> + Name="Debug|x64" + > + PreprocessorDefinitions="" + /> + RelativePath="bench.h" + > + RelativePath=".\bench2.cpp" + > + + + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|x64" + > + PreprocessorDefinitions="" + /> + Name="Debug|x64" + > + PreprocessorDefinitions="" + /> + RelativePath="dlltest.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|x64" + > + PreprocessorDefinitions="" + /> + Name="Debug|x64" + > + PreprocessorDefinitions="" + /> + RelativePath="factory.h" + > + + + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> - - + Name="Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|x64" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|x64" + > + PreprocessorDefinitions="" + /> + Name="Debug|x64" + > + PreprocessorDefinitions="" + /> + RelativePath="regtest.cpp" + > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/trunk/c5/cryptlib.vcproj b/trunk/c5/cryptlib.vcproj index 43986df8..bf0fb975 100755 --- a/trunk/c5/cryptlib.vcproj +++ b/trunk/c5/cryptlib.vcproj @@ -1,219 +1,574 @@ - + + RootNamespace="cryptlib" + SccLocalPath="." + > + Name="Win32" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + WholeProgramOptimization="1" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="3" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="3" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + SuppressStartupBanner="true" + DebugInformationFormat="4" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + ATLMinimizesCRunTimeLibraryUsage="false" + > + + + + + + SuppressStartupBanner="true" + Detect64BitPortabilityProblems="true" + DebugInformationFormat="4" + /> - - - - - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLibrarianTool" + SuppressStartupBanner="true" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -221,3939 +576,9196 @@ + Filter=".cpp" + > + RelativePath="3way.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="adhoc.cpp.proto" + > + Name="Release|Win32" + > + CommandLine="if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp echo: >> adhoc.cpp.copied " + Outputs="adhoc.cpp.copied" + /> + Name="DLL-Import Release|Win32" + > + CommandLine="if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp echo: >> adhoc.cpp.copied " + Outputs="adhoc.cpp.copied" + /> + Name="Debug|Win32" + > + CommandLine="if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp echo: >> adhoc.cpp.copied " + Outputs="adhoc.cpp.copied" + /> + Name="DLL-Import Debug|Win32" + > + CommandLine="if not exist adhoc.cpp copy "$(InputPath)" adhoc.cpp echo: >> adhoc.cpp.copied " + Outputs="adhoc.cpp.copied" + /> + + + + + + + + + + + + + RelativePath="adler32.cpp" + > - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="Release|Win32" + > + /> + Name="DLL-Import Release|Win32" + > + /> + Name="Debug|Win32" + > + /> + Name="DLL-Import Debug|Win32" + > + /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Name="Release|x64" + > + /> + Name="DLL-Import Release|x64" + > + /> + Name="Debug|x64" + > + /> + Name="DLL-Import Debug|x64" + > + /> + RelativePath="algebra.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="algparam.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="arc4.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="asn.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="base32.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="base64.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="basecode.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="bfinit.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="blowfish.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="blumshub.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="camellia.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="cast.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="casts.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="cbcmac.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="channels.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="crc.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="cryptlib.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="default.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="des.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="dessp.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="dh.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="dh2.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="dll.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + UsePrecompiledHeader="0" + /> + + + + + + + + + + + + + RelativePath="dsa.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="ec2n.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="eccrypto.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="ecp.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="elgamal.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="emsa2.cpp" + > + + + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="esign.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="files.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="filters.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="fips140.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="fipstest.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="gf256.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="gf2_32.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="gf2n.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="gfpcrypt.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="gost.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="gzip.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="haval.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="hex.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="hmac.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="hrtimer.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + RelativePath="ida.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + PreprocessorDefinitions="" + /> + Name="DLL-Import Debug|Win32" + > + PreprocessorDefinitions="" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Filter=".;.h" + > + RelativePath="3way.h" + > + RelativePath="adler32.h" + > + RelativePath="aes.h" + > + RelativePath="algebra.h" + > + RelativePath="algparam.h" + > + RelativePath="arc4.h" + > + RelativePath="argnames.h" + > + RelativePath="asn.h" + > + RelativePath="base32.h" + > + RelativePath="base64.h" + > + RelativePath="basecode.h" + > + RelativePath="blowfish.h" + > + RelativePath="blumshub.h" + > + RelativePath="camellia.h" + > + RelativePath="cast.h" + > + RelativePath="cbcmac.h" + > + RelativePath="channels.h" + > + RelativePath="config.h" + > + RelativePath="crc.h" + > + RelativePath="cryptlib.h" + > + RelativePath="default.h" + > + RelativePath="des.h" + > + RelativePath="dh.h" + > + RelativePath="dh2.h" + > + RelativePath="dmac.h" + > + RelativePath="dsa.h" + > + RelativePath="ec2n.h" + > + RelativePath="eccrypto.h" + > + RelativePath="ecp.h" + > + RelativePath="elgamal.h" + > + RelativePath="emsa2.h" + > + RelativePath="eprecomp.h" + > + RelativePath="esign.h" + > + RelativePath="files.h" + > + RelativePath="filters.h" + > + RelativePath="fips140.h" + > + RelativePath="fltrimpl.h" + > + RelativePath="gf256.h" + > + RelativePath="gf2_32.h" + > + RelativePath="gf2n.h" + > + RelativePath="gfpcrypt.h" + > + RelativePath="gost.h" + > + RelativePath="gzip.h" + > + RelativePath="haval.h" + > + RelativePath="hex.h" + > + RelativePath="hmac.h" + > + RelativePath="hrtimer.h" + > + RelativePath="ida.h" + > + RelativePath="idea.h" + > + RelativePath="integer.h" + > + RelativePath="iterhash.h" + > + RelativePath="lubyrack.h" + > + RelativePath="luc.h" + > + RelativePath="mars.h" + > + RelativePath="md2.h" + > + RelativePath="md4.h" + > + RelativePath="md5.h" + > + RelativePath="md5mac.h" + > + RelativePath="mdc.h" + > + RelativePath="misc.h" + > + RelativePath="modarith.h" + > + RelativePath="modes.h" + > + RelativePath="modexppc.h" + > + RelativePath="mqueue.h" + > + RelativePath="mqv.h" + > + RelativePath="nbtheory.h" + > + RelativePath="network.h" + > + RelativePath="nr.h" + > + RelativePath="oaep.h" + > + RelativePath="oids.h" + > + RelativePath="osrng.h" + > + RelativePath="panama.h" + > + RelativePath="pch.h" + > + RelativePath="pkcspad.h" + > + RelativePath="polynomi.h" + > + RelativePath="pssr.h" + > + RelativePath="pubkey.h" + > + RelativePath="pwdbased.h" + > + RelativePath="queue.h" + > + RelativePath="rabin.h" + > + RelativePath="randpool.h" + > + RelativePath="rc2.h" + > + RelativePath="rc5.h" + > + RelativePath="rc6.h" + > + RelativePath="rijndael.h" + > + RelativePath="ripemd.h" + > + RelativePath="rng.h" + > + RelativePath="rsa.h" + > + RelativePath="rw.h" + > + RelativePath="safer.h" + > + RelativePath="seal.h" + > + RelativePath="secblock.h" + > + RelativePath="seckey.h" + > + RelativePath="serpent.h" + > + RelativePath="sha.h" + > + RelativePath="shacal2.h" + > + RelativePath="shark.h" + > + RelativePath="simple.h" + > + RelativePath="skipjack.h" + > + RelativePath="smartptr.h" + > + RelativePath="socketft.h" + > + RelativePath="square.h" + > + RelativePath="strciphr.h" + > + RelativePath="tea.h" + > + RelativePath="tiger.h" + > + RelativePath="trdlocal.h" + > + RelativePath="trunhash.h" + > + RelativePath="ttmac.h" + > + RelativePath="twofish.h" + > + RelativePath="wait.h" + > + RelativePath="wake.h" + > + RelativePath="whrlpool.h" + > + RelativePath="winpipes.h" + > + RelativePath="words.h" + > + RelativePath="xormac.h" + > + RelativePath="xtr.h" + > + RelativePath="xtrcrypt.h" + > + RelativePath="zdeflate.h" + > + RelativePath="zinflate.h" + > + RelativePath="zlib.h" + > + > + RelativePath="Doxyfile" + > + RelativePath="GNUmakefile" + > + RelativePath="license.txt" + > + RelativePath="readme.txt" + > diff --git a/trunk/c5/dlltest.vcproj b/trunk/c5/dlltest.vcproj index cbaf82b8..e5695fba 100755 --- a/trunk/c5/dlltest.vcproj +++ b/trunk/c5/dlltest.vcproj @@ -1,166 +1,414 @@ + ProjectGUID="{A7483CE8-2784-46CE-8CB8-8C0C1D27E232}" + SccLocalPath="." + > + Name="Win32" + /> + + + + WholeProgramOptimization="1" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + + HeaderFileName="" + /> + Name="VCCLCompilerTool" + Optimization="1" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="2" + OmitFramePointers="true" + PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CRYPTOPP_DLL_ONLY" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + CallingConvention="2" + /> - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> - - - - - - - - + Name="VCPreLinkEventTool" + /> + /> + + + + + + + + + + + + + + + HeaderFileName="" + /> + Name="VCCLCompilerTool" + Optimization="0" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CRYPTOPP_DLL_ONLY" + BasicRuntimeChecks="3" + RuntimeLibrary="1" + UsePrecompiledHeader="0" + WarningLevel="3" + SuppressStartupBanner="true" + DebugInformationFormat="4" + CallingConvention="2" + /> - + Name="VCManagedResourceCompilerTool" + /> + Culture="1033" + /> + Name="VCPreLinkEventTool" + /> + Name="VCLinkerTool" + AdditionalDependencies="odbc32.lib odbccp32.lib" + SuppressStartupBanner="true" + AdditionalLibraryDirectories="" + GenerateDebugInformation="true" + SubSystem="1" + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + RelativePath="dlltest.cpp" + > + Name="Release|Win32" + > + PreprocessorDefinitions="" + /> + Name="Debug|Win32" + > + BasicRuntimeChecks="3" + /> + + + + + + diff --git a/trunk/c5/fips140.h b/trunk/c5/fips140.h index 28ff8bdc..a3e53861 100644 --- a/trunk/c5/fips140.h +++ b/trunk/c5/fips140.h @@ -37,10 +37,6 @@ CRYPTOPP_DLL PowerUpSelfTestStatus CRYPTOPP_API GetPowerUpSelfTestStatus(); typedef PowerUpSelfTestStatus (CRYPTOPP_API * PGetPowerUpSelfTestStatus)(); -CRYPTOPP_DLL const byte * CRYPTOPP_API GetActualMacAndLocation(unsigned int &macSize, unsigned int &fileLocation); - -typedef const byte * (CRYPTOPP_API * PGetActualMacAndLocation)(unsigned int &macSize, unsigned int &fileLocation); - CRYPTOPP_DLL MessageAuthenticationCode * CRYPTOPP_API NewIntegrityCheckingMAC(); CRYPTOPP_DLL bool CRYPTOPP_API IntegrityCheckModule(const char *moduleFilename, const byte *expectedModuleMac, SecByteBlock *pActualMac = NULL, unsigned long *pMacFileLocation = NULL); @@ -56,6 +52,8 @@ void EncryptionPairwiseConsistencyTest(const PK_Encryptor &encryptor, const PK_D void SignaturePairwiseConsistencyTest_FIPS_140_Only(const PK_Signer &signer, const PK_Verifier &verifier); void EncryptionPairwiseConsistencyTest_FIPS_140_Only(const PK_Encryptor &encryptor, const PK_Decryptor &decryptor); +#define CRYPTOPP_DUMMY_DLL_MAC "MAC_51f34b8db820ae8" + NAMESPACE_END #endif diff --git a/trunk/c5/fipstest.cpp b/trunk/c5/fipstest.cpp index e5f0859c..bc86fe2e 100644 --- a/trunk/c5/fipstest.cpp +++ b/trunk/c5/fipstest.cpp @@ -496,7 +496,9 @@ done: #ifdef CRYPTOPP_WIN32_AVAILABLE -static const byte s_moduleMac[CryptoPP::HMAC::DIGESTSIZE] = "reserved for mac"; +// use a random dummy string here, to be searched/replaced later with the real MAC +static const byte s_moduleMac[CryptoPP::HMAC::DIGESTSIZE] = CRYPTOPP_DUMMY_DLL_MAC; +CRYPTOPP_COMPILE_ASSERT(sizeof(s_moduleMac) == CryptoPP::SHA1::DIGESTSIZE); static HMODULE s_hModule = NULL; void DoDllPowerUpSelfTest() diff --git a/trunk/c5/test.cpp b/trunk/c5/test.cpp index 24fcb8cf..66827dbd 100644 --- a/trunk/c5/test.cpp +++ b/trunk/c5/test.cpp @@ -166,45 +166,41 @@ int __cdecl main(int argc, char *argv[]) fs.TransferAllTo(mt); cout << "Maurer Test Value: " << mt.GetTestValue() << endl; } -#ifdef CRYPTOPP_WIN32_AVAILABLE else if (command == "mac_dll") { - HMODULE hModule = LoadLibrary(argv[2]); - PGetPowerUpSelfTestStatus pGetPowerUpSelfTestStatus = (PGetPowerUpSelfTestStatus)GetProcAddress(hModule, "?GetPowerUpSelfTestStatus@CryptoPP@@YA?AW4PowerUpSelfTestStatus@1@XZ"); - PGetActualMacAndLocation pGetActualMacAndLocation = (PGetActualMacAndLocation)GetProcAddress(hModule, - sizeof(byte *)==4 ? "?GetActualMacAndLocation@CryptoPP@@YAPBEAAI0@Z" : "?GetActualMacAndLocation@CryptoPP@@YAPEBEAEAI0@Z"); - - PowerUpSelfTestStatus status = pGetPowerUpSelfTestStatus(); - if (status == POWER_UP_SELF_TEST_PASSED) + std::fstream dllFile(argv[2], ios::in | ios::out | ios::binary); + std::ifstream::pos_type fileEnd = dllFile.seekg(0, std::ios_base::end).tellg(); + if (fileEnd > 20*1000*1000) // sanity check on file size { - cout << "Crypto++ DLL MAC is valid. Nothing to do.\n"; - return 0; - } - - unsigned int macSize, macFileLocation; - const byte *pMac = pGetActualMacAndLocation(macSize, macFileLocation); - - if (macFileLocation == 0) - { - cerr << "Could not find MAC location in Crypto++ DLL.\n"; + cerr << "Input file too large (more than 20 MB).\n"; return 1; } - else + + unsigned int fileSize = (unsigned int)fileEnd; + SecByteBlock buf(fileSize); + dllFile.seekg(0, std::ios_base::beg); + dllFile.read((char *)buf.begin(), fileSize); + + byte dummyMac[] = CRYPTOPP_DUMMY_DLL_MAC; + + byte *found = std::search(buf.begin(), buf.end(), dummyMac+0, dummyMac+sizeof(dummyMac)); + if (found == buf.end()) { - SecByteBlock mac(pMac, macSize); // copy MAC before freeing the DLL - BOOL r = FreeLibrary(hModule); - cout << "Placing MAC in file " << argv[2] << ", location " << macFileLocation << ".\n"; - std::ofstream dllFile(argv[2], ios::in | ios::out | ios::binary); - dllFile.seekp(macFileLocation); - dllFile.write((const char *)mac.data(), macSize); - if (!dllFile.good()) - { - cerr << "Error writing file.\n"; - return 1; - } + cerr << "MAC placeholder not found. Possibly the actual MAC was already placed.\n"; + return 1; } + + unsigned int macPos = found-buf.begin(); + member_ptr pMac(NewIntegrityCheckingMAC()); + pMac->Update(buf.begin(), macPos); + pMac->Update(buf.begin() + macPos + sizeof(dummyMac), fileSize - sizeof(dummyMac) - macPos); + assert(pMac->DigestSize() == sizeof(dummyMac)); + pMac->Final(dummyMac); + + cout << "Placing MAC in file " << argv[2] << ", location " << macPos << ".\n"; + dllFile.seekg(macPos, std::ios_base::beg); + dllFile.write((char *)dummyMac, sizeof(dummyMac)); } -#endif else if (command == "m") DigestFile(argv[2]); else if (command == "tv")