commit 06376e76a0c5b0868db2767c46e3b69ed2f7cec0
author Alphan Ulusoy <alphan@google.com> Wed Jul 14 10:09:59 2021 -0400
committer Alphan Ulusoy <alphan@google.com> Thu Jul 15 19:29:22 2021 -0400
tree 508d10560f2f4c8ebeae0494616790c7252d4454
parent 2c531f259fe5a7a75f8fdefc226737c7c4175e84

[sw/silicon_creator] Minor edits in sigverify_keys unit tests

Signed-off-by: Alphan Ulusoy <alphan@google.com>

sw/device/silicon_creator/mask_rom/sigverify_keys_unittest.cc

diff --git a/sw/device/silicon_creator/mask_rom/sigverify_keys_unittest.cc b/sw/device/silicon_creator/mask_rom/sigverify_keys_unittest.cc
index 62c67f7..74398e6 100644
--- a/sw/device/silicon_creator/mask_rom/sigverify_keys_unittest.cc
+++ b/sw/device/silicon_creator/mask_rom/sigverify_keys_unittest.cc
@@ -99,8 +99,8 @@
 }
 
 // Note: The test cases below test sigverify using mask ROM keys. They have some
-// overlap with sigverify unit tests but this way we don't have to worry about
-// keeping the keys used in tests in sync with mask ROM keys.
+// overlap with sigverify_mod_exp_ibex unit tests but this way we don't have to
+// worry about keeping the keys used in those tests in sync with mask ROM keys.
 
 /**
  * Message and digest used in tests.
@@ -132,7 +132,7 @@
  * These can be generated using the `openssl dgst` command as discussed in
  * sw/device/silicon_creator/keys/README.md.
  */
-struct SigTestCase {
+struct RsaVerifyTestCase {
   /**
    * Signer's RSA public key.
    */
@@ -143,7 +143,7 @@
   sigverify_rsa_buffer_t sig;
 };
 
-constexpr SigTestCase kSigTestCases[2]{
+constexpr RsaVerifyTestCase kRsaVerifyTestCases[2]{
     // message: "test"
     {
         .key = &kSigVerifyRsaKeys[0],
@@ -200,22 +200,23 @@
     },
 };
 
-TEST(SigTestCases, AllKeys) {
+TEST(RsaVerifyTestCases, AllKeys) {
   std::unordered_set<uint32_t> ids;
-  for (auto const &test_case : kSigTestCases) {
+  for (auto const &test_case : kRsaVerifyTestCases) {
     ids.insert(sigverify_rsa_key_id_get(&test_case.key->n));
   }
 
   EXPECT_EQ(ids.size(), kSigVerifyNumRsaKeys);
 }
 
-class Sigverify : public mask_rom_test::MaskRomTest,
-                  public testing::WithParamInterface<SigTestCase> {
+class SigverifyRsaVerify
+    : public mask_rom_test::MaskRomTest,
+      public testing::WithParamInterface<RsaVerifyTestCase> {
  protected:
   mask_rom_test::MockHmac hmac_;
 };
 
-TEST_P(Sigverify, Ibex) {
+TEST_P(SigverifyRsaVerify, Ibex) {
   EXPECT_CALL(hmac_, sha256_init());
   EXPECT_CALL(hmac_, sha256_update(kMessage.data(), kMessage.size()))
       .WillOnce(Return(kErrorOk));
@@ -226,7 +227,8 @@
             kErrorOk);
 }
 
-INSTANTIATE_TEST_SUITE_P(AllCases, Sigverify, testing::ValuesIn(kSigTestCases));
+INSTANTIATE_TEST_SUITE_P(AllCases, SigverifyRsaVerify,
+                         testing::ValuesIn(kRsaVerifyTestCases));
 
 }  // namespace
 }  // namespace sigverify_keys_unittest