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.

Sign up for GitHub

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

Jump to bottom

Replace MBEDTLS_MD_CAN_SHA512 with its PSA_WANT counterpart #9252

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Replace MBEDTLS_MD_CAN_SHA512 with its PSA_WANT counterpart #9252

merged 1 commit into from
Sep 3, 2024

Conversation

gabor-mezei-arm
Copy link
Contributor

@gabor-mezei-arm gabor-mezei-arm commented Jun 13, 2024 •
edited
Loading

Description

Replace the macros other then in the include directory:

  • MBEDTLS_MD_CAN_SHA512 to PSA_WANT_ALG_SHA_512

Resolve #9114

PR checklist

Please tick as appropriate and edit the reasons (e.g.: "backport: not needed because this is a new feature")

  • changelog not required, internal changes
  • 3.6 backport not required, needed for 4.0
  • 2.28 backport not required, needed for 4.0
  • tests not required

@gabor-mezei-arm gabor-mezei-arm added enhancement component-crypto Crypto primitives and low-level interfaces needs-ci Needs to pass CI tests needs-preceding-pr Requires another PR to be merged first size-s Estimated task size: small (~2d) priority-high High priority - will be reviewed soon labels Jun 13, 2024
@gabor-mezei-arm gabor-mezei-arm self-assigned this Jun 13, 2024
@gabor-mezei-arm gabor-mezei-arm force-pushed the 9114_replace_MBEDTLS_MD_CAN_SHA512_with_PSA_WANT branch 2 times, most recently from 62cd4f5 to ad2471a Compare June 18, 2024 16:04
@davidhorstmann-arm davidhorstmann-arm added priority-very-high Highest priority - prioritise this over other review work and removed priority-high High priority - will be reviewed soon labels Jun 19, 2024
@ronald-cron-arm ronald-cron-arm changed the title Replace MBEDTLS_MD_CAN_SHA512 with its PSA_WANT counterpartart Replace MBEDTLS_MD_CAN_SHA512 with its PSA_WANT counterpart Jun 19, 2024
@ronald-cron-arm
Copy link
Contributor

@gabor-mezei-arm We are in the final steps of merging #9185. You will be able to rebase to development then and this should resolve the "framework" conflict.

@gabor-mezei-arm gabor-mezei-arm force-pushed the 9114_replace_MBEDTLS_MD_CAN_SHA512_with_PSA_WANT branch 2 times, most recently from 0be51e5 to a293676 Compare June 20, 2024 10:23
@gabor-mezei-arm gabor-mezei-arm added priority-high High priority - will be reviewed soon needs-review Every commit must be reviewed by at least two team members, needs-reviewer This PR needs someone to pick it up for review and removed needs-preceding-pr Requires another PR to be merged first priority-very-high Highest priority - prioritise this over other review work labels Jun 20, 2024
@gabor-mezei-arm gabor-mezei-arm requested a review from eleuzi01 June 20, 2024 16:08
eleuzi01
eleuzi01 previously approved these changes Jun 20, 2024
View reviewed changes
Copy link
Contributor

@eleuzi01 eleuzi01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@gabor-mezei-arm gabor-mezei-arm force-pushed the 9114_replace_MBEDTLS_MD_CAN_SHA512_with_PSA_WANT branch from a293676 to b36c36d Compare July 2, 2024 15:45
@gabor-mezei-arm gabor-mezei-arm removed the needs-ci Needs to pass CI tests label Jul 3, 2024
@gabor-mezei-arm gabor-mezei-arm requested a review from eleuzi01 July 3, 2024 09:31
eleuzi01
eleuzi01 previously approved these changes Jul 3, 2024
View reviewed changes
Copy link
Contributor

@eleuzi01 eleuzi01 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@tom-daubney-arm tom-daubney-arm self-requested a review July 3, 2024 13:46
@tom-daubney-arm tom-daubney-arm removed the needs-reviewer This PR needs someone to pick it up for review label Jul 3, 2024
tom-daubney-arm
tom-daubney-arm previously approved these changes Jul 3, 2024
View reviewed changes
Copy link
Contributor

@tom-daubney-arm tom-daubney-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@tom-daubney-arm tom-daubney-arm added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels Jul 3, 2024
@gabor-mezei-arm
Copy link
Contributor Author

The legacy macro removal PRs most probably cause a merge conflict to each other so wait for the others to be merged.

@gilles-peskine-arm gilles-peskine-arm added needs-work and removed approved Design and code approved - may be waiting for CI or backports DO-NOT-MERGE labels Jul 4, 2024
@mpg mpg mentioned this pull request Aug 12, 2024
Merged
4 tasks
@eleuzi01 eleuzi01 mentioned this pull request Aug 21, 2024
Merged
6 tasks
@gabor-mezei-arm
Replace MBEDTLS_MD_CAN_SHA512 with PSA_WANT_ALG_SHA_512
c15ef93 
Signed-off-by: Gabor Mezei <gabor.mezei@arm.com>
@ronald-cron-arm
Copy link
Contributor

@gabor-mezei-arm it seems that if you rebase this PR we should be close to be able to merge it, right?

@gabor-mezei-arm gabor-mezei-arm force-pushed the 9114_replace_MBEDTLS_MD_CAN_SHA512_with_PSA_WANT branch from b36c36d to c15ef93 Compare September 2, 2024 12:49
@eleuzi01 eleuzi01 added needs-review Every commit must be reviewed by at least two team members, and removed needs-work labels Sep 3, 2024
tom-daubney-arm
tom-daubney-arm approved these changes Sep 3, 2024
View reviewed changes
Copy link
Contributor

@tom-daubney-arm tom-daubney-arm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rebase LGTM - thanks!

@tom-daubney-arm tom-daubney-arm added approved Design and code approved - may be waiting for CI or backports and removed needs-review Every commit must be reviewed by at least two team members, labels Sep 3, 2024
@davidhorstmann-arm davidhorstmann-arm added this pull request to the merge queue Sep 3, 2024
Merged via the queue into Mbed-TLS:development with commit 36fe918 Sep 3, 2024
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tom-daubney-arm tom-daubney-arm tom-daubney-arm approved these changes

@eleuzi01 eleuzi01 eleuzi01 approved these changes

Assignees

@gabor-mezei-arm gabor-mezei-arm

Labels
approved Design and code approved - may be waiting for CI or backports component-crypto Crypto primitives and low-level interfaces enhancement priority-high High priority - will be reviewed soon size-s Estimated task size: small (~2d)
Projects
Roadmap pull requests (new board)
Status: Done
Roadmap Board for Mbed TLS
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Replace MBEDTLS_MD_CAN_SHA512 with its PSA_WANT counterpartart
6 participants
@gabor-mezei-arm @ronald-cron-arm @tom-daubney-arm @eleuzi01 @gilles-peskine-arm @davidhorstmann-arm