mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

extmod: Update for move of crypto-algorithms, re1.5, uzlib to lib. 

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2021-07-12 16:34:27 +10:00
parent 966e8bf934
commit 94dfaff18b
5 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extmod/axtls-include/axtls_os_port.h
View File

@ -28,7 +28,7 @@
#include <errno.h> #include <errno.h>
#include "py/stream.h" #include "py/stream.h"
#include "extmod/crypto-algorithms/sha256.h" #include "lib/crypto-algorithms/sha256.h"
#define SSL_CTX_MUTEX_INIT(mutex) #define SSL_CTX_MUTEX_INIT(mutex)
#define SSL_CTX_MUTEX_DESTROY(mutex) #define SSL_CTX_MUTEX_DESTROY(mutex)

2
extmod/modubinascii.c
View File

@ -218,7 +218,7 @@ STATIC mp_obj_t mod_binascii_b2a_base64(mp_obj_t data) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj, mod_binascii_b2a_base64); STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj, mod_binascii_b2a_base64);
#if MICROPY_PY_UBINASCII_CRC32 #if MICROPY_PY_UBINASCII_CRC32
#include "uzlib/tinf.h" #include "lib/uzlib/tinf.h"
STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) { STATIC mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
mp_buffer_info_t bufinfo; mp_buffer_info_t bufinfo;

4
extmod/moduhashlib.c
View File

@ -40,7 +40,7 @@
#if MICROPY_SSL_MBEDTLS #if MICROPY_SSL_MBEDTLS
#include "mbedtls/sha256.h" #include "mbedtls/sha256.h"
#else #else
#include "crypto-algorithms/sha256.h" #include "lib/crypto-algorithms/sha256.h"
#endif #endif
#endif #endif
@ -115,7 +115,7 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
#else #else
#include "crypto-algorithms/sha256.c" #include "lib/crypto-algorithms/sha256.c"
STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) { STATIC mp_obj_t uhashlib_sha256_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *args) {
mp_arg_check_num(n_args, n_kw, 0, 1, false); mp_arg_check_num(n_args, n_kw, 0, 1, false);

10
extmod/modure.c
View File

@ -37,7 +37,7 @@
#define re1_5_stack_chk() MP_STACK_CHECK() #define re1_5_stack_chk() MP_STACK_CHECK()
#include "re1.5/re1.5.h" #include "lib/re1.5/re1.5.h"
#define FLAG_DEBUG 0x1000 #define FLAG_DEBUG 0x1000
@ -454,11 +454,11 @@ const mp_obj_module_t mp_module_ure = {
// only if module is enabled by config setting. // only if module is enabled by config setting.
#define re1_5_fatal(x) assert(!x) #define re1_5_fatal(x) assert(!x)
#include "re1.5/compilecode.c" #include "lib/re1.5/compilecode.c"
#if MICROPY_PY_URE_DEBUG #if MICROPY_PY_URE_DEBUG
#include "re1.5/dumpcode.c" #include "lib/re1.5/dumpcode.c"
#endif #endif
#include "re1.5/recursiveloop.c" #include "lib/re1.5/recursiveloop.c"
#include "re1.5/charclass.c" #include "lib/re1.5/charclass.c"
#endif // MICROPY_PY_URE #endif // MICROPY_PY_URE

12
extmod/moduzlib.c
View File

@ -33,7 +33,7 @@
#if MICROPY_PY_UZLIB #if MICROPY_PY_UZLIB
#include "uzlib/tinf.h" #include "lib/uzlib/tinf.h"
#if 0 // print debugging info #if 0 // print debugging info
#define DEBUG_printf DEBUG_printf #define DEBUG_printf DEBUG_printf
@ -223,10 +223,10 @@ const mp_obj_module_t mp_module_uzlib = {
// Source files #include'd here to make sure they're compiled in // Source files #include'd here to make sure they're compiled in
// only if module is enabled by config setting. // only if module is enabled by config setting.
#include "uzlib/tinflate.c" #include "lib/uzlib/tinflate.c"
#include "uzlib/tinfzlib.c" #include "lib/uzlib/tinfzlib.c"
#include "uzlib/tinfgzip.c" #include "lib/uzlib/tinfgzip.c"
#include "uzlib/adler32.c" #include "lib/uzlib/adler32.c"
#include "uzlib/crc32.c" #include "lib/uzlib/crc32.c"
#endif // MICROPY_PY_UZLIB #endif // MICROPY_PY_UZLIB