Skip to content

[Mbed OS 5.15] Upgrade to Mbed TLS 2.22.0 #13033

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
Merged
merged 7 commits into from
Jun 8, 2020
Merged

[Mbed OS 5.15] Upgrade to Mbed TLS 2.22.0 #13033

merged 7 commits into from
Jun 8, 2020

Conversation

Patater
Copy link
Contributor

@Patater Patater commented May 29, 2020

Summary of changes

Upgrade Mbed TLS from 2.21.0 to 2.22.0.

This is a backport of #12757 to the Mbed OS 5.15 branch.

Impact of changes

None

Migration actions required

None

Documentation

No changes

Pull request type 

[X] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results 

[] No Tests required for this change (E.g docs only update)
[X] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers

@dgreen-arm

urutva and others added 7 commits May 29, 2020 13:03
@urutva @Patater
tls: Remove apache-2.0.txt from importer script
a041df7 
Both Mbed TLS and Mbed Crypto libraries doesn't contain
`apache-2.0.txt` anymore. Do not access those files in the importer
script.

Signed-off-by: Devaraj Ranganna <[email protected]>
@dgreen-arm @Patater
Adjust Mbed TLS importer and config script
7cf7f2e 
Mbed Crypto has been remerged back into Mbed TLS. Update the
Mbed TLS importer script with the relevant parts of the
Mbed Crypto importer.

Signed-off-by: Darryl Green <[email protected]>
@dgreen-arm @Patater
Update Mbed TLS to latest version
71d213d 
As Mbed Crypto has been remerged into Mbed TLS, remove Mbed Crypto
at the same time.

Signed-off-by: Darryl Green <[email protected]>
@dgreen-arm @Patater
Move Mbed Crypto Greentea tests to Mbed TLS
560e7c0 
Signed-off-by: Darryl Green <[email protected]>
@dgreen-arm @Patater
Remove references to mbed-crypto
f7fdee3 
Signed-off-by: Darryl Green <[email protected]>
@dgreen-arm @Patater
Define mbedtls_ecc_group_to_psa inline for NS world
4effe85 
Signed-off-by: Darryl Green <[email protected]>
@dgreen-arm @Patater
Fix assertation ordering in tests
cff3dd7 
Signed-off-by: Darryl Green <[email protected]>
@ciarmcom
Copy link
Member

@Patater, thank you for your changes.
@dgreen-arm @ARMmbed/mbed-os-maintainers please review.

@ciarmcom ciarmcom requested review from dgreen-arm and a team May 29, 2020 13:00
dgreen-arm
dgreen-arm approved these changes May 29, 2020
View reviewed changes
Copy link
Contributor

@dgreen-arm dgreen-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

@Patater
Copy link
Contributor Author

Patater commented May 29, 2020

Note that 53260eb is not included in this PR because it is already merged on the 5.15 branch in 65e9124.

@0xc0170
Copy link
Contributor

0xc0170 commented May 29, 2020

CI started

@mbed-ci
Copy link

mbed-ci commented May 29, 2020

Test run: FAILED

Summary: 1 of 10 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_cloud-client-pytest-lts

@mergify mergify bot added needs: work and removed needs: CI labels May 29, 2020
@0xc0170
Copy link
Contributor

0xc0170 commented May 29, 2020

Both 5.15 latest PRs failed, looks like internal failure, will ask for confirmation.

@Patater
Copy link
Contributor Author

Patater commented May 29, 2020

CI started

@mbed-ci
Copy link

mbed-ci commented May 29, 2020

Test run: FAILED

Summary: 1 of 10 test jobs failed
Build number : 2
Build artifacts

Failed test jobs:

  • jenkins-ci/mbed-os-ci_cloud-client-pytest-lts

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 3, 2020

CI restarted

@mergify mergify bot added the needs: CI label Jun 3, 2020
@mergify mergify bot removed the needs: work label Jun 3, 2020
@mbed-ci
Copy link

mbed-ci commented Jun 3, 2020

Test run: SUCCESS

Summary: 10 of 10 test jobs passed
Build number : 3
Build artifacts

@0xc0170 0xc0170 requested a review from andypowers June 4, 2020 13:17
andypowers
andypowers approved these changes Jun 5, 2020
View reviewed changes
Copy link
Collaborator

@andypowers andypowers left a comment

Choose a reason for hiding this comment

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

Approved.

@0xc0170 0xc0170 merged commit ffe6b49 into ARMmbed:mbed-os-5.15 Jun 8, 2020
@mergify mergify bot removed the ready for merge label Jun 8, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@0xc0170 0xc0170 0xc0170 approved these changes

@dgreen-arm dgreen-arm dgreen-arm approved these changes

@andypowers andypowers andypowers approved these changes

Assignees
No one assigned
Labels
release-version: 5.15.4
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Patater @ciarmcom @0xc0170 @mbed-ci @dgreen-arm @andypowers @urutva