From 4652a08d1029c1fc0d448bed5f1b105efa72fadc Mon Sep 17 00:00:00 2001 From: jakcron Date: Thu, 31 Mar 2022 14:59:55 +0800 Subject: [PATCH] (ctrtool::CrrProcess) Emit errors/warns/logs in a consistent manner. --- ctrtool/src/CrrProcess.cpp | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ctrtool/src/CrrProcess.cpp b/ctrtool/src/CrrProcess.cpp index a0f3537..bffd1b5 100644 --- a/ctrtool/src/CrrProcess.cpp +++ b/ctrtool/src/CrrProcess.cpp @@ -124,7 +124,7 @@ void ctrtool::CrrProcess::verifyData() } else { - fmt::print(stderr, "Could not read static CRR public key.\n"); + fmt::print(stderr, "[{} LOG] Could not read static CRR public key.\n", mModuleLabel); mValidCertificateSignature = ValidState::Fail; } @@ -145,6 +145,20 @@ void ctrtool::CrrProcess::verifyData() { mValidUniqueId = ((mBodyHeader.unique_id.unwrap() & mHeader.body_certificate.unique_id_mask.unwrap()) == 0) ? ValidState::Good : ValidState::Fail; } + + // log validation errors + if (mValidCertificateSignature != ValidState::Good) + { + fmt::print(stderr, "[{} LOG] Signature for CRR Certificate was invalid.\n", mModuleLabel); + } + if (mValidBodySignature != ValidState::Good) + { + fmt::print(stderr, "[{} LOG] Signature for CRR Body was invalid.\n", mModuleLabel); + } + if (mValidUniqueId != ValidState::Good) + { + fmt::print(stderr, "[{} LOG] CRR UniqueId was invalid.\n", mModuleLabel); + } } void ctrtool::CrrProcess::printData()