aboutsummaryrefslogtreecommitdiffstats
path: root/src/block
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-10-13 15:14:07 +0000
committerlloyd <[email protected]>2010-10-13 15:14:07 +0000
commite846f62c1c9a0e1f6aed562c462561cc91406501 (patch)
tree413dce73612b225c76228782052d51c0945f720c /src/block
parent30a71cfa8d2d4c78e3a2b9f4c394b652f457e1f2 (diff)
More size_t. Document changes
Diffstat (limited to 'src/block')
-rw-r--r--src/block/aes/aes.cpp2
-rw-r--r--src/block/aes/aes.h2
-rw-r--r--src/block/block_cipher.h12
3 files changed, 8 insertions, 8 deletions
diff --git a/src/block/aes/aes.cpp b/src/block/aes/aes.cpp
index 1530af965..e562b8343 100644
--- a/src/block/aes/aes.cpp
+++ b/src/block/aes/aes.cpp
@@ -681,7 +681,7 @@ u32bit AES::S(u32bit input)
/*
* AES Constructor
*/
-AES::AES(u32bit key_size) : BlockCipher_Fixed_Block_Size(key_size),
+AES::AES(size_t key_size) : BlockCipher_Fixed_Block_Size(key_size),
EK(56), ME(16), DK(56), MD(16)
{
if(key_size != 16 && key_size != 24 && key_size != 32)
diff --git a/src/block/aes/aes.h b/src/block/aes/aes.h
index 6fa0ccaff..96b8e91da 100644
--- a/src/block/aes/aes.h
+++ b/src/block/aes/aes.h
@@ -34,7 +34,7 @@ class BOTAN_DLL AES : public BlockCipher_Fixed_Block_Size<16>
* AES fixed to a particular key_size (16, 24, or 32 bytes)
* @param key_size the chosen fixed key size
*/
- AES(u32bit key_size);
+ AES(size_t key_size);
private:
void key_schedule(const byte[], size_t);
static u32bit S(u32bit);
diff --git a/src/block/block_cipher.h b/src/block/block_cipher.h
index e522005b9..3e14e0739 100644
--- a/src/block/block_cipher.h
+++ b/src/block/block_cipher.h
@@ -25,9 +25,9 @@ class BOTAN_DLL BlockCipher : public SymmetricAlgorithm
* @param key_max the maximum key size
* @param key_mod the modulo restriction on the key size
*/
- BlockCipher(u32bit key_min,
- u32bit key_max = 0,
- u32bit key_mod = 1) :
+ BlockCipher(size_t key_min,
+ size_t key_max = 0,
+ size_t key_mod = 1) :
SymmetricAlgorithm(key_min, key_max, key_mod) {}
virtual ~BlockCipher() {}
@@ -119,9 +119,9 @@ template<size_t N>
class BlockCipher_Fixed_Block_Size : public BlockCipher
{
public:
- BlockCipher_Fixed_Block_Size(u32bit kmin,
- u32bit kmax = 0,
- u32bit kmod = 1) :
+ BlockCipher_Fixed_Block_Size(size_t kmin,
+ size_t kmax = 0,
+ size_t kmod = 1) :
BlockCipher(kmin, kmax, kmod) {}
enum { BLOCK_SIZE = N };