aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/des/desx.cpp
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-11-09 15:57:31 +0000
committerlloyd <[email protected]>2008-11-09 15:57:31 +0000
commita02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 (patch)
tree57899ab98328aea62d6d665a38638e112697ff5a /src/block/des/desx.cpp
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/des/desx.cpp')
-rw-r--r--src/block/des/desx.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/block/des/desx.cpp b/src/block/des/desx.cpp
index fb76ec731..41c3bcd8d 100644
--- a/src/block/des/desx.cpp
+++ b/src/block/des/desx.cpp
@@ -31,7 +31,7 @@ void DESX::dec(const byte in[], byte out[]) const
/*************************************************
* DESX Key Schedule *
*************************************************/
-void DESX::key(const byte key[], u32bit)
+void DESX::key_schedule(const byte key[], u32bit)
{
K1.copy(key, 8);
des.set_key(key + 8, 8);