ot_otp: perform partition descrambling in DAI
#252
Conversation
luismarques
force-pushed
the
ot_otp_eg_descrambling
branch
from
bad7426 to
16c16db
Compare
AlexJones0
force-pushed
the
ot_otp_eg_descrambling
branch
from
16c16db to
d735823
Compare
Load the OTP scrambling keys from hex-string configured properties. These keys are used for decoding the scrambled data stored in secret partitions (`SECRET0`, `SECRET1`, etc.) Signed-off-by: Alex Jones <alex.jones@lowrisc.org>
Load the OTP scrambling keys from hex-string configured properties. These keys are used for decoding the scrambled data stored in secret partitions (`SECRET0`, `SECRET1`, etc.) Signed-off-by: Alex Jones <alex.jones@lowrisc.org>
Parse the hard-coded OTP scrambling key constants out of the relevant SV partition SV files into the generated OT configuration files, so that they can be used in the OTP. Signed-off-by: Alex Jones <alex.jones@lowrisc.org>
Unscramble DAI reads from secret partitions, which are scrambled with a scrambling key (configured per-partition as a netlist constant) via a simple Present block cipher. Co-authored-by: Alex Jones <alex.jones@lowrisc.org> Signed-off-by: Luís Marques <luismarques@lowrisc.org> Signed-off-by: Alex Jones <alex.jones@lowrisc.org>
Unscramble DAI reads from secret partitions, which are scrambled with a scrambling key (configured per-partition as a netlist constant) via a simple Present block cipher. Signed-off-by: Alex Jones <alex.jones@lowrisc.org>
These files need to include the new OTP scrambling keys, so regenerate them from the latest commits on the `master` branch (for Darjeeling) and the `earlgrey_1.0.0` branch (for Earlgrey). Signed-off-by: Alex Jones <alex.jones@lowrisc.org>
AlexJones0
force-pushed
the
ot_otp_eg_descrambling
branch
from
d735823 to
c70a4cd
Compare
|
This should be working on Earlgrey going via I've tried to add the support for Darjeeling as well, but don't have an easy way to test it. I can see the keys are being parsed into the configuration file correctly at least. @rivos-eblot would it be possible for you could check the Darjeeling implementation? |
AlexJones0
changed the title
ot_otp: perform partition descrambling in DAI
I can give it a try, but I do not know how. Let me check if we have some way to test it and get back to you. |
| except KeyError as exc: | ||
| raise ValueError('No scrambling key constants found') from exc | ||
| if len(key_values) <= idx: | ||
| raise ValueError(f'No such key {name} in the key array') from exc |
There was a problem hiding this comment.
Ah, I tried to push this change but you had already merged the PR 😅
| raise ValueError(f'No such key {name} in the key array') from exc | |
| raise ValueError(f'No such key {name} in the key array') |
It'll likely just throw an UnboundLocalError instead of a ValueError on this error case, so not a huge deal.
I'll open a PR to fix this.
3 participants
The descrambling for the token loading path will be done in a separate PR.