3 files changed, 31 insertions, 19 deletions
diff --git a/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp b/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
index c6b283d9961..10403b84a1f 100644
--- a/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
+++ b/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
@@ -27,11 +27,11 @@ WorldPacketCrypt::WorldPacketCrypt() : PacketCrypt(SHA_DIGEST_LENGTH)
 void WorldPacketCrypt::Init(BigNumber* K)
 {
     uint8 ServerEncryptionKey[SEED_KEY_SIZE] = { 0xCC, 0x98, 0xAE, 0x04, 0xE8, 0x97, 0xEA, 0xCA, 0x12, 0xDD, 0xC0, 0x93, 0x42, 0x91, 0x53, 0x57 };
-    HmacHash serverEncryptHmac(SEED_KEY_SIZE, (uint8*)ServerEncryptionKey, EVP_sha1(), SHA_DIGEST_LENGTH);
+    HmacSha1 serverEncryptHmac(SEED_KEY_SIZE, (uint8*)ServerEncryptionKey);
     uint8 *encryptHash = serverEncryptHmac.ComputeHash(K);
 
     uint8 ServerDecryptionKey[SEED_KEY_SIZE] = { 0xC2, 0xB3, 0x72, 0x3C, 0xC6, 0xAE, 0xD9, 0xB5, 0x34, 0x3C, 0x53, 0xEE, 0x2F, 0x43, 0x67, 0xCE };
-    HmacHash clientDecryptHmac(SEED_KEY_SIZE, (uint8*)ServerDecryptionKey, EVP_sha1(), SHA_DIGEST_LENGTH);
+    HmacSha1 clientDecryptHmac(SEED_KEY_SIZE, (uint8*)ServerDecryptionKey);
     uint8 *decryptHash = clientDecryptHmac.ComputeHash(K);
 
     _clientDecrypt.Init(decryptHash);
diff --git a/src/server/shared/Cryptography/HmacHash.cpp b/src/server/shared/Cryptography/HmacHash.cpp
index 71fc362ae5d..2913b9fa79a 100644
--- a/src/server/shared/Cryptography/HmacHash.cpp
+++ b/src/server/shared/Cryptography/HmacHash.cpp
@@ -20,40 +20,47 @@
 #include "BigNumber.h"
 #include "Common.h"
 
-HmacHash::HmacHash(uint32 len, uint8 *seed, EVP_MD const* hasher, uint32 digestLength) : _digestLength(digestLength)
+template<HashCreateFn HashCreator, uint32 DigestLength>
+HmacHash<HashCreator, DigestLength>::HmacHash(uint32 len, uint8 *seed)
 {
     HMAC_CTX_init(&_ctx);
-    HMAC_Init_ex(&_ctx, seed, len, hasher, NULL);
-    _digest = new uint8[digestLength];
-    memset(_digest, 0, digestLength);
+    HMAC_Init_ex(&_ctx, seed, len, HashCreator(), NULL);
+    memset(_digest, 0, DigestLength);
 }
 
-HmacHash::~HmacHash()
+template<HashCreateFn HashCreator, uint32 DigestLength>
+HmacHash<HashCreator, DigestLength>::~HmacHash()
 {
     HMAC_CTX_cleanup(&_ctx);
-    delete[] _digest;
 }
 
-void HmacHash::UpdateData(const std::string &str)
+template<HashCreateFn HashCreator, uint32 DigestLength>
+void HmacHash<HashCreator, DigestLength>::UpdateData(const std::string &str)
 {
     HMAC_Update(&_ctx, (uint8 const*)str.c_str(), str.length());
 }
 
-void HmacHash::UpdateData(const uint8* data, size_t len)
+template<HashCreateFn HashCreator, uint32 DigestLength>
+void HmacHash<HashCreator, DigestLength>::UpdateData(const uint8* data, size_t len)
 {
     HMAC_Update(&_ctx, data, len);
 }
 
-void HmacHash::Finalize()
+template<HashCreateFn HashCreator, uint32 DigestLength>
+void HmacHash<HashCreator, DigestLength>::Finalize()
 {
     uint32 length = 0;
     HMAC_Final(&_ctx, _digest, &length);
-    ASSERT(length == _digestLength);
+    ASSERT(length == DigestLength);
 }
 
-uint8* HmacHash::ComputeHash(BigNumber* bn)
+template<HashCreateFn HashCreator, uint32 DigestLength>
+uint8* HmacHash<HashCreator, DigestLength>::ComputeHash(BigNumber* bn)
 {
     HMAC_Update(&_ctx, bn->AsByteArray().get(), bn->GetNumBytes());
     Finalize();
     return _digest;
 }
+
+template class HmacHash<EVP_sha1, SHA_DIGEST_LENGTH>;
+template class HmacHash<EVP_sha256, SHA256_DIGEST_LENGTH>;
diff --git a/src/server/shared/Cryptography/HmacHash.h b/src/server/shared/Cryptography/HmacHash.h
index bf82e39a526..56ee55edda2 100644
--- a/src/server/shared/Cryptography/HmacHash.h
+++ b/src/server/shared/Cryptography/HmacHash.h
@@ -28,21 +28,26 @@ class BigNumber;
 
 #define SEED_KEY_SIZE 16
 
+typedef EVP_MD const* (*HashCreateFn)();
+
+template<HashCreateFn HashCreator, uint32 DigestLength>
 class HmacHash
 {
     public:
-        HmacHash(uint32 len, uint8 *seed, EVP_MD const* hasher, uint32 digestLength);
+        HmacHash(uint32 len, uint8 *seed);
         ~HmacHash();
-        void UpdateData(const std::string &str);
-        void UpdateData(const uint8* data, size_t len);
+        void UpdateData(std::string const& str);
+        void UpdateData(uint8 const* data, size_t len);
         void Finalize();
         uint8* ComputeHash(BigNumber* bn);
         uint8* GetDigest() { return _digest; }
-        uint32 GetLength() const { return _digestLength; }
+        uint32 GetLength() const { return DigestLength; }
     private:
         HMAC_CTX _ctx;
-        uint8* _digest;
-        uint32 _digestLength;
+        uint8 _digest[DigestLength];
 };
 
+typedef HmacHash<EVP_sha1, SHA_DIGEST_LENGTH> HmacSha1;
+typedef HmacHash<EVP_sha256, SHA256_DIGEST_LENGTH> HmacSha256;
+
 #endif