Skip to content

Commit f2b076c

Browse files
m-goreckiutzig
authored andcommitted
boot/mynewt: remove redundant mbedtls flag and enable CTR
Now flag defining config file for MbedTLS is global (see apache/mynewt-core#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 <michal.gorecki@codecoup.pl>
1 parent 6b272e2 commit f2b076c

File tree

3 files changed

+3
-6
lines changed

3 files changed

+3
-6
lines changed

boot/boot_serial/test/syscfg.yml

+3
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@
2121
syscfg.vals:
2222
# This is here to work around the $notnull syscfg restriction.
2323
BOOT_SERIAL_DETECT_PIN: 0
24+
25+
syscfg.vals.BOOTUTIL_USE_MBED_TLS:
26+
MBEDTLS_CIPHER_MODE_CTR: 1

boot/bootutil/pkg.yml

-3
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ pkg.apis:
3131
pkg.cflags:
3232
- "-DMCUBOOT_MYNEWT=1"
3333

34-
pkg.cflags.BOOTUTIL_USE_MBED_TLS:
35-
- '-DMBEDTLS_USER_CONFIG_FILE="mbedtls/config_mynewt.h"'
36-
3734
pkg.deps:
3835
- "@mcuboot/boot/mynewt/mcuboot_config"
3936
- "@apache-mynewt-core/hw/hal"

ci/mynewt_keys/enc_rsa/pkg.yml

-3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,3 @@
2020
pkg.name: keys/enc_rsa
2121
pkg.author: "Apache Mynewt <dev@mynewt.apache.org>"
2222
pkg.homepage: "http://mynewt.apache.org/"
23-
24-
pkg.cflags:
25-
- '-DMBEDTLS_USER_CONFIG_FILE="mbedtls/config_mynewt.h"'

0 commit comments

Comments
 (0)