1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
From ab8be9279c8eb5bdc584cd3253e679d326901cca Mon Sep 17 00:00:00 2001
From: yangfl <yangfl@users.noreply.github.com>
Date: Fri, 9 Feb 2024 21:29:32 +0800
Subject: [PATCH 6/8] extmod: Use system mbedtls
---
extmod/extmod.mk | 87 ++----------------------------------------------
1 file changed, 2 insertions(+), 85 deletions(-)
diff --git a/extmod/extmod.mk b/extmod/extmod.mk
index 37151ad12..dee49ecd5 100644
--- a/extmod/extmod.mk
+++ b/extmod/extmod.mk
@@ -242,91 +242,8 @@ SRC_THIRDPARTY_C += $(addprefix $(AXTLS_DIR)/,\
crypto/sha1.c \
)
else ifeq ($(MICROPY_SSL_MBEDTLS),1)
-MBEDTLS_DIR = lib/mbedtls
-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
-ifeq ($(MICROPY_PY_SSL_ECDSA_SIGN_ALT),1)
-CFLAGS_EXTMOD += -DMICROPY_PY_SSL_ECDSA_SIGN_ALT=1
-LDFLAGS_EXTMOD += -Wl,--wrap=mbedtls_ecdsa_write_signature
-endif
-SRC_THIRDPARTY_C += lib/mbedtls_errors/mp_mbedtls_errors.c
-SRC_THIRDPARTY_C += $(addprefix $(MBEDTLS_DIR)/library/,\
- aes.c \
- aesni.c \
- asn1parse.c \
- asn1write.c \
- base64.c \
- bignum_core.c \
- bignum_mod.c \
- bignum_mod_raw.c \
- bignum.c \
- camellia.c \
- ccm.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 \
- dhm.c \
- ecdh.c \
- ecdsa.c \
- ecjpake.c \
- ecp.c \
- ecp_curves.c \
- entropy.c \
- entropy_poll.c \
- gcm.c \
- hmac_drbg.c \
- md5.c \
- md.c \
- oid.c \
- padlock.c \
- pem.c \
- pk.c \
- pkcs12.c \
- pkcs5.c \
- pkparse.c \
- pk_ecc.c \
- pk_wrap.c \
- pkwrite.c \
- platform.c \
- platform_util.c \
- poly1305.c \
- ripemd160.c \
- rsa.c \
- rsa_alt_helpers.c \
- sha1.c \
- sha256.c \
- sha512.c \
- ssl_cache.c \
- ssl_ciphersuites.c \
- ssl_client.c \
- ssl_cookie.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 \
- x509.c \
- x509_create.c \
- x509_crl.c \
- x509_crt.c \
- x509_csr.c \
- x509write_crt.c \
- x509write_csr.c \
- )
+CFLAGS_EXTMOD += -DMICROPY_SSL_MBEDTLS=1
+LDFLAGS_EXTMOD += -lmbedx509 -lmbedtls -lmbedcrypto
endif
endif
--
2.51.0
|
