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

Update Mbed TLS to version 2.10.0 #7135

Merged
merged 3 commits into from Jun 8, 2018

Conversation

Projects
None yet
6 participants
@k-stachowiak
Contributor

k-stachowiak commented Jun 6, 2018

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(ARMmbed/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 added the do not merge label Jun 6, 2018

@0xc0170 0xc0170 requested a review from ARMmbed/mbed-os-tls Jun 6, 2018

@sbutcher-arm

This comment has been minimized.

Contributor

sbutcher-arm commented Jun 6, 2018

@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.

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

This comment has been minimized.

@Patater

Patater Jun 6, 2018

Contributor

This needs to be uncommented.

@@ -1899,7 +1957,7 @@
* Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
*
*/
#define MBEDTLS_CMAC_C
//#define MBEDTLS_CMAC_C

This comment has been minimized.

@Patater

Patater Jun 6, 2018

Contributor

This should also be uncommented.

@@ -1899,7 +1957,7 @@
* Requires: MBEDTLS_AES_C or MBEDTLS_DES_C
*
*/
#define MBEDTLS_CMAC_C
//#define MBEDTLS_CMAC_C

This comment has been minimized.

@sbutcher-arm

sbutcher-arm Jun 6, 2018

Contributor

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

@sbutcher-arm

This comment has been minimized.

Contributor

sbutcher-arm commented Jun 6, 2018

@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 added the needs: work label Jun 7, 2018

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

@0xc0170

This comment has been minimized.

Member

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

LGTM

@cmonr

This comment has been minimized.

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

This comment has been minimized.

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

This comment has been minimized.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Jun 7, 2018

/morph export-build

@cmonr

This comment has been minimized.

Contributor

cmonr commented Jun 7, 2018

Apparently Jenkins timed out on cloing the repo.

Odd.

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Jun 7, 2018

/morph mbed2-build

@cmonr

cmonr approved these changes Jun 8, 2018

@0xc0170 0xc0170 added ready for merge and removed needs: work labels Jun 8, 2018

@0xc0170 0xc0170 merged commit 73cfc7b into ARMmbed:master Jun 8, 2018

14 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
travis-ci/astyle Passed, 920 files
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9990 cycles (-185 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 9964B (+0.00%)
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details

@cmonr cmonr removed the ready for merge label Jun 8, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment