This is an automated email from the ASF dual-hosted git repository. sjanc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-nimble.git
commit e2e040a1f58f9fffdcff7d98d2c3553f33bf09b7 Author: Szymon Janc <[email protected]> AuthorDate: Wed May 27 14:47:19 2026 +0200 porting: Build ports with MbedTLS Tinycrypt support is being removed from NimBLE. --- porting/examples/dummy/Makefile | 11 +++-------- porting/examples/linux/Makefile | 12 +++--------- porting/examples/linux_blemesh/Makefile | 12 +++--------- porting/examples/linux_blemesh_shell/Makefile | 12 +++--------- porting/examples/nuttx/Make.defs | 9 +++------ porting/nimble/Makefile.defs | 6 +++--- porting/nimble/{Makefile.tinycrypt => Makefile.mbedtls} | 10 +--------- 7 files changed, 19 insertions(+), 53 deletions(-) diff --git a/porting/examples/dummy/Makefile b/porting/examples/dummy/Makefile index 6e2f061d2..58410185e 100644 --- a/porting/examples/dummy/Makefile +++ b/porting/examples/dummy/Makefile @@ -31,7 +31,7 @@ SIZE := $(CROSS_COMPILE)size # Configure NimBLE variables NIMBLE_ROOT := ../../.. -NIMBLE_CFG_TINYCRYPT := 1 +NIMBLE_CFG_MBEDTLS := 1 # Skip files that don't build for this port NIMBLE_IGNORE := $(NIMBLE_ROOT)/nimble/host/src/ble_gatts_lcl.c \ @@ -47,7 +47,6 @@ SRC = \ $(wildcard $(NIMBLE_ROOT)/porting/npl/dummy/src/*.c) \ $(NIMBLE_SRC) \ $(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \ - $(TINYCRYPT_SRC) \ main.c \ # Add dummy NPL and all NimBLE directories to include paths @@ -55,14 +54,12 @@ INC = \ $(NIMBLE_ROOT)/porting/npl/dummy/include \ $(NIMBLE_INCLUDE) \ $(NIMBLE_ROOT)/nimble/transport/socket/include \ - $(TINYCRYPT_INCLUDE) \ $(INCLUDE) \ OBJ := $(SRC:.c=.o) -TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o) CFLAGS := $(NIMBLE_CFLAGS) -LDFLAGS := $(NIMBLE_LDFLAGS) +LDFLAGS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS) .PHONY: all clean .DEFAULT: all @@ -73,10 +70,8 @@ clean: rm $(OBJ) -f rm dummy -f -$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS) - %.o: %.c $(CC) -c $(addprefix -I, $(INC)) $(CFLAGS) -o $@ $< -dummy: $(OBJ) $(TINYCRYPT_OBJ) +dummy: $(OBJ) $(CC) -o $@ $^ $(LDFLAGS) diff --git a/porting/examples/linux/Makefile b/porting/examples/linux/Makefile index c3eee16cb..ab3755692 100644 --- a/porting/examples/linux/Makefile +++ b/porting/examples/linux/Makefile @@ -29,7 +29,7 @@ SIZE := $(CROSS_COMPILE)size # Configure NimBLE variables NIMBLE_ROOT := ../../.. -NIMBLE_CFG_TINYCRYPT := 1 +NIMBLE_CFG_MBEDTLS:= 1 # Skip files that don't build for this port NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \ @@ -46,7 +46,6 @@ SRC += \ $(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.c) \ $(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.cc) \ $(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \ - $(TINYCRYPT_SRC) \ $(NULL) # Source files for demo app @@ -61,7 +60,6 @@ INC = \ $(NIMBLE_ROOT)/porting/npl/linux/include \ $(NIMBLE_ROOT)/nimble/transport/socket/include \ $(NIMBLE_INCLUDE) \ - $(TINYCRYPT_INCLUDE) \ $(NULL) INCLUDES := $(addprefix -I, $(INC)) @@ -72,8 +70,6 @@ SRC_CC = $(filter %.cc, $(SRC)) OBJ := $(SRC_C:.c=.o) OBJ += $(SRC_CC:.cc=.o) -TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o) - CFLAGS = \ $(NIMBLE_CFLAGS) \ $(INCLUDES) \ @@ -81,7 +77,7 @@ CFLAGS = \ -D_GNU_SOURCE \ $(NULL) -LIBS := $(NIMBLE_LDFLAGS) -lrt -lpthread -lstdc++ +LIBS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS) -lrt -lpthread -lstdc++ .PHONY: all clean .DEFAULT: all @@ -92,14 +88,12 @@ clean: rm $(OBJ) -f rm nimble-linux -f -$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS) - %.o: %.c $(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $< %.o: %.cc $(CXX) -c $(INCLUDES) $(CFLAGS) -o $@ $< -nimble-linux: $(OBJ) $(TINYCRYPT_OBJ) +nimble-linux: $(OBJ) $(LD) -o $@ $^ $(LIBS) $(SIZE) $@ diff --git a/porting/examples/linux_blemesh/Makefile b/porting/examples/linux_blemesh/Makefile index 67783f276..0bc7830ac 100644 --- a/porting/examples/linux_blemesh/Makefile +++ b/porting/examples/linux_blemesh/Makefile @@ -29,7 +29,7 @@ SIZE := $(CROSS_COMPILE)size # Configure NimBLE variables NIMBLE_ROOT := ../../.. -NIMBLE_CFG_TINYCRYPT := 1 +NIMBLE_CFG_MBEDTLS := 1 # Skip files that don't build for this port NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \ @@ -47,7 +47,6 @@ SRC += \ $(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.c) \ $(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.cc) \ $(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \ - $(TINYCRYPT_SRC) \ $(NULL) # Source files for demo app @@ -63,7 +62,6 @@ INC = \ $(NIMBLE_ROOT)/porting/npl/linux/src \ $(NIMBLE_ROOT)/nimble/transport/socket/include \ $(NIMBLE_INCLUDE) \ - $(TINYCRYPT_INCLUDE) \ $(NULL) INCLUDES := $(addprefix -I, $(INC)) @@ -74,8 +72,6 @@ SRC_CC = $(filter %.cc, $(SRC)) OBJ := $(SRC_C:.c=.o) OBJ += $(SRC_CC:.cc=.o) -TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o) - CFLAGS = \ $(NIMBLE_CFLAGS) \ $(INCLUDES) \ @@ -83,7 +79,7 @@ CFLAGS = \ -D_GNU_SOURCE \ $(NULL) -LIBS := $(NIMBLE_LDFLAGS) -lrt -lpthread -lstdc++ +LIBS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS) -lrt -lpthread -lstdc++ .PHONY: all clean .DEFAULT: all @@ -94,14 +90,12 @@ clean: rm $(OBJ) -f rm nimble-linux-blemesh -f -$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS) - %.o: %.c $(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $< %.o: %.cc $(CXX) -c $(INCLUDES) $(CFLAGS) -o $@ $< -nimble-linux-blemesh: $(OBJ) $(TINYCRYPT_OBJ) +nimble-linux-blemesh: $(OBJ) $(LD) -o $@ $^ $(LIBS) $(SIZE) $@ diff --git a/porting/examples/linux_blemesh_shell/Makefile b/porting/examples/linux_blemesh_shell/Makefile index c90f87781..8afe3479b 100644 --- a/porting/examples/linux_blemesh_shell/Makefile +++ b/porting/examples/linux_blemesh_shell/Makefile @@ -29,7 +29,7 @@ SIZE := $(CROSS_COMPILE)size # Configure NimBLE variables NIMBLE_ROOT := ../../.. -NIMBLE_CFG_TINYCRYPT := 1 +NIMBLE_CFG_MBEDTLS := 1 # Skip files that don't build for this port NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \ @@ -47,7 +47,6 @@ SRC += \ $(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.c) \ $(wildcard $(NIMBLE_ROOT)/porting/npl/linux/src/*.cc) \ $(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \ - $(TINYCRYPT_SRC) \ $(wildcard $(NIMBLE_ROOT)/nimble/host/mesh/src/*.c) \ $(NULL) @@ -66,7 +65,6 @@ INC = \ $(NIMBLE_ROOT)/porting/npl/linux/src \ $(NIMBLE_ROOT)/nimble/transport/socket/include \ $(NIMBLE_INCLUDE) \ - $(TINYCRYPT_INCLUDE) \ $(NULL) INCLUDES := $(addprefix -I, $(INC)) @@ -77,8 +75,6 @@ SRC_CC = $(filter %.cc, $(SRC)) OBJ := $(SRC_C:.c=.o) OBJ += $(SRC_CC:.cc=.o) -TINYCRYPT_OBJ := $(TINYCRYPT_SRC:.c=.o) - CFLAGS = \ $(NIMBLE_CFLAGS) \ $(INCLUDES) \ @@ -86,7 +82,7 @@ CFLAGS = \ -D_GNU_SOURCE \ $(NULL) -LIBS := $(NIMBLE_LDFLAGS) -lrt -lpthread -lstdc++ +LIBS := $(NIMBLE_LDFLAGS) $(MBEDTLS_LDFLAGS) -lrt -lpthread -lstdc++ .PHONY: all clean .DEFAULT: all @@ -97,14 +93,12 @@ clean: rm $(OBJ) -f rm nimble-linux-blemesh-shell -f -$(TINYCRYPT_OBJ): CFLAGS+=$(TINYCRYPT_CFLAGS) - %.o: %.c $(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $< %.o: %.cc $(CXX) -c $(INCLUDES) $(CFLAGS) -o $@ $< -nimble-linux-blemesh-shell: $(OBJ) $(TINYCRYPT_OBJ) +nimble-linux-blemesh-shell: $(OBJ) $(LD) -o $@ $^ $(LIBS) $(SIZE) $@ diff --git a/porting/examples/nuttx/Make.defs b/porting/examples/nuttx/Make.defs index 94a2a3e1d..8a6328391 100644 --- a/porting/examples/nuttx/Make.defs +++ b/porting/examples/nuttx/Make.defs @@ -16,7 +16,7 @@ # # Configure NimBLE variables -NIMBLE_CFG_TINYCRYPT := 1 +NIMBLE_CFG_MBEDTLS := 1 # Skip files that don't build for this port NIMBLE_IGNORE := $(NIMBLE_ROOT)/porting/nimble/src/hal_timer.c \ @@ -30,8 +30,7 @@ CSRCS := $(NIMBLE_SRC) # Source files for NPL OSAL CSRCS += \ $(wildcard $(NIMBLE_ROOT)/porting/npl/nuttx/src/*.c) \ - $(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) \ - $(TINYCRYPT_SRC) + $(wildcard $(NIMBLE_ROOT)/nimble/transport/socket/src/*.c) # Source files for demo app CSRCS += $(NIMBLE_ROOT)/porting/examples/nuttx/ble.c @@ -43,14 +42,12 @@ INC = \ $(wildcard $(NIMBLE_ROOT)/porting/examples/nuttx/include) \ $(NIMBLE_ROOT)/porting/npl/nuttx/include \ $(NIMBLE_ROOT)/nimble/transport/socket/include \ - $(NIMBLE_INCLUDE) \ - $(TINYCRYPT_INCLUDE) + $(NIMBLE_INCLUDE) INCLUDES := $(addprefix -I, $(INC)) CFLAGS += \ $(INCLUDES) \ - $(TINYCRYPT_CFLAGS) \ -DNIMBLE_CFG_CONTROLLER=0 -DOS_CFG_ALIGN_4=4 -DOS_CFG_ALIGNMENT=4 \ -Ddefault_RNG_defined=0 diff --git a/porting/nimble/Makefile.defs b/porting/nimble/Makefile.defs index dfb685104..308798e9f 100644 --- a/porting/nimble/Makefile.defs +++ b/porting/nimble/Makefile.defs @@ -63,9 +63,9 @@ ifneq (,$(NIMBLE_CFG_CONTROLLER)) include $(NIMBLE_ROOT)/porting/nimble/Makefile.controller endif -# TinyCrypt (for SM) -ifneq (,$(NIMBLE_CFG_TINYCRYPT)) -include $(NIMBLE_ROOT)/porting/nimble/Makefile.tinycrypt +# Mbed TLS (for SM) +ifneq (,$(NIMBLE_CFG_MBEDTLS)) +include $(NIMBLE_ROOT)/porting/nimble/Makefile.mbedtls endif ifneq (,$(NIMBLE_CFG_MESH)) diff --git a/porting/nimble/Makefile.tinycrypt b/porting/nimble/Makefile.mbedtls similarity index 78% rename from porting/nimble/Makefile.tinycrypt rename to porting/nimble/Makefile.mbedtls index 2333e6188..bcc6cd8f7 100644 --- a/porting/nimble/Makefile.tinycrypt +++ b/porting/nimble/Makefile.mbedtls @@ -15,12 +15,4 @@ # under the License. # -TINYCRYPT_CFLAGS := -std=c99 - -TINYCRYPT_INCLUDE := \ - $(NIMBLE_ROOT)/ext/tinycrypt/include \ - $(NULL) - -TINYCRYPT_SRC := \ - $(filter-out $(NIMBLE_IGNORE), $(wildcard $(NIMBLE_ROOT)/ext/tinycrypt/src/*.c)) \ - $(NULL) +MBEDTLS_LDFLAGS := -lmbedtls -lmbedcrypto
