Rename SymmetricAlgorithm::key to key_schedule to avoid many name

conflicts/collisions

2 files changed, 2 insertions, 2 deletions

diff --git a/src/stream/salsa20/salsa20.cpp b/src/stream/salsa20/salsa20.cpp
index c2c8f289f..e6a190fc3 100644
--- a/src/stream/salsa20/salsa20.cpp
+++ b/src/stream/salsa20/salsa20.cpp
@@ -120,7 +120,7 @@ void Salsa20::cipher(const byte in[], byte out[], u32bit length)
 /*************************************************
 * Salsa20 Key Schedule                           *
 *************************************************/
-void Salsa20::key(const byte key[], u32bit length)
+void Salsa20::key_schedule(const byte key[], u32bit length)
    {
    static const u32bit TAU[] =
       { 0x61707865, 0x3120646e, 0x79622d36, 0x6b206574 };
diff --git a/src/stream/salsa20/salsa20.h b/src/stream/salsa20/salsa20.h
index 345a8dbbd..d40b84cfc 100644
--- a/src/stream/salsa20/salsa20.h
+++ b/src/stream/salsa20/salsa20.h
@@ -26,7 +26,7 @@ class BOTAN_DLL Salsa20 : public StreamCipher
       ~Salsa20() { clear(); }
    private:
       void cipher(const byte[], byte[], u32bit);
-      void key(const byte[], u32bit);
+      void key_schedule(const byte[], u32bit);
 
       SecureBuffer<u32bit, 16> state;