Skip to content

O
OpenXG-RAN
Commit 801a2e5d authored by calvin wang's avatar calvin wang
Browse files
Options

fix mistake bitwise operators

parent 3ec3d2a6
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 12 deletions
openair3/NAS/COMMON/API/NETWORK/nas_message.c
View file @ 801a2e5d
...@@ -993,11 +993,11 @@ static int _nas_message_decrypt( ...@@ -993,11 +993,11 @@ static int _nas_message_decrypt(
case NAS_SECURITY_ALGORITHMS_EEA1: { case NAS_SECURITY_ALGORITHMS_EEA1: {
if (direction == SECU_DIRECTION_UPLINK) { if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 | 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); (emm_security_context->ul_count.seq_num & 0x000000FF);
} else { } else {
count = 0x00000000 | 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); (emm_security_context->dl_count.seq_num & 0x000000FF);
} }
...@@ -1027,11 +1027,11 @@ static int _nas_message_decrypt( ...@@ -1027,11 +1027,11 @@ static int _nas_message_decrypt(
case NAS_SECURITY_ALGORITHMS_EEA2: { case NAS_SECURITY_ALGORITHMS_EEA2: {
if (direction == SECU_DIRECTION_UPLINK) { if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 | 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); (emm_security_context->ul_count.seq_num & 0x000000FF);
} else { } else {
count = 0x00000000 | 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); (emm_security_context->dl_count.seq_num & 0x000000FF);
} }
...@@ -1155,11 +1155,11 @@ static int _nas_message_encrypt( ...@@ -1155,11 +1155,11 @@ static int _nas_message_encrypt(
case NAS_SECURITY_ALGORITHMS_EEA1: { case NAS_SECURITY_ALGORITHMS_EEA1: {
if (direction == SECU_DIRECTION_UPLINK) { if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 | 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); (emm_security_context->ul_count.seq_num & 0x000000FF);
} else { } else {
count = 0x00000000 | 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); (emm_security_context->dl_count.seq_num & 0x000000FF);
} }
...@@ -1186,11 +1186,11 @@ static int _nas_message_encrypt( ...@@ -1186,11 +1186,11 @@ static int _nas_message_encrypt(
case NAS_SECURITY_ALGORITHMS_EEA2: { case NAS_SECURITY_ALGORITHMS_EEA2: {
if (direction == SECU_DIRECTION_UPLINK) { if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 | 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); (emm_security_context->ul_count.seq_num & 0x000000FF);
} else { } else {
count = 0x00000000 | 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); (emm_security_context->dl_count.seq_num & 0x000000FF);
} }
...@@ -1300,11 +1300,11 @@ static uint32_t _nas_message_get_mac( ...@@ -1300,11 +1300,11 @@ static uint32_t _nas_message_get_mac(
if (direction == SECU_DIRECTION_UPLINK) { if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 | 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); (emm_security_context->ul_count.seq_num & 0x000000FF);
} else { } else {
count = 0x00000000 | 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); (emm_security_context->dl_count.seq_num & 0x000000FF);
} }
...@@ -1368,11 +1368,11 @@ static uint32_t _nas_message_get_mac( ...@@ -1368,11 +1368,11 @@ static uint32_t _nas_message_get_mac(
if (direction == SECU_DIRECTION_UPLINK) { if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 | 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); (emm_security_context->ul_count.seq_num & 0x000000FF);
} else { } else {
count = 0x00000000 | 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); (emm_security_context->dl_count.seq_num & 0x000000FF);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment