Skip to content

Commit 8630ed7

Browse files
dropbear: rename libtomcrypt symbols to avoid NuttX collisions
Rename base64 and ecc_make_key when CONFIG_CODECS_BASE64/CONFIG_CRYPTO are enabled alongside Dropbear. Signed-off-by: Abhishek Mishra <mishra.abhishek2808@gmail.com>
1 parent 2f32e3e commit 8630ed7

1 file changed

Lines changed: 9 additions & 0 deletions

File tree

netutils/dropbear/Makefile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,15 @@ endif
130130
# Match the ESP-IDF port behavior: LTC_SOURCE is only for libtomcrypt sources.
131131
$(foreach src,$(TOMCRYPT_SRCS),$(eval $(src)_CFLAGS += ${DEFINE_PREFIX}LTC_SOURCE=1))
132132

133+
# Avoid duplicate symbols when NuttX/apps also provide these APIs.
134+
ifeq ($(CONFIG_CODECS_BASE64),y)
135+
$(foreach src,$(TOMCRYPT_SRCS),$(eval $(src)_CFLAGS += ${DEFINE_PREFIX}base64_encode=dropbear_ltc_base64_encode))
136+
$(foreach src,$(TOMCRYPT_SRCS),$(eval $(src)_CFLAGS += ${DEFINE_PREFIX}base64_decode=dropbear_ltc_base64_decode))
137+
endif
138+
ifeq ($(CONFIG_CRYPTO),y)
139+
$(foreach src,$(TOMCRYPT_SRCS),$(eval $(src)_CFLAGS += ${DEFINE_PREFIX}ecc_make_key=dropbear_ltc_ecc_make_key))
140+
endif
141+
133142
MAINSRC = dropbear_main.c
134143

135144
ifneq ($(CONFIG_NETUTILS_DROPBEAR_SCP),)

0 commit comments

Comments
 (0)