diff --git a/openair3/NAS/COMMON/API/NETWORK/nas_message.c b/openair3/NAS/COMMON/API/NETWORK/nas_message.c index f714af66f724f5a64df72b155d9c99724079eca2..55adce8ea34c9fb182f705f73635b3a2a5c1035a 100644 --- a/openair3/NAS/COMMON/API/NETWORK/nas_message.c +++ b/openair3/NAS/COMMON/API/NETWORK/nas_message.c @@ -993,11 +993,11 @@ static int _nas_message_decrypt( case NAS_SECURITY_ALGORITHMS_EEA1: { if (direction == SECU_DIRECTION_UPLINK) { count = 0x00000000 | - ((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->ul_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->ul_count.seq_num & 0x000000FF); } else { count = 0x00000000 | - ((emm_security_context->dl_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->dl_count.seq_num & 0x000000FF); } @@ -1027,11 +1027,11 @@ static int _nas_message_decrypt( case NAS_SECURITY_ALGORITHMS_EEA2: { if (direction == SECU_DIRECTION_UPLINK) { count = 0x00000000 | - ((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->ul_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->ul_count.seq_num & 0x000000FF); } else { count = 0x00000000 | - ((emm_security_context->dl_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->dl_count.seq_num & 0x000000FF); } @@ -1155,11 +1155,11 @@ static int _nas_message_encrypt( case NAS_SECURITY_ALGORITHMS_EEA1: { if (direction == SECU_DIRECTION_UPLINK) { count = 0x00000000 | - ((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->ul_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->ul_count.seq_num & 0x000000FF); } else { count = 0x00000000 | - ((emm_security_context->dl_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->dl_count.seq_num & 0x000000FF); } @@ -1186,11 +1186,11 @@ static int _nas_message_encrypt( case NAS_SECURITY_ALGORITHMS_EEA2: { if (direction == SECU_DIRECTION_UPLINK) { count = 0x00000000 | - ((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->ul_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->ul_count.seq_num & 0x000000FF); } else { count = 0x00000000 | - ((emm_security_context->dl_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->dl_count.seq_num & 0x000000FF); } @@ -1300,11 +1300,11 @@ static uint32_t _nas_message_get_mac( if (direction == SECU_DIRECTION_UPLINK) { count = 0x00000000 | - ((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->ul_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->ul_count.seq_num & 0x000000FF); } else { count = 0x00000000 | - ((emm_security_context->dl_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->dl_count.seq_num & 0x000000FF); } @@ -1368,11 +1368,11 @@ static uint32_t _nas_message_get_mac( if (direction == SECU_DIRECTION_UPLINK) { count = 0x00000000 | - ((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->ul_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->ul_count.seq_num & 0x000000FF); } else { count = 0x00000000 | - ((emm_security_context->dl_count.overflow && 0x0000FFFF) << 8) | + ((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) | (emm_security_context->dl_count.seq_num & 0x000000FF); }