aboutsummaryrefslogtreecommitdiffstats
path: root/src/stream/arc4
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/stream/arc4
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/stream/arc4')
-rw-r--r--src/stream/arc4/arc4.cpp2
-rw-r--r--src/stream/arc4/arc4.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/stream/arc4/arc4.cpp b/src/stream/arc4/arc4.cpp
index 238567cdc..f422582cc 100644
--- a/src/stream/arc4/arc4.cpp
+++ b/src/stream/arc4/arc4.cpp
@@ -57,7 +57,7 @@ void ARC4::generate()
/*************************************************
* ARC4 Key Schedule *
*************************************************/
-void ARC4::key(const byte key[], u32bit length)
+void ARC4::key_schedule(const byte key[], u32bit length)
{
clear();
for(u32bit j = 0; j != 256; ++j)
diff --git a/src/stream/arc4/arc4.h b/src/stream/arc4/arc4.h
index 0976ce7ea..d399e2144 100644
--- a/src/stream/arc4/arc4.h
+++ b/src/stream/arc4/arc4.h
@@ -24,7 +24,7 @@ class BOTAN_DLL ARC4 : public StreamCipher
~ARC4() { clear(); }
private:
void cipher(const byte[], byte[], u32bit);
- void key(const byte[], u32bit);
+ void key_schedule(const byte[], u32bit);
void generate();
const u32bit SKIP;