Rename SymmetricAlgorithm::key to key_schedule to avoid many name

conflicts/collisions

2 files changed, 2 insertions, 2 deletions

diff --git a/src/block/serpent/serpent.cpp b/src/block/serpent/serpent.cpp
index 997daa8b1..07ff8b2cf 100644
--- a/src/block/serpent/serpent.cpp
+++ b/src/block/serpent/serpent.cpp
@@ -333,7 +333,7 @@ void Serpent::dec(const byte in[], byte out[]) const
 /*************************************************
 * Serpent Key Schedule                           *
 *************************************************/
-void Serpent::key(const byte key[], u32bit length)
+void Serpent::key_schedule(const byte key[], u32bit length)
    {
    const u32bit PHI = 0x9E3779B9;
 
diff --git a/src/block/serpent/serpent.h b/src/block/serpent/serpent.h
index cac042185..fd26d9f7f 100644
--- a/src/block/serpent/serpent.h
+++ b/src/block/serpent/serpent.h
@@ -23,7 +23,7 @@ class BOTAN_DLL Serpent : public BlockCipher
    protected:
       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, 132> round_key;
    };