2
3
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00

Fix conflicting ShaDigest types.

This commit is contained in:
Darryl Pogue
2012-02-11 23:15:06 -08:00
parent 404cd09f1c
commit 1b22f044f0
5 changed files with 14 additions and 68 deletions

View File

@ -2649,7 +2649,7 @@ bool LoginRequestTrans::Send () {
PathSplitEmail(s_accountName, nil, 0, domain, arrsize(domain), nil, 0, nil, 0, 0);
if (StrLen(domain) == 0 || StrCmpI(domain, L"gametap") == 0) {
challengeHash = s_accountNamePassHash;
memcpy(challengeHash, s_accountNamePassHash, sizeof(ShaDigest));
}
else {
CryptCreateRandomSeed(
@ -5253,7 +5253,7 @@ void NetCliAuthLoginRequest (
if (accountName)
StrCopy(s_accountName, accountName, arrsize(s_accountName));
if (accountNamePassHash)
s_accountNamePassHash = *accountNamePassHash;
memcpy(s_accountNamePassHash, *accountNamePassHash, sizeof(ShaDigest));
if (authToken)
StrCopy(s_authToken, authToken, arrsize(s_authToken));
if (os)

View File

@ -633,11 +633,11 @@ LoginRequestTrans::LoginRequestTrans (
FNetCliCsrLoginCallback callback,
void * param
) : NetCsrTrans(kCsrLoginTrans)
, m_namePassHash(namePassHash)
, m_callback(callback)
, m_param(param)
{
ASSERT(callback);
memcpy(m_namePassHash, namePassHash, sizeof(ShaDigest));
StrCopy(m_csrName, csrName, arrsize(m_csrName));
}