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/safer | |
| 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/safer')
| -rw-r--r-- | src/block/safer/safer_sk.cpp | 3 | ||||
| -rw-r--r-- | src/block/safer/safer_sk.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/block/safer/safer_sk.cpp b/src/block/safer/safer_sk.cpp index a91e5f687..1d103040d 100644 --- a/src/block/safer/safer_sk.cpp +++ b/src/block/safer/safer_sk.cpp @@ -131,8 +131,7 @@ BlockCipher* SAFER_SK::clone() const /* * SAFER-SK Constructor */ -SAFER_SK::SAFER_SK(size_t rounds) : - BlockCipher_Fixed_Block_Size(16) +SAFER_SK::SAFER_SK(size_t rounds) { if(rounds > 13 || rounds == 0) throw Invalid_Argument(name() + ": Invalid number of rounds"); diff --git a/src/block/safer/safer_sk.h b/src/block/safer/safer_sk.h index 2fde757bd..803afffa0 100644 --- a/src/block/safer/safer_sk.h +++ b/src/block/safer/safer_sk.h @@ -15,7 +15,7 @@ namespace Botan { /** * SAFER-SK */ -class BOTAN_DLL SAFER_SK : public BlockCipher_Fixed_Block_Size<8> +class BOTAN_DLL SAFER_SK : public Block_Cipher_Fixed_Params<8, 16> { public: void encrypt_n(const byte in[], byte out[], size_t blocks) const; |