2 files changed, 35 insertions, 5 deletions
diff --git a/src/server/game/Warden/Warden.cpp b/src/server/game/Warden/Warden.cpp
index ce64dbd1a94..06f8454fda7 100644
--- a/src/server/game/Warden/Warden.cpp
+++ b/src/server/game/Warden/Warden.cpp
@@ -151,13 +151,28 @@ bool Warden::IsValidCheckSum(uint32 checksum, const uint8* data, const uint16 le
     }
 }
 
+struct keyData {
+    union
+    {
+        struct
+        {
+            uint8 bytes[20];
+        } bytes;
+
+        struct
+        {
+            uint32 ints[5];
+        } ints;
+    };
+};
+
 uint32 Warden::BuildChecksum(const uint8* data, uint32 length)
 {
-    uint8 hash[20];
-    SHA1(data, length, hash);
+    keyData hash;
+    SHA1(data, length, hash.bytes.bytes);
     uint32 checkSum = 0;
     for (uint8 i = 0; i < 5; ++i)
-        checkSum = checkSum ^ *(uint32*)(&hash[0] + i * 4);
+        checkSum = checkSum ^ hash.ints.ints[i];
 
     return checkSum;
 }
diff --git a/src/server/game/Warden/WardenMac.cpp b/src/server/game/Warden/WardenMac.cpp
index e08d24ecbcd..c6ce33fe131 100644
--- a/src/server/game/Warden/WardenMac.cpp
+++ b/src/server/game/Warden/WardenMac.cpp
@@ -114,17 +114,32 @@ void WardenMac::RequestHash()
     _session->SendPacket(&pkt);
 }
 
+struct keyData {
+    union
+    {
+        struct
+        {
+            uint8 bytes[16];
+        } bytes;
+
+        struct
+        {
+            int ints[4];
+        } ints;
+    };
+};
+
 void WardenMac::HandleHashResult(ByteBuffer &buff)
 {
 
     // test
     int keyIn[4];
 
-    uint8 mod_seed[16] = { 0x4D, 0x80, 0x8D, 0x2C, 0x77, 0xD9, 0x05, 0xC4, 0x1A, 0x63, 0x80, 0xEC, 0x08, 0x58, 0x6A, 0xFE };
+    keyData mod_seed = { { { { 0x4D, 0x80, 0x8D, 0x2C, 0x77, 0xD9, 0x05, 0xC4, 0x1A, 0x63, 0x80, 0xEC, 0x08, 0x58, 0x6A, 0xFE } } } };
 
     for (int i = 0; i < 4; ++i)
     {
-        keyIn[i] = *(int*)(&mod_seed[0] + i * 4);
+        keyIn[i] = mod_seed.ints.ints[i];
     }
 
     int keyOut[4];