diff options
author | lloyd <[email protected]> | 2008-11-09 15:57:31 +0000 |
---|---|---|
committer | lloyd <[email protected]> | 2008-11-09 15:57:31 +0000 |
commit | a02b8a6dcebfa285e42a6a7010735dfdf7b47ac0 (patch) | |
tree | 57899ab98328aea62d6d665a38638e112697ff5a /src/mac/x919_mac | |
parent | c604f94ec71cb520580c6fcf9257560bb7c053c5 (diff) |
Rename SymmetricAlgorithm::key to key_schedule to avoid many name
conflicts/collisions
Diffstat (limited to 'src/mac/x919_mac')
-rw-r--r-- | src/mac/x919_mac/x919_mac.cpp | 2 | ||||
-rw-r--r-- | src/mac/x919_mac/x919_mac.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mac/x919_mac/x919_mac.cpp b/src/mac/x919_mac/x919_mac.cpp index 5e03b2e6c..9db32c8a2 100644 --- a/src/mac/x919_mac/x919_mac.cpp +++ b/src/mac/x919_mac/x919_mac.cpp @@ -51,7 +51,7 @@ void ANSI_X919_MAC::final_result(byte mac[]) /************************************************* * ANSI X9.19 MAC Key Schedule * *************************************************/ -void ANSI_X919_MAC::key(const byte key[], u32bit length) +void ANSI_X919_MAC::key_schedule(const byte key[], u32bit length) { e->set_key(key, 8); if(length == 8) d->set_key(key, 8); diff --git a/src/mac/x919_mac/x919_mac.h b/src/mac/x919_mac/x919_mac.h index 46196f8f4..a2a40e3ca 100644 --- a/src/mac/x919_mac/x919_mac.h +++ b/src/mac/x919_mac/x919_mac.h @@ -26,7 +26,7 @@ class BOTAN_DLL ANSI_X919_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); BlockCipher* e; BlockCipher* d; |