-
Notifications
You must be signed in to change notification settings - Fork 38
Move public legacy headers to /include/mbedtls #247
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?
Conversation
There are probably build scripts that need to be updated. For example
and presumably there needs to be a line for |
a4f8043
to
d653d1b
Compare
The companion PR Mbed-TLS/mbedtls#10122 has now passed the CI |
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.
The PR looks mostly OK to me. I only left 1 question
The CI is unhappy here. Is the companion mbedtls pull request needed to make it happy? |
Yep, there's Mbed-TLS/mbedtls#10122 & Mbed-TLS/mbedtls-framework#156. Both of those should be merge-able without any dependencies, so I guess the process would be merge framework -> update mbedtls PR's tf-psa-crypto pointer to development head rather than this patch & update framework pointer to the merge commit -> wait for mbedtls to pass CI without this tf-psa-crypto commit -> merge mbedtls PR -> update framework pointer to the merge commit for this tf-psa-crypto PR which should then make this CI green -> merge this PR. Does this seem right? |
@felixc-arm The framework PR can be merged on its own. But the mbedtls PR updates the crypto submodule, so it can't be merged until the crypto PR is merged. Is there a reasonable intermediate step where we can update mbedtls and crypto independently? |
@gilles-peskine-arm If I change the crypto pointer in the mbedtls PR back to Then this crypto PR can be merged as the CI will use the new mbedtls from the now-merged mbedtls PR. I guess after that is done then we can do a new patch that just updates mbedtls' crypto pointer to use the merge commit from this crypto PR, although that might not be needed if we don't care about the change being picked up immediately (although it would probably be better to do this so that This is the only way I can see to get stuff merged without (temporarily) breaking things for other people. |
@felixc-arm That's great! Please do this then. When it's just a matter of splitting PR like this, it's less disruptive than requiring branch updates to be synchronized — that tends to break many pull requests for unrelated work in progress. |
There's a merge conflict in the framework submodule, please update it. There are also CI failures which look like they might be related to this change. |
@gilles-peskine-arm Yep, just waiting on Mbed-TLS/mbedtls#10122 to go in so that the |
Signed-off-by: Felix Conway <[email protected]>
Signed-off-by: Felix Conway <[email protected]>
Signed-off-by: Felix Conway <[email protected]>
ced1c6d
to
63b5717
Compare
Moves public headers from
/drivers/builtin/include/mbedtls
to/include/mbedtls
to make it clear that they are public.Resolves #223, although there may be further work to move these headers somewhere else, e.g.
/include/tf-psa-crypto
.List of files moved for reference:
PR checklist