Skip to content

Commit 32fcecd

Browse files
committed
dasharo-deploy & btg_key_validator: reword error messages
Signed-off-by: Michał Iwanicki <michal.iwanicki@3mdeb.com>
1 parent a22ed0b commit 32fcecd

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

scripts/btg_key_validator

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ parse_args "$@"
6262

6363
if [ -z "$expected_hash" ]; then
6464
board_config
65-
error_check "Failed to download board configuration"
65+
error_check "Failed to download board configuration."
6666
if [ -z "$INTEL_BTG_HASH" ]; then
67-
error_exit "Cannot determine expected key hash.
68-
Make sure your platform firmware supports Intel BootGuard"
67+
error_exit "Platform configuration is missing expected key hash.
68+
The most likely reason is that there is no fusing binary for your platform."
6969
fi
7070
expected_hash="$INTEL_BTG_HASH"
7171
fi

scripts/dasharo-deploy.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1450,6 +1450,9 @@ fuse_workflow() {
14501450
echo "No release with fusing support is available for your platform."
14511451
exit "${CANCEL}"
14521452
fi
1453+
if [ -z "$INTEL_BTG_HASH" ]; then
1454+
error_exit "Platform config is missing hash of the key used to sign firmware"
1455+
fi
14531456

14541457
BIOS_LINK="${EOM_LINK_COMM_CAP}"
14551458
BIOS_HASH_LINK="${EOM_HASH_LINK_COMM_CAP}"
@@ -1471,7 +1474,8 @@ fuse_workflow() {
14711474
download_bios
14721475
verify_artifacts bios
14731476
btg_key_validator --file "$BIOS_UPDATE_FILE" --key-hash "$INTEL_BTG_HASH"
1474-
error_check "Firmware Intel BootGuard signature check failed. Aborting..."
1477+
error_check "Firmware Intel BootGuard signature check failed. Aborting...
1478+
Platform has not been fused and no changes were made."
14751479
# Ask user for confirmation:
14761480
display_warning
14771481

0 commit comments

Comments
 (0)