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

Finish deprecation of pnUtPath

Browse Source
This commit is contained in:
Michael Hansen
2013-01-20 17:50:01 -08:00
parent 6e564476b7
commit cc54fb07be
16 changed files with 120 additions and 886 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
View File

@ -1203,14 +1203,14 @@ static bool s_running;
static CCritSect s_critsect;
static LISTDECL(CliAuConn, link) s_conns;
static CliAuConn * s_active;
static wchar_t s_accountName[kMaxAccountNameLength];
static wchar_t s_accountName[kMaxAccountNameLength];
static ShaDigest s_accountNamePassHash;
static wchar_t s_authToken[kMaxPublisherAuthKeyLength];
static wchar_t s_os[kMaxGTOSIdLength];
static wchar_t s_authToken[kMaxPublisherAuthKeyLength];
static wchar_t s_os[kMaxGTOSIdLength];
static long s_perf[kNumPerf];
static uint32_t s_encryptionKey[4];
static uint32_t s_encryptionKey[4];
static FNetCliAuthRecvBufferHandler s_bufRcvdCb;
static FNetCliAuthConnectCallback s_connectedCb;
@ -2635,13 +2635,11 @@ bool LoginRequestTrans::Send () {
ShaDigest challengeHash;
uint32_t clientChallenge = 0;
wchar_t domain[15];
PathSplitEmail(s_accountName, nil, 0, domain, arrsize(domain), nil, 0, nil, 0, 0);
if (StrLen(domain) == 0 || StrCmpI(domain, L"gametap") == 0) {
// Regex search for primary email domain
std::vector<plString> match = plString::FromWchar(s_accountName).RESearch("[^@]+@([^.]+\\.)*([^.]+)\\.[^.]+");
if (match.empty() || match[2].CompareI("gametap") == 0) {
memcpy(challengeHash, s_accountNamePassHash, sizeof(ShaDigest));
}
else {
} else {
CryptCreateRandomSeed(
sizeof(clientChallenge),
(uint8_t *) &clientChallenge
@ -5243,10 +5241,10 @@ void NetCliAuthAccountExistsRequest (
//============================================================================
void NetCliAuthLoginRequest (
const wchar_t accountName[],
const wchar_t accountName[],
const ShaDigest * accountNamePassHash,
const wchar_t authToken[],
const wchar_t os[],
const wchar_t authToken[],
const wchar_t os[],
FNetCliAuthLoginRequestCallback callback,
void * param
) {

6
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.h
View File

@ -135,10 +135,10 @@ typedef void (*FNetCliAuthLoginRequestCallback)(
unsigned playerCount
);
void NetCliAuthLoginRequest (
const wchar_t accountName[], // nil --> reuse previous acct name
const wchar_t accountName[], // nil --> reuse previous acct name
const ShaDigest * accountNamePassHash, // nil --> reuse previous acct pass
const wchar_t authToken[], // nil --> reuse previous auth token
const wchar_t os[], // nil --> reuse previous os
const wchar_t authToken[], // nil --> reuse previous auth token
const wchar_t os[], // nil --> reuse previous os
FNetCliAuthLoginRequestCallback callback,
void * param
);