aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/idea
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/idea
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/idea')
-rw-r--r--src/block/idea/idea.cpp2
-rw-r--r--src/block/idea/idea.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/idea/idea.cpp b/src/block/idea/idea.cpp
index a2b076015..88dc04a3d 100644
--- a/src/block/idea/idea.cpp
+++ b/src/block/idea/idea.cpp
@@ -134,7 +134,7 @@ void IDEA::dec(const byte in[], byte out[]) const
/*************************************************
* IDEA Key Schedule *
*************************************************/
-void IDEA::key(const byte key[], u32bit)
+void IDEA::key_schedule(const byte key[], u32bit)
{
for(u32bit j = 0; j != 8; ++j)
EK[j] = load_be<u16bit>(key, j);
diff --git a/src/block/idea/idea.h b/src/block/idea/idea.h
index 824a9c6ed..cd47111a6 100644
--- a/src/block/idea/idea.h
+++ b/src/block/idea/idea.h
@@ -23,7 +23,7 @@ class BOTAN_DLL IDEA : public BlockCipher
private:
void enc(const byte[], byte[]) const;
void dec(const byte[], byte[]) const;
- void key(const byte[], u32bit);
+ void key_schedule(const byte[], u32bit);
SecureBuffer<u16bit, 52> EK, DK;
};