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/des/des.cpp | |
| parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) | |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/des/des.cpp')
| -rw-r--r-- | src/block/des/des.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/block/des/des.cpp b/src/block/des/des.cpp index 53a1a278e..f6453cff0 100644 --- a/src/block/des/des.cpp +++ b/src/block/des/des.cpp @@ -187,7 +187,7 @@ void DES::dec(const byte in[], byte out[]) const /************************************************* * DES Key Schedule * *************************************************/ -void DES::key(const byte key[], u32bit) +void DES::key_schedule(const byte key[], u32bit) { des_key_schedule(round_key.begin(), key); } @@ -249,7 +249,7 @@ void TripleDES::dec(const byte in[], byte out[]) const /************************************************* * TripleDES Key Schedule * *************************************************/ -void TripleDES::key(const byte key[], u32bit length) +void TripleDES::key_schedule(const byte key[], u32bit length) { des_key_schedule(&round_key[0], key); des_key_schedule(&round_key[32], key + 8); |