Replace MBEDTLS_PK_HAVE_ECC_KEYS with PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY #34
Conversation
eleuzi01
added
enhancement
eleuzi01
added
needs-work
and removed
needs-review
scripts/generate_config_tests.py
Outdated
| @@ -87,7 +87,7 @@ def dependencies_of_setting(cfg: config.Config, | |||
| if name.startswith('MBEDTLS_CIPHER_PADDING_'): | |||
| return 'MBEDTLS_CIPHER_C:MBEDTLS_CIPHER_MODE_CBC' | |||
| if name.startswith('MBEDTLS_PK_PARSE_EC_'): | |||
| return 'MBEDTLS_PK_C:MBEDTLS_PK_HAVE_ECC_KEYS' | |||
| return 'MBEDTLS_PK_C:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY' | |||
There was a problem hiding this comment.
We need this change for development (to be able to merge #9492) and to keep MBEDTLS_PK_HAVE_ECC_KEYS for 3.6. There has been some discussion how to do that (see #51) but to unblock #9492 let's go with a local ad-hoc solution here based on build_tree.is_mbedtls_3_6(). Something like (not tested):
if build_tree.is_mbedtls_3_6():
return 'MBEDTLS_PK_C:MBEDTLS_PK_HAVE_ECC_KEYS'
else:
return 'MBEDTLS_PK_C:PSA_WANT_KEY_TYPE_ECC_PUBLIC_KEY'with a comment indicating that it is temporary and pointing to #51.
Otherwise, let's do the same in #31 and eventually update #9492 with both #31 and #34 changes in the framework.
eleuzi01
added
needs-review
|
@eleuzi01 This looks good to me and #31 as well, but you probably need to merge the two PRs in one (let's say this one) then you can update in #9492 the Mbed TLS framework pointer to the HEAD of this PR. Then we will also need an 3.6 PR that just update the framework to the head of that PR to validate the changes in 3.6 through Mbed TLS CI. |
Thanks for the help! I'm not used to working with submodules but I think I managed to clean this up. |
Signed-off-by: Elena Uziunaite <[email protected]>
Signed-off-by: Elena Uziunaite <[email protected]>
And add temporary solution so it works with 3.6 and 4.0 Temporary solution to be resolved in Mbed-TLS#51. Signed-off-by: Elena Uziunaite <[email protected]>
Signed-off-by: Elena Uziunaite <[email protected]>
eleuzi01
force-pushed
the
replace-ecc-keys
branch
from
e759837
to
f7b2465
Compare
That's fine no worries. Our workflow without CI for mbedtls-framework is also quite complicated. It looks all good now, well done. This is not the end of the story though. When this one is fully approved, we will merge it. Then you will need to update your last commit in #9492 and #9640 with the commit id of the merge of this PR into main. I will ping you at that time. |
gabor-mezei-arm
added
approved
|
Validated for dev by the CI of Mbed-TLS/mbedtls#9492, for 3.6 by the CI of Mbed-TLS/mbedtls#9640. |
Part of #9492