aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/square
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/square
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/square')
-rw-r--r--src/block/square/square.cpp2
-rw-r--r--src/block/square/square.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/square/square.cpp b/src/block/square/square.cpp
index f2b15499b..44fb26bfd 100644
--- a/src/block/square/square.cpp
+++ b/src/block/square/square.cpp
@@ -114,7 +114,7 @@ void Square::dec(const byte in[], byte out[]) const
/*************************************************
* Square Key Schedule *
*************************************************/
-void Square::key(const byte key[], u32bit)
+void Square::key_schedule(const byte key[], u32bit)
{
SecureBuffer<u32bit, 36> XEK, XDK;
for(u32bit j = 0; j != 4; ++j)
diff --git a/src/block/square/square.h b/src/block/square/square.h
index 97326e7ea..4c4d89100 100644
--- a/src/block/square/square.h
+++ b/src/block/square/square.h
@@ -23,7 +23,7 @@ class BOTAN_DLL Square : 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);
static void transform(u32bit[4]);