From 98a4000720c347d2168dff9381be4c626bebb262 Mon Sep 17 00:00:00 2001 From: Michal Gorecki Date: Mon, 24 Mar 2025 10:33:53 +0100 Subject: [PATCH] boot/mynewt: remove redundant mbedtls flag and enable CTR Now flag defining config file for MbedTLS is global (see https://github.com/apache/mynewt-core/pull/3394), so we do not have to include the same flag in bootutil package. This also enables MBEDTLS_CIPHER_MODE_CTR in boot_serial test package, as it is used in unit tests and it is disabled by default. Signed-off-by: Michal Gorecki --- boot/boot_serial/test/syscfg.yml | 3 +++ boot/bootutil/pkg.yml | 3 --- ci/mynewt_keys/enc_rsa/pkg.yml | 3 --- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/boot/boot_serial/test/syscfg.yml b/boot/boot_serial/test/syscfg.yml index ff841d626c..07baa99795 100644 --- a/boot/boot_serial/test/syscfg.yml +++ b/boot/boot_serial/test/syscfg.yml @@ -21,3 +21,6 @@ syscfg.vals: # This is here to work around the $notnull syscfg restriction. BOOT_SERIAL_DETECT_PIN: 0 + +syscfg.vals.BOOTUTIL_USE_MBED_TLS: + MBEDTLS_CIPHER_MODE_CTR: 1 diff --git a/boot/bootutil/pkg.yml b/boot/bootutil/pkg.yml index 4a7fabc1ca..c5d713b691 100644 --- a/boot/bootutil/pkg.yml +++ b/boot/bootutil/pkg.yml @@ -31,9 +31,6 @@ pkg.apis: pkg.cflags: - "-DMCUBOOT_MYNEWT=1" -pkg.cflags.BOOTUTIL_USE_MBED_TLS: - - '-DMBEDTLS_USER_CONFIG_FILE="mbedtls/config_mynewt.h"' - pkg.deps: - "@mcuboot/boot/mynewt/mcuboot_config" - "@apache-mynewt-core/hw/hal" diff --git a/ci/mynewt_keys/enc_rsa/pkg.yml b/ci/mynewt_keys/enc_rsa/pkg.yml index 61918f1b45..619832c54c 100644 --- a/ci/mynewt_keys/enc_rsa/pkg.yml +++ b/ci/mynewt_keys/enc_rsa/pkg.yml @@ -20,6 +20,3 @@ pkg.name: keys/enc_rsa pkg.author: "Apache Mynewt " pkg.homepage: "http://mynewt.apache.org/" - -pkg.cflags: - - '-DMBEDTLS_USER_CONFIG_FILE="mbedtls/config_mynewt.h"'