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/skipjack | |
| parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) | |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/skipjack')
| -rw-r--r-- | src/block/skipjack/skipjack.cpp | 2 | ||||
| -rw-r--r-- | src/block/skipjack/skipjack.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/skipjack/skipjack.cpp b/src/block/skipjack/skipjack.cpp index 3cad75436..62918a3fd 100644 --- a/src/block/skipjack/skipjack.cpp +++ b/src/block/skipjack/skipjack.cpp @@ -117,7 +117,7 @@ void Skipjack::step_Bi(u16bit& W2, u16bit& W3, u32bit round) const /************************************************* * Skipjack Key Schedule * *************************************************/ -void Skipjack::key(const byte key[], u32bit) +void Skipjack::key_schedule(const byte key[], u32bit) { static const byte F[256] = { 0xA3, 0xD7, 0x09, 0x83, 0xF8, 0x48, 0xF6, 0xF4, 0xB3, 0x21, 0x15, 0x78, diff --git a/src/block/skipjack/skipjack.h b/src/block/skipjack/skipjack.h index c7c9ec9b9..2d8956215 100644 --- a/src/block/skipjack/skipjack.h +++ b/src/block/skipjack/skipjack.h @@ -23,7 +23,7 @@ class BOTAN_DLL Skipjack : 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); void step_A(u16bit&, u16bit&, u32bit) const; void step_B(u16bit&, u16bit&, u32bit) const; void step_Ai(u16bit&, u16bit&, u32bit) const; |