maki/openairinterface5g
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix mistake bitwise operators

Browse Source
This commit is contained in:
calvin wang
2017-01-12 16:47:57 +08:00
parent 3ec3d2a6b1
commit 801a2e5de7
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openair3/NAS/COMMON/API/NETWORK/nas_message.c
+12 -12
View File
@@ -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);
}