aboutsummaryrefslogtreecommitdiffstats
path: root/src/block/lubyrack
diff options
context:
space:
mode:
authorlloyd <lloyd@randombit.net>2008-11-09 15:57:31 +0000
committerlloyd <lloyd@randombit.net>2008-11-09 15:57:31 +0000
commita02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 (patch)
tree57899ab98328aea62d6d665a38638e112697ff5a /src/block/lubyrack
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/block/lubyrack')
-rw-r--r--src/block/lubyrack/lubyrack.cpp2
-rw-r--r--src/block/lubyrack/lubyrack.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/block/lubyrack/lubyrack.cpp b/src/block/lubyrack/lubyrack.cpp
index c9e6fc531..5304d14d6 100644
--- a/src/block/lubyrack/lubyrack.cpp
+++ b/src/block/lubyrack/lubyrack.cpp
@@ -69,7 +69,7 @@ void LubyRackoff::dec(const byte in[], byte out[]) const
/*************************************************
* Luby-Rackoff Key Schedule *
*************************************************/
-void LubyRackoff::key(const byte key[], u32bit length)
+void LubyRackoff::key_schedule(const byte key[], u32bit length)
{
K1.set(key, length / 2);
K2.set(key + length / 2, length / 2);
diff --git a/src/block/lubyrack/lubyrack.h b/src/block/lubyrack/lubyrack.h
index ba5a4d052..6fedc38fe 100644
--- a/src/block/lubyrack/lubyrack.h
+++ b/src/block/lubyrack/lubyrack.h
@@ -26,7 +26,7 @@ class BOTAN_DLL LubyRackoff : 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);
HashFunction* hash;
SecureVector<byte> K1, K2;
};