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 >(); // Test Vectors RegisterSymmetricCipherDefaultFactories >(); // Benchmarks - RegisterSymmetricCipherDefaultFactories >("Threefish-256(256)/ECB"); // Test Vectors - RegisterSymmetricCipherDefaultFactories >("Threefish-256(256)/CBC"); // Test Vectors - RegisterSymmetricCipherDefaultFactories >("Threefish-512(512)/ECB"); // Test Vectors - RegisterSymmetricCipherDefaultFactories >("Threefish-512(512)/CBC"); // Test Vectors - RegisterSymmetricCipherDefaultFactories >("Threefish-1024(1024)/ECB"); // Test Vectors - RegisterSymmetricCipherDefaultFactories >("Threefish-1024(1024)/CBC"); // Test Vectors + RegisterSymmetricCipherDefaultFactories >(); // Test Vectors + RegisterSymmetricCipherDefaultFactories >(); // Test Vectors + RegisterSymmetricCipherDefaultFactories >(); // Test Vectors + RegisterSymmetricCipherDefaultFactories >(); // Test Vectors + RegisterSymmetricCipherDefaultFactories >(); // Test Vectors + RegisterSymmetricCipherDefaultFactories >(); // Test Vectors - RegisterSymmetricCipherDefaultFactories >("Threefish-256(256)/CTR"); // Benchmarks - RegisterSymmetricCipherDefaultFactories >("Threefish-512(512)/CTR"); // Benchmarks - RegisterSymmetricCipherDefaultFactories >("Threefish-1024(1024)/CTR"); // Benchmarks + RegisterSymmetricCipherDefaultFactories >(); // Benchmarks + RegisterSymmetricCipherDefaultFactories >(); // Benchmarks + RegisterSymmetricCipherDefaultFactories >(); // Benchmarks RegisterDefaultFactoryFor >(); RegisterDefaultFactoryFor >(); 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, FixedKeyLength static const std::string StaticAlgorithmName() { // Format is Cipher-Blocksize(Keylength) - return "Threefish-" + IntToString(BS) + "(" + IntToString(BS) + ")"; + return "Threefish-" + IntToString(BS*8) + "(" + IntToString(BS*8) + ")"; } };