diff options
author | lloyd <[email protected]> | 2010-10-13 01:34:15 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2010-10-13 01:34:15 +0000 |
commit | fe4119c74b5e81a354a5313e4d2efbf9a135aa81 (patch) | |
tree | 5c5254cc3a4e5713169ef1d52a83db19c8c4ed65 /src/block/cast | |
parent | 60fb91d8cb1710d07041f76050d24229ce91131b (diff) |
Use size_t rather than u32bit in SymmetricAlgorithm
Diffstat (limited to 'src/block/cast')
-rw-r--r-- | src/block/cast/cast128.cpp | 2 | ||||
-rw-r--r-- | src/block/cast/cast128.h | 2 | ||||
-rw-r--r-- | src/block/cast/cast256.cpp | 2 | ||||
-rw-r--r-- | src/block/cast/cast256.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/block/cast/cast128.cpp b/src/block/cast/cast128.cpp index 538c1bd5b..24469e025 100644 --- a/src/block/cast/cast128.cpp +++ b/src/block/cast/cast128.cpp @@ -116,7 +116,7 @@ void CAST_128::decrypt_n(const byte in[], byte out[], size_t blocks) const /* * CAST-128 Key Schedule */ -void CAST_128::key_schedule(const byte key[], u32bit length) +void CAST_128::key_schedule(const byte key[], size_t length) { clear(); SecureVector<u32bit> X(4); diff --git a/src/block/cast/cast128.h b/src/block/cast/cast128.h index 18c0c1868..edccf04b3 100644 --- a/src/block/cast/cast128.h +++ b/src/block/cast/cast128.h @@ -27,7 +27,7 @@ class BOTAN_DLL CAST_128 : public BlockCipher CAST_128() : BlockCipher(8, 11, 16), MK(16), RK(16) {} private: - void key_schedule(const byte[], u32bit); + void key_schedule(const byte[], size_t); static void cast_ks(MemoryRegion<u32bit>& ks, MemoryRegion<u32bit>& user_key); diff --git a/src/block/cast/cast256.cpp b/src/block/cast/cast256.cpp index 6567ffbd4..8be0a8dd6 100644 --- a/src/block/cast/cast256.cpp +++ b/src/block/cast/cast256.cpp @@ -136,7 +136,7 @@ void CAST_256::decrypt_n(const byte in[], byte out[], size_t blocks) const /* * CAST-256 Key Schedule */ -void CAST_256::key_schedule(const byte key[], u32bit length) +void CAST_256::key_schedule(const byte key[], size_t length) { SecureVector<u32bit> K(8); for(size_t j = 0; j != length; ++j) diff --git a/src/block/cast/cast256.h b/src/block/cast/cast256.h index ef73fbf94..74e38face 100644 --- a/src/block/cast/cast256.h +++ b/src/block/cast/cast256.h @@ -27,7 +27,7 @@ class BOTAN_DLL CAST_256 : public BlockCipher CAST_256() : BlockCipher(16, 4, 32, 4), MK(48), RK(48) {} private: - void key_schedule(const byte[], u32bit); + void key_schedule(const byte[], size_t); static const u32bit KEY_MASK[192]; static const byte KEY_ROT[32]; |