diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-07-13 01:49:38 +0300 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2016-07-13 01:49:38 +0300 |
| commit | 20283aec107d60f4339268f56fdf451d8867b49a (patch) | |
| tree | 3b5b18862e780ff4703ec712407eca03eb0c069d | |
| parent | e32d1e17bb7c17b5474c4be696e5428ece973301 (diff) | |
| download | micropython-20283aec107d60f4339268f56fdf451d8867b49a.tar.gz micropython-20283aec107d60f4339268f56fdf451d8867b49a.zip | |
extmod/modussl_axtls: Further changes to allow alternative SSL modules.
Make variable MICROPY_SSL_AXTLS=1 should be defined to activate modussl_axtls
and link with -laxtls.
| -rw-r--r-- | extmod/modussl_axtls.c | 2 | ||||
| -rw-r--r-- | py/py.mk | 5 | ||||
| -rw-r--r-- | unix/mpconfigport.h | 2 | ||||
| -rw-r--r-- | unix/mpconfigport.mk | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/extmod/modussl_axtls.c b/extmod/modussl_axtls.c index 4a3e297e1e..9e30ce6f87 100644 --- a/extmod/modussl_axtls.c +++ b/extmod/modussl_axtls.c @@ -32,7 +32,7 @@ #include "py/runtime.h" #include "py/stream.h" -#if MICROPY_PY_USSL +#if MICROPY_PY_USSL && MICROPY_SSL_AXTLS #include "ssl.h" @@ -20,9 +20,12 @@ INC += -I../lib INC += -I../lib/netutils ifeq ($(MICROPY_PY_USSL),1) -CFLAGS_MOD += -DMICROPY_PY_USSL=1 -I../lib/axtls/ssl -I../lib/axtls/crypto -I../lib/axtls/config +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 += -L../lib/axtls/_stage -laxtls endif +endif #ifeq ($(MICROPY_PY_LWIP),1) #CFLAGS_MOD += -DMICROPY_PY_LWIP=1 -I../lib/lwip/src/include -I../lib/lwip/src/include/ipv4 -I../extmod/lwip-include diff --git a/unix/mpconfigport.h b/unix/mpconfigport.h index 06c4edc1e2..30441c9fd2 100644 --- a/unix/mpconfigport.h +++ b/unix/mpconfigport.h @@ -111,7 +111,7 @@ #define MICROPY_PY_URE (1) #define MICROPY_PY_UHEAPQ (1) #define MICROPY_PY_UHASHLIB (1) -#if MICROPY_PY_USSL +#if MICROPY_PY_USSL && MICROPY_SSL_AXTLS #define MICROPY_PY_UHASHLIB_SHA1 (1) #endif #define MICROPY_PY_UBINASCII (1) diff --git a/unix/mpconfigport.mk b/unix/mpconfigport.mk index 9f826661a9..f7912141af 100644 --- a/unix/mpconfigport.mk +++ b/unix/mpconfigport.mk @@ -28,6 +28,7 @@ MICROPY_PY_FFI = 1 # ussl module requires axtls MICROPY_PY_USSL = 1 +MICROPY_SSL_AXTLS = 1 # jni module requires JVM/JNI MICROPY_PY_JNI = 0 |