Skip to content

O
OpenXG-RAN
Commit 490492cb authored by Cedric Roux's avatar Cedric Roux
Browse files
Options

Merge branch '182-MistakeLogicalOperatorsAndBitwiseOperators' into develop_integration_w02

parents 7edff5fe 801a2e5d
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
openair3/NAS/COMMON/API/NETWORK/nas_message.c
View file @ 490492cb
......@@ -992,12 +992,12 @@ 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) ||
count = 0x00000000 |
((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) ||
count = 0x00000000 |
((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) |
(emm_security_context->dl_count.seq_num & 0x000000FF);
}
......@@ -1026,12 +1026,12 @@ 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) ||
count = 0x00000000 |
((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) ||
count = 0x00000000 |
((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) |
(emm_security_context->dl_count.seq_num & 0x000000FF);
}
......@@ -1154,12 +1154,12 @@ 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) ||
count = 0x00000000 |
((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) ||
count = 0x00000000 |
((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) |
(emm_security_context->dl_count.seq_num & 0x000000FF);
}
......@@ -1185,12 +1185,12 @@ 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) ||
count = 0x00000000 |
((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) ||
count = 0x00000000 |
((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) |
(emm_security_context->dl_count.seq_num & 0x000000FF);
}
......@@ -1299,12 +1299,12 @@ static uint32_t _nas_message_get_mac(
int i,bytes = 0;
if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 ||
((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) ||
count = 0x00000000 |
((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) ||
count = 0x00000000 |
((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) |
(emm_security_context->dl_count.seq_num & 0x000000FF);
}
......@@ -1367,12 +1367,12 @@ static uint32_t _nas_message_get_mac(
uint32_t *mac32;
if (direction == SECU_DIRECTION_UPLINK) {
count = 0x00000000 ||
((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) ||
count = 0x00000000 |
((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) ||
count = 0x00000000 |
((emm_security_context->dl_count.overflow & 0x0000FFFF) << 8) |
(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