aboutsummaryrefslogtreecommitdiffstats
path: root/src/mac/hmac
diff options
context:
space:
mode:
authorlloyd <[email protected]>2008-11-09 15:57:31 +0000
committerlloyd <[email protected]>2008-11-09 15:57:31 +0000
commita02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 (patch)
tree57899ab98328aea62d6d665a38638e112697ff5a /src/mac/hmac
parentc604f94ec71cb520580c6fcf9257560bb7c053c5 (diff)
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/mac/hmac')
-rw-r--r--src/mac/hmac/hmac.cpp2
-rw-r--r--src/mac/hmac/hmac.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mac/hmac/hmac.cpp b/src/mac/hmac/hmac.cpp
index 6401b0000..15552b8ea 100644
--- a/src/mac/hmac/hmac.cpp
+++ b/src/mac/hmac/hmac.cpp
@@ -32,7 +32,7 @@ void HMAC::final_result(byte mac[])
/*************************************************
* HMAC Key Schedule *
*************************************************/
-void HMAC::key(const byte key[], u32bit length)
+void HMAC::key_schedule(const byte key[], u32bit length)
{
hash->clear();
std::fill(i_key.begin(), i_key.end(), 0x36);
diff --git a/src/mac/hmac/hmac.h b/src/mac/hmac/hmac.h
index 122441120..c3081edfd 100644
--- a/src/mac/hmac/hmac.h
+++ b/src/mac/hmac/hmac.h
@@ -26,7 +26,7 @@ class BOTAN_DLL HMAC : 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;
};