Skip to content

Commit aaf5980

Browse files
LuDudaLuDuda
committed
[crypto] mbedtls: refactor mbedtls-config.h for better readability
Group mbedTLS configuration macros into logical sections and improve formatting. This commit helps prepare for PSA API backend introduction. Signed-off-by: Łukasz Duda <lukasz.duda@nordicsemi.no>
1 parent 551b887 commit aaf5980

File tree

1 file changed

+76
-35
lines changed

1 file changed

+76
-35
lines changed

‎third_party/mbedtls/mbedtls-config.h‎

Lines changed: 76 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,9 @@
4040
#include <openthread/platform/logging.h>
4141
#include <openthread/platform/memory.h>
4242

43-
#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
43+
// ==============================================================================
44+
// Cryptographic configuration
45+
// ==============================================================================
4446

4547
#define MBEDTLS_AES_C
4648
#if (MBEDTLS_VERSION_NUMBER >= 0x03050000)
@@ -66,19 +68,34 @@
6668
#define MBEDTLS_ENTROPY_C
6769
#define MBEDTLS_HAVE_ASM
6870
#define MBEDTLS_HMAC_DRBG_C
69-
#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
7071
#define MBEDTLS_MD_C
71-
#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
72-
#define MBEDTLS_NO_PLATFORM_ENTROPY
73-
#define MBEDTLS_OID_C
74-
#define MBEDTLS_PK_C
75-
#define MBEDTLS_PK_PARSE_C
76-
#define MBEDTLS_PLATFORM_C
77-
#define MBEDTLS_PLATFORM_MEMORY
78-
#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
7972
#define MBEDTLS_SHA224_C
8073
#define MBEDTLS_SHA256_C
8174
#define MBEDTLS_SHA256_SMALLER
75+
76+
#if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE || OPENTHREAD_CONFIG_TLS_ENABLE
77+
#define MBEDTLS_BASE64_C
78+
#define MBEDTLS_ECDH_C
79+
#define MBEDTLS_ECDSA_C
80+
#endif
81+
82+
#if OPENTHREAD_CONFIG_BLE_TCAT_ENABLE
83+
#define MBEDTLS_GCM_C
84+
#endif
85+
86+
#if OPENTHREAD_CONFIG_ECDSA_ENABLE
87+
#define MBEDTLS_BASE64_C
88+
#define MBEDTLS_ECDH_C
89+
#define MBEDTLS_ECDSA_C
90+
#if OPENTHREAD_CONFIG_DETERMINISTIC_ECDSA_ENABLE
91+
#define MBEDTLS_ECDSA_DETERMINISTIC
92+
#endif
93+
#endif
94+
95+
// ==============================================================================
96+
// SSL configuration
97+
// ==============================================================================
98+
8299
#define MBEDTLS_SSL_CLI_C
83100
#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
84101
#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
@@ -93,6 +110,12 @@
93110
#define MBEDTLS_SSL_SRV_C
94111
#endif
95112

113+
#if OPENTHREAD_CONFIG_BLE_TCAT_ENABLE
114+
#define MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
115+
#endif
116+
117+
#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
118+
96119
#if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
97120
#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
98121
#endif
@@ -102,55 +125,73 @@
102125
#endif
103126

104127
#if OPENTHREAD_CONFIG_BLE_TCAT_ENABLE
105-
#define MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
106-
#define MBEDTLS_GCM_C
128+
#define MBEDTLS_SSL_MAX_CONTENT_LEN 2000 /**< Maxium fragment length in bytes */
129+
#elif OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
130+
#define MBEDTLS_SSL_MAX_CONTENT_LEN 900 /**< Maxium fragment length in bytes */
131+
#else
132+
#define MBEDTLS_SSL_MAX_CONTENT_LEN 768 /**< Maxium fragment length in bytes */
107133
#endif
108134

109-
#ifdef MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
135+
#define MBEDTLS_SSL_IN_CONTENT_LEN MBEDTLS_SSL_MAX_CONTENT_LEN
136+
#define MBEDTLS_SSL_OUT_CONTENT_LEN MBEDTLS_SSL_MAX_CONTENT_LEN
137+
#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
138+
139+
// ==============================================================================
140+
// x509 & PK configuration
141+
// ==============================================================================
142+
143+
#define MBEDTLS_OID_C
144+
#define MBEDTLS_PK_C
145+
#define MBEDTLS_PK_PARSE_C
146+
147+
#if OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE || OPENTHREAD_CONFIG_TLS_ENABLE
110148
#define MBEDTLS_BASE64_C
111-
#define MBEDTLS_ECDH_C
112-
#define MBEDTLS_ECDSA_C
113149
#define MBEDTLS_PEM_PARSE_C
114150
#define MBEDTLS_X509_USE_C
115151
#define MBEDTLS_X509_CRT_PARSE_C
116152
#endif
117153

118154
#if OPENTHREAD_CONFIG_ECDSA_ENABLE
119-
#define MBEDTLS_BASE64_C
120-
#define MBEDTLS_ECDH_C
121-
#define MBEDTLS_ECDSA_C
122-
#if OPENTHREAD_CONFIG_DETERMINISTIC_ECDSA_ENABLE
123-
#define MBEDTLS_ECDSA_DETERMINISTIC
124-
#endif
125155
#define MBEDTLS_PEM_PARSE_C
126156
#define MBEDTLS_PK_WRITE_C
127157
#endif
128158

159+
// ==============================================================================
160+
// MPI configuration
161+
// ==============================================================================
162+
129163
#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */
130164
#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */
165+
166+
// ==============================================================================
167+
// ECP configuration
168+
// ==============================================================================
169+
170+
#if (MBEDTLS_VERSION_NUMBER < 0x03000000)
131171
#define MBEDTLS_ECP_MAX_BITS 256 /**< Maximum bit size of groups */
172+
#endif
132173
#define MBEDTLS_ECP_WINDOW_SIZE 2 /**< Maximum window size used */
133174
#define MBEDTLS_ECP_FIXED_POINT_OPTIM 0 /**< Enable fixed-point speed-up */
134-
#define MBEDTLS_ENTROPY_MAX_SOURCES 1 /**< Maximum number of sources supported */
175+
176+
// ==============================================================================
177+
// Platform configuration
178+
// ==============================================================================
179+
180+
#define MBEDTLS_PLATFORM_SNPRINTF_MACRO snprintf
135181

136182
#if OPENTHREAD_CONFIG_HEAP_EXTERNAL_ENABLE
137-
#define MBEDTLS_PLATFORM_STD_CALLOC calloc /**< Default allocator to use, can be undefined */
138-
#define MBEDTLS_PLATFORM_STD_FREE free /**< Default free to use, can be undefined */
183+
#define MBEDTLS_PLATFORM_STD_CALLOC calloc /**< Default allocator to use, can be undefined */
184+
#define MBEDTLS_PLATFORM_STD_FREE free /**< Default free to use, can be undefined */
139185
#else
140186
#define MBEDTLS_MEMORY_BUFFER_ALLOC_C
141187
#endif
142188

143-
#if OPENTHREAD_CONFIG_BLE_TCAT_ENABLE
144-
#define MBEDTLS_SSL_MAX_CONTENT_LEN 2000 /**< Maxium fragment length in bytes */
145-
#elif OPENTHREAD_CONFIG_COAP_SECURE_API_ENABLE
146-
#define MBEDTLS_SSL_MAX_CONTENT_LEN 900 /**< Maxium fragment length in bytes */
147-
#else
148-
#define MBEDTLS_SSL_MAX_CONTENT_LEN 768 /**< Maxium fragment length in bytes */
149-
#endif
150-
151-
#define MBEDTLS_SSL_IN_CONTENT_LEN MBEDTLS_SSL_MAX_CONTENT_LEN
152-
#define MBEDTLS_SSL_OUT_CONTENT_LEN MBEDTLS_SSL_MAX_CONTENT_LEN
153-
#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
189+
#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES
190+
#define MBEDTLS_NO_PLATFORM_ENTROPY
191+
#define MBEDTLS_PLATFORM_C
192+
#define MBEDTLS_PLATFORM_MEMORY
193+
#define MBEDTLS_PLATFORM_NO_STD_FUNCTIONS
194+
#define MBEDTLS_ENTROPY_MAX_SOURCES 1
154195

155196
// Spans multiple lines to avoid being processed by unifdef
156197
#if defined(\

0 commit comments

Comments
 (0)