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/lion | |
parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/lion')
-rw-r--r-- | src/block/lion/lion.cpp | 2 | ||||
-rw-r--r-- | src/block/lion/lion.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/lion/lion.cpp b/src/block/lion/lion.cpp index 629badd3d..f35cbf424 100644 --- a/src/block/lion/lion.cpp +++ b/src/block/lion/lion.cpp @@ -52,7 +52,7 @@ void Lion::dec(const byte in[], byte out[]) const /************************************************* * Lion Key Schedule * *************************************************/ -void Lion::key(const byte key[], u32bit length) +void Lion::key_schedule(const byte key[], u32bit length) { clear(); diff --git a/src/block/lion/lion.h b/src/block/lion/lion.h index d541eb76e..b16db966e 100644 --- a/src/block/lion/lion.h +++ b/src/block/lion/lion.h @@ -27,7 +27,7 @@ class BOTAN_DLL Lion : 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); const u32bit LEFT_SIZE, RIGHT_SIZE; |