From 8a0109cb6de485510a9cff3686a357d3cdd9d63c Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin <dima@doty.ru> Date: Thu, 4 Nov 2021 19:51:26 +0300 Subject: [PATCH] Fix MBedTLS WebRTC compatibility issues --- .../package/mbedtls-openipc/mbedtls-openipc.mk | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/general/package/mbedtls-openipc/mbedtls-openipc.mk b/general/package/mbedtls-openipc/mbedtls-openipc.mk index ae630f4d..5370c8ca 100644 --- a/general/package/mbedtls-openipc/mbedtls-openipc.mk +++ b/general/package/mbedtls-openipc/mbedtls-openipc.mk @@ -13,19 +13,20 @@ MBEDTLS_OPENIPC_INSTALL_STAGING = YES MBEDTLS_OPENIPC_LICENSE = Apache-2.0 MBEDTLS_OPENIPC_LICENSE_FILES = apache-2.0.txt -# This is mandatory for hiawatha -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -define MBEDTLS_ENABLE_THREADING - $(SED) "s://#define MBEDTLS_THREADING_C:#define MBEDTLS_THREADING_C:" \ +define MBEDTLS_ENABLE_SRTP + $(SED) "s://#define MBEDTLS_SSL_DTLS_SRTP:#define MBEDTLS_SSL_DTLS_SRTP:" \ $(@D)/include/mbedtls/config.h - $(SED) "s://#define MBEDTLS_THREADING_PTHREAD:#define MBEDTLS_THREADING_PTHREAD:" \ + $(SED) "s:#define MBEDTLS_SSL_CBC_RECORD_SPLITTING://#define MBEDTLS_SSL_CBC_RECORD_SPLITTING:" \ + $(@D)/include/mbedtls/config.h + $(SED) "s:#define MBEDTLS_ECP_DP_SECP224K1_ENABLED://#define MBEDTLS_ECP_DP_SECP224K1_ENABLED:" \ + $(@D)/include/mbedtls/config.h + $(SED) "s:#define MBEDTLS_ECP_DP_SECP256K1_ENABLED://#define MBEDTLS_ECP_DP_SECP256K1_ENABLED:" \ $(@D)/include/mbedtls/config.h endef -MBEDTLS_OPENIPC_POST_PATCH_HOOKS += MBEDTLS_ENABLE_THREADING +MBEDTLS_OPENIPC_POST_PATCH_HOOKS += MBEDTLS_ENABLE_SRTP ifeq ($(BR2_STATIC_LIBS),y) MBEDTLS_OPENIPC_CONF_OPTS += -DLINK_WITH_PTHREAD=ON endif -endif ifeq ($(BR2_STATIC_LIBS),y) MBEDTLS_OPENIPC_CONF_OPTS += \