ua1zbe
/
dsd-fme
mirror of https://github.com/lwvmobile/dsd-fme.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

M17: Don't Attempt To Decode Encrypted Packet Data; Disable Annoying Nonce TS Warning;

This commit is contained in:
lwvmobile 2024-06-15 00:21:20 -04:00
parent f2312e63eb
commit 7f7c13a72a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/m17.c
View File

@ -186,11 +186,11 @@ void M17decodeLSF(dsd_state * state)
}
//compare incoming META/IV value on AES, if timestamp 32-bits are not within a time 5 minute window, then throw a warning
long long int epoch = 1577836800LL; //Jan 1, 2020, 00:00:00 UTC
uint32_t tsn = ( (time(NULL)-epoch) & 0xFFFFFFFF); //current LSB 32-bit value
uint32_t tsi = (uint32_t)ConvertBitIntoBytes(&state->m17_lsf[112], 32); //OTA LSB 32-bit value
uint32_t dif = abs(tsn-tsi);
if (lsf_et == 2 && dif > 3600) fprintf (stderr, " \n Warning! Time Difference > %d secs; Potential NONCE/IV Replay!\n", dif);
// long long int epoch = 1577836800LL; //Jan 1, 2020, 00:00:00 UTC
// uint32_t tsn = ( (time(NULL)-epoch) & 0xFFFFFFFF); //current LSB 32-bit value
// uint32_t tsi = (uint32_t)ConvertBitIntoBytes(&state->m17_lsf[112], 32); //OTA LSB 32-bit value
// uint32_t dif = abs(tsn-tsi);
// if (lsf_et == 2 && dif > 3600) fprintf (stderr, " \n Warning! Time Difference > %d secs; Potential NONCE/IV Replay!\n", dif);
//debug
// fprintf (stderr, "TSN: %ld; TSI: %ld; DIF: %ld;", tsn, tsi, dif);
@ -3176,6 +3176,13 @@ void decodeM17PKT(dsd_opts * opts, dsd_state * state, uint8_t * input, int len)
else if (protocol == 0x89) fprintf (stderr, " 1600 Arbitrary Data;"); //internal format only from 1600
else fprintf (stderr, " Res/Unk: %02X;", protocol);
//check for encryption, if encrypted, skip decode and report as encrypted
if (state->m17_enc != 0)
{
fprintf (stderr, " *Encrypted*");
goto PKT_END;
}
//simple UTF-8 SMS Decoder
if (protocol == 0x05)
{
@ -3278,6 +3285,8 @@ void decodeM17PKT(dsd_opts * opts, dsd_state * state, uint8_t * input, int len)
fprintf (stderr, "%02X", input[i]);
}
PKT_END: ; //do nothing
}
//WIP PKT decoder