diff options
| -rw-r--r-- | Readme.txt | 5 | ||||
| -rw-r--r-- | TestVectors/Readme.txt | 1 | ||||
| -rw-r--r-- | TestVectors/all.txt | 1 | ||||
| -rwxr-xr-x | TestVectors/salsa.txt | 33 | ||||
| -rw-r--r-- | bench.cpp | 13 | ||||
| -rwxr-xr-x | cryptest.vcproj | 358 | ||||
| -rwxr-xr-x | cryptlib.vcproj | 10 | ||||
| -rw-r--r-- | datatest.cpp | 6 | ||||
| -rw-r--r-- | regtest.cpp | 2 | ||||
| -rwxr-xr-x | salsa.cpp | 139 | ||||
| -rwxr-xr-x | salsa.h | 43 | ||||
| -rw-r--r-- | test.cpp | 1 | ||||
| -rw-r--r-- | validat1.cpp | 8 | ||||
| -rw-r--r-- | validat3.cpp | 2 | ||||
| -rw-r--r-- | validate.h | 1 |
15 files changed, 437 insertions, 186 deletions
@@ -1,5 +1,5 @@ Crypto++: a C++ Class Library of Cryptographic Schemes -Version 5.3 (in development) +Version 5.4 (in development) This library includes: @@ -354,4 +354,7 @@ the mailing list. - Added defense against AES timing attacks, and more AES test vectors - Changed StaticAlgorithmName() of Rijndael to "AES", CTR to "CTR" +5.4 - added Salsa20 + - updated Whirlpool to version 3.0 + Written by Wei Dai diff --git a/TestVectors/Readme.txt b/TestVectors/Readme.txt index 664d972..755a046 100644 --- a/TestVectors/Readme.txt +++ b/TestVectors/Readme.txt @@ -54,6 +54,7 @@ Plaintext - encoded string Ciphertext - encoded string Digest - encoded string TruncatedSize - int, size of truncated digest in bytes +Seek - int, seek location for random access ciphers (more to come here) Possible Tests diff --git a/TestVectors/all.txt b/TestVectors/all.txt index a0cfaa9..4419e30 100644 --- a/TestVectors/all.txt +++ b/TestVectors/all.txt @@ -19,3 +19,4 @@ Test: seal.txt Test: sha.txt Test: panama.txt Test: aes.txt +Test: salsa.txt diff --git a/TestVectors/salsa.txt b/TestVectors/salsa.txt new file mode 100755 index 0000000..d07967e --- /dev/null +++ b/TestVectors/salsa.txt @@ -0,0 +1,33 @@ +AlgorithmType: SymmetricCipher +Name: Salsa20 +Source: http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/full/verified.test-vectors?rev=161&view=markup +Comment: Set 1, vector# 0 +Key: 80000000000000000000000000000000 +IV: 0000000000000000 +Plaintext: r16 00000000 +Seek: 0 +Ciphertext: 4DFA5E481DA23EA09A31022050859936DA52FCEE218005164F267CB65F5CFD7F2B4F97E0FF16924A52DF269515110A07F9E460BC65EF95DA58F740B7D1DBB0AA +Test: Encrypt +Seek: 448 +Ciphertext: B375703739DACED4DD4059FD71C3C47FC2F9939670FAD4A46066ADCC6A5645783308B90FFB72BE04A6B147CBE38CC0C3B9267C296A92A7C69873F9F263BE9703 +Test: Encrypt +Seek: 192 +Plaintext: r32 00000000 +Ciphertext: DA9C1581F429E0A00F7D67E23B730676783B262E8EB43A25F55FB90B3E753AEF8C6713EC66C51881111593CCB3E8CB8F8DE124080501EEEB389C4BCB6977CF95\ +7D5789631EB4554400E1E025935DFA7B3E9039D61BDC58A8697D36815BF1985CEFDF7AE112E5BB81E37ECF0616CE7147FC08A93A367E08631F23C03B00A8DA2F +Test: Encrypt +Comment: Set 3, vector#243 +Key: F3F4F5F6F7F8F9FAFBFCFDFEFF000102030405060708090A0B0C0D0E0F101112 +IV: 0000000000000000 +Plaintext: r16 00000000 +Seek: 0 +Ciphertext: B4C0AFA503BE7FC29A62058166D56F8F5D27DC246F75B9AD8760C8C39DFD87492D3B76D5D9637F009EADA14458A52DFB09815337E72672681DDDC24633750D83 +Test: Encrypt +Seek: 448 +Ciphertext: 5A5FB5C8F0AFEA471F0318A4A2792F7AA5C67B6D6E0F0DDB79961C34E3A564BA2EECE78D9AFF45E510FEAB1030B102D39DFCECB77F5798F7D2793C0AB09C7A04 +Test: Encrypt +Seek: 192 +Plaintext: r32 00000000 +Ciphertext: DBBA0683DF48C335A9802EEF0252256354C9F763C3FDE19131A6BB7B85040624B1D6CD4BF66D16F7482236C8602A6D58505EEDCCA0B77AED574AB583115124B9\ +F0C5F98BAE05E019764EF6B65E0694A904CB9EC9C10C297B1AB1A6052365BB78E55D3C6CB9F06184BA7D425A92E7E987757FC5D9AFD7082418DD64125CA6F2B6 +Test: Encrypt @@ -49,6 +49,7 @@ #include "mdc.h" #include "lubyrack.h" #include "tea.h" +#include "salsa.h" #include <time.h> #include <math.h> @@ -184,19 +185,19 @@ void BenchMark(const char *name, BufferedTransformation &bt, double timeTotal) //VC60 workaround: compiler bug triggered without the extra dummy parameters template <class T> -void BenchMarkKeyed(const char *name, double timeTotal, T *x=NULL) +void BenchMarkKeyed(const char *name, double timeTotal, const NameValuePairs ¶ms = g_nullNameValuePairs, T *x=NULL) { T c; - c.SetKey(key, c.DefaultKeyLength(), MakeParameters(Name::IV(), key, false)); + c.SetKey(key, c.DefaultKeyLength(), CombinedNameValuePairs(params, MakeParameters(Name::IV(), key, false))); BenchMark(name, c, timeTotal); } //VC60 workaround: compiler bug triggered without the extra dummy parameters template <class T> -void BenchMarkKeyedVariable(const char *name, double timeTotal, unsigned int keyLength, T *x=NULL) +void BenchMarkKeyedVariable(const char *name, double timeTotal, unsigned int keyLength, const NameValuePairs ¶ms = g_nullNameValuePairs, T *x=NULL) { T c; - c.SetKey(key, keyLength, MakeParameters(Name::IV(), key, false)); + c.SetKey(key, keyLength, CombinedNameValuePairs(params, MakeParameters(Name::IV(), key, false))); BenchMark(name, c, timeTotal); } @@ -287,6 +288,10 @@ void BenchmarkAll(double t) BenchMarkKeyedVariable<Camellia::Encryption>("Camellia (128-bit key)", t, 16); BenchMarkKeyedVariable<Camellia::Encryption>("Camellia (256-bit key)", t, 32); #endif + BenchMarkKeyed<Salsa20::Encryption>("Salsa20", t); + BenchMarkKeyed<Salsa20::Encryption>("Salsa20/12", t, MakeParameters(Name::Rounds(), 12)); + BenchMarkKeyed<Salsa20::Encryption>("Salsa20/8", t, MakeParameters(Name::Rounds(), 8)); + BenchMarkKeyed<MD5MAC>("MD5-MAC", t); BenchMarkKeyed<XMACC<MD5> >("XMACC/MD5", t); BenchMarkKeyed<HMAC<MD5> >("HMAC/MD5", t); diff --git a/cryptest.vcproj b/cryptest.vcproj index 0cf74eb..2620b16 100755 --- a/cryptest.vcproj +++ b/cryptest.vcproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="gb2312"?> <VisualStudioProject ProjectType="Visual C++" Version="8.00" @@ -109,14 +109,15 @@ /> </Configuration> <Configuration - Name="DLL-Import Release|Win32" - OutputDirectory="$(PlatformName)\DLL_Output\Release" + Name="Release|x64" + OutputDirectory="$(PlatformName)\Output\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" + WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -132,15 +133,19 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\CT_DLL_Import_Release/cryptest.tlb" + TargetEnvironment="3" + TypeLibraryName=".\CTRelease/cryptest.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm400 " Optimization="2" - InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" + InlineFunctionExpansion="2" + EnableIntrinsicFunctions="true" + FavorSizeOrSpeed="1" + OmitFramePointers="true" + PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="true" @@ -159,18 +164,17 @@ /> <Tool 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.
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" + AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" SuppressStartupBanner="true" - AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="1" OptimizeReferences="2" EnableCOMDATFolding="2" OptimizeForWindows98="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -198,8 +202,8 @@ /> </Configuration> <Configuration - Name="DLL-Import Debug|Win32" - OutputDirectory="$(PlatformName)\DLL_Output\Debug" + Name="DLL-Import Release|Win32" + OutputDirectory="$(PlatformName)\DLL_Output\Release" IntermediateDirectory="$(PlatformName)\$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" @@ -221,27 +225,29 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\CT_DLL_Import_Debug/cryptest.tlb" + TypeLibraryName=".\CT_DLL_Import_Release/cryptest.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm400 " - Optimization="0" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="_DEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" - RuntimeLibrary="1" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="NDEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool @@ -255,6 +261,8 @@ AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" OptimizeForWindows98="1" /> <Tool @@ -283,8 +291,8 @@ /> </Configuration> <Configuration - Name="Debug|Win32" - OutputDirectory="$(PlatformName)\Output\$(ConfigurationName)" + Name="DLL-Import Release|x64" + OutputDirectory="$(PlatformName)\DLL_Output\Release" IntermediateDirectory="$(PlatformName)\$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" @@ -306,39 +314,47 @@ /> <Tool Name="VCMIDLTool" - TypeLibraryName=".\CTDebug/cryptest.tlb" + TargetEnvironment="3" + TypeLibraryName=".\CT_DLL_Import_Release/cryptest.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm400 " - Optimization="0" - EnableIntrinsicFunctions="true" - PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32" - RuntimeLibrary="1" + Optimization="2" + InlineFunctionExpansion="1" + PreprocessorDefinitions="NDEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" + StringPooling="true" + RuntimeLibrary="0" + EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="4" + DebugInformationFormat="3" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="_DEBUG" + PreprocessorDefinitions="NDEBUG" Culture="1033" /> <Tool 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.
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" + AdditionalDependencies="Ws2_32.lib" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="1" + OptimizeReferences="2" + EnableCOMDATFolding="2" OptimizeForWindows98="1" + TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -366,15 +382,14 @@ /> </Configuration> <Configuration - Name="Release|x64" - OutputDirectory="$(PlatformName)\Output\$(ConfigurationName)" + Name="DLL-Import Debug|Win32" + OutputDirectory="$(PlatformName)\DLL_Output\Debug" IntermediateDirectory="$(PlatformName)\$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" UseOfMFC="0" ATLMinimizesCRunTimeLibraryUsage="false" CharacterSet="2" - WholeProgramOptimization="1" > <Tool Name="VCPreBuildEventTool" @@ -390,48 +405,41 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" - TypeLibraryName=".\CTRelease/cryptest.tlb" + TypeLibraryName=".\CT_DLL_Import_Debug/cryptest.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm400 " - Optimization="2" - InlineFunctionExpansion="2" + Optimization="0" EnableIntrinsicFunctions="true" - FavorSizeOrSpeed="1" - OmitFramePointers="true" - PreprocessorDefinitions="NDEBUG;_CONSOLE;WIN32" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" + PreprocessorDefinitions="_DEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" + DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool 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.
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" + AdditionalDependencies="Ws2_32.lib" SuppressStartupBanner="true" + AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" OptimizeForWindows98="1" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -459,8 +467,8 @@ /> </Configuration> <Configuration - Name="DLL-Import Release|x64" - OutputDirectory="$(PlatformName)\DLL_Output\Release" + Name="DLL-Import Debug|x64" + OutputDirectory="$(PlatformName)\DLL_Output\Debug" IntermediateDirectory="$(PlatformName)\$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" @@ -483,18 +491,16 @@ <Tool Name="VCMIDLTool" TargetEnvironment="3" - TypeLibraryName=".\CT_DLL_Import_Release/cryptest.tlb" + TypeLibraryName=".\CT_DLL_Import_Debug/cryptest.tlb" HeaderFileName="" /> <Tool Name="VCCLCompilerTool" AdditionalOptions="/Zm400 " - Optimization="2" - InlineFunctionExpansion="1" - PreprocessorDefinitions="NDEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" - StringPooling="true" - RuntimeLibrary="0" - EnableFunctionLevelLinking="true" + Optimization="0" + EnableIntrinsicFunctions="true" + PreprocessorDefinitions="_DEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" + RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" @@ -505,7 +511,7 @@ /> <Tool Name="VCResourceCompilerTool" - PreprocessorDefinitions="NDEBUG" + PreprocessorDefinitions="_DEBUG" Culture="1033" /> <Tool @@ -519,8 +525,6 @@ AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="1" - OptimizeReferences="2" - EnableCOMDATFolding="2" OptimizeForWindows98="1" TargetMachine="17" /> @@ -550,8 +554,8 @@ /> </Configuration> <Configuration - Name="DLL-Import Debug|x64" - OutputDirectory="$(PlatformName)\DLL_Output\Debug" + Name="Debug|Win32" + OutputDirectory="$(PlatformName)\Output\$(ConfigurationName)" IntermediateDirectory="$(PlatformName)\$(ProjectName)\$(ConfigurationName)" ConfigurationType="1" InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops" @@ -573,8 +577,7 @@ /> <Tool Name="VCMIDLTool" - TargetEnvironment="3" - TypeLibraryName=".\CT_DLL_Import_Debug/cryptest.tlb" + TypeLibraryName=".\CTDebug/cryptest.tlb" HeaderFileName="" /> <Tool @@ -582,12 +585,12 @@ AdditionalOptions="/Zm400 " Optimization="0" EnableIntrinsicFunctions="true" - PreprocessorDefinitions="_DEBUG;CRYPTOPP_IMPORTS;WIN32;_CONSOLE" + PreprocessorDefinitions="_DEBUG;_CONSOLE;WIN32" RuntimeLibrary="1" UsePrecompiledHeader="0" WarningLevel="3" SuppressStartupBanner="true" - DebugInformationFormat="3" + DebugInformationFormat="4" /> <Tool Name="VCManagedResourceCompilerTool" @@ -599,17 +602,14 @@ /> <Tool 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.
" /> <Tool Name="VCLinkerTool" - AdditionalDependencies="Ws2_32.lib" + AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib" SuppressStartupBanner="true" - AdditionalLibraryDirectories="$(OutDir)" GenerateDebugInformation="true" SubSystem="1" OptimizeForWindows98="1" - TargetMachine="17" /> <Tool Name="VCALinkTool" @@ -967,52 +967,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1043,52 +1043,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1127,52 +1127,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1203,52 +1203,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1283,52 +1283,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1359,52 +1359,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1435,52 +1435,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1511,52 +1511,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1587,52 +1587,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" @@ -1663,52 +1663,52 @@ /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|Win32" + Name="Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="1" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|Win32" + Name="DLL-Import Release|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Debug|Win32" + Name="DLL-Import Release|x64" > <Tool Name="VCCLCompilerTool" - Optimization="0" + Optimization="2" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="Release|x64" + Name="DLL-Import Debug|Win32" > <Tool Name="VCCLCompilerTool" - Optimization="1" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Release|x64" + Name="DLL-Import Debug|x64" > <Tool Name="VCCLCompilerTool" - Optimization="2" + Optimization="0" PreprocessorDefinitions="" /> </FileConfiguration> <FileConfiguration - Name="DLL-Import Debug|x64" + Name="Debug|Win32" > <Tool Name="VCCLCompilerTool" diff --git a/cryptlib.vcproj b/cryptlib.vcproj index 714153a..dd01fbb 100755 --- a/cryptlib.vcproj +++ b/cryptlib.vcproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="gb2312"?> <VisualStudioProject ProjectType="Visual C++" Version="8.00" @@ -7075,6 +7075,10 @@ </FileConfiguration> </File> <File + RelativePath=".\salsa.cpp" + > + </File> + <File RelativePath="seal.cpp" > <FileConfiguration @@ -9568,6 +9572,10 @@ > </File> <File + RelativePath=".\salsa.h" + > + </File> + <File RelativePath="seal.h" > </File> diff --git a/datatest.cpp b/datatest.cpp index 79609e8..32b10fb 100644 --- a/datatest.cpp +++ b/datatest.cpp @@ -265,6 +265,9 @@ void TestSymmetricCipher(TestData &v) { std::auto_ptr<SymmetricCipher> encryptor(ObjectFactoryRegistry<SymmetricCipher, ENCRYPTION>::Registry().CreateObject(name.c_str())); encryptor->SetKey((const byte *)key.data(), key.size(), pairs); + int seek = pairs.GetIntValueWithDefault("Seek", 0); + if (seek) + encryptor->Seek(seek); std::string encrypted; StringSource ss(plaintext, true, new StreamTransformationFilter(*encryptor, new StringSink(encrypted), StreamTransformationFilter::NO_PADDING)); if (encrypted != ciphertext) @@ -274,6 +277,9 @@ void TestSymmetricCipher(TestData &v) { std::auto_ptr<SymmetricCipher> decryptor(ObjectFactoryRegistry<SymmetricCipher, DECRYPTION>::Registry().CreateObject(name.c_str())); decryptor->SetKey((const byte *)key.data(), key.size(), pairs); + int seek = pairs.GetIntValueWithDefault("Seek", 0); + if (seek) + decryptor->Seek(seek); std::string decrypted; StringSource ss(ciphertext, true, new StreamTransformationFilter(*decryptor, new StringSink(decrypted), StreamTransformationFilter::NO_PADDING)); if (decrypted != plaintext) diff --git a/regtest.cpp b/regtest.cpp index 05ff75e..a59e0d4 100644 --- a/regtest.cpp +++ b/regtest.cpp @@ -19,6 +19,7 @@ #include "panama.h" #include "pssr.h" #include "aes.h" +#include "salsa.h" USING_NAMESPACE(CryptoPP) @@ -69,6 +70,7 @@ void RegisterFactories() RegisterSymmetricCipherDefaultFactories<CFB_Mode<AES> >(); RegisterSymmetricCipherDefaultFactories<OFB_Mode<AES> >(); RegisterSymmetricCipherDefaultFactories<CTR_Mode<AES> >(); + RegisterSymmetricCipherDefaultFactories<Salsa20>(); s_registered = true; } diff --git a/salsa.cpp b/salsa.cpp new file mode 100755 index 0000000..a3c18ef --- /dev/null +++ b/salsa.cpp @@ -0,0 +1,139 @@ +// salsa.cpp - written and placed in the public domain by Wei Dai + +#include "pch.h" +#include "salsa.h" +#include "misc.h" +#include "argnames.h" + +NAMESPACE_BEGIN(CryptoPP) + +void Salsa20_TestInstantiations() +{ + Salsa20::Encryption x; +} + +void Salsa20_Policy::GetNextIV(byte *IV) const +{ + word32 j6 = m_state[6] + 1; + word32 j7 = m_state[7] + (j6 == 0); + + UnalignedPutWord(LITTLE_ENDIAN_ORDER, IV, j6); + UnalignedPutWord(LITTLE_ENDIAN_ORDER, IV+4, j7); +} + +void Salsa20_Policy::CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length) +{ + m_rounds = params.GetIntValueWithDefault(Name::Rounds(), 20); + + if (!(m_rounds == 8 || m_rounds == 12 || m_rounds == 20)) + throw InvalidRounds(StaticAlgorithmName(), m_rounds); + + GetUserKey(LITTLE_ENDIAN_ORDER, m_state+1, 4, key, 16); + GetUserKey(LITTLE_ENDIAN_ORDER, m_state+11, 4, key + length - 16, 16); + + // m_state[0,5,10,15] forms "expand 16-byte k" or "expand 32-byte k" + m_state[0] = 0x61707865; + m_state[5] = (length == 16) ? 0x3120646e : 0x3320646e; + m_state[10] = (length == 16) ? 0x79622d36 : 0x79622d32; + m_state[15] = 0x6b206574; +} + +void Salsa20_Policy::CipherResynchronize(byte *keystreamBuffer, const byte *IV) +{ + GetUserKey(LITTLE_ENDIAN_ORDER, m_state+6, 4, IV, 8); +} + +void Salsa20_Policy::SeekToIteration(lword iterationCount) +{ + m_state[8] = (word32)iterationCount; + m_state[9] = (word32)SafeRightShift<32>(iterationCount); +} + +void Salsa20_Policy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount) +{ + KeystreamOutput<LittleEndian> keystreamOutput(operation, output, input); + + word32 x0, x1, x2, x3, x4, x5, x6, x7, x8, x9, x10, x11, x12, x13, x14, x15; + word32 j0, j1, j2, j3, j4, j5, j6, j7, j8, j9, j10, j11, j12, j13, j14, j15; + + j0 = m_state[0]; + j1 = m_state[1]; + j2 = m_state[2]; + j3 = m_state[3]; + j4 = m_state[4]; + j5 = m_state[5]; + j6 = m_state[6]; + j7 = m_state[7]; + j8 = m_state[8]; + j9 = m_state[9]; + j10 = m_state[10]; + j11 = m_state[11]; + j12 = m_state[12]; + j13 = m_state[13]; + j14 = m_state[14]; + j15 = m_state[15]; + + for (size_t iteration = 0; iteration < iterationCount; ++iteration) + { + x0 = j0; + x1 = j1; + x2 = j2; + x3 = j3; + x4 = j4; + x5 = j5; + x6 = j6; + x7 = j7; + x8 = j8; + x9 = j9; + x10 = j10; + x11 = j11; + x12 = j12; + x13 = j13; + x14 = j14; + x15 = j15; + + for (int i=m_rounds; i>0; i-=2) + { +#define QUARTER_ROUND(a, b, c, d) \ + b = b ^ rotlFixed(a + d, 7); \ + c = c ^ rotlFixed(b + a, 9); \ + d = d ^ rotlFixed(c + b, 13); \ + a = a ^ rotlFixed(d + c, 18); + + QUARTER_ROUND(x0, x4, x8, x12) + QUARTER_ROUND(x5, x9, x13, x1) + QUARTER_ROUND(x10, x14, x2, x6) + QUARTER_ROUND(x15, x3, x7, x11) + + QUARTER_ROUND(x0, x1, x2, x3) + QUARTER_ROUND(x5, x6, x7, x4) + QUARTER_ROUND(x10, x11, x8, x9) + QUARTER_ROUND(x15, x12, x13, x14) + } + + keystreamOutput (x0 + j0) + (x1 + j1) + (x2 + j2) + (x3 + j3) + (x4 + j4) + (x5 + j5) + (x6 + j6) + (x7 + j7) + (x8 + j8) + (x9 + j9) + (x10 + j10) + (x11 + j11) + (x12 + j12) + (x13 + j13) + (x14 + j14) + (x15 + j15); + + if (++j8 == 0) + ++j9; + } + + m_state[8] = j8; + m_state[9] = j9; +} + +NAMESPACE_END @@ -0,0 +1,43 @@ +// salsa.h - written and placed in the public domain by Wei Dai + +#ifndef CRYPTOPP_SALSA_H +#define CRYPTOPP_SALSA_H + +#include "strciphr.h" + +NAMESPACE_BEGIN(CryptoPP) + +//! _ +struct Salsa20_Info : public VariableKeyLength<32, 16, 32, 16, SimpleKeyingInterface::STRUCTURED_IV> +{ + static const char *StaticAlgorithmName() {return "Salsa20";} +}; + +class CRYPTOPP_NO_VTABLE Salsa20_Policy : public AdditiveCipherConcretePolicy<word32, 16>, public Salsa20_Info +{ +public: + unsigned int IVSize() const {return 8;} + void GetNextIV(byte *IV) const; + +protected: + void CipherSetKey(const NameValuePairs ¶ms, const byte *key, size_t length); + void OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount); + void CipherResynchronize(byte *keystreamBuffer, const byte *IV); + bool IsRandomAccess() const {return true;} + void SeekToIteration(lword iterationCount); + +private: + int m_rounds; + FixedSizeSecBlock<word32, 16> m_state; +}; + +//! Salsa20, variable rounds: 8, 12 or 20 (default 20) +struct Salsa20 : public Salsa20_Info, public SymmetricCipherDocumentation +{ + typedef SymmetricCipherFinal<ConcretePolicyHolder<Salsa20_Policy, AdditiveCipherTemplate<> >, Salsa20_Info> Encryption; + typedef Encryption Decryption; +}; + +NAMESPACE_END + +#endif @@ -811,6 +811,7 @@ bool Validate(int alg, bool thorough, const char *seed) case 61: result = ValidateCamellia(); break; case 62: result = ValidateWhirlpool(); break; case 63: result = ValidateTTMAC(); break; + case 64: result = ValidateSalsa(); break; default: result = ValidateAll(thorough); break; } diff --git a/validat1.cpp b/validat1.cpp index f337ca1..361aa9a 100644 --- a/validat1.cpp +++ b/validat1.cpp @@ -91,6 +91,7 @@ bool ValidateAll(bool thorough) pass=ValidateSerpent() && pass; pass=ValidateSHACAL2() && pass; pass=ValidateCamellia() && pass; + pass=ValidateSalsa() && pass; pass=ValidateBBS() && pass; pass=ValidateDH() && pass; @@ -1307,3 +1308,10 @@ bool ValidateCamellia() return true; #endif } + +bool ValidateSalsa() +{ + cout << "\nSalsa validation suite running...\n"; + + return RunTestDataFile("TestVectors/salsa.txt"); +} diff --git a/validat3.cpp b/validat3.cpp index cfe989a..437d151 100644 --- a/validat3.cpp +++ b/validat3.cpp @@ -391,7 +391,7 @@ bool ValidateWhirlpool() cout << "word64 not available, skipping Whirlpool validation." << endl; return true; #endif - } +} bool ValidateMD5MAC() { @@ -52,6 +52,7 @@ bool ValidateTwofish(); bool ValidateSerpent(); bool ValidateSHACAL2(); bool ValidateCamellia(); +bool ValidateSalsa(); bool ValidateBBS(); bool ValidateDH(); |