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

Chip away at uses of pnUtStr

Browse Source
This commit is contained in:
Adam Johnson
2012-02-20 12:06:41 -05:00
parent 653c29d0bd
commit 897abb7200
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Sources/Plasma/Apps/plClient/winmain.cpp
View File

@ -970,22 +970,18 @@ BOOL CALLBACK UruTOSDialogProc( HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l
static void SaveUserPass (LoginDialogParam *pLoginParam, char *password) static void SaveUserPass (LoginDialogParam *pLoginParam, char *password)
{ {
uint32_t cryptKey[4]; uint32_t cryptKey[4];
ZeroMemory(cryptKey, sizeof(cryptKey)); memset(cryptKey, 0, sizeof(cryptKey));
GetCryptKey(cryptKey, arrsize(cryptKey)); GetCryptKey(cryptKey, arrsize(cryptKey));
wchar_t wusername[kMaxAccountNameLength]; plString theUser = _TEMP_CONVERT_FROM_LITERAL(pLoginParam->username);
wchar_t wpassword[kMaxPasswordLength]; plString thePass = (_TEMP_CONVERT_FROM_LITERAL(password)).Left(kMaxPasswordLength);
StrToUnicode(wusername, pLoginParam->username, arrsize(wusername));
// if the password field is the fake string then we've already // if the password field is the fake string then we've already
// loaded the namePassHash from the file // loaded the namePassHash from the file
if (StrCmp(password, FAKE_PASS_STRING) != 0) if (thePass.Compare(FAKE_PASS_STRING) != 0)
{ {
StrToUnicode(wpassword, password, arrsize(wpassword));
wchar_t domain[15]; wchar_t domain[15];
PathSplitEmail(wusername, nil, 0, domain, arrsize(domain), nil, 0, nil, 0, 0); PathSplitEmail(_TEMP_CONVERT_TO_WCHAR_T(theUser), nil, 0, domain, arrsize(domain), nil, 0, nil, 0, 0);
if (StrLen(domain) == 0 || StrCmpI(domain, L"gametap") == 0) { if (StrLen(domain) == 0 || StrCmpI(domain, L"gametap") == 0) {
plSHA1Checksum shasum(StrLen(password) * sizeof(password[0]), (uint8_t*)password); plSHA1Checksum shasum(StrLen(password) * sizeof(password[0]), (uint8_t*)password);
@ -1001,11 +997,11 @@ static void SaveUserPass (LoginDialogParam *pLoginParam, char *password)
} }
else else
{ {
CryptHashPassword(_TEMP_CONVERT_FROM_WCHAR_T(wusername), _TEMP_CONVERT_FROM_WCHAR_T(wpassword), pLoginParam->namePassHash); CryptHashPassword(theUser, thePass, pLoginParam->namePassHash);
} }
} }
NetCommSetAccountUsernamePassword(wusername, pLoginParam->namePassHash); NetCommSetAccountUsernamePassword(_TEMP_CONVERT_TO_WCHAR_T(theUser), pLoginParam->namePassHash);
if (TGIsCider) if (TGIsCider)
NetCommSetAuthTokenAndOS(nil, L"mac"); NetCommSetAuthTokenAndOS(nil, L"mac");
else else

2
Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.cpp
View File

@ -1037,7 +1037,7 @@ void NetCommSetMsgPreHandler (
//============================================================================ //============================================================================
void NetCommSetAccountUsernamePassword ( void NetCommSetAccountUsernamePassword (
wchar_t username[], const wchar_t username[],
const ShaDigest & namePassHash const ShaDigest & namePassHash
) { ) {
StrCopy(s_iniAccountUsername, username, arrsize(s_iniAccountUsername)); StrCopy(s_iniAccountUsername, username, arrsize(s_iniAccountUsername));

2
Sources/Plasma/PubUtilLib/plNetClientComm/plNetClientComm.h
View File

@ -102,7 +102,7 @@ const ARRAY(NetCommPlayer) & NetCommGetPlayerList ();
unsigned NetCommGetPlayerCount (); unsigned NetCommGetPlayerCount ();
bool NetCommIsLoginComplete (); bool NetCommIsLoginComplete ();
void NetCommSetReadIniAccountInfo (bool readFromIni); void NetCommSetReadIniAccountInfo (bool readFromIni);
void NetCommSetAccountUsernamePassword (wchar_t username[], const ShaDigest & namePassHash); void NetCommSetAccountUsernamePassword (const wchar_t username[], const ShaDigest & namePassHash);
void NetCommSetAuthTokenAndOS (wchar_t authToken[], wchar_t os[]); void NetCommSetAuthTokenAndOS (wchar_t authToken[], wchar_t os[]);
ENetError NetCommGetAuthResult (); ENetError NetCommGetAuthResult ();