Skip to content

Commit

Permalink
image-verify: Add calls to cfi_assert_eq_N_words
Browse files Browse the repository at this point in the history
  • Loading branch information
@korran
korran committed Nov 8, 2023
1 parent de53cd2 commit 1671ebb
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 15 deletions.
4 changes: 2 additions & 2 deletions FROZEN_IMAGES.sha384sum
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# WARNING: Do not update this file without the approval of the Caliptra TAC
2b92c15fb71345d8e6576f597dd0e7ba609cf4769cd8d177f09f3316b9b2a850caa90d67398cf6c7ed2174282287566f caliptra-rom-no-log.bin
49b3f504a3db1b597b77cc8c214f17d94e94e2f3d66647a98481989e8497ca3fc5a4705d6bcc9419b076a293215346b4 caliptra-rom-with-log.bin
6b280ebd87f2343c2deeef3f5707d15b112ff6369a1d233dd261667bbf43b4477a51702a300de4d554a3da389e9f1342 caliptra-rom-no-log.bin
9cfd467b59716222a6462d3d3ba11c2b0978938782f4fc3b6478a5f6cab4a9f8eeb63fb98e97c105eb1c3cf6bce8877b caliptra-rom-with-log.bin
30 changes: 17 additions & 13 deletions image/verify/src/verifier.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
if cfi_launder(expected) != actual {
Err(CaliptraError::IMAGE_VERIFIER_ERR_VENDOR_PUB_KEY_DIGEST_MISMATCH)?;
} else {
cfi_assert_eq(expected, actual);
caliptra_cfi_lib::cfi_assert_eq_12_words(&expected, &actual);
}

Ok(())
Expand All @@ -358,18 +358,20 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {

let fuses_digest = self.env.owner_pub_key_digest_fuses();

if cfi_launder(fuses_digest) != ZERO_DIGEST && cfi_launder(fuses_digest) != actual {
if fuses_digest == ZERO_DIGEST {
caliptra_cfi_lib::cfi_assert_eq_12_words(&fuses_digest, &ZERO_DIGEST);
} else if fuses_digest != actual {
return Err(CaliptraError::IMAGE_VERIFIER_ERR_OWNER_PUB_KEY_DIGEST_MISMATCH);
} else {
cfi_assert!(fuses_digest == ZERO_DIGEST || fuses_digest == actual);
caliptra_cfi_lib::cfi_assert_eq_12_words(&fuses_digest, &actual);
}

if cfi_launder(reason) == ResetReason::UpdateReset {
let cold_boot_digest = self.env.owner_pub_key_digest_dv();
if cfi_launder(cold_boot_digest) != actual {
return Err(CaliptraError::IMAGE_VERIFIER_ERR_UPDATE_RESET_OWNER_DIGEST_FAILURE);
} else {
cfi_assert_eq(cold_boot_digest, actual);
caliptra_cfi_lib::cfi_assert_eq_12_words(&cold_boot_digest, &actual);
}
} else {
cfi_assert_ne(reason, ResetReason::UpdateReset);
Expand Down Expand Up @@ -475,7 +477,7 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
if cfi_launder(verify_r) != caliptra_drivers::Array4xN(sig.r) {
Err(CaliptraError::IMAGE_VERIFIER_ERR_OWNER_ECC_SIGNATURE_INVALID)?;
} else {
cfi_assert_eq(verify_r, caliptra_drivers::Array4xN(sig.r));
caliptra_cfi_lib::cfi_assert_eq_12_words(&verify_r.0, &sig.r);
}

Ok(())
Expand Down Expand Up @@ -507,7 +509,7 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
if cfi_launder(verify_r) != caliptra_drivers::Array4xN(ecc_sig.r) {
Err(CaliptraError::IMAGE_VERIFIER_ERR_VENDOR_ECC_SIGNATURE_INVALID)?;
} else {
cfi_assert_eq(verify_r, caliptra_drivers::Array4xN(ecc_sig.r));
caliptra_cfi_lib::cfi_assert_eq_12_words(&verify_r.0, &ecc_sig.r);
}

if cfi_launder(self.env.lms_verify_enabled()) {
Expand All @@ -520,10 +522,11 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
self.env.set_fw_extended_error(err.into());
CaliptraError::IMAGE_VERIFIER_ERR_VENDOR_LMS_VERIFY_FAILURE
})?;
if cfi_launder(candidate_key) != HashValue::from(lms_pub_key.digest) {
let pub_key_digest = HashValue::from(lms_pub_key.digest);
if candidate_key != pub_key_digest {
return Err(CaliptraError::IMAGE_VERIFIER_ERR_VENDOR_LMS_SIGNATURE_INVALID);
} else {
cfi_assert_eq(candidate_key, HashValue::from(lms_pub_key.digest));
caliptra_cfi_lib::cfi_assert_eq_6_words(&candidate_key.0, &pub_key_digest.0);
}
}
} else {
Expand All @@ -548,10 +551,11 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
CaliptraError::IMAGE_VERIFIER_ERR_OWNER_LMS_VERIFY_FAILURE
})?;

if cfi_launder(candidate_key) != HashValue::from(lms_pub_key.digest) {
let pub_key_digest = HashValue::from(lms_pub_key.digest);
if candidate_key != pub_key_digest {
return Err(CaliptraError::IMAGE_VERIFIER_ERR_OWNER_LMS_SIGNATURE_INVALID);
} else {
cfi_assert_eq(candidate_key, HashValue::from(lms_pub_key.digest));
caliptra_cfi_lib::cfi_assert_eq_6_words(&candidate_key.0, &pub_key_digest.0);
}

Ok(())
Expand Down Expand Up @@ -584,7 +588,7 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
if cfi_launder(*verify_info.digest) != actual {
Err(CaliptraError::IMAGE_VERIFIER_ERR_TOC_DIGEST_MISMATCH)?;
} else {
cfi_assert_eq(*verify_info.digest, actual);
caliptra_cfi_lib::cfi_assert_eq_12_words(verify_info.digest, &actual);
}

// Verify the FMC size is not zero.
Expand Down Expand Up @@ -682,7 +686,7 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
if cfi_launder(verify_info.digest) != actual {
Err(CaliptraError::IMAGE_VERIFIER_ERR_FMC_DIGEST_MISMATCH)?;
} else {
cfi_assert_eq(verify_info.digest, actual);
caliptra_cfi_lib::cfi_assert_eq_12_words(&verify_info.digest, &actual);
}

// Overflow/underflow is checked in verify_toc
Expand Down Expand Up @@ -771,7 +775,7 @@ impl<Env: ImageVerificationEnv> ImageVerifier<Env> {
if cfi_launder(verify_info.digest) != actual {
Err(CaliptraError::IMAGE_VERIFIER_ERR_RUNTIME_DIGEST_MISMATCH)?;
} else {
cfi_assert_eq(verify_info.digest, actual);
caliptra_cfi_lib::cfi_assert_eq_12_words(&verify_info.digest, &actual);
}

// Overflow/underflow is checked in verify_toc
Expand Down

0 comments on commit 1671ebb

Please sign in to comment.