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/aes_intel | |
| parent | 60fb91d8cb1710d07041f76050d24229ce91131b (diff) | |
Use size_t rather than u32bit in SymmetricAlgorithm
Diffstat (limited to 'src/block/aes_intel')
| -rw-r--r-- | src/block/aes_intel/aes_intel.cpp | 6 | ||||
| -rw-r--r-- | src/block/aes_intel/aes_intel.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/block/aes_intel/aes_intel.cpp b/src/block/aes_intel/aes_intel.cpp index d03767e72..a2e660f2c 100644 --- a/src/block/aes_intel/aes_intel.cpp +++ b/src/block/aes_intel/aes_intel.cpp @@ -255,7 +255,7 @@ void AES_128_Intel::decrypt_n(const byte in[], byte out[], size_t blocks) const /* * AES-128 Key Schedule */ -void AES_128_Intel::key_schedule(const byte key[], u32bit) +void AES_128_Intel::key_schedule(const byte key[], size_t) { #define AES_128_key_exp(K, RCON) \ aes_128_key_expansion(K, _mm_aeskeygenassist_si128(K, RCON)) @@ -477,7 +477,7 @@ void AES_192_Intel::decrypt_n(const byte in[], byte out[], size_t blocks) const /* * AES-192 Key Schedule */ -void AES_192_Intel::key_schedule(const byte key[], u32bit) +void AES_192_Intel::key_schedule(const byte key[], size_t) { __m128i K0 = _mm_loadu_si128((const __m128i*)(key)); __m128i K1 = _mm_loadu_si128((const __m128i*)(key + 8)); @@ -705,7 +705,7 @@ void AES_256_Intel::decrypt_n(const byte in[], byte out[], size_t blocks) const /* * AES-256 Key Schedule */ -void AES_256_Intel::key_schedule(const byte key[], u32bit) +void AES_256_Intel::key_schedule(const byte key[], size_t) { __m128i K0 = _mm_loadu_si128((const __m128i*)(key)); __m128i K1 = _mm_loadu_si128((const __m128i*)(key + 16)); diff --git a/src/block/aes_intel/aes_intel.h b/src/block/aes_intel/aes_intel.h index 43e8f2f0e..1d8a68389 100644 --- a/src/block/aes_intel/aes_intel.h +++ b/src/block/aes_intel/aes_intel.h @@ -29,7 +29,7 @@ class BOTAN_DLL AES_128_Intel : public BlockCipher AES_128_Intel() : BlockCipher(16, 16) { } private: - void key_schedule(const byte[], u32bit); + void key_schedule(const byte[], size_t); SecureVector<u32bit, 44> EK, DK; }; @@ -51,7 +51,7 @@ class BOTAN_DLL AES_192_Intel : public BlockCipher AES_192_Intel() : BlockCipher(16, 24) { } private: - void key_schedule(const byte[], u32bit); + void key_schedule(const byte[], size_t); SecureVector<u32bit, 52> EK, DK; }; @@ -73,7 +73,7 @@ class BOTAN_DLL AES_256_Intel : public BlockCipher AES_256_Intel() : BlockCipher(16, 32) { } private: - void key_schedule(const byte[], u32bit); + void key_schedule(const byte[], size_t); SecureVector<u32bit, 60> EK, DK; }; |