From 5f9b2b2a85550bca2d8c1683a33bde0ecc982a26 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Sat, 18 Nov 2017 14:21:10 -0500
Subject: [PATCH] Fix algorithm names for Threefish (GH #535) Algorithm name
 was returning " Threefish-32(32)" instead of "Threefish-256(256)"

---
 regtest2.cpp | 18 +++++++++---------
 threefish.h  |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/regtest2.cpp b/regtest2.cpp
index e152c276..784dab07 100644
--- a/regtest2.cpp
+++ b/regtest2.cpp
@@ -143,16 +143,16 @@ void RegisterFactories2()
 	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Kalyna> >();  // Test Vectors
 	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Kalyna> >();  // Benchmarks
 
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish256> >("Threefish-256(256)/ECB");  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish256> >("Threefish-256(256)/CBC");  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish512> >("Threefish-512(512)/ECB");  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish512> >("Threefish-512(512)/CBC");  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish1024> >("Threefish-1024(1024)/ECB");  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish1024> >("Threefish-1024(1024)/CBC");  // Test Vectors
+	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish256> >();  // Test Vectors
+	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish256> >();  // Test Vectors
+	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish512> >();  // Test Vectors
+	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish512> >();  // Test Vectors
+	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish1024> >();  // Test Vectors
+	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish1024> >();  // Test Vectors
 
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish256> >("Threefish-256(256)/CTR");  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish512> >("Threefish-512(512)/CTR");  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish1024> >("Threefish-1024(1024)/CTR");  // Benchmarks
+	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish256> >();  // Benchmarks
+	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish512> >();  // Benchmarks
+	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish1024> >();  // Benchmarks
 
 	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA1> >();
 	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA256> >();
diff --git a/threefish.h b/threefish.h
index d9167fee..a103e094 100644
--- a/threefish.h
+++ b/threefish.h
@@ -28,7 +28,7 @@ struct Threefish_Info : public FixedBlockSize<BS>, FixedKeyLength<BS>
     static const std::string StaticAlgorithmName()
     {
         // Format is Cipher-Blocksize(Keylength)
-        return "Threefish-" + IntToString(BS) + "(" + IntToString(BS) + ")";
+        return "Threefish-" + IntToString(BS*8) + "(" + IntToString(BS*8) + ")";
     }
 };