diff options
| author | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2013-01-19 02:20:00 +0000 |
|---|---|---|
| committer | weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0> | 2013-01-19 02:20:00 +0000 |
| commit | 6282aab71c9f925b533065e4dbfce632b83ee4ac (patch) | |
| tree | 0489fdbd8b1c5c6f87537d4136dcf1afeecb0bd8 /validat1.cpp | |
| parent | 34c4e67c9abc9402c95a6b9533fbbae6b486be63 (diff) | |
| download | cryptopp-6282aab71c9f925b533065e4dbfce632b83ee4ac.tar.gz | |
add SHA-3
update DSA to FIPS 186-3
update version numbers
git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@535 57ff6487-cd31-0410-9ec3-f628ee90f5f0
Diffstat (limited to 'validat1.cpp')
| -rw-r--r-- | validat1.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/validat1.cpp b/validat1.cpp index 5b82539..a40816b 100644 --- a/validat1.cpp +++ b/validat1.cpp @@ -55,6 +55,7 @@ bool ValidateAll(bool thorough) pass=ValidateMD2() && pass; pass=ValidateMD5() && pass; pass=ValidateSHA() && pass; + pass=RunTestDataFile("TestVectors/sha3.txt") && pass; pass=ValidateTiger() && pass; pass=ValidateRIPEMD() && pass; pass=ValidatePanama() && pass; @@ -1148,9 +1149,9 @@ bool ValidateSerpent() FileSource valdata("TestData/serpentv.dat", true, new HexDecoder); bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(24), valdata, 3) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(32), valdata, 2) && pass; + pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(16), valdata, 5) && pass; + pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(24), valdata, 4) && pass; + pass = BlockTransformationTest(FixedRoundsCipherFactory<SerpentEncryption, SerpentDecryption>(32), valdata, 3) && pass; return pass; } |