Skip to content
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.

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

[rom_ext] Eliminate ROM_EXT RSA application keys (manual cherry-pick) #25020

Merged
merged 1 commit into from
Nov 7, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
24 changes: 1 addition & 23 deletions rules/opentitan.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -125,23 +125,6 @@ SILICON_CREATOR_KEYS = struct(
),
)

SILICON_OWNER_KEYS = struct(
FAKE = struct(
RSA = struct(
TEST = [
create_test_key("fake_rsa_rom_ext_test_key_0", "@//sw/device/silicon_creator/rom_ext/keys/fake:rom_ext_test_private_key_0"),
],
DEV = [
create_dev_key("fake_rsa_rom_ext_dev_key_0", "@//sw/device/silicon_creator/rom_ext/keys/fake:rom_ext_dev_private_key_0"),
],
PROD = None,
),
# We can't expose real private keys publicly.
REAL = None,
UNAUTHORIZED = None,
),
)

def flatten(l):
return [item for ll in l for item in ll]

Expand Down Expand Up @@ -170,11 +153,6 @@ ECDSA_SPX_KEY_STRUCTS = [
create_key_struct(SILICON_CREATOR_KEYS.FAKE.ECDSA.PROD[0], None, SILICON_CREATOR_KEYS.FAKE.SPX.PROD[0]),
]

RSA_ONLY_ROM_EXT_KEY_STRUCTS = [
create_key_struct(None, SILICON_OWNER_KEYS.FAKE.RSA.TEST[0], None),
create_key_struct(None, SILICON_OWNER_KEYS.FAKE.RSA.DEV[0], None),
]

def _obj_transform_impl(ctx):
cc_toolchain = find_cc_toolchain(ctx)
outputs = []
Expand Down Expand Up @@ -970,7 +948,7 @@ def opentitan_flash_binary(
name,
devices = PER_DEVICE_DEPS.keys(),
platform = OPENTITAN_PLATFORM,
signing_key_structs = ECDSA_ONLY_KEY_STRUCTS + RSA_ONLY_ROM_EXT_KEY_STRUCTS,
signing_key_structs = ECDSA_ONLY_KEY_STRUCTS,
signed = True,
sim_otp = None,
testonly = False,
Expand Down
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
4 changes: 3 additions & 1 deletion sw/device/silicon_creator/rom_ext/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,7 @@ manifest(d = {

opentitan_binary(
name = "rom_ext_slot_a_bad_address_translation",
testonly = True,
ecdsa_key = {"//sw/device/silicon_creator/rom/keys/fake/ecdsa:test_key_0_ecdsa_p256": "test_key_0"},
exec_env = [
"//hw/top_earlgrey:fpga_cw310",
Expand All @@ -335,6 +336,7 @@ opentitan_binary(
":rom_ext",
"//sw/device/lib/crt",
"//sw/device/silicon_creator/lib:manifest_def",
"//sw/device/silicon_creator/rom_ext/keys/fake",
"//sw/device/silicon_creator/lib/ownership:test_owner",
"//sw/device/silicon_creator/lib/ownership/keys/fake",
],
)
61 changes: 0 additions & 61 deletions sw/device/silicon_creator/rom_ext/keys/fake/BUILD

This file was deleted.

Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Binary file not shown.

This file was deleted.

Binary file not shown.
Loading
Loading