Commit 3ec3d2a6 authored by calvin wang's avatar calvin wang

fix mistake logical and bitwise operators

parent f3b84e74
......@@ -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) |
  • @calvin.wang I think you should also change all the && by &

  • About the calculation of value "count", I only find logical operator "||", but not find "&&".

  • In the following:

            count = 0x00000000 |
                     ((emm_security_context->ul_count.overflow && 0x0000FFFF) << 8) |
                     (emm_security_context->ul_count.seq_num & 0x000000FF);

    The && that we see is correct? It looks very suspicious to me.

    It's the same for all the places I see it in this file.

    By the way all the 0x00000000 | are not necessary. They don't hurt though, so you can leave them.

  • Exactly, thank you, I will change it.

Please register or sign in to reply
(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