diff options
| author | lloyd <[email protected]> | 2010-10-13 14:58:58 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-10-13 14:58:58 +0000 |
| commit | 6e85766cf001183e160c8ca2c0ed3eb40f07125c (patch) | |
| tree | df11b301786829bc2f6f545038ec97c2269154d9 /src/block/mars/mars.h | |
| parent | fcd3aba1ff6b8597b31165474573dbb339479c14 (diff) | |
| parent | bb53c6169463a67cc751625cb0a2c47df129a2ab (diff) | |
propagate from branch 'net.randombit.botan' (head 6581b789d58717bc6acee5c6a248e2d44c636e40)
to branch 'net.randombit.botan.c++0x' (head 227a989ae94da8f4379ea4b9b0fc0ee8dbdde0c7)
Diffstat (limited to 'src/block/mars/mars.h')
| -rw-r--r-- | src/block/mars/mars.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/block/mars/mars.h b/src/block/mars/mars.h index a61f475f2..7a53d116b 100644 --- a/src/block/mars/mars.h +++ b/src/block/mars/mars.h @@ -15,7 +15,7 @@ namespace Botan { /** * MARS, IBM's candidate for AES */ -class BOTAN_DLL MARS : public BlockCipher +class BOTAN_DLL MARS : public BlockCipher_Fixed_Block_Size<16> { public: void encrypt_n(const byte in[], byte out[], size_t blocks) const; @@ -25,7 +25,7 @@ class BOTAN_DLL MARS : public BlockCipher std::string name() const { return "MARS"; } BlockCipher* clone() const { return new MARS; } - MARS() : BlockCipher(16, 16, 32, 4), EK(40) {} + MARS() : BlockCipher_Fixed_Block_Size(16, 32, 4), EK(40) {} private: void key_schedule(const byte[], size_t); |