From aec67799a3eea9745f6866e0795145ea1473e120 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Wed, 22 Nov 2017 18:43:08 -0500 Subject: [PATCH] Add CTR to display for SIMON and SPECK --- bench1.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/bench1.cpp b/bench1.cpp index a7af3a93..644a10b0 100644 --- a/bench1.cpp +++ b/bench1.cpp @@ -598,23 +598,23 @@ void Benchmark2(double t, double hertz) BenchMarkByName("SKIPJACK/CTR"); BenchMarkByName("SEED/CTR", 0, "SEED/CTR (1/2 K table)"); - BenchMarkByName("Kalyna/CTR", 16, "Kalyna-128(128) (128-bit key)", MakeParameters(Name::BlockSize(), 16)); - BenchMarkByName("Kalyna/CTR", 32, "Kalyna-128(256) (256-bit key)", MakeParameters(Name::BlockSize(), 16)); - BenchMarkByName("Kalyna/CTR", 32, "Kalyna-256(256) (256-bit key)", MakeParameters(Name::BlockSize(), 32)); - BenchMarkByName("Kalyna/CTR", 64, "Kalyna-256(512) (512-bit key)", MakeParameters(Name::BlockSize(), 32)); - BenchMarkByName("Kalyna/CTR", 64, "Kalyna-512(512) (512-bit key)", MakeParameters(Name::BlockSize(), 64)); + BenchMarkByName("Kalyna/CTR", 16, "Kalyna-128(128)/CTR (128-bit key)", MakeParameters(Name::BlockSize(), 16)); + BenchMarkByName("Kalyna/CTR", 32, "Kalyna-128(256)/CTR (256-bit key)", MakeParameters(Name::BlockSize(), 16)); + BenchMarkByName("Kalyna/CTR", 32, "Kalyna-256(256)/CTR (256-bit key)", MakeParameters(Name::BlockSize(), 32)); + BenchMarkByName("Kalyna/CTR", 64, "Kalyna-256(512)/CTR (512-bit key)", MakeParameters(Name::BlockSize(), 32)); + BenchMarkByName("Kalyna/CTR", 64, "Kalyna-512(512)/CTR (512-bit key)", MakeParameters(Name::BlockSize(), 64)); - BenchMarkByName("SIMON-64/CTR", 12, "SIMON-64(96) (96-bit key)"); - BenchMarkByName("SIMON-64/CTR", 16, "SIMON-64(128) (128-bit key)"); - BenchMarkByName("SIMON-128/CTR", 16, "SIMON-128(128) (128-bit key)"); - BenchMarkByName("SIMON-128/CTR", 24, "SIMON-128(192) (192-bit key)"); - BenchMarkByName("SIMON-128/CTR", 32, "SIMON-128(256) (256-bit key)"); + BenchMarkByName("SIMON-64/CTR", 12, "SIMON-64(96)/CTR (96-bit key)"); + BenchMarkByName("SIMON-64/CTR", 16, "SIMON-64(128)/CTR (128-bit key)"); + BenchMarkByName("SIMON-128/CTR", 16, "SIMON-128(128)/CTR (128-bit key)"); + BenchMarkByName("SIMON-128/CTR", 24, "SIMON-128(192)/CTR (192-bit key)"); + BenchMarkByName("SIMON-128/CTR", 32, "SIMON-128(256)/CTR (256-bit key)"); - BenchMarkByName("SPECK-64/CTR", 12, "SPECK-64(96) (96-bit key)"); - BenchMarkByName("SPECK-64/CTR", 16, "SPECK-64(128) (128-bit key)"); - BenchMarkByName("SPECK-128/CTR", 16, "SPECK-128(128) (128-bit key)"); - BenchMarkByName("SPECK-128/CTR", 24, "SPECK-128(192) (192-bit key)"); - BenchMarkByName("SPECK-128/CTR", 32, "SPECK-128(256) (256-bit key)"); + BenchMarkByName("SPECK-64/CTR", 12, "SPECK-64(96)/CTR (96-bit key)"); + BenchMarkByName("SPECK-64/CTR", 16, "SPECK-64(128)/CTR (128-bit key)"); + BenchMarkByName("SPECK-128/CTR", 16, "SPECK-128(128)/CTR (128-bit key)"); + BenchMarkByName("SPECK-128/CTR", 24, "SPECK-128(192)/CTR (192-bit key)"); + BenchMarkByName("SPECK-128/CTR", 32, "SPECK-128(256)/CTR (256-bit key)"); } std::cout << "\n";