aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/aes/aes.h
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-10-13 01:34:15 +0000
committerlloyd <[email protected]>2010-10-13 01:34:15 +0000
commitfe4119c74b5e81a354a5313e4d2efbf9a135aa81 (patch)
tree5c5254cc3a4e5713169ef1d52a83db19c8c4ed65 /src/block/aes/aes.h
parent60fb91d8cb1710d07041f76050d24229ce91131b (diff)
Use size_t rather than u32bit in SymmetricAlgorithm
Diffstat (limited to 'src/block/aes/aes.h')
-rw-r--r--src/block/aes/aes.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/block/aes/aes.h b/src/block/aes/aes.h
index 6bc1f44b4..d62413f5b 100644
--- a/src/block/aes/aes.h
+++ b/src/block/aes/aes.h
@@ -25,7 +25,8 @@ class BOTAN_DLL AES : public BlockCipher
std::string name() const { return "AES"; }
BlockCipher* clone() const { return new AES; }
- AES() : BlockCipher(16, 16, 32, 8), EK(56), ME(16), DK(56), MD(16) { ROUNDS = 14; }
+ AES() : BlockCipher(16, 16, 32, 8), EK(56), ME(16), DK(56), MD(16)
+ { ROUNDS = 14; }
/**
* AES fixed to a particular key_size (16, 24, or 32 bytes)
@@ -33,7 +34,7 @@ class BOTAN_DLL AES : public BlockCipher
*/
AES(u32bit key_size);
private:
- void key_schedule(const byte[], u32bit);
+ void key_schedule(const byte[], size_t);
static u32bit S(u32bit);
u32bit ROUNDS;
@@ -41,7 +42,7 @@ class BOTAN_DLL AES : public BlockCipher
SecureVector<u32bit> EK;
SecureVector<byte> ME;
- SecureVector<u32bit> DK;
+ SecureVector<u32bit > DK;
SecureVector<byte> MD;
};