db9202ccc5
Removed 050-py-stackctrl-fix-gcc-13.patch as it has been merged in the new version. This also: * Add STRIP= (empty value) to skip micropython's stripping step, letting the OpenWrt build system control stripping. * Add a workaround for "variable might be clobbered" warning leading to build error on riscv64 (https://github.com/micropython/micropython/issues/12838). * Change Build/InstallDev to install host tools into an unversioned directory, and update micropython-lib to use the unversioned path. There is no need to keep available multiple versions of the host tools. * Add a test.sh script for the packages feed CI. Signed-off-by: Jeffery To <jeffery.to@gmail.com>
99 lines
1.9 KiB
Diff
99 lines
1.9 KiB
Diff
From 9717338f1917fa5db63fe7c9758639417ab06f61 Mon Sep 17 00:00:00 2001
|
|
From: yangfl <yangfl@users.noreply.github.com>
|
|
Date: Mon, 4 Jan 2021 23:09:41 +0800
|
|
Subject: [PATCH 06/10] extmod: Use system mbedtls
|
|
|
|
---
|
|
extmod/extmod.mk | 77 ++----------------------------------------------
|
|
1 file changed, 2 insertions(+), 75 deletions(-)
|
|
|
|
--- a/extmod/extmod.mk
|
|
+++ b/extmod/extmod.mk
|
|
@@ -131,85 +131,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\"
|
|
-GIT_SUBMODULES += $(MBEDTLS_DIR)
|
|
-CFLAGS_EXTMOD += -DMBEDTLS_CONFIG_FILE=$(MBEDTLS_CONFIG_FILE)
|
|
-CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1 -I$(TOP)/$(MBEDTLS_DIR)/include
|
|
-SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c
|
|
-SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
|
|
- aes.c \
|
|
- aesni.c \
|
|
- arc4.c \
|
|
- asn1parse.c \
|
|
- asn1write.c \
|
|
- base64.c \
|
|
- bignum.c \
|
|
- blowfish.c \
|
|
- camellia.c \
|
|
- ccm.c \
|
|
- certs.c \
|
|
- chacha20.c \
|
|
- chachapoly.c \
|
|
- cipher.c \
|
|
- cipher_wrap.c \
|
|
- cmac.c \
|
|
- ctr_drbg.c \
|
|
- debug.c \
|
|
- des.c \
|
|
- dhm.c \
|
|
- ecdh.c \
|
|
- ecdsa.c \
|
|
- ecjpake.c \
|
|
- ecp.c \
|
|
- ecp_curves.c \
|
|
- 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 \
|
|
- pk_wrap.c \
|
|
- pkwrite.c \
|
|
- platform.c \
|
|
- platform_util.c \
|
|
- poly1305.c \
|
|
- ripemd160.c \
|
|
- rsa.c \
|
|
- rsa_internal.c \
|
|
- sha1.c \
|
|
- sha256.c \
|
|
- sha512.c \
|
|
- ssl_cache.c \
|
|
- ssl_ciphersuites.c \
|
|
- ssl_cli.c \
|
|
- ssl_cookie.c \
|
|
- ssl_srv.c \
|
|
- ssl_msg.c \
|
|
- ssl_ticket.c \
|
|
- ssl_tls.c \
|
|
- timing.c \
|
|
- constant_time.c \
|
|
- x509.c \
|
|
- x509_create.c \
|
|
- x509_crl.c \
|
|
- x509_crt.c \
|
|
- x509_csr.c \
|
|
- x509write_crt.c \
|
|
- x509write_csr.c \
|
|
- xtea.c \
|
|
- )
|
|
+CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1
|
|
+LDFLAGS_MOD += -lmbedx509 -lmbedtls -lmbedcrypto
|
|
endif
|
|
endif
|
|
|