From a02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Sun, 9 Nov 2008 15:57:31 +0000
Subject: Rename SymmetricAlgorithm::key to key_schedule to avoid many name
 conflicts/collisions

---
 src/stream/arc4/arc4.cpp | 2 +-
 src/stream/arc4/arc4.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/stream/arc4')

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;
-- 
cgit v1.2.3