[sw/silicon_creator] Fix sigverify filenames Signed-off-by: Alphan Ulusoy <alphan@google.com>

diff --git a/sw/device/silicon_creator/lib/manifest.h b/sw/device/silicon_creator/lib/manifest.h
index dc3f60f..14bc437 100644
--- a/sw/device/silicon_creator/lib/manifest.h
+++ b/sw/device/silicon_creator/lib/manifest.h

@@ -12,7 +12,7 @@
 #include "sw/device/silicon_creator/lib/keymgr_binding_value.h"
 #include "sw/device/silicon_creator/lib/manifest_size.h"
 // FIXME: Move sigverify to sw/device/silicon_creator/lib
-#include "sw/device/silicon_creator/mask_rom/sig_verify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_keys.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/sw/device/silicon_creator/mask_rom/mask_rom.c b/sw/device/silicon_creator/mask_rom/mask_rom.c
index 2e7db89..2a63124 100644
--- a/sw/device/silicon_creator/mask_rom/mask_rom.c
+++ b/sw/device/silicon_creator/mask_rom/mask_rom.c

@@ -17,7 +17,7 @@
 #include "sw/device/silicon_creator/lib/drivers/keymgr.h"
 #include "sw/device/silicon_creator/lib/drivers/uart.h"
 #include "sw/device/silicon_creator/mask_rom/romextimage.h"
-#include "sw/device/silicon_creator/mask_rom/sig_verify.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify.h"
 
 #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
 

diff --git a/sw/device/silicon_creator/mask_rom/meson.build b/sw/device/silicon_creator/mask_rom/meson.build
index b36dd8a..66fd351 100644
--- a/sw/device/silicon_creator/mask_rom/meson.build
+++ b/sw/device/silicon_creator/mask_rom/meson.build

@@ -18,9 +18,9 @@
   link_with: static_library(
     'sw_silicon_creator_mask_rom_sigverify',
     sources: [
-      'rsa_verify.c',
-      'sig_verify_keys.c',
-      'sig_verify.c',
+      'sigverify_mod_exp_ibex.c',
+      'sigverify_keys.c',
+      'sigverify.c',
     ],
     dependencies: [
       sw_silicon_creator_lib_driver_hmac,
@@ -137,12 +137,12 @@
   )
 endforeach
 
-test('sw_silicon_creator_mask_rom_rsa_verify_unittest', executable(
-    'sw_silicon_creator_mask_rom_rsa_verify_unittest',
+test('sw_silicon_creator_mask_rom_sigverify_mod_exp_ibex_unittest', executable(
+    'sw_silicon_creator_mask_rom_sigverify_mod_exp_ibex_unittest',
     sources: [
-      'rsa_verify.c',
-      'sig_verify_keys.c',
-      'rsa_verify_unittest.cc',
+      'sigverify_mod_exp_ibex.c',
+      'sigverify_keys.c',
+      'sigverify_mod_exp_ibex_unittest.cc',
     ],
     dependencies: [
       sw_vendor_gtest,
@@ -152,12 +152,12 @@
   suite: 'mask_rom',
 )
 
-test('sw_silicon_creator_mask_rom_sig_verify_unittest', executable(
-    'sw_silicon_creator_mask_rom_sig_verify_unittest',
+test('sw_silicon_creator_mask_rom_sigverify_unittest', executable(
+    'sw_silicon_creator_mask_rom_sigverify_unittest',
     sources: [
-      'sig_verify_unittest.cc',
-      'sig_verify.c',
-      'sig_verify_keys.c',
+      'sigverify_unittest.cc',
+      'sigverify.c',
+      'sigverify_keys.c',
     ],
     dependencies: [
       sw_vendor_gtest,

diff --git a/sw/device/silicon_creator/mask_rom/mock_rsa_verify.h b/sw/device/silicon_creator/mask_rom/mock_rsa_verify.h
deleted file mode 100644
index e5b39ae..0000000
--- a/sw/device/silicon_creator/mask_rom/mock_rsa_verify.h
+++ /dev/null

@@ -1,40 +0,0 @@
-// Copyright lowRISC contributors.
-// Licensed under the Apache License, Version 2.0, see LICENSE for details.
-// SPDX-License-Identifier: Apache-2.0
-
-#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_MOCK_RSA_VERIFY_H_
-#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_MOCK_RSA_VERIFY_H_
-
-#include "sw/device/lib/testing/mask_rom_test.h"
-#include "sw/device/silicon_creator/mask_rom/rsa_verify.h"
-
-namespace mask_rom_test {
-namespace internal {
-
-/**
- * Mock class for rsa_verify.c.
- */
-class MockRsaVerify {
- public:
-  MOCK_METHOD(bool, mod_exp_ibex,
-              (const sigverify_rsa_key_t *, const sigverify_rsa_buffer_t *,
-               sigverify_rsa_buffer_t *));
-  virtual ~MockRsaVerify() {}
-};
-
-}  // namespace internal
-
-using MockRsaVerify = GlobalMock<testing::StrictMock<internal::MockRsaVerify>>;
-
-extern "C" {
-
-bool sigverify_mod_exp_ibex(const sigverify_rsa_key_t *key,
-                            const sigverify_rsa_buffer_t *sig,
-                            sigverify_rsa_buffer_t *result) {
-  return MockRsaVerify::Instance().mod_exp_ibex(key, sig, result);
-}
-
-}  // extern "C"
-}  // namespace mask_rom_test
-
-#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_MOCK_RSA_VERIFY_H_

diff --git a/sw/device/silicon_creator/mask_rom/mock_sigverify_mod_exp.h b/sw/device/silicon_creator/mask_rom/mock_sigverify_mod_exp.h
new file mode 100644
index 0000000..d22fb14
--- /dev/null
+++ b/sw/device/silicon_creator/mask_rom/mock_sigverify_mod_exp.h

@@ -0,0 +1,41 @@
+// Copyright lowRISC contributors.
+// Licensed under the Apache License, Version 2.0, see LICENSE for details.
+// SPDX-License-Identifier: Apache-2.0
+
+#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_MOCK_SIGVERIFY_MOD_EXP_H_
+#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_MOCK_SIGVERIFY_MOD_EXP_H_
+
+#include "sw/device/lib/testing/mask_rom_test.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_mod_exp.h"
+
+namespace mask_rom_test {
+namespace internal {
+
+/**
+ * Mock class for sigverify_mod_exp.h
+ */
+class MockSigverifyModExp {
+ public:
+  MOCK_METHOD(bool, ibex,
+              (const sigverify_rsa_key_t *, const sigverify_rsa_buffer_t *,
+               sigverify_rsa_buffer_t *));
+  virtual ~MockSigverifyModExp() {}
+};
+
+}  // namespace internal
+
+using MockSigverifyModExp =
+    GlobalMock<testing::StrictMock<internal::MockSigverifyModExp>>;
+
+extern "C" {
+
+bool sigverify_mod_exp_ibex(const sigverify_rsa_key_t *key,
+                            const sigverify_rsa_buffer_t *sig,
+                            sigverify_rsa_buffer_t *result) {
+  return MockSigverifyModExp::Instance().ibex(key, sig, result);
+}
+
+}  // extern "C"
+}  // namespace mask_rom_test
+
+#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_MOCK_SIGVERIFY_MOD_EXP_H_

diff --git a/sw/device/silicon_creator/mask_rom/sig_verify.c b/sw/device/silicon_creator/mask_rom/sigverify.c
similarity index 95%
rename from sw/device/silicon_creator/mask_rom/sig_verify.c
rename to sw/device/silicon_creator/mask_rom/sigverify.c
index f1c138e..dbfb3f9 100644
--- a/sw/device/silicon_creator/mask_rom/sig_verify.c
+++ b/sw/device/silicon_creator/mask_rom/sigverify.c

@@ -2,13 +2,13 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "sw/device/silicon_creator/mask_rom/sig_verify.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify.h"
 
 #include "sw/device/lib/base/memory.h"
 #include "sw/device/lib/base/mmio.h"
 #include "sw/device/silicon_creator/lib/drivers/hmac.h"
-#include "sw/device/silicon_creator/mask_rom/rsa_verify.h"
-#include "sw/device/silicon_creator/mask_rom/sig_verify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_mod_exp.h"
 
 #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
 

diff --git a/sw/device/silicon_creator/mask_rom/sig_verify.h b/sw/device/silicon_creator/mask_rom/sigverify.h
similarity index 77%
rename from sw/device/silicon_creator/mask_rom/sig_verify.h
rename to sw/device/silicon_creator/mask_rom/sigverify.h
index 96cc12a..616501c 100644
--- a/sw/device/silicon_creator/mask_rom/sig_verify.h
+++ b/sw/device/silicon_creator/mask_rom/sigverify.h

@@ -2,14 +2,14 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIG_VERIFY_H_
-#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIG_VERIFY_H_
+#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_H_
+#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "sw/device/silicon_creator/lib/error.h"
-#include "sw/device/silicon_creator/mask_rom/sig_verify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_keys.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,4 +33,4 @@
 }  // extern "C"
 #endif  // __cplusplus
 
-#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIG_VERIFY_H_
+#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_H_

diff --git a/sw/device/silicon_creator/mask_rom/sig_verify_keys.c b/sw/device/silicon_creator/mask_rom/sigverify_keys.c
similarity index 98%
rename from sw/device/silicon_creator/mask_rom/sig_verify_keys.c
rename to sw/device/silicon_creator/mask_rom/sigverify_keys.c
index 1283bd3..fb08997 100644
--- a/sw/device/silicon_creator/mask_rom/sig_verify_keys.c
+++ b/sw/device/silicon_creator/mask_rom/sigverify_keys.c

@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "sw/device/silicon_creator/mask_rom/sig_verify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_keys.h"
 
 /**
  * Public keys for signature verification.

diff --git a/sw/device/silicon_creator/mask_rom/sig_verify_keys.h b/sw/device/silicon_creator/mask_rom/sigverify_keys.h
similarity index 89%
rename from sw/device/silicon_creator/mask_rom/sig_verify_keys.h
rename to sw/device/silicon_creator/mask_rom/sigverify_keys.h
index d5aa611..0eac4b3 100644
--- a/sw/device/silicon_creator/mask_rom/sig_verify_keys.h
+++ b/sw/device/silicon_creator/mask_rom/sigverify_keys.h

@@ -2,8 +2,8 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIG_VERIFY_KEYS_H_
-#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIG_VERIFY_KEYS_H_
+#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_KEYS_H_
+#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_KEYS_H_
 
 #include <stdint.h>
 
@@ -80,4 +80,4 @@
 }  // extern "C"
 #endif  // __cplusplus
 
-#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIG_VERIFY_KEYS_H_
+#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_KEYS_H_

diff --git a/sw/device/silicon_creator/mask_rom/rsa_verify.h b/sw/device/silicon_creator/mask_rom/sigverify_mod_exp.h
similarity index 88%
rename from sw/device/silicon_creator/mask_rom/rsa_verify.h
rename to sw/device/silicon_creator/mask_rom/sigverify_mod_exp.h
index e84d264..c5ae69a 100644
--- a/sw/device/silicon_creator/mask_rom/rsa_verify.h
+++ b/sw/device/silicon_creator/mask_rom/sigverify_mod_exp.h

@@ -2,13 +2,13 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_RSA_VERIFY_H_
-#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_RSA_VERIFY_H_
+#ifndef OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_MOD_EXP_H_
+#define OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_MOD_EXP_H_
 
 #include <stdbool.h>
 #include <stdint.h>
 
-#include "sw/device/silicon_creator/mask_rom/sig_verify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_keys.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -67,4 +67,4 @@
 }  // extern "C"
 #endif  // __cplusplus
 
-#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_RSA_VERIFY_H_
+#endif  // OPENTITAN_SW_DEVICE_SILICON_CREATOR_MASK_ROM_SIGVERIFY_MOD_EXP_H_

diff --git a/sw/device/silicon_creator/mask_rom/rsa_verify.c b/sw/device/silicon_creator/mask_rom/sigverify_mod_exp_ibex.c
similarity index 97%
rename from sw/device/silicon_creator/mask_rom/rsa_verify.c
rename to sw/device/silicon_creator/mask_rom/sigverify_mod_exp_ibex.c
index 1ee633d..76c6b42 100644
--- a/sw/device/silicon_creator/mask_rom/rsa_verify.c
+++ b/sw/device/silicon_creator/mask_rom/sigverify_mod_exp_ibex.c

@@ -2,12 +2,11 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "sw/device/silicon_creator/mask_rom/rsa_verify.h"
-
 #include <stddef.h>
 
 #include "sw/device/lib/base/memory.h"
-#include "sw/device/silicon_creator/mask_rom/sig_verify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_keys.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_mod_exp.h"
 
 /**
  * Subtracts the modulus of `key` from `a` in-place, i.e. `a -= n`.

diff --git a/sw/device/silicon_creator/mask_rom/rsa_verify_unittest.cc b/sw/device/silicon_creator/mask_rom/sigverify_mod_exp_ibex_unittest.cc
similarity index 98%
rename from sw/device/silicon_creator/mask_rom/rsa_verify_unittest.cc
rename to sw/device/silicon_creator/mask_rom/sigverify_mod_exp_ibex_unittest.cc
index 3728dae..dd0300d 100644
--- a/sw/device/silicon_creator/mask_rom/rsa_verify_unittest.cc
+++ b/sw/device/silicon_creator/mask_rom/sigverify_mod_exp_ibex_unittest.cc

@@ -2,14 +2,13 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "sw/device/silicon_creator/mask_rom/rsa_verify.h"
-
 #include <unordered_set>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify_mod_exp.h"
 
-namespace rsa_verify_unittest {
+namespace sigverify_mod_exp_ibex_unittest {
 namespace {
 
 TEST(Keys, UniqueIds) {
@@ -39,7 +38,7 @@
 };
 
 /**
- * R^2 mod n for each key in `sig_verify_keys.c`.
+ * R^2 mod n for each key in `sigverify_keys.c`.
  */
 constexpr Rsquare kRsquares[kSigVerifyNumRsaKeys] = {
     {
@@ -368,4 +367,4 @@
 INSTANTIATE_TEST_SUITE_P(AllCases, ModExp, testing::ValuesIn(kSigTestCases));
 
 }  // namespace
-}  // namespace rsa_verify_unittest
+}  // namespace sigverify_mod_exp_ibex_unittest

diff --git a/sw/device/silicon_creator/mask_rom/sig_verify_unittest.cc b/sw/device/silicon_creator/mask_rom/sigverify_unittest.cc
similarity index 90%
rename from sw/device/silicon_creator/mask_rom/sig_verify_unittest.cc
rename to sw/device/silicon_creator/mask_rom/sigverify_unittest.cc
index 204d91c..5b0f4a1 100644
--- a/sw/device/silicon_creator/mask_rom/sig_verify_unittest.cc
+++ b/sw/device/silicon_creator/mask_rom/sigverify_unittest.cc

@@ -2,19 +2,19 @@
 // Licensed under the Apache License, Version 2.0, see LICENSE for details.
 // SPDX-License-Identifier: Apache-2.0
 
-#include "sw/device/silicon_creator/mask_rom/sig_verify.h"
+#include "sw/device/silicon_creator/mask_rom/sigverify.h"
 
 #include <cstring>
 
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
-#include "sig_verify_keys.h"
+#include "sigverify_keys.h"
 #include "sw/device/silicon_creator/lib/drivers/mock_hmac.h"
-#include "sw/device/silicon_creator/mask_rom/mock_rsa_verify.h"
+#include "sw/device/silicon_creator/mask_rom/mock_sigverify_mod_exp.h"
 
 #include "hw/top_earlgrey/sw/autogen/top_earlgrey.h"
 
-namespace sig_verify_unittest {
+namespace sigverify_unittest {
 namespace {
 using ::testing::DoAll;
 using ::testing::NotNull;
@@ -88,7 +88,7 @@
 
 class SigVerifyTest : public mask_rom_test::MaskRomTest {
  protected:
-  mask_rom_test::MockRsaVerify sig_verify_mod_exp_;
+  mask_rom_test::MockSigverifyModExp sigverify_mod_exp_;
   mask_rom_test::MockHmac hmac_;
 };
 
@@ -101,8 +101,8 @@
       .WillOnce(Return(kErrorOk));
   EXPECT_CALL(hmac_, sha256_final(NotNull()))
       .WillOnce(DoAll(SetArgPointee<0>(kTestDigest), Return(kErrorOk)));
-  EXPECT_CALL(sig_verify_mod_exp_,
-              mod_exp_ibex(&kSigVerifyRsaKeys[0], &kSignature, NotNull()))
+  EXPECT_CALL(sigverify_mod_exp_,
+              ibex(&kSigVerifyRsaKeys[0], &kSignature, NotNull()))
       .WillOnce(DoAll(SetArgPointee<2>(kEncMsg), Return(kErrorOk)));
 
   EXPECT_EQ(
@@ -128,8 +128,8 @@
         .WillOnce(Return(kErrorOk));
     EXPECT_CALL(hmac_, sha256_final(NotNull()))
         .WillOnce(DoAll(SetArgPointee<0>(kTestDigest), Return(kErrorOk)));
-    EXPECT_CALL(sig_verify_mod_exp_,
-                mod_exp_ibex(&kSigVerifyRsaKeys[0], &kSignature, NotNull()))
+    EXPECT_CALL(sigverify_mod_exp_,
+                ibex(&kSigVerifyRsaKeys[0], &kSignature, NotNull()))
         .WillOnce(DoAll(SetArgPointee<2>(bad_enc_msg), Return(true)));
 
     EXPECT_EQ(
@@ -140,4 +140,4 @@
 }
 
 }  // namespace
-}  // namespace sig_verify_unittest
+}  // namespace sigverify_unittest