Skip to content

Update Mbed TLS to version 2.10.0 #7135

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 3 commits into from
Jun 8, 2018
Merged

Update Mbed TLS to version 2.10.0 #7135

merged 3 commits into from
Jun 8, 2018

Conversation

k-stachowiak
Copy link
Contributor

@k-stachowiak k-stachowiak commented Jun 6, 2018 •
edited
Loading

Description

This PR updates Mbed TLS to the release candidate of the version 2.10.0

Note
This PR should not be merged until this PR(Mbed-TLS/mbedtls#1693) has been merged upstream and the changes have been imported to mbed-os. It would be best to perform the import until this PR(#7144) has been merged as it automates setting the proper configuration.

Pull request type

[ ] Fix
[ ] Refactor
[ ] New target
[x] Feature
[ ] Breaking change

@0xc0170 0xc0170 requested a review from a team June 6, 2018 08:29
@simonbutcher
Copy link
Contributor

simonbutcher commented Jun 6, 2018 •
edited
Loading

@0xc0170 (or other maintainers) - can you please change the title to 'Update Mbed TLS to version 2.10.0' as it's the final PR and no longer a draft, and can you also please label it as required for Mbed OS 5.9?

Finally, please note, #7144 MUST be merged before this one.

Patater
Patater suggested changes Jun 6, 2018
View reviewed changes
features/mbedtls/inc/mbedtls/config-no-entropy.h Outdated
@@ -82,7 +82,7 @@
#define MBEDTLS_X509_USE_C
#define MBEDTLS_X509_CRT_PARSE_C
#define MBEDTLS_X509_CRL_PARSE_C
#define MBEDTLS_CMAC_C
//#define MBEDTLS_CMAC_C
Copy link
Contributor

Choose a reason for hiding this comment

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

This needs to be uncommented.

features/mbedtls/inc/mbedtls/config.h Outdated
@@ -1899,7 +1957,7 @@
* Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
*
*/
#define MBEDTLS_CMAC_C
//#define MBEDTLS_CMAC_C
Copy link
Contributor

Choose a reason for hiding this comment

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

This should also be uncommented.

simonbutcher
simonbutcher suggested changes Jun 6, 2018
View reviewed changes
features/mbedtls/inc/mbedtls/config.h Outdated
@@ -1899,7 +1957,7 @@
* Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
*
*/
#define MBEDTLS_CMAC_C
//#define MBEDTLS_CMAC_C
Copy link
Contributor

Choose a reason for hiding this comment

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

This shouldn't be commented out. It shows the PR wasn't generated with #7144.

@simonbutcher
Copy link
Contributor

@k-stachowiak - Can you please re-work the PR and re-run the script using #7144 as a baseline?

This PR should use the changes in #7144, but not include the changes of #7144 nor have the commits in its history (which I think is where we had a misunderstanding).

@0xc0170 0xc0170 changed the title DRAFT (do not merge) Update Mbed TLS do version 2.10.0-rc1 Update Mbed TLS to version 2.10.0 Jun 7, 2018
@0xc0170
Copy link
Contributor

0xc0170 commented Jun 7, 2018

Title updated.

Finally, please note, #7144 MUST be merged before this one.

Set as preceding PR needed for this one (the other one is already in CI).

Patater
Patater approved these changes Jun 7, 2018
View reviewed changes
Copy link
Contributor

@Patater Patater left a comment

Choose a reason for hiding this comment

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

LGTM

@cmonr
Copy link
Contributor

cmonr commented Jun 7, 2018

This PR should use the changes in #7144, but not include the changes of #7144 nor have the commits in its history (which I think is where we had a misunderstanding).

@sbutcher-arm #7144 is in! Doesn't look like any merge conflicts have appeared, so going to start CI!

/morph build

@mbed-ci
Copy link

mbed-ci commented Jun 7, 2018

Build : SUCCESS

Build number : 2281
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/7135/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build
/morph mbed2-build

@mbed-ci
Copy link

mbed-ci commented Jun 7, 2018

Exporter Build : FAILURE

Build number : 1894
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7135/

@cmonr
Copy link
Contributor

cmonr commented Jun 7, 2018

/morph export-build

@cmonr
Copy link
Contributor

cmonr commented Jun 7, 2018

Apparently Jenkins timed out on cloing the repo.

Odd.

@mbed-ci
Copy link

mbed-ci commented Jun 7, 2018

Test : SUCCESS

Build number : 2056
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/7135/2056

@mbed-ci
Copy link

mbed-ci commented Jun 7, 2018

Exporter Build : SUCCESS

Build number : 1895
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/exporter/7135/

@cmonr
Copy link
Contributor

cmonr commented Jun 7, 2018

/morph mbed2-build

@0xc0170 0xc0170 merged commit 73cfc7b into ARMmbed:master Jun 8, 2018
@simonbutcher simonbutcher mentioned this pull request Jun 19, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cmonr cmonr cmonr approved these changes

@Patater Patater Patater approved these changes

@simonbutcher simonbutcher simonbutcher approved these changes

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

Successfully merging this pull request may close these issues.
6 participants
@k-stachowiak @simonbutcher @0xc0170 @cmonr @mbed-ci @Patater