faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nts: check all encrypted fields before saving cookies

Browse source 
Don't save any cookies if an encrypted extension field fails parsing.
This commit is contained in:
Miroslav Lichvar 2020-08-13 14:25:12 +02:00
parent 356c475a6a
commit ed1077a788
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
nts_ntp_client.c
View file

@ -353,6 +353,23 @@ NNC_GenerateRequestAuth(NNC_Instance inst, NTP_Packet *packet,
/* ================================================== */ /* ================================================== */
static int
parse_encrypted_efs(NNC_Instance inst, unsigned char *plaintext, int length)
{
int ef_length, parsed;
for (parsed = 0; parsed < length; parsed += ef_length) {
if (!NEF_ParseSingleField(plaintext, length, parsed, &ef_length, NULL, NULL, NULL)) {
DEBUG_LOG("Could not parse encrypted EF");
return 0;
}
}
return 1;
}
/* ================================================== */
static int static int
extract_cookies(NNC_Instance inst, unsigned char *plaintext, int length) extract_cookies(NNC_Instance inst, unsigned char *plaintext, int length)
{ {
@ -363,10 +380,8 @@ extract_cookies(NNC_Instance inst, unsigned char *plaintext, int length)
for (parsed = 0; parsed < length; parsed += ef_length) { for (parsed = 0; parsed < length; parsed += ef_length) {
if (!NEF_ParseSingleField(plaintext, length, parsed, if (!NEF_ParseSingleField(plaintext, length, parsed,
&ef_length, &ef_type, &ef_body, &ef_body_length)) { &ef_length, &ef_type, &ef_body, &ef_body_length))
DEBUG_LOG("Could not parse encrypted EF");
return 0; return 0;
}
if (ef_type != NTP_EF_NTS_COOKIE) if (ef_type != NTP_EF_NTS_COOKIE)
continue; continue;
@ -449,6 +464,9 @@ NNC_CheckResponseAuth(NNC_Instance inst, NTP_Packet *packet,
plaintext, sizeof (plaintext), &plaintext_length)) plaintext, sizeof (plaintext), &plaintext_length))
return 0; return 0;
if (!parse_encrypted_efs(inst, plaintext, plaintext_length))
return 0;
has_valid_auth = 1; has_valid_auth = 1;
break; break;
default: default: