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/rc6/rc6.cpp | |
| parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) | |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/rc6/rc6.cpp')
| -rw-r--r-- | src/block/rc6/rc6.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/block/rc6/rc6.cpp b/src/block/rc6/rc6.cpp index 67d765222..1295592d8 100644 --- a/src/block/rc6/rc6.cpp +++ b/src/block/rc6/rc6.cpp @@ -97,7 +97,7 @@ void RC6::dec(const byte in[], byte out[]) const /************************************************* * RC6 Key Schedule * *************************************************/ -void RC6::key(const byte key[], u32bit length) +void RC6::key_schedule(const byte key[], u32bit length) { const u32bit WORD_KEYLENGTH = (((length - 1) / 4) + 1), MIX_ROUNDS = 3*std::max(WORD_KEYLENGTH, S.size()); |