PentHertz
/
srsLTE
mirror of https://github.com/PentHertz/srsLTE.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use received count for NAS integrity check 

using the local rx count has caused issues when our UE
missed one NAS message was therefore out-of-sync and then
dropped all following NAS messages due to integrity failure

the NAS spec clearly states that the UE should use the
count received as an input for the integrity check calculation
This commit is contained in:
Andre Puschmann 2019-09-30 21:31:27 +02:00
parent 3e4bbbda5c
commit cfadd1ba0b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
srsue/src/stack/upper/nas.cc
View File

@ -672,14 +672,13 @@ bool nas::integrity_check(byte_buffer_t* pdu)
}
if (pdu->N_bytes > 5) {
uint8_t exp_mac[4] = {0};
uint8_t exp_mac[4] = {0};
uint8_t *mac = &pdu->msg[1];
integrity_generate(&k_nas_int[16],
ctxt.rx_count,
SECURITY_DIRECTION_DOWNLINK,
&pdu->msg[5],
pdu->N_bytes-5,
&exp_mac[0]);
// generate expected MAC
uint32_t count_est = (ctxt.rx_count & 0x0FF0) | pdu->msg[5];
integrity_generate(
&k_nas_int[16], count_est, SECURITY_DIRECTION_DOWNLINK, &pdu->msg[5], pdu->N_bytes - 5, &exp_mac[0]);
// Check if expected mac equals the sent mac
for (int i = 0; i < 4; i++) {
@ -693,6 +692,12 @@ bool nas::integrity_check(byte_buffer_t* pdu)
}
nas_log->info("Integrity check ok. Local: count=%d, Received: count=%d\n",
ctxt.rx_count, pdu->msg[5]);
// Updated local count (according to TS 24.301 Sec. 4.4.3.3)
if (pdu->msg[5] != ctxt.rx_count) {
nas_log->info("Update local count to received value %d\n", pdu->msg[5]);
ctxt.rx_count = count_est;
}
return true;
} else {
nas_log->error("Invalid integrity check PDU size (%d)\n", pdu->N_bytes);