Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mbedtls: update Kconfig and mbedtls_config.h #1998

Merged
merged 1 commit into from
Aug 27, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions crypto/mbedtls/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,17 @@ config MBEDTLS_DEBUG_C
---help---
This module provides debugging functions.

config MBEDTLS_SSL_MAX_CONTENT_LEN
int "Maximum length (in bytes) of incoming and outgoing plaintext fragments."
config MBEDTLS_SSL_IN_CONTENT_LEN
int "Maximum length (in bytes) of incoming plaintext fragments."
default 16384
---help---
Maximum length (in bytes) of incoming and outgoing plaintext fragments.
Maximum length (in bytes) of incoming plaintext fragments.

config MBEDTLS_SSL_OUT_CONTENT_LEN
int "Maximum length (in bytes) of outgoing plaintext fragments."
default 16384
---help---
Maximum length (in bytes) of outgoing plaintext fragments.

config MBEDTLS_SSL_SRV_C
bool "This module is required for SSL/TLS server support."
Expand All @@ -47,10 +53,6 @@ config MBEDTLS_AES_ROM_TABLES
bool "Store the AES tables in ROM."
default n

config MBEDTLS_REMOVE_ARC4_CIPHERSUITES
xiaoxiang781216 marked this conversation as resolved.
Show resolved Hide resolved
bool "Remove RC4 ciphersuites by default in SSL / TLS."
default n

config MBEDTLS_NO_PLATFORM_ENTROPY
bool "Do not use built-in platform entropy functions."
default n
Expand All @@ -61,7 +63,7 @@ config MBEDTLS_ECP_RESTARTABLE

config MBEDTLS_SELF_TEST
bool "Enable the checkup functions (*_self_test)."
default y
default n

config MBEDTLS_SSL_DTLS_CLIENT_PORT_REUSE
bool "Enable server-side support for clients that reconnect from the same port."
Expand All @@ -75,10 +77,6 @@ config MBEDTLS_CAMELLIA_C
bool "Enable the Camellia block cipher."
default n

config MBEDTLS_CERTS_C
xiaoxiang781216 marked this conversation as resolved.
Show resolved Hide resolved
bool "Enable the test certificates."
default n

config MBEDTLS_PADLOCK_C
bool "Enable VIA Padlock support on x86."
default n
Expand Down Expand Up @@ -183,6 +181,10 @@ config MBEDTLS_X509_CSR_PARSE_C
bool "Enable X.509 Certificate Signing Request (CSR) parsing."
default n

config MBEDTLS_X509_CRT_POOL
bool "Enable the X509 Certificate Pool"
default n

if CRYPTO_CRYPTODEV

config MBEDTLS_ALT
Expand Down
8 changes: 4 additions & 4 deletions crypto/mbedtls/include/mbedtls/mbedtls_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -4381,8 +4381,8 @@
*
* Uncomment to set the maximum plaintext size of the incoming I/O buffer.
*/
#ifdef CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
#define MBEDTLS_SSL_IN_CONTENT_LEN CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
#ifdef CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN
#define MBEDTLS_SSL_IN_CONTENT_LEN CONFIG_MBEDTLS_SSL_IN_CONTENT_LEN
#endif

/** \def MBEDTLS_SSL_CID_IN_LEN_MAX
Expand Down Expand Up @@ -4437,8 +4437,8 @@
*
* Uncomment to set the maximum plaintext size of the outgoing I/O buffer.
*/
#ifdef CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
#define MBEDTLS_SSL_OUT_CONTENT_LEN CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
#ifdef CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN
#define MBEDTLS_SSL_OUT_CONTENT_LEN CONFIG_MBEDTLS_SSL_OUT_CONTENT_LEN
#endif

/** \def MBEDTLS_SSL_DTLS_MAX_BUFFERING
Expand Down
Loading