Backout ChaCha changes to Crypto++ 7.0

These changes made it in by accident at Commit b74a6f444568. We were going to try to let them ride but they broke versioning. They may be added later but we should avoid the change at this time.

1 files changed, 3 insertions, 3 deletions

diff --git a/bench1.cpp b/bench1.cpp
index 9c36452b..700a071d 100644
--- a/bench1.cpp
+++ b/bench1.cpp
@@ -567,9 +567,9 @@ void Benchmark2(double t, double hertz)
 		BenchMarkByName<SymmetricCipher>("Salsa20");

 		BenchMarkByName<SymmetricCipher>("Salsa20", 0, "Salsa20/12", MakeParameters(Name::Rounds(), 12));

 		BenchMarkByName<SymmetricCipher>("Salsa20", 0, "Salsa20/8", MakeParameters(Name::Rounds(), 8));

-		BenchMarkByName<SymmetricCipher>("ChaCha");

-		BenchMarkByName<SymmetricCipher>("ChaCha", 0, "ChaCha/12", MakeParameters(Name::Rounds(), 12));

-		BenchMarkByName<SymmetricCipher>("ChaCha", 0, "ChaCha/8", MakeParameters(Name::Rounds(), 8));

+		BenchMarkByName<SymmetricCipher>("ChaCha8");

+		BenchMarkByName<SymmetricCipher>("ChaCha12");

+		BenchMarkByName<SymmetricCipher>("ChaCha20");

 		BenchMarkByName<SymmetricCipher>("Sosemanuk");

 		BenchMarkByName<SymmetricCipher>("Rabbit");

 		BenchMarkByName<SymmetricCipher>("RabbitWithIV");