Skip to content

Backport 25964 ([rom] Make the DEV key valid in TEST and RMA) #28792

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −3
Open

Backport 25964 ([rom] Make the DEV key valid in TEST and RMA) #28792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions rules/opentitan/keyutils.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,15 @@ def create_test_key(name, label):

def create_dev_key(name, label):
return create_key_(name, label, [
CONST.LCV.TEST_UNLOCKED0,
CONST.LCV.TEST_UNLOCKED1,
CONST.LCV.TEST_UNLOCKED2,
CONST.LCV.TEST_UNLOCKED3,
CONST.LCV.TEST_UNLOCKED4,
CONST.LCV.TEST_UNLOCKED5,
CONST.LCV.TEST_UNLOCKED6,
CONST.LCV.TEST_UNLOCKED7,
CONST.LCV.RMA,
CONST.LCV.DEV,
])

Expand Down
2 changes: 1 addition & 1 deletion sw/device/silicon_creator/rom/doc/sigverify.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ not depend on the OTP value since it may not have been programmed yet.
| | TEST_UNLOCKED | PROD, PROD_END | DEV | RMA |
|-----------|---------------|----------------|-----|-----|
| Test keys | Yes | No | No | OTP |
| Dev keys | No | No | OTP | No |
| Dev keys | Yes | No | OTP | OTP |
| Prod keys | Yes | OTP | OTP | OTP |

### Digest Computation
Expand Down
4 changes: 2 additions & 2 deletions sw/device/silicon_creator/rom/sigverify_otp_keys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ static rom_error_t key_is_valid_in_lc_state_rma(sigverify_key_type_t key_type) {
return kErrorOk;
case kSigverifyKeyTypeDev:
HARDENED_CHECK_EQ(key_type, kSigverifyKeyTypeDev);
return kErrorSigverifyBadKey;
return kErrorOk;
default:
HARDENED_TRAP();
OT_UNREACHABLE();
Expand Down Expand Up @@ -145,7 +145,7 @@ static rom_error_t key_is_valid_in_lc_state_test(
return kErrorOk;
case kSigverifyKeyTypeDev:
HARDENED_CHECK_EQ(key_type, kSigverifyKeyTypeDev);
return kErrorSigverifyBadKey;
return kErrorOk;
default:
HARDENED_TRAP();
OT_UNREACHABLE();
Expand Down
Loading