michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mbedtls: Replace COAP-specific max len setting with generic

Browse source 
Instead of CONFIG_COAP_MBEDTLS_SSL_MAX_CONTENT_LEN, use recently
introduced CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
This commit is contained in:
Paul Sokolovsky 2018-03-15 21:26:14 +02:00 • committed by Anas Nashif
commit e82578919a
4 changed files with 5 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ext/lib/crypto/mbedtls/configs/config-coap.h
View file

@ -91,15 +91,11 @@
#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8 #define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8
/* /*
* Save RAM at the expense of interoperability: do this only if you control * Allow to save RAM at the expense of interoperability: do this only if you
* both ends of the connection! (See comments in "mbedtls/ssl.h".) * control both ends of the connection! (See comments in "mbedtls/ssl.h".)
* The optimal size here depends on the typical size of records. * The optimal size here depends on the typical size of records.
*/ */
#ifndef CONFIG_COAP_MBEDTLS_SSL_MAX_CONTENT_LEN #define MBEDTLS_SSL_MAX_CONTENT_LEN CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN
#define MBEDTLS_SSL_MAX_CONTENT_LEN 1500
#else
#define MBEDTLS_SSL_MAX_CONTENT_LEN CONFIG_COAP_MBEDTLS_SSL_MAX_CONTENT_LEN
#endif
#include "mbedtls/check_config.h" #include "mbedtls/check_config.h"

2
samples/net/coaps_client/prj.conf
View file

@ -21,7 +21,7 @@ CONFIG_MBEDTLS_BUILTIN=y
CONFIG_MBEDTLS_CFG_FILE="config-coap.h" CONFIG_MBEDTLS_CFG_FILE="config-coap.h"
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_COAP_MBEDTLS_SSL_MAX_CONTENT_LEN=256 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=256
CONFIG_NET_APP_SETTINGS=y CONFIG_NET_APP_SETTINGS=y
CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::3" CONFIG_NET_APP_MY_IPV6_ADDR="2001:db8::3"

2
samples/net/coaps_server/prj.conf
View file

@ -17,7 +17,7 @@ CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
CONFIG_NET_MAX_CONTEXTS=10 CONFIG_NET_MAX_CONTEXTS=10
CONFIG_COAP=y CONFIG_COAP=y
CONFIG_COAP_MBEDTLS_SSL_MAX_CONTENT_LEN=256 CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=256
CONFIG_MBEDTLS=y CONFIG_MBEDTLS=y
CONFIG_MBEDTLS_BUILTIN=y CONFIG_MBEDTLS_BUILTIN=y

10
subsys/net/lib/coap/Kconfig
View file

@ -62,16 +62,6 @@ config COAP_EXTENDED_OPTIONS_LEN_VALUE
COAP_EXTENDED_OPTIONS_LEN is enabled. Define the value according to COAP_EXTENDED_OPTIONS_LEN is enabled. Define the value according to
user requirement. user requirement.
config COAP_MBEDTLS_SSL_MAX_CONTENT_LEN
int "CoAP MBEDTLS maximum content length value"
default 1500
range 256 16384
depends on MBEDTLS
help
This option sets the value of the MBEDTLS_SSL_MAX_CONTENT_LEN option
in ext/lib/crypto/mbedtls/configs/config-coap.h For client/server
communication to work these values need to be the same on both sides.
config NET_DEBUG_COAP config NET_DEBUG_COAP
bool "Debug COAP" bool "Debug COAP"
default n default n