diff options
| author | lloyd <[email protected]> | 2010-10-28 20:05:21 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-28 20:05:21 +0000 |
| commit | 7c2ac02f29fd4b5d629e187381baa783b53bd2e4 (patch) | |
| tree | 9d07a452f0a7bd44a2b9d3aaac16f9d9e692fde5 /src/block/misty1 | |
| parent | b502cefaf0f9396354d58c4c18a78ac7870f6168 (diff) | |
| parent | 7e4c62045c8216138dbed1c586139a1de7cd7f27 (diff) | |
propagate from branch 'net.randombit.botan' (head 2841fb518e20d2fe0a374e4f6b08bdbb14d5d158)
to branch 'net.randombit.botan.c++0x' (head 0b9275139d6346bd3aa28d63bf8b8a03851d853d)
Diffstat (limited to 'src/block/misty1')
| -rw-r--r-- | src/block/misty1/misty1.cpp | 4 | ||||
| -rw-r--r-- | src/block/misty1/misty1.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/block/misty1/misty1.cpp b/src/block/misty1/misty1.cpp index 9ad30502c..77d1047b1 100644 --- a/src/block/misty1/misty1.cpp +++ b/src/block/misty1/misty1.cpp @@ -251,9 +251,7 @@ void MISTY1::key_schedule(const byte key[], size_t length) /* * MISTY1 Constructor */ -MISTY1::MISTY1(size_t rounds) : - BlockCipher_Fixed_Block_Size(16), - EK(100), DK(100) +MISTY1::MISTY1(size_t rounds) : EK(100), DK(100) { if(rounds != 8) throw Invalid_Argument("MISTY1: Invalid number of rounds: " diff --git a/src/block/misty1/misty1.h b/src/block/misty1/misty1.h index 3bd05b4c6..14d8a2958 100644 --- a/src/block/misty1/misty1.h +++ b/src/block/misty1/misty1.h @@ -15,7 +15,7 @@ namespace Botan { /** * MISTY1 */ -class BOTAN_DLL MISTY1 : public BlockCipher_Fixed_Block_Size<8> +class BOTAN_DLL MISTY1 : public Block_Cipher_Fixed_Params<8, 16> { public: void encrypt_n(const byte in[], byte out[], size_t blocks) const; |