* Rename: Sha1Hash -> SHA1Hash.
--HG-- branch : trunk
This commit is contained in:
@@ -285,7 +285,7 @@ void AuthSocket::_SetVSFields(const std::string& rI)
|
|||||||
|
|
||||||
std::reverse(mDigest, mDigest + SHA_DIGEST_LENGTH);
|
std::reverse(mDigest, mDigest + SHA_DIGEST_LENGTH);
|
||||||
|
|
||||||
Sha1Hash sha;
|
SHA1Hash sha;
|
||||||
sha.UpdateData(s.AsByteArray(), s.GetNumBytes());
|
sha.UpdateData(s.AsByteArray(), s.GetNumBytes());
|
||||||
sha.UpdateData(mDigest, SHA_DIGEST_LENGTH);
|
sha.UpdateData(mDigest, SHA_DIGEST_LENGTH);
|
||||||
sha.Finalize();
|
sha.Finalize();
|
||||||
@@ -536,7 +536,7 @@ bool AuthSocket::_HandleLogonProof()
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
Sha1Hash sha;
|
SHA1Hash sha;
|
||||||
sha.UpdateBigNumbers(&A, &B, NULL);
|
sha.UpdateBigNumbers(&A, &B, NULL);
|
||||||
sha.Finalize();
|
sha.Finalize();
|
||||||
BigNumber u;
|
BigNumber u;
|
||||||
@@ -762,7 +762,7 @@ bool AuthSocket::_HandleReconnectProof()
|
|||||||
BigNumber t1;
|
BigNumber t1;
|
||||||
t1.SetBinary(lp.R1, 16);
|
t1.SetBinary(lp.R1, 16);
|
||||||
|
|
||||||
Sha1Hash sha;
|
SHA1Hash sha;
|
||||||
sha.Initialize();
|
sha.Initialize();
|
||||||
sha.UpdateData(_login);
|
sha.UpdateData(_login);
|
||||||
sha.UpdateBigNumbers(&t1, &_reconnectProof, &K, NULL);
|
sha.UpdateBigNumbers(&t1, &_reconnectProof, &K, NULL);
|
||||||
|
|||||||
@@ -243,7 +243,7 @@ bool AccountMgr::normalizeString(std::string& utf8str)
|
|||||||
|
|
||||||
std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password)
|
std::string AccountMgr::CalculateShaPassHash(std::string& name, std::string& password)
|
||||||
{
|
{
|
||||||
Sha1Hash sha;
|
SHA1Hash sha;
|
||||||
sha.Initialize();
|
sha.Initialize();
|
||||||
sha.UpdateData(name);
|
sha.UpdateData(name);
|
||||||
sha.UpdateData(":");
|
sha.UpdateData(":");
|
||||||
|
|||||||
@@ -781,7 +781,7 @@ int WorldSocket::HandleAuthSession (WorldPacket& recvPacket)
|
|||||||
//uint8 expansion = 0;
|
//uint8 expansion = 0;
|
||||||
LocaleConstant locale;
|
LocaleConstant locale;
|
||||||
std::string account;
|
std::string account;
|
||||||
Sha1Hash sha1;
|
SHA1Hash sha1;
|
||||||
BigNumber v, s, g, N;
|
BigNumber v, s, g, N;
|
||||||
WorldPacket packet, SendAddonPacked;
|
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
|
// Check that Key and account name are the same on client and server
|
||||||
Sha1Hash sha;
|
SHA1Hash sha;
|
||||||
|
|
||||||
uint32 t = 0;
|
uint32 t = 0;
|
||||||
uint32 seed = m_Seed;
|
uint32 seed = m_Seed;
|
||||||
|
|||||||
@@ -22,27 +22,27 @@
|
|||||||
#include "BigNumber.h"
|
#include "BigNumber.h"
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
Sha1Hash::Sha1Hash()
|
SHA1Hash::SHA1Hash()
|
||||||
{
|
{
|
||||||
SHA1_Init(&mC);
|
SHA1_Init(&mC);
|
||||||
}
|
}
|
||||||
|
|
||||||
Sha1Hash::~Sha1Hash()
|
SHA1Hash::~SHA1Hash()
|
||||||
{
|
{
|
||||||
SHA1_Init(&mC);
|
SHA1_Init(&mC);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sha1Hash::UpdateData(const uint8 *dta, int len)
|
void SHA1Hash::UpdateData(const uint8 *dta, int len)
|
||||||
{
|
{
|
||||||
SHA1_Update(&mC, dta, 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());
|
UpdateData((uint8 const*)str.c_str(), str.length());
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sha1Hash::UpdateBigNumbers(BigNumber *bn0, ...)
|
void SHA1Hash::UpdateBigNumbers(BigNumber *bn0, ...)
|
||||||
{
|
{
|
||||||
va_list v;
|
va_list v;
|
||||||
BigNumber *bn;
|
BigNumber *bn;
|
||||||
@@ -57,12 +57,12 @@ void Sha1Hash::UpdateBigNumbers(BigNumber *bn0, ...)
|
|||||||
va_end(v);
|
va_end(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sha1Hash::Initialize()
|
void SHA1Hash::Initialize()
|
||||||
{
|
{
|
||||||
SHA1_Init(&mC);
|
SHA1_Init(&mC);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Sha1Hash::Finalize(void)
|
void SHA1Hash::Finalize(void)
|
||||||
{
|
{
|
||||||
SHA1_Final(mDigest, &mC);
|
SHA1_Final(mDigest, &mC);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,11 +27,11 @@
|
|||||||
|
|
||||||
class BigNumber;
|
class BigNumber;
|
||||||
|
|
||||||
class Sha1Hash
|
class SHA1Hash
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Sha1Hash();
|
SHA1Hash();
|
||||||
~Sha1Hash();
|
~SHA1Hash();
|
||||||
|
|
||||||
void UpdateFinalizeBigNumbers(BigNumber *bn0, ...);
|
void UpdateFinalizeBigNumbers(BigNumber *bn0, ...);
|
||||||
void UpdateBigNumbers(BigNumber *bn0, ...);
|
void UpdateBigNumbers(BigNumber *bn0, ...);
|
||||||
|
|||||||
Reference in New Issue
Block a user