Rename SymmetricAlgorithm::key to key_schedule to avoid many name

conflicts/collisions

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mac/cmac/cmac.cpp b/src/mac/cmac/cmac.cpp
index 937c15c63..bd3f174c1 100644
--- a/src/mac/cmac/cmac.cpp
+++ b/src/mac/cmac/cmac.cpp
@@ -87,7 +87,7 @@ void CMAC::final_result(byte mac[])
 /*************************************************
 * CMAC Key Schedule                              *
 *************************************************/
-void CMAC::key(const byte key[], u32bit length)
+void CMAC::key_schedule(const byte key[], u32bit length)
    {
    clear();
    e->set_key(key, length);
diff --git a/src/mac/cmac/cmac.h b/src/mac/cmac/cmac.h
index 66eb46a69..9f745ee22 100644
--- a/src/mac/cmac/cmac.h
+++ b/src/mac/cmac/cmac.h
@@ -29,7 +29,7 @@ class BOTAN_DLL CMAC : public MessageAuthenticationCode
    private:
       void add_data(const byte[], u32bit);
       void final_result(byte[]);
-      void key(const byte[], u32bit);
+      void key_schedule(const byte[], u32bit);
 
       BlockCipher* e;
       SecureVector<byte> buffer, state, B, P;