Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'feature/mbedtls_chacha_poly' into 'master'

Browse source 
mbedtls: Add config options for chacha20, poly1305 and chachapoly

See merge request espressif/esp-idf!8605
This commit is contained in:
Mahavir Jain 2020-05-07 03:44:23 +08:00
parent a064e0c4de 62e1d6712b
commit a2263571b5
2 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
components/mbedtls/Kconfig
View file

@ -695,6 +695,25 @@ menu "mbedTLS"
# end of Elliptic Curve options # end of Elliptic Curve options
config MBEDTLS_POLY1305_C
bool "Poly1305 MAC algorithm"
default n
help
Enable support for Poly1305 MAC algorithm.
config MBEDTLS_CHACHA20_C
bool "Chacha20 stream cipher"
default n
help
Enable support for Chacha20 stream cipher.
config MBEDTLS_CHACHAPOLY_C
bool "ChaCha20-Poly1305 AEAD algorithm"
default n
depends on MBEDTLS_CHACHA20_C && MBEDTLS_POLY1305_C
help
Enable support for ChaCha20-Poly1305 AEAD algorithm
menuconfig MBEDTLS_SECURITY_RISKS menuconfig MBEDTLS_SECURITY_RISKS
bool "Show configurations with potential security risks" bool "Show configurations with potential security risks"
default n default n

18
components/mbedtls/port/include/mbedtls/esp_config.h
View file

@ -1452,24 +1452,28 @@
/** /**
* \def MBEDTLS_CHACHA20_C * \def MBEDTLS_CHACHA20_C
* *
* Disable the ChaCha20 stream cipher. * Enable the ChaCha20 stream cipher.
* *
* Module: library/chacha20.c * Module: library/chacha20.c
*/ */
#ifdef MBEDTLS_CHACHA20_C #ifdef CONFIG_MBEDTLS_CHACHA20_C
#define MBEDTLS_CHACHA20_C
#else
#undef MBEDTLS_CHACHA20_C #undef MBEDTLS_CHACHA20_C
#endif #endif
/** /**
* \def MBEDTLS_CHACHAPOLY_C * \def MBEDTLS_CHACHAPOLY_C
* *
* Disable the ChaCha20-Poly1305 AEAD algorithm. * Enable the ChaCha20-Poly1305 AEAD algorithm.
* *
* Module: library/chachapoly.c * Module: library/chachapoly.c
* *
* This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C * This module requires: MBEDTLS_CHACHA20_C, MBEDTLS_POLY1305_C
*/ */
#ifdef MBEDTLS_CHACHAPOLY_C #ifdef CONFIG_MBEDTLS_CHACHAPOLY_C
#define MBEDTLS_CHACHAPOLY_C
#else
#undef MBEDTLS_CHACHAPOLY_C #undef MBEDTLS_CHACHAPOLY_C
#endif #endif
@ -1932,12 +1936,14 @@
/** /**
* \def MBEDTLS_POLY1305_C * \def MBEDTLS_POLY1305_C
* *
* Disable the Poly1305 MAC algorithm. * Enable the Poly1305 MAC algorithm.
* *
* Module: library/poly1305.c * Module: library/poly1305.c
* Caller: library/chachapoly.c * Caller: library/chachapoly.c
*/ */
#ifdef MBEDTLS_POLY1305_C #ifdef CONFIG_MBEDTLS_POLY1305_C
#define MBEDTLS_POLY1305_C
#else
#undef MBEDTLS_POLY1305_C #undef MBEDTLS_POLY1305_C
#endif #endif