Address PR and CI concerns:

* Change memcmp in CBMC harnesses
aws · Aug 15, 2024 · 12f4ff8 · 12f4ff8
1 parent ac6f580
commit 12f4ff8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tests/cbmc/proofs/s2n_stuffer_peek_check_for_str/s2n_stuffer_peek_check_for_str_harness.c b/tests/cbmc/proofs/s2n_stuffer_peek_check_for_str/s2n_stuffer_peek_check_for_str_harness.c
@@ -37,7 +37,7 @@ void s2n_stuffer_peek_check_for_str_harness()
     size_t expected_length = (expected != NULL) ? strlen(expected) : 0;
     if (expected_length > 0 && s2n_stuffer_peek_check_for_str(stuffer, expected) == S2N_SUCCESS) {
         uint8_t *actual = stuffer->blob.data + stuffer->read_cursor;
-        assert(!memcmp(actual, expected, expected_length));
+        assert(s2n_constant_time_equals(actual, (uint8_t *) expected, expected_length));
     }
     assert_stuffer_equivalence(stuffer, &old_stuffer, &old_byte_from_stuffer);
     assert(s2n_result_is_ok(s2n_stuffer_validate(stuffer)));

diff --git a/tests/cbmc/proofs/s2n_stuffer_read_expected_str/s2n_stuffer_read_expected_str_harness.c b/tests/cbmc/proofs/s2n_stuffer_read_expected_str/s2n_stuffer_read_expected_str_harness.c
@@ -37,7 +37,7 @@ void s2n_stuffer_read_expected_str_harness()
     size_t expected_length = (expected != NULL) ? strlen(expected) : 0;
     if (expected_length > 0 && s2n_stuffer_read_expected_str(stuffer, expected) == S2N_SUCCESS) {
         uint8_t *actual = stuffer->blob.data + stuffer->read_cursor - expected_length;
-        assert(!memcmp(actual, expected, expected_length));
+        assert(s2n_constant_time_equals(actual, (uint8_t *) expected, expected_length));
         assert(stuffer->read_cursor == old_stuffer.read_cursor + expected_length);
     } else {
         assert(stuffer->read_cursor == old_stuffer.read_cursor);