arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix benchmarks after variable block size removal (GH #535)

pull/546/head
Jeffrey Walton 2018-01-18 21:31:19 -05:00
parent 58b6999274
commit 5542055327
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bench1.cpp
View File

@ -609,11 +609,11 @@ void Benchmark2(double t, double hertz)
BenchMarkByName<SymmetricCipher>("SEED/CTR", 0, "SEED/CTR (1/2 K table)"); BenchMarkByName<SymmetricCipher>("SEED/CTR", 0, "SEED/CTR (1/2 K table)");
BenchMarkByName<SymmetricCipher>("SM4/CTR"); BenchMarkByName<SymmetricCipher>("SM4/CTR");
BenchMarkByName<SymmetricCipher>("Kalyna/CTR", 16, "Kalyna-128(128)/CTR (128-bit key)", MakeParameters(Name::BlockSize(), 16)); BenchMarkByName<SymmetricCipher>("Kalyna-128/CTR", 16, "Kalyna-128(128)/CTR (128-bit key)");
BenchMarkByName<SymmetricCipher>("Kalyna/CTR", 32, "Kalyna-128(256)/CTR (256-bit key)", MakeParameters(Name::BlockSize(), 16)); BenchMarkByName<SymmetricCipher>("Kalyna-128/CTR", 32, "Kalyna-128(256)/CTR (256-bit key)");
BenchMarkByName<SymmetricCipher>("Kalyna/CTR", 32, "Kalyna-256(256)/CTR (256-bit key)", MakeParameters(Name::BlockSize(), 32)); BenchMarkByName<SymmetricCipher>("Kalyna-256/CTR", 32, "Kalyna-256(256)/CTR (256-bit key)");
BenchMarkByName<SymmetricCipher>("Kalyna/CTR", 64, "Kalyna-256(512)/CTR (512-bit key)", MakeParameters(Name::BlockSize(), 32)); BenchMarkByName<SymmetricCipher>("Kalyna-256/CTR", 64, "Kalyna-256(512)/CTR (512-bit key)");
BenchMarkByName<SymmetricCipher>("Kalyna/CTR", 64, "Kalyna-512(512)/CTR (512-bit key)", MakeParameters(Name::BlockSize(), 64)); BenchMarkByName<SymmetricCipher>("Kalyna-512/CTR", 64, "Kalyna-512(512)/CTR (512-bit key)");
BenchMarkByName<SymmetricCipher>("SIMON-64/CTR", 12, "SIMON-64(96)/CTR (96-bit key)"); BenchMarkByName<SymmetricCipher>("SIMON-64/CTR", 12, "SIMON-64(96)/CTR (96-bit key)");
BenchMarkByName<SymmetricCipher>("SIMON-64/CTR", 16, "SIMON-64(128)/CTR (128-bit key)"); BenchMarkByName<SymmetricCipher>("SIMON-64/CTR", 16, "SIMON-64(128)/CTR (128-bit key)");

15
kalyna.h
View File

@ -23,7 +23,7 @@ NAMESPACE_BEGIN(CryptoPP)
/// \class Kalyna128_Info /// \class Kalyna128_Info
/// \brief Kalyna-128 block cipher information /// \brief Kalyna-128 block cipher information
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
struct Kalyna128_Info : public FixedBlockSize<16>, VariableKeyLength<16, 16, 32> struct CRYPTOPP_NO_VTABLE Kalyna128_Info : public FixedBlockSize<16>, VariableKeyLength<16, 16, 32>
{ {
static const char* StaticAlgorithmName() static const char* StaticAlgorithmName()
{ {
@ -35,7 +35,7 @@ struct Kalyna128_Info : public FixedBlockSize<16>, VariableKeyLength<16, 16, 32>
/// \class Kalyna256_Info /// \class Kalyna256_Info
/// \brief Kalyna-256 block cipher information /// \brief Kalyna-256 block cipher information
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
struct Kalyna256_Info : public FixedBlockSize<32>, VariableKeyLength<32, 32, 64> struct CRYPTOPP_NO_VTABLE Kalyna256_Info : public FixedBlockSize<32>, VariableKeyLength<32, 32, 64>
{ {
static const char* StaticAlgorithmName() static const char* StaticAlgorithmName()
{ {
@ -47,7 +47,7 @@ struct Kalyna256_Info : public FixedBlockSize<32>, VariableKeyLength<32, 32, 64>
/// \class Kalyna512_Info /// \class Kalyna512_Info
/// \brief Kalyna-512 block cipher information /// \brief Kalyna-512 block cipher information
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
struct Kalyna512_Info : public FixedBlockSize<64>, FixedKeyLength<64> struct CRYPTOPP_NO_VTABLE Kalyna512_Info : public FixedBlockSize<64>, FixedKeyLength<64>
{ {
static const char* StaticAlgorithmName() static const char* StaticAlgorithmName()
{ {
@ -59,14 +59,17 @@ struct Kalyna512_Info : public FixedBlockSize<64>, FixedKeyLength<64>
/// \class Kalyna /// \class Kalyna
/// \brief Kalyna block cipher /// \brief Kalyna block cipher
/// \since Crypto++ 6.0 /// \since Crypto++ 6.0
class Kalyna_Base class CRYPTOPP_NO_VTABLE Kalyna_Base
{ {
public:
virtual ~Kalyna_Base() {}
protected: protected:
typedef SecBlock<word64, AllocatorWithCleanup<word64, true> > AlignedSecBlock64; typedef SecBlock<word64, AllocatorWithCleanup<word64, true> > AlignedSecBlock64;
mutable AlignedSecBlock64 m_wspace; // work space mutable AlignedSecBlock64 m_wspace; // work space
AlignedSecBlock64 m_mkey; // master key AlignedSecBlock64 m_mkey; // master key
AlignedSecBlock64 m_rkeys; // round keys AlignedSecBlock64 m_rkeys; // round keys
unsigned int m_kl, m_nb, m_nk; // key length, number 64-bit blocks and keys unsigned int m_kl, m_nb, m_nk; // number 64-bit blocks and keys
}; };
class Kalyna128 : public Kalyna128_Info, public BlockCipherDocumentation class Kalyna128 : public Kalyna128_Info, public BlockCipherDocumentation
@ -103,7 +106,7 @@ public:
void SetKey_24(const word64 key[4]); void SetKey_24(const word64 key[4]);
void ProcessBlock_22(const word64 inBlock[2], const word64 xorBlock[2], word64 outBlock[2]) const; void ProcessBlock_22(const word64 inBlock[2], const word64 xorBlock[2], word64 outBlock[2]) const;
void ProcessBlock_24(const word64 inBlock[2], const word64 xorBlock[2] ,word64 outBlock[2]) const; void ProcessBlock_24(const word64 inBlock[2], const word64 xorBlock[2] ,word64 outBlock[2]) const;
}; };
typedef BlockCipherFinal<ENCRYPTION, Base> Encryption; typedef BlockCipherFinal<ENCRYPTION, Base> Encryption;
typedef BlockCipherFinal<DECRYPTION, Base> Decryption; typedef BlockCipherFinal<DECRYPTION, Base> Decryption;