Skip to content

Commit 8f476b3

Browse files
mkardous-silabsrestyled-io[bot]restyled-commits
authored
Remove build_info workaround from the generated files (SiliconLabs#218)
* Remove build_info workaround from the generated files * add comment * Restyle Remove build_info workaround from the generated files (SiliconLabs#219) Restyled by clang-format Co-authored-by: Restyled.io <commits@restyled.io> --------- Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com> Co-authored-by: Restyled.io <commits@restyled.io>
1 parent 3c313dd commit 8f476b3

File tree

2 files changed

+79
-67
lines changed

2 files changed

+79
-67
lines changed

‎matter/mbedtls/tinycrypt/inc/mbedtls/build_info.h

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
2+
#ifndef MBEDTLS_BUILD_INFO_H
3+
#define MBEDTLS_BUILD_INFO_H
4+
5+
// Custom file added to provide the necessary headers for the generated
6+
// sl_mbedtls_config header. File keeps the previous logic by only including
7+
// check_config without needing to modfy the generated files.
8+
9+
#include <mbedtls/check_config.h>
10+
11+
#endif /* MBEDTLS_BUILD_INFO_H */

‎matter/si91x/siwx917/BRD4338A/config/sl_mbedtls_config.h

+68-67
Original file line numberDiff line numberDiff line change
@@ -8,78 +8,83 @@
88

99
// <h> TLS/DTLS configuration
1010

11-
// <o MBEDTLS_SSL_CIPHERSUITES> Complete list of ciphersuites to use, in order
12-
// of preference. <i> Default: MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8 <i>
13-
// Complete list of ciphersuites to use, in order of preference. <i> The value
14-
// of this configuration should be updated for the application needs.
15-
#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
16-
17-
// <o SL_MBEDTLS_SSL_IN_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes
18-
// (input). <i> Default: 768 <i> The size configured here determines the size of
19-
// the internal I/O <i> buffer used in mbedTLS when receiving data.
20-
#define SL_MBEDTLS_SSL_IN_CONTENT_LEN 768
21-
22-
// <o SL_MBEDTLS_SSL_OUT_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes
23-
// (output). <i> Default: 768 <i> The size configured here determines the size
24-
// of the internal I/O <i> buffer used in mbedTLS when sending data.
25-
#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN 768
26-
27-
// <q SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH> Enable support for RFC 6066
28-
// max_fragment_length extension in SSL. <i> Default: 1 <i> Enable support for
29-
// RFC 6066 max_fragment_length extension in SSL.
30-
#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH 1
31-
32-
// <q SL_MBEDTLS_SSL_EXPORT_KEYS> Enable support for exporting key block and
33-
// master secret. <i> Default: 1 <i> Enable support for exporting key block and
34-
// master secret. <i> This is required for certain users of TLS, e.g. EAP-TLS.
35-
#define SL_MBEDTLS_SSL_EXPORT_KEYS 1
36-
37-
// <q SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED> Enable the PSK based ciphersuite
38-
// modes in SSL / TLS. <i> Default: 0 <i> Enable the PSK based ciphersuite modes
39-
// in SSL / TLS.
40-
#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED 0
41-
42-
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED> Enable the ECDHE-PSK based
43-
// ciphersuite modes in SSL / TLS. <i> Default: 0 <i> Enable the ECDHE-PSK based
44-
// ciphersuite modes in SSL / TLS.
45-
#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED 0
46-
47-
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED> Enable the ECDHE-ECDSA based
48-
// ciphersuite modes in SSL / TLS. <i> Default: 0 <i> Enable the ECDHE-ECDSA
49-
// based ciphersuite modes in SSL / TLS.
50-
#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED 0
51-
52-
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED> Enable the ECDHE-RSA based
53-
// ciphersuite modes in SSL / TLS. <i> Default: 0 <i> Enable the ECDHE-RSA based
54-
// ciphersuite modes in SSL / TLS.
55-
#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED 0
56-
57-
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED> Enable the ECDH-ECDSA based
58-
// ciphersuite modes in SSL / TLS. <i> Default: 0 <i> Enable the ECDH-ECDSA
59-
// based ciphersuite modes in SSL / TLS.
60-
#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED 0
61-
62-
// <q SL_MBEDTLS_ECP_ENABLE_COMPRESSED_CURVE_PARSING> Enable parsing of the
63-
// compressed curves. <i> Default: 0 <i> Enable parsing of the compressed
64-
// curves.
11+
// <o MBEDTLS_SSL_CIPHERSUITES> Complete list of ciphersuites to use, in order of preference.
12+
// <i> Default: MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
13+
// <i> Complete list of ciphersuites to use, in order of preference.
14+
// <i> The value of this configuration should be updated for the application needs.
15+
#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
16+
17+
// <o SL_MBEDTLS_SSL_IN_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (input).
18+
// <i> Default: 768
19+
// <i> The size configured here determines the size of the internal I/O
20+
// <i> buffer used in mbedTLS when receiving data.
21+
#define SL_MBEDTLS_SSL_IN_CONTENT_LEN 768
22+
23+
// <o SL_MBEDTLS_SSL_OUT_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (output).
24+
// <i> Default: 768
25+
// <i> The size configured here determines the size of the internal I/O
26+
// <i> buffer used in mbedTLS when sending data.
27+
#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN 768
28+
29+
// <q SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH> Enable support for RFC 6066 max_fragment_length extension in SSL.
30+
// <i> Default: 1
31+
// <i> Enable support for RFC 6066 max_fragment_length extension in SSL.
32+
#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH 1
33+
34+
// <q SL_MBEDTLS_SSL_EXPORT_KEYS> Enable support for exporting key block and master secret.
35+
// <i> Default: 1
36+
// <i> Enable support for exporting key block and master secret.
37+
// <i> This is required for certain users of TLS, e.g. EAP-TLS.
38+
#define SL_MBEDTLS_SSL_EXPORT_KEYS 1
39+
40+
// <q SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED> Enable the PSK based ciphersuite modes in SSL / TLS.
41+
// <i> Default: 0
42+
// <i> Enable the PSK based ciphersuite modes in SSL / TLS.
43+
#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED 0
44+
45+
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
46+
// <i> Default: 0
47+
// <i> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
48+
#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED 0
49+
50+
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
51+
// <i> Default: 0
52+
// <i> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
53+
#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED 0
54+
55+
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
56+
// <i> Default: 0
57+
// <i> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
58+
#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED 0
59+
60+
// <q SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
61+
// <i> Default: 0
62+
// <i> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
63+
#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED 0
64+
65+
// <q SL_MBEDTLS_ECP_ENABLE_COMPRESSED_CURVE_PARSING> Enable parsing of the compressed curves.
66+
// <i> Default: 0
67+
// <i> Enable parsing of the compressed curves.
6568
#define SL_MBEDTLS_ECP_ENABLE_COMPRESSED_CURVE_PARSING 0
6669

6770
// </h>
6871

6972
// <h> RSA configuration
7073

71-
// <q SL_MBEDTLS_RSA_NO_CRT> Disable use of the Chinese Remainder Theorem for
72-
// RSA. <i> Default: 0 <i> Disable use of the Chinese Remainder Theorem for RSA
73-
// private key <i> computations.
74+
// <q SL_MBEDTLS_RSA_NO_CRT> Disable use of the Chinese Remainder Theorem for RSA.
75+
// <i> Default: 0
76+
// <i> Disable use of the Chinese Remainder Theorem for RSA private key
77+
// <i> computations.
7478
#define SL_MBEDTLS_RSA_NO_CRT 0
7579

7680
// </h>
7781

7882
// <h> Miscellaneous configuration
7983

80-
// <q SL_MBEDTLS_DRIVERS_ENABLED> Enable Silicon Labs' Mbed TLS- and PSA Crypto
81-
// drivers. <i> Default: 1 <i> Enable drivers for hardware acceleration (Mbed
82-
// TLS and PSA Crypto) and <i> secure key handling (PSA Crypto).
84+
// <q SL_MBEDTLS_DRIVERS_ENABLED> Enable Silicon Labs' Mbed TLS- and PSA Crypto drivers.
85+
// <i> Default: 1
86+
// <i> Enable drivers for hardware acceleration (Mbed TLS and PSA Crypto) and
87+
// <i> secure key handling (PSA Crypto).
8388
#define SL_MBEDTLS_DRIVERS_ENABLED 1
8489

8590
// </h>
@@ -90,15 +95,15 @@
9095
// Sub-files
9196

9297
#if defined(SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE)
93-
#include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
98+
#include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
9499
#else
95-
#include "sli_mbedtls_config_autogen.h"
100+
#include "sli_mbedtls_config_autogen.h"
96101
#endif
97102

98103
#include "sli_mbedtls_omnipresent.h"
99104

100105
#if SL_MBEDTLS_DRIVERS_ENABLED
101-
#include "sli_mbedtls_acceleration.h"
106+
#include "sli_mbedtls_acceleration.h"
102107
#endif
103108

104109
#include "sl_mbedtls_device_config.h"
@@ -107,11 +112,7 @@
107112
// the correct Mbed TLS / PSA Crypto options.
108113
#include "sli_mbedtls_config_transform_autogen.h"
109114

110-
#ifdef SL_MBEDTLS_USE_TINYCRYPT
111-
#include "mbedtls/check_config.h"
112-
#else
113115
// Included for backward compatibility reasons.
114116
#include "mbedtls/build_info.h"
115-
#endif // SL_MBEDTLS_USE_TINYCRYPT
116117

117118
#endif // SL_MBEDTLS_CONFIG_H

0 commit comments

Comments
 (0)