feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

Merge branch 'feature/mbedtls_hkdf' into 'master'

Browse Source 
mbedtls_hkdf: Add a config option to enable HKDF

See merge request espressif/esp-idf!8680
This commit is contained in:
Mahavir Jain
2020-05-11 15:29:54 +08:00
parent c0c0223747 43b3def711
commit 012b111d6d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
components/mbedtls/Kconfig
View File

@@ -712,7 +712,14 @@ menu "mbedTLS"
default n default n
depends on MBEDTLS_CHACHA20_C && MBEDTLS_POLY1305_C depends on MBEDTLS_CHACHA20_C && MBEDTLS_POLY1305_C
help help
Enable support for ChaCha20-Poly1305 AEAD algorithm Enable support for ChaCha20-Poly1305 AEAD algorithm.
config MBEDTLS_HKDF_C
bool "HKDF algorithm (RFC 5869)"
default n
help
Enable support for the Hashed Message Authentication Code
(HMAC)-based key derivation function (HKDF).
menuconfig MBEDTLS_SECURITY_RISKS menuconfig MBEDTLS_SECURITY_RISKS
bool "Show configurations with potential security risks" bool "Show configurations with potential security risks"

8
components/mbedtls/port/include/mbedtls/esp_config.h
View File

@@ -1692,17 +1692,19 @@
/** /**
* \def MBEDTLS_HKDF_C * \def MBEDTLS_HKDF_C
* *
* Disable the HKDF algorithm (RFC 5869). * Enable the HKDF algorithm (RFC 5869).
* *
* Module: library/hkdf.c * Module: library/hkdf.c
* Caller: * Caller:
* *
* Requires: MBEDTLS_MD_C * Requires: MBEDTLS_MD_C
* *
* This module adds support for the Hashed Message Authentication Code * This module enables support for the Hashed Message Authentication Code
* (HMAC)-based key derivation function (HKDF). * (HMAC)-based key derivation function (HKDF).
*/ */
#ifdef MBEDTLS_HKDF_C #ifdef CONFIG_MBEDTLS_HKDF_C
#define MBEDTLS_HKDF_C
#else
#undef MBEDTLS_HKDF_C #undef MBEDTLS_HKDF_C
#endif #endif