Skip to content

Integrate mbedtls 4.x #81

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

Open
valeriosetti wants to merge 5 commits into
base: zephyr_mbedtls_v4.0.99_488dbf8bc
Choose a base branch
from
Open

Integrate mbedtls 4.x #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b6055e5
[zep fromlist] library: check_config: remove RSA encryption requireme…
valeriosetti Mar 13, 2026
c96930b
[zep fromlist] library: bulk replace MBEDTLS_RSA_C with PSA_HAVE_RSA_…
valeriosetti Feb 10, 2026
957d556
[zep noup] remove tf-psa-crypto and framework submodules
valeriosetti Jan 27, 2026
73a706f
[zep noup] checkout automatically generated files
valeriosetti Mar 17, 2026
1f548a9
[zep noup] add module.yml file
valeriosetti Jan 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,6 @@ compile_commands.json

# VScode folder to store local debug files and configurations
.vscode

/tf-psa-crypto/
/framework/
6 changes: 0 additions & 6 deletions .gitmodules
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,15 +334,6 @@ if(CMAKE_BUILD_TYPE STREQUAL "Check" AND TEST_CPP)
endif()
endif()

if (NOT EXISTS "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt")
if (EXISTS "${MBEDTLS_DIR}/.git")
message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does appear to be a git checkout). Run `git submodule update --init` from the source tree to fetch the submodule contents.")
else ()
message(FATAL_ERROR "${MBEDTLS_FRAMEWORK_DIR}/CMakeLists.txt not found (and does not appear to be a git checkout). Please ensure you have downloaded the right archive from the release page on GitHub.")
endif()
endif()
add_subdirectory(framework)

add_subdirectory(include)

set(TF_PSA_CRYPTO_TARGET_PREFIX ${MBEDTLS_TARGET_PREFIX} CACHE STRING "")
Expand Down
1 change: 0 additions & 1 deletion framework
Open in desktop
Submodule framework deleted from 9b9216
9 changes: 0 additions & 9 deletions library/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,3 @@
libmbed*
*.sln
*.vcxproj

###START_GENERATED_FILES###
/error.c
/mbedtls_config_check_before.h
/mbedtls_config_check_final.h
/mbedtls_config_check_user.h
/version_features.c
/ssl_debug_helpers_generated.c
###END_GENERATED_FILES###
505 changes: 505 additions & 0 deletions library/error.c
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion library/mbedtls_check_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@

#if defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED) && \
( !defined(MBEDTLS_CAN_ECDH) || !defined(PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_BASIC) || \
!defined(MBEDTLS_X509_CRT_PARSE_C) || !defined(PSA_WANT_ALG_RSA_PKCS1V15_CRYPT) || !defined(PSA_WANT_ALG_RSA_PKCS1V15_SIGN) )
!defined(MBEDTLS_X509_CRT_PARSE_C) || !defined(PSA_WANT_ALG_RSA_PKCS1V15_SIGN) )
#error "MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED defined, but not all prerequisites"
#endif

Expand Down
Loading