diff -up ./bench.cpp.nomars ./bench.cpp --- ./bench.cpp.nomars 2008-09-12 18:30:58.000000000 +0200 +++ ./bench.cpp 2008-09-12 18:31:11.000000000 +0200 @@ -13,7 +13,6 @@ #include "cast.h" #include "seal.h" #include "rc6.h" -#include "mars.h" #include "twofish.h" #include "serpent.h" #include "skipjack.h" @@ -319,7 +318,6 @@ void BenchmarkAll(double t, double hertz BenchMarkKeyed("Serpent", t); BenchMarkKeyed("CAST-256", t); BenchMarkKeyed("RC6", t); - BenchMarkKeyed("MARS", t); BenchMarkByName("SHACAL-2/ECB", 16); BenchMarkByName("SHACAL-2/ECB", 64); BenchMarkKeyed("DES", t); diff -up ./test.cpp.nomars ./test.cpp --- ./test.cpp.nomars 2008-09-12 18:32:37.000000000 +0200 +++ ./test.cpp 2008-09-12 18:32:54.000000000 +0200 @@ -816,7 +816,7 @@ bool Validate(int alg, bool thorough, co case 36: result = ValidateSquare(); break; case 37: result = ValidateRC2(); break; case 38: result = ValidateRC6(); break; - case 39: result = ValidateMARS(); break; + //case 39: result = ValidateMARS(); break; case 40: result = ValidateRW(); break; case 41: result = ValidateMD2(); break; case 42: result = ValidateNR(); break; diff -up ./validat1.cpp.nomars ./validat1.cpp --- ./validat1.cpp.nomars 2008-09-12 18:32:42.000000000 +0200 +++ ./validat1.cpp 2008-09-12 18:33:18.000000000 +0200 @@ -25,7 +25,6 @@ #include "square.h" #include "seal.h" #include "rc6.h" -#include "mars.h" #include "rijndael.h" #include "twofish.h" #include "serpent.h" @@ -84,7 +83,6 @@ bool ValidateAll(bool thorough) pass=ValidateSKIPJACK() && pass; pass=ValidateSEAL() && pass; pass=ValidateRC6() && pass; - pass=ValidateMARS() && pass; pass=ValidateRijndael() && pass; pass=ValidateTwofish() && pass; pass=ValidateSerpent() && pass; @@ -1066,18 +1064,6 @@ bool ValidateRC6() return pass; } -bool ValidateMARS() -{ - cout << "\nMARS validation suite running...\n\n"; - - FileSource valdata("marsval.dat", true, new HexDecoder); - bool pass = true; - pass = BlockTransformationTest(FixedRoundsCipherFactory(16), valdata, 4) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(24), valdata, 3) && pass; - pass = BlockTransformationTest(FixedRoundsCipherFactory(32), valdata, 2) && pass; - return pass; -} - bool ValidateRijndael() { cout << "\nRijndael validation suite running...\n\n"; diff -up ./validate.h.nomars ./validate.h --- ./validate.h.nomars 2008-09-12 18:32:47.000000000 +0200 +++ ./validate.h 2008-09-12 18:33:24.000000000 +0200 @@ -42,7 +42,6 @@ bool ValidateCAST(); bool ValidateSquare(); bool ValidateSKIPJACK(); bool ValidateRC6(); -bool ValidateMARS(); bool ValidateRijndael(); bool ValidateTwofish(); bool ValidateSerpent();