Fix the incorrect use of logical negation in the unit tests.

Signed-off-by: Xiao <[email protected]>
DMTF · Jul 17, 2024 · 504fd45 · 504fd45
1 parent fbc1960
commit 504fd45
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 36 deletions.
diff --git a/unit_test/test_spdm_requester/error_test/key_exchange_err.c b/unit_test/test_spdm_requester/error_test/key_exchange_err.c
@@ -5951,9 +5951,9 @@ static void libspdm_test_requester_key_exchange_err_case26(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_INVALID_MSG_FIELD);
     free(data);
 }
@@ -6041,9 +6041,9 @@ static void libspdm_test_requester_key_exchange_err_case27(void **state)
         measurement_hash);
     /*Clear Mut_auth flags*/
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_INVALID_MSG_FIELD);
     free(data);
 }
@@ -6131,9 +6131,9 @@ static void libspdm_test_requester_key_exchange_err_case28(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_INVALID_MSG_FIELD);
     free(data);
 }
@@ -6233,9 +6233,9 @@ static void libspdm_test_requester_key_exchange_err_case31(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_INVALID_MSG_FIELD);
     free(data);
 }

diff --git a/unit_test/test_spdm_requester/key_exchange.c b/unit_test/test_spdm_requester/key_exchange.c
@@ -6780,9 +6780,9 @@ static void libspdm_test_requester_key_exchange_case19(void **state)
         measurement_hash);
     /* Clear Handshake in the clear flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HANDSHAKE_IN_THE_CLEAR_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HANDSHAKE_IN_THE_CLEAR_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HANDSHAKE_IN_THE_CLEAR_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HANDSHAKE_IN_THE_CLEAR_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);
     assert_int_equal(
@@ -6955,9 +6955,9 @@ static void libspdm_test_requester_key_exchange_case21(void **state)
         measurement_hash);
     /* clear Heartbeat flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);
     assert_int_equal(
@@ -7052,9 +7052,9 @@ static void libspdm_test_requester_key_exchange_case22(void **state)
 
     /*clear Heartbeat flags*/
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
 
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);
@@ -7149,9 +7149,9 @@ static void libspdm_test_requester_key_exchange_case23(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);
     assert_int_equal(
@@ -7242,9 +7242,9 @@ static void libspdm_test_requester_key_exchange_case24(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);
     assert_int_equal(
@@ -7340,9 +7340,9 @@ static void libspdm_test_requester_key_exchange_case25(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);
     assert_int_equal(
@@ -7438,9 +7438,9 @@ static void libspdm_test_requester_key_exchange_case26(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_INVALID_MSG_FIELD);
     free(data);
 }
@@ -7528,9 +7528,9 @@ static void libspdm_test_requester_key_exchange_case27(void **state)
         measurement_hash);
     /*Clear Mut_auth flags*/
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_INVALID_MSG_FIELD);
     free(data);
 }
@@ -7618,9 +7618,9 @@ static void libspdm_test_requester_key_exchange_case28(void **state)
         measurement_hash);
     /* Clear Mut_auth flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MUT_AUTH_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_MUT_AUTH_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_INVALID_MSG_FIELD);
     free(data);
 }

diff --git a/unit_test/test_spdm_requester/key_update.c b/unit_test/test_spdm_requester/key_update.c
@@ -4215,9 +4215,9 @@ void libspdm_test_requester_key_update_case12(void **state)
 
     /*no capabilities*/
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_KEY_UPD_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_KEY_UPD_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_UPD_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_UPD_CAP;
 
     session_info = &spdm_context->session_info[0];
 

diff --git a/unit_test/test_spdm_requester/psk_exchange.c b/unit_test/test_spdm_requester/psk_exchange.c
@@ -4564,9 +4564,9 @@ void libspdm_test_requester_psk_exchange_case21(void **state)
         &heartbeat_period, measurement_hash);
     /* clear Heartbeat flags */
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);
     assert_int_equal(
@@ -4657,9 +4657,9 @@ void libspdm_test_requester_psk_exchange_case22(void **state)
 
     /*clear Heartbeat flags*/
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_HBEAT_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_HBEAT_CAP;
 
     assert_int_equal(status, LIBSPDM_STATUS_SUCCESS);
     assert_int_equal(session_id, 0xFFFFFFFF);

diff --git a/unit_test/test_spdm_responder/key_exchange.c b/unit_test/test_spdm_responder/key_exchange.c
@@ -1057,7 +1057,7 @@ void libspdm_test_responder_key_exchange_case11(void **state)
 
     /* Clear capabilities flag */
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP;
 
     /*set capabilities flags */
     spdm_context->connection_info.capability.flags |=

diff --git a/unit_test/test_spdm_responder/key_update.c b/unit_test/test_spdm_responder/key_update.c
@@ -699,9 +699,9 @@ void libspdm_test_responder_key_update_case8(void **state)
 
     /*no capabilities*/
     spdm_context->connection_info.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_KEY_UPD_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_KEY_UPD_CAP;
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_UPD_CAP;
+        ~SPDM_GET_CAPABILITIES_REQUEST_FLAGS_KEY_UPD_CAP;
 
     session_info = &spdm_context->session_info[0];
     secured_message_context = session_info->secured_message_context;

diff --git a/unit_test/test_spdm_responder/psk_exchange.c b/unit_test/test_spdm_responder/psk_exchange.c
@@ -1283,7 +1283,7 @@ void libspdm_test_responder_psk_exchange_case13(void **state)
         LIBSPDM_CONNECTION_STATE_NEGOTIATED;
 
     spdm_context->local_context.capability.flags &=
-        !SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP;
+        ~SPDM_GET_CAPABILITIES_RESPONSE_FLAGS_MEAS_CAP;
 
     spdm_context->connection_info.capability.flags |=
         SPDM_GET_CAPABILITIES_REQUEST_FLAGS_PSK_CAP;