From 94dfaff18bd1941c773f89359e40db5b555cd3ef Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Mon, 12 Jul 2021 16:34:27 +1000
Subject: [PATCH] extmod: Update for move of crypto-algorithms, re1.5, uzlib to
 lib.

Signed-off-by: Damien George <damien@micropython.org>
---
 extmod/axtls-include/axtls_os_port.h |  2 +-
 extmod/modubinascii.c                |  2 +-
 extmod/moduhashlib.c                 |  4 ++--
 extmod/modure.c                      | 10 +++++-----
 extmod/moduzlib.c                    | 12 ++++++------
 5 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/extmod/axtls-include/axtls_os_port.h b/extmod/axtls-include/axtls_os_port.h
index a58b13d7cc..ef2683acfc 100644
--- a/extmod/axtls-include/axtls_os_port.h
+++ b/extmod/axtls-include/axtls_os_port.h
@@ -28,7 +28,7 @@
 
 #include <errno.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_DESTROY(mutex)
diff --git a/extmod/modubinascii.c b/extmod/modubinascii.c
index 9e4f86fbd2..fab7717c4e 100644
--- a/extmod/modubinascii.c
+++ b/extmod/modubinascii.c
@@ -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);
 
 #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) {
     mp_buffer_info_t bufinfo;
diff --git a/extmod/moduhashlib.c b/extmod/moduhashlib.c
index b170de9e58..e97e8cb75d 100644
--- a/extmod/moduhashlib.c
+++ b/extmod/moduhashlib.c
@@ -40,7 +40,7 @@
 #if MICROPY_SSL_MBEDTLS
 #include "mbedtls/sha256.h"
 #else
-#include "crypto-algorithms/sha256.h"
+#include "lib/crypto-algorithms/sha256.h"
 #endif
 
 #endif
@@ -115,7 +115,7 @@ STATIC mp_obj_t uhashlib_sha256_digest(mp_obj_t self_in) {
 
 #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) {
     mp_arg_check_num(n_args, n_kw, 0, 1, false);
diff --git a/extmod/modure.c b/extmod/modure.c
index 220587b42f..d0829e8c5d 100644
--- a/extmod/modure.c
+++ b/extmod/modure.c
@@ -37,7 +37,7 @@
 
 #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
 
@@ -454,11 +454,11 @@ const mp_obj_module_t mp_module_ure = {
 // only if module is enabled by config setting.
 
 #define re1_5_fatal(x) assert(!x)
-#include "re1.5/compilecode.c"
+#include "lib/re1.5/compilecode.c"
 #if MICROPY_PY_URE_DEBUG
-#include "re1.5/dumpcode.c"
+#include "lib/re1.5/dumpcode.c"
 #endif
-#include "re1.5/recursiveloop.c"
-#include "re1.5/charclass.c"
+#include "lib/re1.5/recursiveloop.c"
+#include "lib/re1.5/charclass.c"
 
 #endif // MICROPY_PY_URE
diff --git a/extmod/moduzlib.c b/extmod/moduzlib.c
index ab70d67479..999cb48131 100644
--- a/extmod/moduzlib.c
+++ b/extmod/moduzlib.c
@@ -33,7 +33,7 @@
 
 #if MICROPY_PY_UZLIB
 
-#include "uzlib/tinf.h"
+#include "lib/uzlib/tinf.h"
 
 #if 0 // print debugging info
 #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
 // only if module is enabled by config setting.
 
-#include "uzlib/tinflate.c"
-#include "uzlib/tinfzlib.c"
-#include "uzlib/tinfgzip.c"
-#include "uzlib/adler32.c"
-#include "uzlib/crc32.c"
+#include "lib/uzlib/tinflate.c"
+#include "lib/uzlib/tinfzlib.c"
+#include "lib/uzlib/tinfgzip.c"
+#include "lib/uzlib/adler32.c"
+#include "lib/uzlib/crc32.c"
 
 #endif // MICROPY_PY_UZLIB