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/seed | |
| parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) | |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/seed')
| -rw-r--r-- | src/block/seed/seed.cpp | 2 | ||||
| -rw-r--r-- | src/block/seed/seed.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/seed/seed.cpp b/src/block/seed/seed.cpp index ecb6a86fa..0b63ff341 100644 --- a/src/block/seed/seed.cpp +++ b/src/block/seed/seed.cpp @@ -88,7 +88,7 @@ void SEED::dec(const byte in[], byte out[]) const /************************************************* * SEED Key Schedule * *************************************************/ -void SEED::key(const byte key[], u32bit) +void SEED::key_schedule(const byte key[], u32bit) { const u32bit RC[16] = { 0x9E3779B9, 0x3C6EF373, 0x78DDE6E6, 0xF1BBCDCC, diff --git a/src/block/seed/seed.h b/src/block/seed/seed.h index 9e96ec8c2..9f7d1cd2b 100644 --- a/src/block/seed/seed.h +++ b/src/block/seed/seed.h @@ -23,7 +23,7 @@ class BOTAN_DLL SEED : 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); class G_FUNC { |