Added SL_MBEDTLS_USE_TINYCRYPT around build_info.h file in sl_mbedtls…

…_config.h as this is for tinycrypt
SiliconLabs · Sep 23, 2024 · 76d758e · 76d758e
1 parent e80d8eb
commit 76d758e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 40 deletions.
diff --git a/matter/si91x/siwx917/BRD2605A/config/sl_mbedtls_config.h b/matter/si91x/siwx917/BRD2605A/config/sl_mbedtls_config.h
@@ -12,55 +12,55 @@
 // <i> Default: MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 // <i> Complete list of ciphersuites to use, in order of preference.
 // <i> The value of this configuration should be updated for the application needs.
-#define MBEDTLS_SSL_CIPHERSUITES         MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
+#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
 // <o SL_MBEDTLS_SSL_IN_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (input).
 // <i> Default: 768
 // <i> The size configured here determines the size of the internal I/O
 // <i> buffer used in mbedTLS when receiving data.
-#define SL_MBEDTLS_SSL_IN_CONTENT_LEN  768
+#define SL_MBEDTLS_SSL_IN_CONTENT_LEN 768
 
 // <o SL_MBEDTLS_SSL_OUT_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (output).
 // <i> Default: 768
 // <i> The size configured here determines the size of the internal I/O
 // <i> buffer used in mbedTLS when sending data.
-#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN  768
+#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN 768
 
 // <q SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH> Enable support for RFC 6066 max_fragment_length extension in SSL.
 // <i> Default: 1
 // <i> Enable support for RFC 6066 max_fragment_length extension in SSL.
-#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH  1
+#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH 1
 
 // <q SL_MBEDTLS_SSL_EXPORT_KEYS> Enable support for exporting key block and master secret.
 // <i> Default: 1
 // <i> Enable support for exporting key block and master secret.
 // <i> This is required for certain users of TLS, e.g. EAP-TLS.
-#define SL_MBEDTLS_SSL_EXPORT_KEYS  1
+#define SL_MBEDTLS_SSL_EXPORT_KEYS 1
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED> Enable the PSK based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the PSK based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED 0
 
 // <q SL_MBEDTLS_ECP_ENABLE_COMPRESSED_CURVE_PARSING> Enable parsing of the compressed curves.
 // <i> Default: 0
@@ -95,15 +95,15 @@
 // Sub-files
 
 #if defined(SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE)
-  #include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
+#include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
 #else
-  #include "sli_mbedtls_config_autogen.h"
+#include "sli_mbedtls_config_autogen.h"
 #endif
 
 #include "sli_mbedtls_omnipresent.h"
 
 #if SL_MBEDTLS_DRIVERS_ENABLED
-  #include "sli_mbedtls_acceleration.h"
+#include "sli_mbedtls_acceleration.h"
 #endif
 
 #include "sl_mbedtls_device_config.h"
@@ -112,7 +112,9 @@
 // the correct Mbed TLS / PSA Crypto options.
 #include "sli_mbedtls_config_transform_autogen.h"
 
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
 // Included for backward compatibility reasons.
 #include "mbedtls/build_info.h"
+#endif // SL_MBEDTLS_USE_TINYCRYPT
 
 #endif // SL_MBEDTLS_CONFIG_H
diff --git a/matter/si91x/siwx917/BRD4338A/config/sl_mbedtls_config.h b/matter/si91x/siwx917/BRD4338A/config/sl_mbedtls_config.h
@@ -12,55 +12,55 @@
 // <i> Default: MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 // <i> Complete list of ciphersuites to use, in order of preference.
 // <i> The value of this configuration should be updated for the application needs.
-#define MBEDTLS_SSL_CIPHERSUITES         MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
+#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
 // <o SL_MBEDTLS_SSL_IN_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (input).
 // <i> Default: 768
 // <i> The size configured here determines the size of the internal I/O
 // <i> buffer used in mbedTLS when receiving data.
-#define SL_MBEDTLS_SSL_IN_CONTENT_LEN  768
+#define SL_MBEDTLS_SSL_IN_CONTENT_LEN 768
 
 // <o SL_MBEDTLS_SSL_OUT_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (output).
 // <i> Default: 768
 // <i> The size configured here determines the size of the internal I/O
 // <i> buffer used in mbedTLS when sending data.
-#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN  768
+#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN 768
 
 // <q SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH> Enable support for RFC 6066 max_fragment_length extension in SSL.
 // <i> Default: 1
 // <i> Enable support for RFC 6066 max_fragment_length extension in SSL.
-#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH  1
+#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH 1
 
 // <q SL_MBEDTLS_SSL_EXPORT_KEYS> Enable support for exporting key block and master secret.
 // <i> Default: 1
 // <i> Enable support for exporting key block and master secret.
 // <i> This is required for certain users of TLS, e.g. EAP-TLS.
-#define SL_MBEDTLS_SSL_EXPORT_KEYS  1
+#define SL_MBEDTLS_SSL_EXPORT_KEYS 1
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED> Enable the PSK based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the PSK based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED 0
 
 // <q SL_MBEDTLS_ECP_ENABLE_COMPRESSED_CURVE_PARSING> Enable parsing of the compressed curves.
 // <i> Default: 0
@@ -95,15 +95,15 @@
 // Sub-files
 
 #if defined(SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE)
-  #include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
+#include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
 #else
-  #include "sli_mbedtls_config_autogen.h"
+#include "sli_mbedtls_config_autogen.h"
 #endif
 
 #include "sli_mbedtls_omnipresent.h"
 
 #if SL_MBEDTLS_DRIVERS_ENABLED
-  #include "sli_mbedtls_acceleration.h"
+#include "sli_mbedtls_acceleration.h"
 #endif
 
 #include "sl_mbedtls_device_config.h"
@@ -112,7 +112,8 @@
 // the correct Mbed TLS / PSA Crypto options.
 #include "sli_mbedtls_config_transform_autogen.h"
 
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
 // Included for backward compatibility reasons.
 #include "mbedtls/build_info.h"
-
+#endif // SL_MBEDTLS_USE_TINYCRYPT
 #endif // SL_MBEDTLS_CONFIG_H
diff --git a/matter/si91x/siwx917/BRD4342A/config/sl_mbedtls_config.h b/matter/si91x/siwx917/BRD4342A/config/sl_mbedtls_config.h
@@ -12,55 +12,55 @@
 // <i> Default: MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 // <i> Complete list of ciphersuites to use, in order of preference.
 // <i> The value of this configuration should be updated for the application needs.
-#define MBEDTLS_SSL_CIPHERSUITES         MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
+#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 
 // <o SL_MBEDTLS_SSL_IN_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (input).
 // <i> Default: 768
 // <i> The size configured here determines the size of the internal I/O
 // <i> buffer used in mbedTLS when receiving data.
-#define SL_MBEDTLS_SSL_IN_CONTENT_LEN  768
+#define SL_MBEDTLS_SSL_IN_CONTENT_LEN 768
 
 // <o SL_MBEDTLS_SSL_OUT_CONTENT_LEN> Maximum TLS/DTLS fragment length in bytes (output).
 // <i> Default: 768
 // <i> The size configured here determines the size of the internal I/O
 // <i> buffer used in mbedTLS when sending data.
-#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN  768
+#define SL_MBEDTLS_SSL_OUT_CONTENT_LEN 768
 
 // <q SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH> Enable support for RFC 6066 max_fragment_length extension in SSL.
 // <i> Default: 1
 // <i> Enable support for RFC 6066 max_fragment_length extension in SSL.
-#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH  1
+#define SL_MBEDTLS_SSL_MAX_FRAGMENT_LENGTH 1
 
 // <q SL_MBEDTLS_SSL_EXPORT_KEYS> Enable support for exporting key block and master secret.
 // <i> Default: 1
 // <i> Enable support for exporting key block and master secret.
 // <i> This is required for certain users of TLS, e.g. EAP-TLS.
-#define SL_MBEDTLS_SSL_EXPORT_KEYS  1
+#define SL_MBEDTLS_SSL_EXPORT_KEYS 1
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED> Enable the PSK based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the PSK based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_PSK_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-PSK based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_PSK_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-ECDSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDHE-RSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED 0
 
 // <q SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
 // <i> Default: 0
 // <i> Enable the ECDH-ECDSA based ciphersuite modes in SSL / TLS.
-#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED  0
+#define SL_MBEDTLS_KEY_EXCHANGE_ECDH_ECDSA_ENABLED 0
 
 // <q SL_MBEDTLS_ECP_ENABLE_COMPRESSED_CURVE_PARSING> Enable parsing of the compressed curves.
 // <i> Default: 0
@@ -95,15 +95,15 @@
 // Sub-files
 
 #if defined(SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE)
-  #include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
+#include SLI_MBEDTLS_CONFIG_AUTOGEN_OVERRIDE_FILE
 #else
-  #include "sli_mbedtls_config_autogen.h"
+#include "sli_mbedtls_config_autogen.h"
 #endif
 
 #include "sli_mbedtls_omnipresent.h"
 
 #if SL_MBEDTLS_DRIVERS_ENABLED
-  #include "sli_mbedtls_acceleration.h"
+#include "sli_mbedtls_acceleration.h"
 #endif
 
 #include "sl_mbedtls_device_config.h"
@@ -112,7 +112,9 @@
 // the correct Mbed TLS / PSA Crypto options.
 #include "sli_mbedtls_config_transform_autogen.h"
 
+#if defined(SL_MBEDTLS_USE_TINYCRYPT)
 // Included for backward compatibility reasons.
 #include "mbedtls/build_info.h"
+#endif // SL_MBEDTLS_USE_TINYCRYPT
 
 #endif // SL_MBEDTLS_CONFIG_H