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/mars/mars.cpp | |
| parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) | |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/mars/mars.cpp')
| -rw-r--r-- | src/block/mars/mars.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/block/mars/mars.cpp b/src/block/mars/mars.cpp index cc671fc06..5f93f2df4 100644 --- a/src/block/mars/mars.cpp +++ b/src/block/mars/mars.cpp @@ -213,7 +213,7 @@ void MARS::decrypt_round(u32bit& A, u32bit& B, u32bit& C, u32bit& D, /************************************************* * MARS Key Schedule * *************************************************/ -void MARS::key(const byte key[], u32bit length) +void MARS::key_schedule(const byte key[], u32bit length) { SecureBuffer<u32bit, 15> T; for(u32bit j = 0; j != length / 4; ++j) |