summaryrefslogtreecommitdiff
path: root/firmware/2lib
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2020-08-12 15:46:30 -0700
committerCommit Bot <commit-bot@chromium.org>2020-08-19 02:09:02 +0000
commit053592bd3d5fcb79b8fa3a6f6193ffedfc041dba (patch)
tree6088a6910490013226292fdb570f0dcd992d8739 /firmware/2lib
parentfaf9cd3bbbc133487c272d81771b8bbf4d439915 (diff)
downloadvboot-053592bd3d5fcb79b8fa3a6f6193ffedfc041dba.tar.gz
inclusive: change usage of sanity
Google is working to change its source code to use more inclusive language. To that end, replace the term "sanity" with inclusive alternatives. BUG=b:163883397 BRANCH=None TEST=grep -ir sanity TEST=make runtests Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Change-Id: I708a044d89050c442f14fb11a8ae5e98490d56af Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/vboot_reference/+/2353420 Reviewed-by: Julius Werner <jwerner@chromium.org>
Diffstat (limited to 'firmware/2lib')
-rw-r--r--firmware/2lib/2common.c4
-rw-r--r--firmware/2lib/2ui_screens.c6
-rw-r--r--firmware/2lib/include/2common.h6
3 files changed, 8 insertions, 8 deletions
diff --git a/firmware/2lib/2common.c b/firmware/2lib/2common.c
index e51b84ff..09379cc2 100644
--- a/firmware/2lib/2common.c
+++ b/firmware/2lib/2common.c
@@ -267,7 +267,7 @@ vb2_error_t vb2_verify_keyblock(struct vb2_keyblock *block, uint32_t size,
struct vb2_signature *sig = &block->keyblock_signature;
vb2_error_t rv;
- /* Sanity check keyblock before attempting signature check of data */
+ /* Validity check keyblock before attempting signature check of data */
VB2_TRY(vb2_check_keyblock(block, size, sig));
VB2_DEBUG("Checking keyblock signature...\n");
@@ -290,7 +290,7 @@ vb2_error_t vb2_verify_fw_preamble(struct vb2_fw_preamble *preamble,
VB2_DEBUG("Verifying preamble.\n");
- /* Sanity checks before attempting signature of data */
+ /* Validity checks before attempting signature of data */
if(size < sizeof(*preamble)) {
VB2_DEBUG("Not enough data for preamble header\n");
return VB2_ERROR_PREAMBLE_TOO_SMALL_FOR_HEADER;
diff --git a/firmware/2lib/2ui_screens.c b/firmware/2lib/2ui_screens.c
index 04f037bd..e8f59164 100644
--- a/firmware/2lib/2ui_screens.c
+++ b/firmware/2lib/2ui_screens.c
@@ -415,11 +415,11 @@ static vb2_error_t recovery_to_dev_finalize(struct vb2_ui_context *ui)
{
VB2_DEBUG("Physical presence confirmed!\n");
- /* Sanity check, should never happen. */
+ /* Validity check, should never happen. */
if (ui->state->screen->id != VB2_SCREEN_RECOVERY_TO_DEV ||
(vb2_get_sd(ui->ctx)->flags & VB2_SD_FLAG_DEV_MODE_ENABLED) ||
!vb2_allow_recovery(ui->ctx)) {
- VB2_DEBUG("ERROR: Dev transition sanity check failed\n");
+ VB2_DEBUG("ERROR: Dev transition validity check failed\n");
return VB2_REQUEST_UI_CONTINUE;
}
@@ -630,7 +630,7 @@ vb2_error_t vb2_ui_developer_mode_boot_external_action(
{
vb2_error_t rv;
- /* Sanity check, should never happen. */
+ /* Validity check, should never happen. */
if (!(ui->ctx->flags & VB2_CONTEXT_DEVELOPER_MODE) ||
!vb2_dev_boot_allowed(ui->ctx) ||
!vb2_dev_boot_external_allowed(ui->ctx)) {
diff --git a/firmware/2lib/include/2common.h b/firmware/2lib/include/2common.h
index e3a7989b..dbc62643 100644
--- a/firmware/2lib/include/2common.h
+++ b/firmware/2lib/include/2common.h
@@ -371,7 +371,7 @@ vb2_error_t vb2_verify_data(const uint8_t *data, uint32_t size,
const struct vb2_workbuf *wb);
/**
- * Check the sanity of a keyblock structure.
+ * Check the validity of a keyblock structure.
*
* Verifies all the header fields. Does not verify key index or keyblock
* flags. Should be called before verifying the keyblock data itself using
@@ -388,7 +388,7 @@ vb2_error_t vb2_check_keyblock(const struct vb2_keyblock *block, uint32_t size,
/**
* Verify a keyblock using a public key.
*
- * Header fields are also checked for sanity. Does not verify key index or key
+ * Header fields are also checked for validity. Does not verify key index or key
* block flags. Signature inside block is destroyed during check.
*
* @param block Keyblock to verify
@@ -402,7 +402,7 @@ vb2_error_t vb2_verify_keyblock(struct vb2_keyblock *block, uint32_t size,
const struct vb2_workbuf *wb);
/**
- * Check the sanity of a firmware preamble using a public key.
+ * Check the validity of a firmware preamble using a public key.
*
* The signature in the preamble is destroyed during the check.
*