Skip to content

Commit 0efaaa3

Browse files
committed
modules: mbedtls: remove deprecated build symbols
tf-psa-crypto deprecated usage of some build symbols and if they are still specified at build time the build will fail. Signed-off-by: Valerio Setti <vsetti@baylibre.com>
1 parent 59b5cab commit 0efaaa3

File tree

1 file changed

+0
-186
lines changed

1 file changed

+0
-186
lines changed

‎modules/mbedtls/configs/config-tf-psa-crypto.h‎

Lines changed: 0 additions & 186 deletions
Original file line numberDiff line numberDiff line change
@@ -48,20 +48,6 @@
4848
#define MBEDTLS_DEBUG_C
4949
#endif
5050

51-
#if defined(CONFIG_MBEDTLS_ECDSA_DETERMINISTIC)
52-
#define MBEDTLS_ECDSA_DETERMINISTIC
53-
#endif
54-
55-
#if defined(CONFIG_MBEDTLS_HKDF_C)
56-
#define MBEDTLS_HKDF_C
57-
#endif
58-
59-
/* Supported cipher modes */
60-
61-
#if defined(CONFIG_MBEDTLS_CIPHER_AES_ENABLED)
62-
#define MBEDTLS_AES_C
63-
#endif
64-
6551
#if defined(CONFIG_MBEDTLS_AES_ROM_TABLES)
6652
#define MBEDTLS_AES_ROM_TABLES
6753
#endif
@@ -70,134 +56,14 @@
7056
#define MBEDTLS_AES_FEWER_TABLES
7157
#endif
7258

73-
#if defined(CONFIG_MBEDTLS_CIPHER_CAMELLIA_ENABLED)
74-
#define MBEDTLS_CAMELLIA_C
75-
#endif
76-
77-
#if defined(CONFIG_MBEDTLS_CIPHER_DES_ENABLED)
78-
#define MBEDTLS_DES_C
79-
#endif
80-
81-
#if defined(CONFIG_MBEDTLS_CIPHER_CHACHA20_ENABLED)
82-
#define MBEDTLS_CHACHA20_C
83-
#endif
84-
85-
#if defined(CONFIG_MBEDTLS_CIPHER_CCM_ENABLED)
86-
#define MBEDTLS_CCM_C
87-
#endif
88-
89-
#if defined(CONFIG_MBEDTLS_CIPHER_GCM_ENABLED)
90-
#define MBEDTLS_GCM_C
91-
#endif
92-
93-
#if defined(CONFIG_MBEDTLS_CIPHER_MODE_XTS_ENABLED)
94-
#define MBEDTLS_CIPHER_MODE_XTS
95-
#endif
96-
97-
#if defined(CONFIG_MBEDTLS_CIPHER_MODE_CBC_ENABLED)
98-
#define MBEDTLS_CIPHER_MODE_CBC
99-
#endif
100-
101-
#if defined(CONFIG_MBEDTLS_CIPHER_MODE_CTR_ENABLED)
102-
#define MBEDTLS_CIPHER_MODE_CTR
103-
#endif
104-
105-
/* Supported elliptic curves */
106-
107-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED)
108-
#define MBEDTLS_ECP_DP_SECP192R1_ENABLED
109-
#endif
110-
111-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED)
112-
#define MBEDTLS_ECP_DP_SECP224R1_ENABLED
113-
#endif
114-
115-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED)
116-
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
117-
#endif
118-
119-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED)
120-
#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
121-
#endif
122-
123-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED)
124-
#define MBEDTLS_ECP_DP_SECP521R1_ENABLED
125-
#endif
126-
127-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED)
128-
#define MBEDTLS_ECP_DP_SECP192K1_ENABLED
129-
#endif
130-
131-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED)
132-
#define MBEDTLS_ECP_DP_SECP224K1_ENABLED
133-
#endif
134-
135-
#if defined(CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED)
136-
#define MBEDTLS_ECP_DP_SECP256K1_ENABLED
137-
#endif
138-
139-
#if defined(CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED)
140-
#define MBEDTLS_ECP_DP_BP256R1_ENABLED
141-
#endif
142-
143-
#if defined(CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED)
144-
#define MBEDTLS_ECP_DP_BP384R1_ENABLED
145-
#endif
146-
147-
#if defined(CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED)
148-
#define MBEDTLS_ECP_DP_BP512R1_ENABLED
149-
#endif
150-
151-
#if defined(CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED)
152-
#define MBEDTLS_ECP_DP_CURVE25519_ENABLED
153-
#endif
154-
155-
#if defined(CONFIG_MBEDTLS_ECP_DP_CURVE448_ENABLED)
156-
#define MBEDTLS_ECP_DP_CURVE448_ENABLED
157-
#endif
158-
15959
#if defined(CONFIG_MBEDTLS_ECP_NIST_OPTIM)
16060
#define MBEDTLS_ECP_NIST_OPTIM
16161
#endif
16262

163-
/* Supported hash algorithms */
164-
165-
#if defined(CONFIG_MBEDTLS_MD5)
166-
#define MBEDTLS_MD5_C
167-
#endif
168-
169-
#if defined(CONFIG_MBEDTLS_SHA1)
170-
#define MBEDTLS_SHA1_C
171-
#endif
172-
173-
#if defined(CONFIG_MBEDTLS_SHA224)
174-
#define MBEDTLS_SHA224_C
175-
#endif
176-
177-
#if defined(CONFIG_MBEDTLS_SHA256)
178-
#define MBEDTLS_SHA256_C
179-
#endif
180-
18163
#if defined(CONFIG_MBEDTLS_SHA256_SMALLER)
18264
#define MBEDTLS_SHA256_SMALLER
18365
#endif
18466

185-
#if defined(CONFIG_MBEDTLS_SHA384)
186-
#define MBEDTLS_SHA384_C
187-
#endif
188-
189-
#if defined(CONFIG_MBEDTLS_SHA512)
190-
#define MBEDTLS_SHA512_C
191-
#endif
192-
193-
#if defined(CONFIG_MBEDTLS_POLY1305)
194-
#define MBEDTLS_POLY1305_C
195-
#endif
196-
197-
#if defined(CONFIG_MBEDTLS_CMAC)
198-
#define MBEDTLS_CMAC_C
199-
#endif
200-
20167
#if defined(CONFIG_MBEDTLS_CTR_DRBG_C)
20268
#define MBEDTLS_CTR_DRBG_C
20369
#endif
@@ -206,63 +72,17 @@
20672
#define MBEDTLS_HMAC_DRBG_C
20773
#endif
20874

209-
#if defined(CONFIG_MBEDTLS_CHACHAPOLY_AEAD_ENABLED)
210-
#define MBEDTLS_CHACHAPOLY_C
211-
#endif
212-
213-
#if defined(CONFIG_MBEDTLS_GENPRIME_ENABLED)
214-
#define MBEDTLS_GENPRIME
215-
#endif
216-
217-
#if defined(CONFIG_MBEDTLS_ENTROPY_C)
218-
#define MBEDTLS_ENTROPY_C
219-
#endif
220-
221-
#if defined(CONFIG_MBEDTLS_CIPHER)
222-
#define MBEDTLS_CIPHER_C
223-
#endif
224-
22575
#if defined(CONFIG_MBEDTLS_MD_C)
22676
#define MBEDTLS_MD_C
22777
#endif
22878

229-
#if defined(CONFIG_MBEDTLS_RSA_C)
230-
#define MBEDTLS_RSA_C
231-
#endif
232-
233-
#if defined(CONFIG_MBEDTLS_PKCS1_V15)
234-
#define MBEDTLS_PKCS1_V15
235-
#endif
236-
237-
#if defined(CONFIG_MBEDTLS_PKCS1_V21)
238-
#define MBEDTLS_PKCS1_V21
239-
#endif
240-
241-
#if defined(MBEDTLS_KEY_EXCHANGE_DHE_PSK_ENABLED) || \
242-
defined(MBEDTLS_KEY_EXCHANGE_DHE_RSA_ENABLED)
243-
#define MBEDTLS_DHM_C
244-
#endif
245-
24679
#if defined(CONFIG_MBEDTLS_PEM_CERTIFICATE_FORMAT) && \
24780
defined(MBEDTLS_X509_CRT_PARSE_C)
24881
#define MBEDTLS_PEM_PARSE_C
24982
#define MBEDTLS_PEM_WRITE_C
25083
#define MBEDTLS_BASE64_C
25184
#endif
25285

253-
#if defined(MBEDTLS_DHM_C) || \
254-
defined(MBEDTLS_ECP_C) || \
255-
defined(MBEDTLS_RSA_C) || \
256-
defined(MBEDTLS_X509_USE_C) || \
257-
defined(MBEDTLS_GENPRIME)
258-
#define MBEDTLS_BIGNUM_C
259-
#endif
260-
261-
#if defined(MBEDTLS_RSA_C) || \
262-
defined(MBEDTLS_X509_USE_C)
263-
#define MBEDTLS_OID_C
264-
#endif
265-
26686
#if defined(MBEDTLS_X509_USE_C)
26787
#define MBEDTLS_PK_PARSE_C
26888
#endif
@@ -292,7 +112,6 @@
292112
#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */
293113
#define MBEDTLS_ECP_WINDOW_SIZE 2 /**< Maximum window size used */
294114
#define MBEDTLS_ECP_FIXED_POINT_OPTIM 0 /**< Enable fixed-point speed-up */
295-
#define MBEDTLS_ENTROPY_MAX_SOURCES 1 /**< Maximum number of sources supported */
296115
#endif
297116

298117
#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG)
@@ -331,15 +150,10 @@
331150
#if defined(CONFIG_MBEDTLS_PSA_CRYPTO_CLIENT)
332151
#define MBEDTLS_PSA_CRYPTO_CLIENT
333152
#define MBEDTLS_PSA_CRYPTO_CONFIG
334-
#define MBEDTLS_PSA_CRYPTO_CONFIG_FILE "config-psa.h"
335153
#endif
336154

337155
#if defined(CONFIG_MBEDTLS_NIST_KW_C)
338156
#define MBEDTLS_NIST_KW_C
339157
#endif
340158

341-
#if defined(CONFIG_MBEDTLS_DHM_C)
342-
#define MBEDTLS_DHM_C
343-
#endif
344-
345159
#endif /* CONFIG_TF_PSA_CRYPTO_H */

0 commit comments

Comments
 (0)