Skip to content

Will this break Zephyr or not? #87359

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

Closed
wants to merge 2 commits into from
Closed

Will this break Zephyr or not? #87359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98ace0
modules: mbedtls: Expose MBEDTLS_RSA_C
de-nordic Mar 19, 2025
dc24286
manifest: MCUboot does not need that RSA
de-nordic Mar 19, 2025
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
9 changes: 9 additions & 0 deletions modules/mbedtls/Kconfig.tls-generic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,11 @@ menu "Ciphersuite configuration"

comment "Supported key exchange modes"

config MBEDTLS_RSA_C
bool "RSA cryptosystem"
help
Base support for RSA, without key x509 exchange enabled.

config MBEDTLS_KEY_EXCHANGE_ALL_ENABLED
bool "All available ciphersuite modes"
select MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
Expand All @@ -70,6 +75,7 @@ config MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED

config MBEDTLS_KEY_EXCHANGE_RSA_PSK_ENABLED
bool "RSA-PSK based ciphersuite modes"
select MBEDTLS_RSA_C

config MBEDTLS_PSK_MAX_LEN
int "Max size of TLS pre-shared keys"
Expand All @@ -82,16 +88,19 @@ config MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
bool "RSA-only based ciphersuite modes"
default y if UOSCORE || UEDHOC
select MBEDTLS_MD
select MBEDTLS_RSA_C if !PSA_CRYPTO_CLIENT
select PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY if PSA_CRYPTO_CLIENT
select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_IMPORT if PSA_CRYPTO_CLIENT
select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_EXPORT if PSA_CRYPTO_CLIENT
select PSA_WANT_KEY_TYPE_RSA_KEY_PAIR_GENERATE if PSA_CRYPTO_CLIENT

config MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED
bool "DHE-RSA based ciphersuite modes"
select MBEDTLS_RSA_C

config MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED
bool "ECDHE-RSA based ciphersuite modes"
select MBEDTLS_RSA_C
depends on MBEDTLS_ECDH_C

config MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
Expand Down
6 changes: 5 additions & 1 deletion modules/mbedtls/configs/config-tls-generic.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,11 @@
#define MBEDTLS_MD_C
#endif

#if defined(CONFIG_MBEDTLS_RSA_C)
#define MBEDTLS_RSA_C
#define MBEDTLS_PKCS1_V21
#endif

/* Automatic dependencies */

#if defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED) || \
Expand All @@ -379,7 +384,6 @@
defined(MBEDTLS_KEY_EXCHANGE_RSA_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED) || \
defined(MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED)
#define MBEDTLS_RSA_C
#define MBEDTLS_PKCS1_V15
#define MBEDTLS_PKCS1_V21
#endif
Expand Down
5 changes: 4 additions & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ manifest:
url-base: https://github.com/zephyrproject-rtos
- name: babblesim
url-base: https://github.com/BabbleSim
- name: mcu-tools
url-base: https://github.com/mcu-tools

group-filter: [-babblesim, -optional]

Expand Down Expand Up @@ -303,7 +305,8 @@ manifest:
groups:
- crypto
- name: mcuboot
revision: c8470fb145f8aff92696d05396fb77c3b8068b32
remote: mcu-tools
revision: pull/2239/head
path: bootloader/mcuboot
groups:
- bootloader
Expand Down
Loading