aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/kasumi/kasumi.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/kasumi/kasumi.cpp
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/kasumi/kasumi.cpp')
-rw-r--r--src/block/kasumi/kasumi.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/block/kasumi/kasumi.cpp b/src/block/kasumi/kasumi.cpp
index 4b56cc06f..4be6c41a8 100644
--- a/src/block/kasumi/kasumi.cpp
+++ b/src/block/kasumi/kasumi.cpp
@@ -185,7 +185,7 @@ void KASUMI::dec(const byte in[], byte out[]) const
/*************************************************
* KASUMI Key Schedule *
*************************************************/
-void KASUMI::key(const byte key[], u32bit)
+void KASUMI::key_schedule(const byte key[], u32bit)
{
static const u16bit RC[] = { 0x0123, 0x4567, 0x89AB, 0xCDEF,
0xFEDC, 0xBA98, 0x7654, 0x3210 };