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

2 files changed, 8 insertions, 8 deletions

diff --git a/src/server/authserver/Server/BattlenetPacketCrypt.cpp b/src/server/authserver/Server/BattlenetPacketCrypt.cpp
index 31fcfdd930a..de4cf73f71c 100644
--- a/src/server/authserver/Server/BattlenetPacketCrypt.cpp
+++ b/src/server/authserver/Server/BattlenetPacketCrypt.cpp
@@ -28,11 +28,11 @@ void Battlenet::PacketCrypt::Init(BigNumber* K)
     uint8 ServerEncryptionKey[SEED_KEY_SIZE] = { 0x68, 0xE0, 0xC7, 0x2E, 0xDD, 0xD6, 0xD2, 0xF3, 0x1E, 0x5A, 0xB1, 0x55, 0xB1, 0x8B, 0x63, 0x1E };
     uint8 ClientDecryptionKey[SEED_KEY_SIZE] = { 0xDE, 0xA9, 0x65, 0xAE, 0x54, 0x3A, 0x1E, 0x93, 0x9E, 0x69, 0x0C, 0xAA, 0x68, 0xDE, 0x78, 0x39 };
 
-    HmacHash serverEncryptHmac(K->GetNumBytes(), K->AsByteArray().get(), EVP_sha256(), SHA256_DIGEST_LENGTH);
+    HmacSha256 serverEncryptHmac(K->GetNumBytes(), K->AsByteArray().get());
     serverEncryptHmac.UpdateData(ServerEncryptionKey, SEED_KEY_SIZE);
     serverEncryptHmac.Finalize();
 
-    HmacHash clientDecryptHmac(K->GetNumBytes(), K->AsByteArray().get(), EVP_sha256(), SHA256_DIGEST_LENGTH);
+    HmacSha256 clientDecryptHmac(K->GetNumBytes(), K->AsByteArray().get());
     clientDecryptHmac.UpdateData(ClientDecryptionKey, SEED_KEY_SIZE);
     clientDecryptHmac.Finalize();
 
diff --git a/src/server/authserver/Server/BattlenetSocket.cpp b/src/server/authserver/Server/BattlenetSocket.cpp
index db72cbf5e07..1cce8f2f94d 100644
--- a/src/server/authserver/Server/BattlenetSocket.cpp
+++ b/src/server/authserver/Server/BattlenetSocket.cpp
@@ -503,7 +503,7 @@ bool Battlenet::Socket::HandleRealmJoinRequest(PacketHeader& header, BitStream&
     result.ServerSeed = uint32(rand32());
 
     uint8 sessionKey[40];
-    HmacHash hmac(K.GetNumBytes(), K.AsByteArray().get(), EVP_sha1(), SHA_DIGEST_LENGTH);
+    HmacSha1 hmac(K.GetNumBytes(), K.AsByteArray().get());
     hmac.UpdateData((uint8*)"WoW\0", 4);
     hmac.UpdateData((uint8*)&join.ClientSeed, 4);
     hmac.UpdateData((uint8*)&result.ServerSeed, 4);
@@ -511,7 +511,7 @@ bool Battlenet::Socket::HandleRealmJoinRequest(PacketHeader& header, BitStream&
 
     memcpy(sessionKey, hmac.GetDigest(), hmac.GetLength());
 
-    HmacHash hmac2(K.GetNumBytes(), K.AsByteArray().get(), EVP_sha1(), SHA_DIGEST_LENGTH);
+    HmacSha1 hmac2(K.GetNumBytes(), K.AsByteArray().get());
     hmac2.UpdateData((uint8*)"WoW\0", 4);
     hmac2.UpdateData((uint8*)&result.ServerSeed, 4);
     hmac2.UpdateData((uint8*)&join.ClientSeed, 4);
@@ -915,13 +915,13 @@ bool Battlenet::Socket::HandleResumeModule(BitStream* dataStream, ServerPacket**
     ACE_Auto_Array_Ptr<uint8>&& serverChallenge = _reconnectProof.AsByteArray();
     ACE_Auto_Array_Ptr<uint8>&& sessionKey = K.AsByteArray();
 
-    HmacHash clientPart(64, sessionKey.get(), EVP_sha256(), SHA256_DIGEST_LENGTH);
+    HmacSha256 clientPart(64, sessionKey.get());
     clientPart.UpdateData(&ResumeClient, 1);
     clientPart.UpdateData(clientChallenge.get(), 16);
     clientPart.UpdateData(serverChallenge.get(), 16);
     clientPart.Finalize();
 
-    HmacHash serverPart(64, sessionKey.get(), EVP_sha256(), SHA256_DIGEST_LENGTH);
+    HmacSha256 serverPart(64, sessionKey.get());
     serverPart.UpdateData(&ResumeServer, 1);
     serverPart.UpdateData(serverChallenge.get(), 16);
     serverPart.UpdateData(clientChallenge.get(), 16);
@@ -933,7 +933,7 @@ bool Battlenet::Socket::HandleResumeModule(BitStream* dataStream, ServerPacket**
 
     K.SetBinary(newSessionKey, 64);
 
-    HmacHash proof(64, newSessionKey, EVP_sha256(), SHA256_DIGEST_LENGTH);
+    HmacSha256 proof(64, newSessionKey);
     proof.UpdateData(&ResumeClient, 1);
     proof.UpdateData(clientChallenge.get(), 16);
     proof.UpdateData(serverChallenge.get(), 16);
@@ -953,7 +953,7 @@ bool Battlenet::Socket::HandleResumeModule(BitStream* dataStream, ServerPacket**
     stmt->setUInt32(1, _accountId);
     LoginDatabase.Execute(stmt);
 
-    HmacHash serverProof(64, newSessionKey, EVP_sha256(), SHA256_DIGEST_LENGTH);
+    HmacSha256 serverProof(64, newSessionKey);
     serverProof.UpdateData(&ResumeServer, 1);
     serverProof.UpdateData(serverChallenge.get(), 16);
     serverProof.UpdateData(clientChallenge.get(), 16);