From 9cc8ec843eb76e08785093ad5ec3a9d5b1b3102e Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky <pfalcon@users.sourceforge.net> Date: Fri, 23 Sep 2016 14:30:26 +0300 Subject: [PATCH] py/py.mk: Add support for building modussl_mbedtls. --- py/py.mk | 6 ++++++ unix/mpconfigport.mk | 1 + 2 files changed, 7 insertions(+) diff --git a/py/py.mk b/py/py.mk index 658ad10dd..741ad52f9 100644 --- a/py/py.mk +++ b/py/py.mk @@ -24,6 +24,11 @@ CFLAGS_MOD += -DMICROPY_PY_USSL=1 ifeq ($(MICROPY_SSL_AXTLS),1) CFLAGS_MOD += -DMICROPY_SSL_AXTLS=1 -I../lib/axtls/ssl -I../lib/axtls/crypto -I../lib/axtls/config LDFLAGS_MOD += -Lbuild -laxtls +else ifeq ($(MICROPY_SSL_MBEDTLS),1) +# Can be overriden by ports which have "builtin" mbedTLS +MICROPY_SSL_MBEDTLS_INCLUDE ?= ../lib/mbedtls/include +CFLAGS_MOD += -DMICROPY_SSL_MBEDTLS=1 -I$(MICROPY_SSL_MBEDTLS_INCLUDE) +LDFLAGS_MOD += -L../lib/mbedtls/library -lmbedx509 -lmbedtls -lmbedcrypto endif endif @@ -212,6 +217,7 @@ PY_O_BASENAME = \ ../extmod/machine_i2c.o \ ../extmod/machine_spi.o \ ../extmod/modussl_axtls.o \ + ../extmod/modussl_mbedtls.o \ ../extmod/modurandom.o \ ../extmod/modwebsocket.o \ ../extmod/modwebrepl.o \ diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk index f7912141a..3b335ae78 100644 --- a/unix/mpconfigport.mk +++ b/unix/mpconfigport.mk @@ -29,6 +29,7 @@ MICROPY_PY_FFI = 1 # ussl module requires axtls MICROPY_PY_USSL = 1 MICROPY_SSL_AXTLS = 1 +MICROPY_SSL_MBEDTLS = 0 # jni module requires JVM/JNI MICROPY_PY_JNI = 0 -- GitLab