commit 32514aa3be1f04e4665a1180006c6d2a2bca6e9b
author Miguel Young de la Sota <mcyoung@google.com> Thu May 12 15:28:05 2022 -0400
committer Timothy Trippel <5633066+timothytrippel@users.noreply.github.com> Thu May 12 14:09:10 2022 -0700
tree a15ae372187dac64c8644f91c364278b46ed682d
parent 8d9c23ce437406e49c7bef2f0ca4ec003955f0c7

[lib] Delete CHECK_BUFFER macros

Signed-off-by: Miguel Young de la Sota <mcyoung@google.com>

sw/device/lib/crypto/drivers/aes_test.c

diff --git a/sw/device/lib/crypto/drivers/aes_test.c b/sw/device/lib/crypto/drivers/aes_test.c
index c446eb0..1a55ac1 100644
--- a/sw/device/lib/crypto/drivers/aes_test.c
+++ b/sw/device/lib/crypto/drivers/aes_test.c
@@ -88,7 +88,7 @@
       memcpy(cipherptr + i - sizeof(out), &out, len_prev);
     }
   }
-  CHECK_BUFFER_EQ(ciphertext, kCiphertext, ARRAYSIZE(kCiphertext));
+  CHECK_ARRAYS_EQ(ciphertext, kCiphertext, ARRAYSIZE(kCiphertext));
 
   LOG_INFO("Cleaning up.");
   CHECK(aes_end() == kAesOk);

sw/device/lib/testing/test_framework/check.h

diff --git a/sw/device/lib/testing/test_framework/check.h b/sw/device/lib/testing/test_framework/check.h
index 0094b5a..8e7daab 100644
--- a/sw/device/lib/testing/test_framework/check.h
+++ b/sw/device/lib/testing/test_framework/check.h
@@ -157,10 +157,6 @@
     }                                                                          \
   } while (false)
 
-// Temporary shims to prevent merge-skew-breakage during renaming.
-#define CHECK_BUFFER_EQ CHECK_ARRAYS_EQ
-#define CHECK_BUFFER_NEQ CHECK_ARRAYS_NE
-
 /**
  * Checks that the given DIF call returns kDifOk. If the DIF call returns a
  * different dif_result_t value (defined in sw/device/lib/dif/dif_base.h), this

sw/device/tests/aes_entropy_test.c

diff --git a/sw/device/tests/aes_entropy_test.c b/sw/device/tests/aes_entropy_test.c
index b8e71db..f34a2ee 100644
--- a/sw/device/tests/aes_entropy_test.c
+++ b/sw/device/tests/aes_entropy_test.c
@@ -124,7 +124,7 @@
   // Assertion check verifies that the internal states (data_in, key share and
   // IV are also garbage, i.e. different from the originally written values.
   CHECK_DIF_OK(dif_aes_read_iv(&aes, &iv));
-  CHECK_BUFFER_NEQ(iv.iv, kIv, ARRAYSIZE(kIv));
+  CHECK_ARRAYS_NE(iv.iv, kIv, ARRAYSIZE(kIv));
 
   CHECK_DIF_OK(dif_aes_end(&aes));
   return true;