djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/modussl_axtls: Further changes to allow alternative SSL modules.

Browse Source 
Make variable MICROPY_SSL_AXTLS=1 should be defined to activate modussl_axtls
and link with -laxtls.
This commit is contained in:
Paul Sokolovsky 2016-07-13 01:49:38 +03:00
parent e32d1e17bb
commit 20283aec10
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extmod/modussl_axtls.c
View File

@ -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"

5
py/py.mk
View File

@ -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

2
unix/mpconfigport.h
View File

@ -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)

1
unix/mpconfigport.mk
View File

@ -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