Core/Crypto: Refactored HmacHash to make it easier to use with different hash algorithms

1 files changed, 11 insertions, 6 deletions

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