diff options
| author | lloyd <[email protected]> | 2008-11-09 15:57:31 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2008-11-09 15:57:31 +0000 |
| commit | a02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 (patch) | |
| tree | 57899ab98328aea62d6d665a38638e112697ff5a /src/block/aes | |
| parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) | |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/aes')
| -rw-r--r-- | src/block/aes/aes.cpp | 2 | ||||
| -rw-r--r-- | src/block/aes/aes.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/aes/aes.cpp b/src/block/aes/aes.cpp index 24f1f6213..5e934a9f1 100644 --- a/src/block/aes/aes.cpp +++ b/src/block/aes/aes.cpp @@ -123,7 +123,7 @@ void AES::dec(const byte in[], byte out[]) const /************************************************* * AES Key Schedule * *************************************************/ -void AES::key(const byte key[], u32bit length) +void AES::key_schedule(const byte key[], u32bit length) { static const u32bit RC[10] = { 0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000, 0x20000000, diff --git a/src/block/aes/aes.h b/src/block/aes/aes.h index e287a303d..28728a666 100644 --- a/src/block/aes/aes.h +++ b/src/block/aes/aes.h @@ -24,7 +24,7 @@ class BOTAN_DLL AES : public BlockCipher private: void enc(const byte[], byte[]) const; void dec(const byte[], byte[]) const; - void key(const byte[], u32bit); + void key_schedule(const byte[], u32bit); static u32bit S(u32bit); static const byte SE[256]; |