diff options
author | XTZGZoReX <none@none> | 2010-08-08 04:49:04 +0200 |
---|---|---|
committer | XTZGZoReX <none@none> | 2010-08-08 04:49:04 +0200 |
commit | 18dce8897fb33a6c416cb0d7473402ad9c24e252 (patch) | |
tree | ca41e631c0527589d77ae5392bd3e682f14dbde3 | |
parent | 909e33257911cec50284b513742d3d92d12260e3 (diff) |
* Rename: Sha1Hash -> SHA1Hash.
--HG--
branch : trunk
-rw-r--r-- | src/server/authserver/Server/AuthSocket.cpp | 6 | ||||
-rw-r--r-- | src/server/game/Accounts/AccountMgr.cpp | 2 | ||||
-rw-r--r-- | src/server/game/Server/WorldSocket.cpp | 4 | ||||
-rw-r--r-- | src/server/shared/Cryptography/SHA1.cpp | 14 | ||||
-rw-r--r-- | src/server/shared/Cryptography/SHA1.h | 6 |
5 files changed, 16 insertions, 16 deletions
diff --git a/src/server/authserver/Server/AuthSocket.cpp b/src/server/authserver/Server/AuthSocket.cpp index b936a188aee..bf3fc11823c 100644 --- a/src/server/authserver/Server/AuthSocket.cpp +++ b/src/server/authserver/Server/AuthSocket.cpp @@ -285,7 +285,7 @@ void AuthSocket::_SetVSFields(const std::string& rI) std::reverse(mDigest, mDigest + SHA_DIGEST_LENGTH); - Sha1Hash sha; + SHA1Hash sha; sha.UpdateData(s.AsByteArray(), s.GetNumBytes()); sha.UpdateData(mDigest, SHA_DIGEST_LENGTH); sha.Finalize(); @@ -536,7 +536,7 @@ bool AuthSocket::_HandleLogonProof() return true; } - Sha1Hash sha; + SHA1Hash sha; sha.UpdateBigNumbers(&A, &B, NULL); sha.Finalize(); BigNumber u; @@ -762,7 +762,7 @@ bool AuthSocket::_HandleReconnectProof() BigNumber t1; t1.SetBinary(lp.R1, 16); - Sha1Hash sha; + SHA1Hash sha; sha.Initialize(); sha.UpdateData(_login); sha.UpdateBigNumbers(&t1, &_reconnectProof, &K, NULL); diff --git a/src/server/game/Accounts/AccountMgr.cpp b/src/server/game/Accounts/AccountMgr.cpp index 5aae30fe13d..4c641fa9d87 100644 --- a/src/server/game/Accounts/AccountMgr.cpp +++ b/src/server/game/Accounts/AccountMgr.cpp @@ -243,7 +243,7 @@ bool AccountMgr::normalizeString(std::string& utf8str) std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password) { - Sha1Hash sha; + SHA1Hash sha; sha.Initialize(); sha.UpdateData(name); sha.UpdateData(":"); diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp index dea11417e23..5b179288b4c 100644 --- a/src/server/game/Server/WorldSocket.cpp +++ b/src/server/game/Server/WorldSocket.cpp @@ -781,7 +781,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) //uint8 expansion = 0; LocaleConstant locale; std::string account; - Sha1Hash sha1; + SHA1Hash sha1; BigNumber v, s, g, N; WorldPacket packet, SendAddonPacked; @@ -949,7 +949,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket) } // Check that Key and account name are the same on client and server - Sha1Hash sha; + SHA1Hash sha; uint32 t = 0; uint32 seed = m_Seed; diff --git a/src/server/shared/Cryptography/SHA1.cpp b/src/server/shared/Cryptography/SHA1.cpp index b50f72af4d3..8e7cb224421 100644 --- a/src/server/shared/Cryptography/SHA1.cpp +++ b/src/server/shared/Cryptography/SHA1.cpp @@ -22,27 +22,27 @@ #include "BigNumber.h" #include <stdarg.h> -Sha1Hash::Sha1Hash() +SHA1Hash::SHA1Hash() { SHA1_Init(&mC); } -Sha1Hash::~Sha1Hash() +SHA1Hash::~SHA1Hash() { SHA1_Init(&mC); } -void Sha1Hash::UpdateData(const uint8 *dta, int len) +void SHA1Hash::UpdateData(const uint8 *dta, int len) { SHA1_Update(&mC, dta, len); } -void Sha1Hash::UpdateData(const std::string &str) +void SHA1Hash::UpdateData(const std::string &str) { UpdateData((uint8 const*)str.c_str(), str.length()); } -void Sha1Hash::UpdateBigNumbers(BigNumber *bn0, ...) +void SHA1Hash::UpdateBigNumbers(BigNumber *bn0, ...) { va_list v; BigNumber *bn; @@ -57,12 +57,12 @@ void Sha1Hash::UpdateBigNumbers(BigNumber *bn0, ...) va_end(v); } -void Sha1Hash::Initialize() +void SHA1Hash::Initialize() { SHA1_Init(&mC); } -void Sha1Hash::Finalize(void) +void SHA1Hash::Finalize(void) { SHA1_Final(mDigest, &mC); } diff --git a/src/server/shared/Cryptography/SHA1.h b/src/server/shared/Cryptography/SHA1.h index 2d7f361ae9a..87abcf84298 100644 --- a/src/server/shared/Cryptography/SHA1.h +++ b/src/server/shared/Cryptography/SHA1.h @@ -27,11 +27,11 @@ class BigNumber; -class Sha1Hash +class SHA1Hash { public: - Sha1Hash(); - ~Sha1Hash(); + SHA1Hash(); + ~SHA1Hash(); void UpdateFinalizeBigNumbers(BigNumber *bn0, ...); void UpdateBigNumbers(BigNumber *bn0, ...); |