-
Notifications
You must be signed in to change notification settings - Fork 2.7k
Remove MBEDTLS_SHA3_C
config option
#10145
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
base: development
Are you sure you want to change the base?
Remove MBEDTLS_SHA3_C
config option
#10145
Conversation
f2c4433
to
3413305
Compare
fec00a0
to
820ed0d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Generally looks good to me, but I see there's a CI failure saying Error: Test case not executed: test_suite_shax;SHA-3 invalid param
. It also seems to be present in the TF-PSA-Crypto
patch so I'm not sure if the fix would be here or (more likely) in the TF-PSA-Crypto
patch. Otherwise LGTM 🙂
820ed0d
to
56e107c
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good to me, thanks!
As discussed on the crypto PR, I think we can first merge this without updating the crypto pointer, then merge the crypto PR, and be done with it (no mutual dependency, no follow-up). Can you try removing the commit that updates the crypto pointer? Then if we get a green CI I'll formally approve.
Note: I've compared the error.c
files generated before and after this PR, and all the changes look good to me. You've even fixed a minor indentation inconsistency in #if
statements, thanks :)
56e107c
to
4de2732
Compare
I see you're still updating the crypto pointer here. Do you disagree with the proposed approach? If so, can you explain what you think I'm missing? Otherwise, can you push a version of this PR with just the last commit removed (ie keeping all changes except for the submodule update)? If it passes CI that way, we can merge it without waiting for the crypto PR, making things much simpler. |
I only want to test the changes of the crypto repo. |
4de2732
to
1ecf015
Compare
Ok, makes sense. Note that this can be done by starting a job manually with all the branches you want as parameters: https://mbedtls.trustedfirmware.org/job/mbed-tls-restricted-pr-test-parametrized/build?delay=0sec Well looks like the CI fully disagrees with my idea that we could get the Mbed TLS PR merged first, without updating the submodule. So, I officially withdraw that suggestion, sorry. Let's go back to Gille's plan: let's try to get the crypto PR merged first (ie, with a clean CI on its own, not through the companion mbedtls CI). IIRC there was a point where the only CI issue there was |
Signed-off-by: Gabor Mezei <[email protected]>
Adapt the `generate_errors.pl` to handle `PSA_WANT` macros and update to handle SHA3 macros. Signed-off-by: Gabor Mezei <[email protected]>
The markers for the generated code need to indented due to the code style check. During the replacement remove the spaces along with the markers. Signed-off-by: Gabor Mezei <[email protected]>
Signed-off-by: Gabor Mezei <[email protected]>
1ecf015
to
04b18e2
Compare
Description
Replace uses of MBEDTLS_SHA3_C config option with PSA_WANT macros.
Resolve #10203
PR checklist
Please remove the segment/s on either side of the | symbol as appropriate, and add any relevant link/s to the end of the line.
If the provided content is part of the present PR remove the # symbol.
MBEDTLS_SHA3_C
config option TF-PSA-Crypto#266