stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-14 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Recycle oldest challenges first if all are taken

Browse source
This commit is contained in:
fickleheart 2019-03-06 22:36:13 -06:00
parent bc46c3540f
commit 219b240bcf
2 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_clisrv.c
View file

@ -2235,6 +2235,7 @@ static void CL_ConnectToServer(boolean viams)
#endif #endif
cl_mode = CL_SEARCHING; cl_mode = CL_SEARCHING;
cl_challengenum = 0;
#ifdef CLIENT_LOADINGSCREEN #ifdef CLIENT_LOADINGSCREEN
lastfilenum = -1; lastfilenum = -1;

26
src/d_netcmd.c
View file

@ -3710,7 +3710,7 @@ static void Got_Removal(UINT8 **cp, INT32 playernum)
static UINT8 joinpassmd5[17]; static UINT8 joinpassmd5[17];
static boolean joinpasswordset = false; static boolean joinpasswordset = false;
static UINT8 joinpasschallenges[NUMJOINCHALLENGES][17]; static UINT8 joinpasschallenges[NUMJOINCHALLENGES][17];
static boolean joinpasschallengeson[NUMJOINCHALLENGES]; static tic_t joinpasschallengeson[NUMJOINCHALLENGES];
boolean D_IsJoinPasswordOn(void) boolean D_IsJoinPasswordOn(void)
{ {
@ -3745,12 +3745,12 @@ boolean D_VerifyJoinPasswordChallenge(UINT8 num, UINT8 *answer)
num %= NUMJOINCHALLENGES; num %= NUMJOINCHALLENGES;
//@TODO use a constant-time memcmp.... //@TODO use a constant-time memcmp....
if (joinpasschallengeson[num] && memcmp(answer, joinpasschallenges[num], 16) == 0) if (joinpasschallengeson[num] > 0 && memcmp(answer, joinpasschallenges[num], 16) == 0)
passed = true; passed = true;
// Wipe and reset the challenge so that it can't be tried against again, as a small measure against brute-force attacks. // Wipe and reset the challenge so that it can't be tried against again, as a small measure against brute-force attacks.
memset(joinpasschallenges[num], 0x00, 17); memset(joinpasschallenges[num], 0x00, 17);
joinpasschallengeson[num] = false; joinpasschallengeson[num] = 0;
return passed; return passed;
} }
@ -3763,12 +3763,26 @@ void D_MakeJoinPasswordChallenge(UINT8 *num, UINT8 *question)
{ {
(*num) = M_RandomKey(NUMJOINCHALLENGES); (*num) = M_RandomKey(NUMJOINCHALLENGES);
if (!joinpasschallengeson[(*num)]) if (joinpasschallengeson[(*num)] == 0)
break; break;
} }
// If the above loop never breaks, then uh.... we're obliterating one random stored challenge. Sorry (: if (joinpasschallengeson[(*num)] > 0)
joinpasschallengeson[(*num)] = true; {
// Ugh, all challenges are (probably) taken. Let's find the oldest one and overwrite it.
tic_t oldesttic = INT32_MAX;
for (i = 0; i < NUMJOINCHALLENGES; i++)
{
if (joinpasschallengeson[i] < oldesttic)
{
(*num) = i;
oldesttic = joinpasschallengeson[i];
}
}
}
joinpasschallengeson[(*num)] = I_GetTime();
memset(question, 0x00, 17); memset(question, 0x00, 17);
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)