Skip to content

Commit d32000d

Browse files
authored
Merge pull request ARMmbed#13385 from gpsimenos/gp-tls-restruct
Restructure Mbed TLS
2 parents 3b25d2d + 97f31c8 commit d32000d

File tree

285 files changed

+26
-8
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

285 files changed

+26
-8
lines changed

.astyleignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
^connectivity/libraries/mbed-coap
66
^connectivity/libraries/ppp
77
^connectivity/drivers/emac
8+
^connectivity/drivers/mbedtls
9+
^connectivity/mbedtls
810
^features/cryptocell
911
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_MBED_PSA_SRV
1012
^features/FEATURE_EXPERIMENTAL_API/FEATURE_PSA/TARGET_TFM
1113
^features/frameworks
1214
^connectivity/lwipstack/lwip
1315
^connectivity/lwipstack/lwip-sys
14-
^features/mbedtls
1516
^connectivity/nanostack/sal-stack-nanostack/source/Service_Libs/mdns/fnet
1617
^connectivity/nanostack/sal-stack-nanostack-eventloop
1718
^storage/filesystem/fat/ChaN

TESTS/configs/baremetal.json

+2
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
"psa",
88
"psa-services",
99
"mbedtls",
10+
"mbedtls-stm",
11+
"mbedtls-nuvoton",
1012
"psa-compliance-framework",
1113
"filesystem",
1214
"littlefs",

UNITTESTS/CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ set(unittest-includes-base
151151
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/mac"
152152
"${PROJECT_SOURCE_DIR}/../features/lorawan/lorastack/phy"
153153
"${PROJECT_SOURCE_DIR}/../features/lorawan/system"
154-
"${PROJECT_SOURCE_DIR}/../features/mbedtls"
155-
"${PROJECT_SOURCE_DIR}/../features/mbedtls/inc"
154+
"${PROJECT_SOURCE_DIR}/../connectivity/mbedtls"
155+
"${PROJECT_SOURCE_DIR}/../connectivity/mbedtls/include"
156156
)
157157

158158
# Create a list for test suites.

UNITTESTS/empty_baseline/unittest.cmake

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
set(unittest-includes ${unittest-includes}
77
.
88
..
9-
../features/mbedtls/inc/mbedtls/
10-
../features/mbedtls/platform/inc/
9+
../connectivity/mbedtls/include/mbedtls/
10+
../connectivity/mbedtls/platform/inc/
1111
../features/frameworks/mbed-trace/mbed-trace/
1212
)
1313

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "mbedtls-cypress"
3+
}

features/mbedtls/targets/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c renamed to connectivity/drivers/mbedtls/TARGET_NUVOTON/TARGET_M480/ecp/ecp_internal_alt.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ unsigned char mbedtls_internal_ecp_grp_capable( const mbedtls_ecp_group *grp )
214214
{
215215
/* Support only short Weierstrass type
216216
*
217-
* ECP type is checked by referring to mbed-os/features/mbedtls/src/ecp.c > ecp_get_type
217+
* ECP type is checked by referring to mbed-os/connectivity/mbedtls/src/ecp.c > ecp_get_type
218218
*/
219219
if (grp->G.X.p == NULL || grp->G.Y.p == NULL) {
220220
return 0;
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "mbedtls-nuvoton"
3+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "mbedtls-stm"
3+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "mbedtls-samsung"
3+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "mbedtls-siliconlabs"
3+
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

doxyfile_options

+1-1
Original file line numberDiff line numberDiff line change
@@ -843,7 +843,7 @@ EXCLUDE_PATTERNS = */tools/* \
843843
*/cmsis/* \
844844
*/connectivity/drivers/emac/* \
845845
*/features/cryptocell/* \
846-
*/features/mbedtls/* \
846+
*/connectivity/mbedtls/* \
847847
*/features/unsupported/* \
848848
*/connectivity/lwipstack/* \
849849
*/connectivity/nanostack/sal-stack-nanostack/* \

doxygen_options.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"EXPAND_AS_DEFINED": "",
1111
"SKIP_FUNCTION_MACROS": "NO",
1212
"STRIP_CODE_COMMENTS": "NO",
13-
"EXCLUDE_PATTERNS": "*/tools/* */targets/* */features/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */connectivity/drivers/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
13+
"EXCLUDE_PATTERNS": "*/tools/* */targets/* */connectivity/mbedtls/* */features/unsupported/* */BUILD/* */rtos/TARGET_CORTEX/rtx*/* */cmsis/* */features/lwipstack/* */nanostack/sal-stack-nanostack/* */nanostack/coap-service/* */ble/generic/* */ble/pal/* */mbed-trace/* */mbed-coap/* */nanostack-libservice/* */mbed-client-randlib/* */nanostack/sal-stack-nanostack-eventloop/* */connectivity/drivers/802.15.4_RF/* */components/wifi/* */features/nfc/stack/* */UNITTESTS/* */features/cryptocell/*",
1414
"ALPHABETICAL_INDEX": "NO",
1515
"CASE_SENSE_NAMES": "NO",
1616
"DOT_MULTI_TARGETS": "YES",

0 commit comments

Comments
 (0)