From 55550067fd69850c767cc9800433e1eabfeb5da2 Mon Sep 17 00:00:00 2001 From: lloyd Date: Wed, 13 Oct 2010 13:09:56 +0000 Subject: Add a new subclass for BlockCipher BlockCipher_Fixed_Block_Size, which sets the block size statically and also creates an enum with the size. Use the enum instead of calling block_size() where possible, since that uses two virtual function calls per block which is quite unfortunate. The real advantages here as compared to the previous version which kept the block size as a per-object u32bit: - The compiler can inline the constant as an immediate operand (previously it would load the value via an indirection on this) - Removes 32 bits per object overhead (except in cases with actually variable block sizes, which are very few and rarely used) --- src/block/lion/lion.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/block/lion/lion.h') diff --git a/src/block/lion/lion.h b/src/block/lion/lion.h index 9beb68ca6..d4eb9c327 100644 --- a/src/block/lion/lion.h +++ b/src/block/lion/lion.h @@ -28,6 +28,8 @@ class BOTAN_DLL Lion : public BlockCipher void encrypt_n(const byte in[], byte out[], size_t blocks) const; void decrypt_n(const byte in[], byte out[], size_t blocks) const; + size_t block_size() const { return BLOCK_SIZE; } + void clear(); std::string name() const; BlockCipher* clone() const; @@ -45,7 +47,7 @@ class BOTAN_DLL Lion : public BlockCipher private: void key_schedule(const byte[], size_t); - const size_t LEFT_SIZE, RIGHT_SIZE; + const size_t BLOCK_SIZE, LEFT_SIZE, RIGHT_SIZE; HashFunction* hash; StreamCipher* cipher; -- cgit v1.2.3