thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-04-28 04:51:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

USE THE ENTIRE 64 BYTES OF THE CHALLENGE YOU IDIOT also check time/gamemap

Browse source
This commit is contained in:
AJ Martinez 2023-03-22 03:02:45 -07:00 • committed by James R
parent 32b1ff3d3e
commit f873df764e
2 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/d_clisrv.c
View file

@ -161,7 +161,7 @@ boolean acceptnewnode = true;
uint8_t lastReceivedKey[MAXNETNODES][MAXSPLITSCREENPLAYERS][32]; // Player's public key (join process only! active players have it on player_t) uint8_t lastReceivedKey[MAXNETNODES][MAXSPLITSCREENPLAYERS][32]; // Player's public key (join process only! active players have it on player_t)
uint8_t lastSentChallenge[MAXNETNODES][MAXSPLITSCREENPLAYERS][32]; // The random message we asked them to sign in PT_SERVERCHALLENGE, check it in PT_CLIENTJOIN uint8_t lastSentChallenge[MAXNETNODES][MAXSPLITSCREENPLAYERS][32]; // The random message we asked them to sign in PT_SERVERCHALLENGE, check it in PT_CLIENTJOIN
uint8_t lastChallengeAll[32]; // The message we asked EVERYONE to sign for client-to-client identity proofs uint8_t lastChallengeAll[64]; // The message we asked EVERYONE to sign for client-to-client identity proofs
uint8_t lastReceivedSignature[MAXPLAYERS][64]; // Everyone's response to lastChallengeAll uint8_t lastReceivedSignature[MAXPLAYERS][64]; // Everyone's response to lastChallengeAll
uint8_t knownWhenChallenged[MAXPLAYERS][32]; // Everyone a client saw at the moment a challenge should be initiated uint8_t knownWhenChallenged[MAXPLAYERS][32]; // Everyone a client saw at the moment a challenge should be initiated
boolean expectChallenge = false; // Were we in-game before a client-to-client challenge should have been sent? boolean expectChallenge = false; // Were we in-game before a client-to-client challenge should have been sent?
@ -5262,8 +5262,30 @@ static void HandlePacketFromPlayer(SINT8 node)
break; break;
int challengeplayers; int challengeplayers;
time_t now, then;
INT16 sentmap; // if gamemap ever needs to change type, god forbid, change this too
memcpy(lastChallengeAll, netbuffer->u.challengeall.secret, sizeof(lastChallengeAll)); memcpy(lastChallengeAll, netbuffer->u.challengeall.secret, sizeof(lastChallengeAll));
now = time(NULL);
memcpy(&then, lastChallengeAll, sizeof(then));
CONS_Printf("Time offset: %d\n", abs(now - then));
if (abs(now - then) > 300)
{
HandleSigfail("Bad challenge - time difference, check clocks");
break;
}
memcpy(&sentmap, lastChallengeAll + sizeof(then), sizeof(sentmap));
CONS_Printf("Got map %hd, current map %hd\n", sentmap, gamemap);
if (sentmap != gamemap)
{
HandleSigfail("Bad challenge - wrong gamemap");
break;
}
netbuffer->packettype = PT_RESPONSEALL; netbuffer->packettype = PT_RESPONSEALL;
#ifdef DEVELOP #ifdef DEVELOP
@ -6246,12 +6268,14 @@ static void UpdateChallenges(void)
memset(knownWhenChallenged, 0, sizeof(knownWhenChallenged)); memset(knownWhenChallenged, 0, sizeof(knownWhenChallenged));
// Random noise so it's difficult to reuse the response // Random noise so it's difficult to reuse the response
// Current time so that difficult to reuse the challenge (TODO: ACTUALLY DO THIS) // Current time so that difficult to reuse the challenge
const time_t now = time(NULL); const time_t now = time(NULL);
CONS_Printf("now: %d\n", now); CONS_Printf("now: %ld, gamemap: %hd\n", now, gamemap);
csprng(netbuffer->u.serverchallenge.secret, sizeof(netbuffer->u.serverchallenge.secret)); csprng(netbuffer->u.challengeall.secret, sizeof(netbuffer->u.challengeall.secret));
memcpy(netbuffer->u.challengeall.secret, &now, sizeof(now)); // First few bytes are the timestamp...
memcpy(netbuffer->u.challengeall.secret + sizeof(now), &gamemap, sizeof(gamemap)); // And the next two are the current map. (TODO: This works but I don't think it's doing what I think it's doing, pointers suck.)
memcpy(lastChallengeAll, netbuffer->u.serverchallenge.secret, sizeof(lastChallengeAll)); memcpy(lastChallengeAll, netbuffer->u.challengeall.secret, sizeof(lastChallengeAll));
memset(lastReceivedSignature, 0, sizeof(lastReceivedSignature)); memset(lastReceivedSignature, 0, sizeof(lastReceivedSignature));
@ -6260,7 +6284,7 @@ static void UpdateChallenges(void)
if (nodeingame[i]) if (nodeingame[i])
{ {
CONS_Printf("challenge to node %d, player %d\n", i, nodetoplayer[i]); CONS_Printf("challenge to node %d, player %d\n", i, nodetoplayer[i]);
HSendPacket(i, true, 0, sizeof(serverchallenge_pak)); HSendPacket(i, true, 0, sizeof(challengeall_pak));
memcpy(knownWhenChallenged[nodetoplayer[i]], players[nodetoplayer[i]].public_key, sizeof(knownWhenChallenged[nodetoplayer[i]])); memcpy(knownWhenChallenged[nodetoplayer[i]], players[nodetoplayer[i]].public_key, sizeof(knownWhenChallenged[nodetoplayer[i]]));
} }
} }

6
src/d_clisrv.h
View file

@ -355,12 +355,12 @@ struct filesneededconfig_pak
struct clientkey_pak struct clientkey_pak
{ {
char key[MAXSPLITSCREENPLAYERS][32]; uint8_t key[MAXSPLITSCREENPLAYERS][32];
} ATTRPACK; } ATTRPACK;
struct serverchallenge_pak struct serverchallenge_pak
{ {
char secret[MAXSPLITSCREENPLAYERS][32]; uint8_t secret[MAXSPLITSCREENPLAYERS][32];
} ATTRPACK; } ATTRPACK;
struct challengeall_pak struct challengeall_pak
@ -484,7 +484,7 @@ extern SINT8 servernode;
extern char connectedservername[MAXSERVERNAME]; extern char connectedservername[MAXSERVERNAME];
extern uint8_t lastReceivedKey[MAXNETNODES][MAXSPLITSCREENPLAYERS][32]; extern uint8_t lastReceivedKey[MAXNETNODES][MAXSPLITSCREENPLAYERS][32];
extern uint8_t lastSentChallenge[MAXNETNODES][MAXSPLITSCREENPLAYERS][32]; extern uint8_t lastSentChallenge[MAXNETNODES][MAXSPLITSCREENPLAYERS][32];
extern uint8_t lastChallengeAll[32]; extern uint8_t lastChallengeAll[64];
extern uint8_t lastReceivedSignature[MAXPLAYERS][64]; extern uint8_t lastReceivedSignature[MAXPLAYERS][64];
extern uint8_t knownWhenChallenged[MAXPLAYERS][32]; extern uint8_t knownWhenChallenged[MAXPLAYERS][32];
extern boolean expectChallenge; extern boolean expectChallenge;