From 030de2e457fc7cd6d77d18ebd06c7c8d14954507 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 23 Jul 2017 23:25:39 -0400 Subject: [PATCH] Fix multiple output of shared key benchmarks Benchmark2 is used to benchmark shared key algorithms. At the moment Benchmark2 is all or nothing. It does not understand SharedKeyMAC, SharedKeyStream, SharedKeyBlock. It will be fixed in the future. --- bench1.cpp | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/bench1.cpp b/bench1.cpp index 2d128648..c559e2e9 100644 --- a/bench1.cpp +++ b/bench1.cpp @@ -383,22 +383,8 @@ void Benchmark(Test::TestClass suites, double t, double hertz) Benchmark1(t, hertz); } - // Shared key algorithms (MACs) - if (suites & Test::SharedKeyMAC) - { - std::cout << "\n
"; - Benchmark2(t, hertz); - } - - // Shared key algorithms (stream ciphers) - if (suites & Test::SharedKeyStream) - { - std::cout << "\n
"; - Benchmark2(t, hertz); - } - - // Shared key algorithms (block ciphers) - if (suites & Test::SharedKeyBlock) + // Shared key algorithms + if (suites & Test::SharedKey) { std::cout << "\n
"; Benchmark2(t, hertz);