Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/tools/map_extractor/mpq_libmpq04.h

1 files changed, 5 insertions, 0 deletions

diff --git a/src/server/shared/Cryptography/HMACSHA1.cpp b/src/server/shared/Cryptography/HMACSHA1.cpp
index 62d1997ded2..c6c49f14a8e 100644
--- a/src/server/shared/Cryptography/HMACSHA1.cpp
+++ b/src/server/shared/Cryptography/HMACSHA1.cpp
@@ -36,6 +36,11 @@ void HmacHash::UpdateData(const std::string &str)
     HMAC_Update(&m_ctx, (uint8 const*)str.c_str(), str.length());
 }
 
+void HmacHash::UpdateData(const uint8* data, size_t len)
+{
+    HMAC_Update(&m_ctx, data, len);
+}
+
 void HmacHash::Finalize()
 {
     uint32 length = 0;