jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into prerelease-13.0

Browse Source
This commit is contained in:
Theo Arends 2023-06-26 12:39:32 +02:00
commit 383855e1c1
3 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tasmota/include/tasmota_configurations_ESP32.h
View File

@ -778,5 +778,31 @@
#endif // FIRMWARE_TASMOTA32 #endif // FIRMWARE_TASMOTA32
/*********************************************************************************************\
* Post-process compile options for Matter
\*********************************************************************************************/
#ifdef USE_MATTER_DEVICE
#undef USE_DISCOVERY
#define USE_DISCOVERY
// Enable all the crypto required by Matter
#undef USE_BERRY_CRYPTO_EC_P256
#define USE_BERRY_CRYPTO_EC_P256
#undef USE_BERRY_CRYPTO_HMAC_SHA256
#define USE_BERRY_CRYPTO_HMAC_SHA256
#undef USE_BERRY_CRYPTO_HKDF_SHA256
#define USE_BERRY_CRYPTO_HKDF_SHA256
#undef USE_BERRY_CRYPTO_AES_CCM
#define USE_BERRY_CRYPTO_AES_CCM
#undef USE_BERRY_CRYPTO_AES_CTR
#define USE_BERRY_CRYPTO_AES_CTR
#undef USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#define USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#undef USE_BERRY_CRYPTO_SPAKE2P_MATTER
#define USE_BERRY_CRYPTO_SPAKE2P_MATTER
#endif // USE_MATTER_DEVICE
#endif // ESP32 #endif // ESP32
#endif // _TASMOTA_CONFIGURATIONS_ESP32_H_ #endif // _TASMOTA_CONFIGURATIONS_ESP32_H_

28
tasmota/my_user_config.h
View File

@ -1292,34 +1292,6 @@
#define USE_TLS // flag indicates we need to include TLS code #define USE_TLS // flag indicates we need to include TLS code
#endif #endif
/*********************************************************************************************\
* Post-process compile options for Matter
\*********************************************************************************************/
#ifdef ESP32
#ifdef USE_MATTER_DEVICE
#undef USE_DISCOVERY
#define USE_DISCOVERY
// Enable all the crypto required by Matter
#undef USE_BERRY_CRYPTO_EC_P256
#define USE_BERRY_CRYPTO_EC_P256
#undef USE_BERRY_CRYPTO_HMAC_SHA256
#define USE_BERRY_CRYPTO_HMAC_SHA256
#undef USE_BERRY_CRYPTO_HKDF_SHA256
#define USE_BERRY_CRYPTO_HKDF_SHA256
#undef USE_BERRY_CRYPTO_AES_CCM
#define USE_BERRY_CRYPTO_AES_CCM
#undef USE_BERRY_CRYPTO_AES_CTR
#define USE_BERRY_CRYPTO_AES_CTR
#undef USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#define USE_BERRY_CRYPTO_PBKDF2_HMAC_SHA256
#undef USE_BERRY_CRYPTO_SPAKE2P_MATTER
#define USE_BERRY_CRYPTO_SPAKE2P_MATTER
#endif // USE_MATTER_DEVICE
#endif
/*********************************************************************************************\ /*********************************************************************************************\
* Post-process stack size adjustment * Post-process stack size adjustment
\*********************************************************************************************/ \*********************************************************************************************/