Restructure Mbed TLS #13385

gpsimenos · 2020-07-31T13:50:15Z

Summary of changes

mbed-os/features/mbedtls directory moved to mbed-os/connectivity/mbedtls and restructured according to the internal proposal.

Public headers moved into mbed-os/connectivity/mbedtls/include/mbedtls
Greentea tests moved into mbed-os/connectivity/mbedtls/tests/TESTS
src renamed to source
inc renamed to include
Paths updated where necessary

This is one of a series of PRs aiming to clean up the mbed-os directory structure. The intention is to create a consistent tree among mbed components, following the below structure:

[component name]
├── mbed_lib.json                     // Each component comes with their own config that's appended to the App/System ├── config 
├── CMakeList.txt                     // This depends on the build system choices, part of another PREQ
├── README.md
├── include                           // The top-level include path
│   └── [component name]              // Public headers that can be accessed by the developers - `#include [component name]/*.h`
│       └── internal                  // Internal headers that implement or are included by a public header or are needed by other Mbed OS libraries - `#include [component name]/internal/*.h`
├── source                            // Source files and private headers, available only inside the component's source directory
└── tests
    ├── <framework>                   // <framework> test folder (for example CPPUTEST)
    │   └── <test suite one>          // Can be either source file or a directory
    ├── UNITTESTS                     // Unit tests (previously in UNITTESTS) folder using googletest framework (to be renamed to gtest at a later stage)
    │   └── <unit test suite one>     // Can be either source file or a directory
    └── TESTS                         // Greentea tests (previously in TESTS) folder (to be renamed to greentea at a later stage)
        └── <greentea test suite one> // Can be either source file or a directory
 
mbed-os
└── TESTS (to be renamed to greentea at a later stage)
    ├── integration   
    └── system

Impact of changes

None

Migration actions required

None

Documentation

None

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

Build successes:
  * K64F::GCC_ARM::CONNECTIVITY-MBEDTLS-TESTS-TESTS-MBEDTLS-MULTI
  * K64F::GCC_ARM::CONNECTIVITY-MBEDTLS-TESTS-TESTS-MBEDTLS-SELFTEST

Reviewers

@evedon
@ashok-rao

ciarmcom · 2020-07-31T15:00:32Z

@gpsimenos, thank you for your changes.
@ashok-rao @evedon @ARMmbed/mbed-os-maintainers please review.

rajkan01

LGTM

LDong-Arm

Generally target-specifc code goes into connectivity/drivers/. We didn't explicitly document this one but connectivity/mbedtls/targets/TARGET_* should be in connectivity/drivers/mbedtls/ IMO. And we'll need to add a number of missing mbed_lib.jsons to avoid issues on bare metal, like https://github.com/ARMmbed/mbed-os/pull/13379/files.

We can do this now or in the future in which case we need a ticket.

LDong-Arm · 2020-08-03T10:28:03Z

.astyleignore

 ^features/lwipstack/lwip
 ^features/lwipstack/lwip-sys
-^features/mbedtls
+^connectivity/mbedtls


Could you reorder this alphabetically

mergify · 2020-08-05T10:56:51Z

This PR cannot be merged due to conflicts. Please rebase to resolve them.

gpsimenos · 2020-08-05T13:43:31Z

Conflicts resolved 😃
Let's run CI @adbridge

LDong-Arm

LGTM

adbridge · 2020-08-06T09:11:38Z

CI started

mbed-ci · 2020-08-06T09:54:56Z

Jenkins CI Test : ❌ FAILED

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-ARM	❌
jenkins-ci/mbed-os-ci_build-GCC_ARM	❌

adbridge · 2020-08-06T10:45:31Z

@gpsimenos looks like related errors:

Compile [  0.2%]: aesni.c
[Fatal Error] platform_mbed.h@47,10: 'mbedtls_device.h' file not found
[ERROR] In file included from ./connectivity/mbedtls/source/aesni.c:28:
In file included from ./connectivity/mbedtls/include/mbedtls/config.h:31:
./connectivity/mbedtls/platform/inc/platform_mbed.h:47:10: fatal error: 'mbedtls_device.h' file not found
#include "mbedtls_device.h"
         ^~~~~~~~~~~~~~~~~~
1 error generated.

This was one baremetal build . Check the logs for further details.

gpsimenos · 2020-08-07T09:39:28Z

@adbridge CI should pass now with fix above 🤞

mergify · 2020-08-07T10:24:25Z

This PR cannot be merged due to conflicts. Please rebase to resolve them.

adbridge · 2020-08-07T10:41:42Z

@gpsimenos looks like you now need a rebase...

gpsimenos · 2020-08-07T10:42:55Z

@gpsimenos looks like you now need a rebase...

Done.

LDong-Arm · 2020-08-10T13:56:52Z

Still looks good to me after the rebase, we just need another CI run. @adbridge

adbridge · 2020-08-10T15:15:48Z

CI started

mbed-ci · 2020-08-10T16:52:39Z

Jenkins CI Test : ✔️ SUCCESS

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-ARM	✔️
jenkins-ci/mbed-os-ci_build-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_dynamic-memory-usage	✔️
jenkins-ci/mbed-os-ci_cloud-client-pytest	✔️
jenkins-ci/mbed-os-ci_wisun-mesh-test	✔️
jenkins-ci/mbed-os-ci_greentea-test	✔️

mergify · 2020-08-11T09:53:51Z

This PR cannot be merged due to conflicts. Please rebase to resolve them.

gpsimenos · 2020-08-11T10:45:50Z

Rebased.

LDong-Arm

LGTM

0xc0170 · 2020-08-11T12:53:50Z

CI started

mbed-ci · 2020-08-11T13:39:32Z

Jenkins CI Test : ✔️ SUCCESS

Build Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-ARM	✔️
jenkins-ci/mbed-os-ci_build-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_dynamic-memory-usage	✔️
jenkins-ci/mbed-os-ci_cloud-client-pytest	✔️
jenkins-ci/mbed-os-ci_greentea-test	✔️
jenkins-ci/mbed-os-ci_wisun-mesh-test	✔️

gpsimenos · 2020-08-12T09:25:27Z

Let's merge @0xc0170

ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Jul 31, 2020

ciarmcom requested review from ashok-rao and evedon July 31, 2020 15:00

ciarmcom requested a review from a team July 31, 2020 15:00

ciarmcom added the needs: review label Jul 31, 2020

rajkan01 approved these changes Aug 3, 2020

View reviewed changes

LDong-Arm reviewed Aug 3, 2020

View reviewed changes

mergify bot added needs: work and removed needs: review labels Aug 4, 2020

gpsimenos force-pushed the gp-tls-restruct branch from 459323d to a8407b3 Compare August 5, 2020 13:42

LDong-Arm approved these changes Aug 5, 2020

View reviewed changes

adbridge added needs: CI and removed needs: work labels Aug 6, 2020

mergify bot added needs: work and removed needs: CI labels Aug 6, 2020

gpsimenos force-pushed the gp-tls-restruct branch from 065a166 to e4b97a8 Compare August 7, 2020 10:42

gpsimenos added 7 commits August 11, 2020 11:32

Move mbedtls

c8cc5bd

Move mbedtls greentea tests

bf3cf13

Update mbedtls paths

54d8fe7

Move mbedtls target-specific code

6a47761

Create mbed_lib.json for mbedtls target code

bf6693a

Update .astyleignore

4efedba

Fix baremetal targets

97f31c8

gpsimenos force-pushed the gp-tls-restruct branch from e4b97a8 to 97f31c8 Compare August 11, 2020 10:32

LDong-Arm approved these changes Aug 11, 2020

View reviewed changes

0xc0170 added needs: CI and removed needs: work labels Aug 11, 2020

0xc0170 approved these changes Aug 11, 2020

View reviewed changes

mergify bot added ready for merge and removed needs: CI labels Aug 11, 2020

0xc0170 merged commit d32000d into ARMmbed:master Aug 12, 2020

mergify bot removed the ready for merge label Aug 12, 2020

mbedmain added release-version: 6.2.1 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Aug 16, 2020

Restructure Mbed TLS #13385

Restructure Mbed TLS #13385

Uh oh!

Conversation

gpsimenos commented Jul 31, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type

Test results

Reviewers

Uh oh!

ciarmcom commented Jul 31, 2020

Uh oh!

rajkan01 left a comment

Choose a reason for hiding this comment

Uh oh!

LDong-Arm left a comment

Choose a reason for hiding this comment

Uh oh!

LDong-Arm Aug 3, 2020

Choose a reason for hiding this comment

Uh oh!

mergify bot commented Aug 5, 2020

Uh oh!

gpsimenos commented Aug 5, 2020

Uh oh!

LDong-Arm left a comment

Choose a reason for hiding this comment

Uh oh!

adbridge commented Aug 6, 2020

Uh oh!

mbed-ci commented Aug 6, 2020

Jenkins CI Test : ❌ FAILED

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

Uh oh!

adbridge commented Aug 6, 2020

Uh oh!

gpsimenos commented Aug 7, 2020

Uh oh!

mergify bot commented Aug 7, 2020

Uh oh!

adbridge commented Aug 7, 2020

Uh oh!

gpsimenos commented Aug 7, 2020

Uh oh!

LDong-Arm commented Aug 10, 2020

Uh oh!

adbridge commented Aug 10, 2020

Uh oh!

mbed-ci commented Aug 10, 2020

Jenkins CI Test : ✔️ SUCCESS

Build Number: 2 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

Uh oh!

mergify bot commented Aug 11, 2020

Uh oh!

gpsimenos commented Aug 11, 2020

Uh oh!

LDong-Arm left a comment

Choose a reason for hiding this comment

Uh oh!

0xc0170 commented Aug 11, 2020

Uh oh!

mbed-ci commented Aug 11, 2020

Jenkins CI Test : ✔️ SUCCESS

Build Number: 3 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

Uh oh!

gpsimenos commented Aug 12, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

gpsimenos commented Jul 31, 2020 •

edited

Loading