add install restricted screen on installation with locked bootloader #3236
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
matejcik
reviewed
Aug 25, 2023
core/embed/bootloader/main.c
Outdated
Comment on lines
191
to
199
| #ifdef USE_OPTIGA | ||
| if (r == UPLOAD_ERR_BOOTLOADER_LOCKED) { | ||
| ui_screen_install_restricted(); | ||
| } else { | ||
| ui_screen_fail(); | ||
| } | ||
| #else | ||
| ui_screen_fail(); | ||
| #endif |
There was a problem hiding this comment.
let's avoid the ifdef here, and instead redefine ui_screen_install_restricted to ui_screen_fail if there is no optiga.
matejcik
approved these changes
Aug 25, 2023
… bootloader [no changelog]
TychoVrahe
force-pushed
the
tychovrahe/bl_locked/screen
branch
from
cc79e56
to
48c60b6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Somehow we didn't add it with the last T2B1 bootloader changes.
Also fixes residual "attestation present" wording. Especially the return message when failing to install might be a reason to add this to earliest production bootloader version, as its something a user see in trezorctl and suite can react to it too, so having two version might be annoying.