[sw/silicon_creator] Rename sigverify_rom_ext_signature_verify()
Signed-off-by: Alphan Ulusoy <alphan@google.com>
diff --git a/sw/device/silicon_creator/mask_rom/mask_rom.c b/sw/device/silicon_creator/mask_rom/mask_rom.c
index 6439128..e41eb43 100644
--- a/sw/device/silicon_creator/mask_rom/mask_rom.c
+++ b/sw/device/silicon_creator/mask_rom/mask_rom.c
@@ -103,9 +103,8 @@
&key) != kErrorOk) {
break;
}
- if (sigverify_rom_ext_signature_verify(
- signed_region.start, signed_region.length, &manifest->signature,
- key) != kErrorOk) {
+ if (sigverify_rsa_verify(signed_region.start, signed_region.length,
+ &manifest->signature, key) != kErrorOk) {
break;
}
diff --git a/sw/device/silicon_creator/mask_rom/sigverify.c b/sw/device/silicon_creator/mask_rom/sigverify.c
index 1a46555..1cc39c5 100644
--- a/sw/device/silicon_creator/mask_rom/sigverify.c
+++ b/sw/device/silicon_creator/mask_rom/sigverify.c
@@ -69,12 +69,13 @@
return kErrorOk;
}
-rom_error_t sigverify_rom_ext_signature_verify(
- const void *signed_region, size_t signed_region_len,
- const sigverify_rsa_buffer_t *signature, const sigverify_rsa_key_t *key) {
+rom_error_t sigverify_rsa_verify(const void *signed_message,
+ size_t signed_message_len,
+ const sigverify_rsa_buffer_t *signature,
+ const sigverify_rsa_key_t *key) {
hmac_digest_t act_digest;
hmac_sha256_init();
- RETURN_IF_ERROR(hmac_sha256_update(signed_region, signed_region_len));
+ RETURN_IF_ERROR(hmac_sha256_update(signed_message, signed_message_len));
RETURN_IF_ERROR(hmac_sha256_final(&act_digest));
// FIXME: Choose between Ibex and OTBN using OTP.
diff --git a/sw/device/silicon_creator/mask_rom/sigverify.h b/sw/device/silicon_creator/mask_rom/sigverify.h
index b91e9a7..f73e7b5 100644
--- a/sw/device/silicon_creator/mask_rom/sigverify.h
+++ b/sw/device/silicon_creator/mask_rom/sigverify.h
@@ -30,17 +30,18 @@
}
/**
- * Verifies the signature of a ROM_EXT manifest.
+ * Verifies an RSASSA-PKCS1-v1_5 signature.
*
- * @param signed_region Pointer to the start of the signed region.
- * @param signed_region_len Length of the signed region in bytes.
- * @param signature An RSA signature.
- * @param key RSA public key to use for verifying the signature.
+ * @param signed_message Message whose signature is to be verified.
+ * @param signed_message_len Length of the signed message in bytes.
+ * @param signature Signature to be verified.
+ * @param key Signer's RSA public key.
* @return Result of the operation.
*/
-rom_error_t sigverify_rom_ext_signature_verify(
- const void *signed_region, size_t signed_region_len,
- const sigverify_rsa_buffer_t *signature, const sigverify_rsa_key_t *key);
+rom_error_t sigverify_rsa_verify(const void *signed_message,
+ size_t signed_message_len,
+ const sigverify_rsa_buffer_t *signature,
+ const sigverify_rsa_key_t *key);
#ifdef __cplusplus
} // extern "C"
diff --git a/sw/device/silicon_creator/mask_rom/sigverify_unittest.cc b/sw/device/silicon_creator/mask_rom/sigverify_unittest.cc
index 0b0f37b..f5d67bf 100644
--- a/sw/device/silicon_creator/mask_rom/sigverify_unittest.cc
+++ b/sw/device/silicon_creator/mask_rom/sigverify_unittest.cc
@@ -101,9 +101,8 @@
.WillOnce(DoAll(SetArgPointee<2>(kEncMsg), Return(kErrorOk)));
// FIXME: Parameterize with key ids.
- EXPECT_EQ(sigverify_rom_ext_signature_verify(
- kSignedRegion.data(), sizeof(kSignedRegion), &kSignature,
- &kSigVerifyRsaKeys[0]),
+ EXPECT_EQ(sigverify_rsa_verify(kSignedRegion.data(), sizeof(kSignedRegion),
+ &kSignature, &kSigVerifyRsaKeys[0]),
kErrorOk);
}
@@ -126,9 +125,8 @@
.WillOnce(DoAll(SetArgPointee<2>(bad_enc_msg), Return(true)));
// FIXME: Parameterize with key ids.
- EXPECT_EQ(sigverify_rom_ext_signature_verify(
- kSignedRegion.data(), sizeof(kSignedRegion), &kSignature,
- &kSigVerifyRsaKeys[0]),
+ EXPECT_EQ(sigverify_rsa_verify(kSignedRegion.data(), sizeof(kSignedRegion),
+ &kSignature, &kSigVerifyRsaKeys[0]),
kErrorSigverifyInvalidArgument);
}
}
