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/noekeon | |
parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/noekeon')
-rw-r--r-- | src/block/noekeon/noekeon.cpp | 2 | ||||
-rw-r--r-- | src/block/noekeon/noekeon.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/noekeon/noekeon.cpp b/src/block/noekeon/noekeon.cpp index 437972fe5..1a783b432 100644 --- a/src/block/noekeon/noekeon.cpp +++ b/src/block/noekeon/noekeon.cpp @@ -146,7 +146,7 @@ void Noekeon::dec(const byte in[], byte out[]) const /************************************************* * Noekeon Key Schedule * *************************************************/ -void Noekeon::key(const byte key[], u32bit) +void Noekeon::key_schedule(const byte key[], u32bit) { u32bit A0 = load_be<u32bit>(key, 0); u32bit A1 = load_be<u32bit>(key, 1); diff --git a/src/block/noekeon/noekeon.h b/src/block/noekeon/noekeon.h index fb06f8c79..9d4e896b9 100644 --- a/src/block/noekeon/noekeon.h +++ b/src/block/noekeon/noekeon.h @@ -23,7 +23,7 @@ class BOTAN_DLL Noekeon : 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 const byte RC[17]; |