openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 06:04:31 +04:00
Code Issues Packages Projects Releases Wiki Activity

micropython: bump to 1.23.0 release

Browse Source 
Bump micropython to 1.23.0. This is done to fix support for MbedTLS 3.0

Lots changed between 1.21 and 1.23 for the library side.

Mainly the barkeley-db library was moved to micropython own fork and the
cdef patch required lots of changes. (we have to manually include a copy
of cdef.h as it was dropped by them)
Also a new patch is required to mute some compilarion error that are
false-positive. (variable not initialized but that are ALWAYS
initialized)

Also refresh the extmod patch with new files included.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
Christian Marangi
2024-10-22 15:27:36 +02:00
committed by Rosen Penev
parent e3217b54ed
commit 86602b5f3a
5 changed files with 176 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lang/python/micropython/patches/040-extmod-use-external-mbedtls.patch
View File

@@ -9,12 +9,12 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -131,85 +131,8 @@ SRC_THIRDPARTY_C += $(addprefix $(AXTLS_
@@ -235,86 +235,8 @@ SRC_THIRDPARTY_C += $(addprefix $(AXTLS_
crypto/sha1.c \
)
else ifeq ($(MICROPY_SSL_MBEDTLS),1)
-MBEDTLS_DIR = lib/mbedtls
-MBEDTLS_CONFIG_FILE ?= \"mbedtls/mbedtls_config.h\"
-MBEDTLS_CONFIG_FILE ?= \"mbedtls/mbedtls_config_port.h\"
-GIT_SUBMODULES += $(MBEDTLS_DIR)
-CFLAGS_EXTMOD += -DMBEDTLS_CONFIG_FILE=$(MBEDTLS_CONFIG_FILE)
-CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
@@ -22,20 +22,25 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls
-SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
- aes.c \
- aesni.c \
- arc4.c \
- asn1parse.c \
- asn1write.c \
- base64.c \
- bignum_core.c \
- bignum_mod.c \
- bignum_mod_raw.c \
- bignum.c \
- blowfish.c \
- camellia.c \
- ccm.c \
- certs.c \
- chacha20.c \
- chachapoly.c \
- cipher.c \
- cipher_wrap.c \
- nist_kw.c \
- aria.c \
- cmac.c \
- constant_time.c \
- mps_reader.c \
- mps_trace.c \
- ctr_drbg.c \
- debug.c \
- des.c \
@@ -48,17 +53,13 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls
- entropy.c \
- entropy_poll.c \
- gcm.c \
- havege.c \
- hmac_drbg.c \
- md2.c \
- md4.c \
- md5.c \
- md.c \
- oid.c \
- padlock.c \
- pem.c \
- pk.c \
- pkcs11.c \
- pkcs12.c \
- pkcs5.c \
- pkparse.c \
@@ -69,20 +70,21 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls
- poly1305.c \
- ripemd160.c \
- rsa.c \
- rsa_internal.c \
- rsa_alt_helpers.c \
- sha1.c \
- sha256.c \
- sha512.c \
- ssl_cache.c \
- ssl_ciphersuites.c \
- ssl_cli.c \
- ssl_client.c \
- ssl_cookie.c \
- ssl_srv.c \
- ssl_debug_helpers_generated.c \
- ssl_msg.c \
- ssl_ticket.c \
- ssl_tls.c \
- ssl_tls12_client.c \
- ssl_tls12_server.c \
- timing.c \
- constant_time.c \
- x509.c \
- x509_create.c \
- x509_crl.c \
@@ -90,7 +92,6 @@ Subject: [PATCH 06/10] extmod: Use system mbedtls
- x509_csr.c \
- x509write_crt.c \
- x509write_csr.c \
- xtea.c \
- )
+CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1
+LDFLAGS_MOD += -lmbedx509 -lmbedtls -lmbedcrypto