diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-20 03:06:03 +0200 |
| commit | e68d3b0937e205c94c17d7cb1a53194b6d169fe8 (patch) | |
| tree | 326d69976375006fe244df6e858bd20e83fcae90 /src/server/shared/Cryptography | |
| parent | abe8dd7abf70b3589ad0cbba19f91bd4f743bf3e (diff) | |
| parent | 0531f52008cfc4ecb28c0b3cd67504e06452ab75 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
src/server/scripts/Northrend/zone_dalaran.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
Diffstat (limited to 'src/server/shared/Cryptography')
4 files changed, 6 insertions, 0 deletions
diff --git a/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp b/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp index 10403b84a1f..b9d9b86005c 100644 --- a/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp +++ b/src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp @@ -20,6 +20,8 @@ #include "Cryptography/HmacHash.h" #include "Cryptography/BigNumber.h" +#include <cstring> + WorldPacketCrypt::WorldPacketCrypt() : PacketCrypt(SHA_DIGEST_LENGTH) { } diff --git a/src/server/shared/Cryptography/BigNumber.cpp b/src/server/shared/Cryptography/BigNumber.cpp index 364bb8e452f..b68c91001ae 100644 --- a/src/server/shared/Cryptography/BigNumber.cpp +++ b/src/server/shared/Cryptography/BigNumber.cpp @@ -19,6 +19,7 @@ #include "Cryptography/BigNumber.h" #include <openssl/bn.h> #include <openssl/crypto.h> +#include <cstring> #include <algorithm> #include <memory> diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp index c89469bafb5..d47b13067cd 100644 --- a/src/server/shared/Cryptography/SHA1.cpp +++ b/src/server/shared/Cryptography/SHA1.cpp @@ -18,6 +18,7 @@ #include "SHA1.h" #include "BigNumber.h" +#include <cstring> #include <stdarg.h> SHA1Hash::SHA1Hash() diff --git a/src/server/shared/Cryptography/WardenKeyGeneration.h b/src/server/shared/Cryptography/WardenKeyGeneration.h index 11bc00d641a..9832d5a9c72 100644 --- a/src/server/shared/Cryptography/WardenKeyGeneration.h +++ b/src/server/shared/Cryptography/WardenKeyGeneration.h @@ -18,6 +18,8 @@ #include "SHA1.h" +#include <cstring> + #ifndef _WARDEN_KEY_GENERATION_H #define _WARDEN_KEY_GENERATION_H |