Rename SymmetricAlgorithm::key to key_schedule to avoid many name

conflicts/collisions

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mac/ssl3mac/ssl3_mac.cpp b/src/mac/ssl3mac/ssl3_mac.cpp
index d2aec7825..8bd22a779 100644
--- a/src/mac/ssl3mac/ssl3_mac.cpp
+++ b/src/mac/ssl3mac/ssl3_mac.cpp
@@ -30,7 +30,7 @@ void SSL3_MAC::final_result(byte mac[])
 /*************************************************
 * SSL3-MAC Key Schedule                          *
 *************************************************/
-void SSL3_MAC::key(const byte key[], u32bit length)
+void SSL3_MAC::key_schedule(const byte key[], u32bit length)
    {
    hash->clear();
    std::fill(i_key.begin(), i_key.end(), 0x36);
diff --git a/src/mac/ssl3mac/ssl3_mac.h b/src/mac/ssl3mac/ssl3_mac.h
index b9875a0c1..fad9e74cd 100644
--- a/src/mac/ssl3mac/ssl3_mac.h
+++ b/src/mac/ssl3mac/ssl3_mac.h
@@ -26,7 +26,7 @@ class BOTAN_DLL SSL3_MAC : public MessageAuthenticationCode
    private:
       void add_data(const byte[], u32bit);
       void final_result(byte[]);
-      void key(const byte[], u32bit);
+      void key_schedule(const byte[], u32bit);
 
       HashFunction* hash;
       SecureVector<byte> i_key, o_key;