Rename SymmetricAlgorithm::key to key_schedule to avoid many name

conflicts/collisions

2 files changed, 4 insertions, 4 deletions

diff --git a/src/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp
index 407bb3cde..1863ad477 100644
--- a/src/engine/openssl/ossl_bc.cpp
+++ b/src/engine/openssl/ossl_bc.cpp
@@ -29,7 +29,7 @@ class EVP_BlockCipher : 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);
       std::string cipher_name;
       mutable EVP_CIPHER_CTX encrypt, decrypt;
    };
@@ -108,7 +108,7 @@ void EVP_BlockCipher::dec(const byte in[], byte out[]) const
 /*************************************************
 * Set the key                                    *
 *************************************************/
-void EVP_BlockCipher::key(const byte key[], u32bit length)
+void EVP_BlockCipher::key_schedule(const byte key[], u32bit length)
    {
    SecureVector<byte> full_key(key, length);
 
diff --git a/src/engine/openssl/ossl_rc4.cpp b/src/engine/openssl/ossl_rc4.cpp
index eb8e9ded8..ed5c9714f 100644
--- a/src/engine/openssl/ossl_rc4.cpp
+++ b/src/engine/openssl/ossl_rc4.cpp
@@ -25,7 +25,7 @@ class OpenSSL_ARC4 : public StreamCipher
       ~OpenSSL_ARC4() { clear(); }
    private:
       void cipher(const byte[], byte[], u32bit);
-      void key(const byte[], u32bit);
+      void key_schedule(const byte[], u32bit);
 
       const u32bit SKIP;
       RC4_KEY state;
@@ -44,7 +44,7 @@ std::string OpenSSL_ARC4::name() const
 /*************************************************
 * ARC4 Key Schedule                              *
 *************************************************/
-void OpenSSL_ARC4::key(const byte key[], u32bit length)
+void OpenSSL_ARC4::key_schedule(const byte key[], u32bit length)
    {
    RC4_set_key(&state, length, key);
    byte dummy = 0;