Rename SymmetricAlgorithm::key to key_schedule to avoid many name

conflicts/collisions

2 files changed, 2 insertions, 2 deletions

diff --git a/src/block/rc6/rc6.cpp b/src/block/rc6/rc6.cpp
index 67d765222..1295592d8 100644
--- a/src/block/rc6/rc6.cpp
+++ b/src/block/rc6/rc6.cpp
@@ -97,7 +97,7 @@ void RC6::dec(const byte in[], byte out[]) const
 /*************************************************
 * RC6 Key Schedule                               *
 *************************************************/
-void RC6::key(const byte key[], u32bit length)
+void RC6::key_schedule(const byte key[], u32bit length)
    {
    const u32bit WORD_KEYLENGTH = (((length - 1) / 4) + 1),
                 MIX_ROUNDS     = 3*std::max(WORD_KEYLENGTH, S.size());
diff --git a/src/block/rc6/rc6.h b/src/block/rc6/rc6.h
index 3517b4671..fd10070b8 100644
--- a/src/block/rc6/rc6.h
+++ b/src/block/rc6/rc6.h
@@ -23,7 +23,7 @@ class BOTAN_DLL RC6 : 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<u32bit, 44> S;
    };