Skip to content

Commit

Permalink
openthread: update libraries based on commit 2ce3d3b
Browse files Browse the repository at this point in the history 
Update OpenThread pre-build libraries to adapt to Mbed TLS changes.

Signed-off-by: Eduardo Montoya <eduardo.montoya@nordicsemi.no>
  • Loading branch information
@edmont @rlubos
edmont authored and rlubos committed Sep 9, 2022
1 parent 0e0add5 commit 11763cf
Show file tree
Hide file tree
Showing 20 changed files with 37 additions and 55 deletions.
Binary file modified openthread/lib/cortex-m33/hard-float/v1.3/ftd/oberon/libopenthread-cli-ftd.a
View file
Binary file not shown.
Binary file modified openthread/lib/cortex-m33/hard-float/v1.3/ftd/oberon/libopenthread-ftd.a
View file
Binary file not shown.
9 changes: 1 addition & 8 deletions openthread/lib/cortex-m33/hard-float/v1.3/ftd/oberon/nrf_security_mbedtls_configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@
*
* Comment this macro to disable support for Extended Master Secret.
*/
/* #undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET */
#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET

/**
* \def MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
Expand Down Expand Up @@ -3272,13 +3272,6 @@ it is (2^48 - 1), our restriction is : (int - 0xFFFF - 0xF).*/
*/
//#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED

/**
* Nordic added
*
* Adding back the legacy ECDH context for binary compatibility
*/
#define MBEDTLS_ECDH_LEGACY_CONTEXT

#if defined(CONFIG_MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED)
#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */
#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */
Expand Down
9 changes: 6 additions & 3 deletions openthread/lib/cortex-m33/hard-float/v1.3/ftd/oberon/openthread_lib_configuration.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
OpenThread_commit=v2.0.1-115-ge299df7fc
NRFXLIB_commit=v2.0.1-2-g6ed78933
MBEDTLS_commit=v3.0.0-ncs2-0-gb36261c55
GCC_version: arm-zephyr-eabi-gcc (Zephyr SDK 0.14.1) 10.3.0

OpenThread_commit=thread-reference-20200818-ncs1-rc3-764-g0d19f9112
NRFXLIB_commit=v2.1.0-rc1-12-g9a6637e1
MBEDTLS_commit=v2.26.0-3406-gcfc83308d

CONFIG_OPENTHREAD_BUILD_OUTPUT_STRIPPED=y
CONFIG_OPENTHREAD_CHANNEL=11
Expand Down Expand Up @@ -33,6 +35,7 @@ CONFIG_OPENTHREAD_MAX_CHILDREN=32
CONFIG_OPENTHREAD_MAX_IP_ADDR_PER_CHILD=6
CONFIG_OPENTHREAD_MAX_STATECHANGE_HANDLERS=2
CONFIG_OPENTHREAD_MBEDTLS_LIB_NAME=mbedtls_external
CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE=128
CONFIG_OPENTHREAD_MLR=y
CONFIG_OPENTHREAD_MTD_NETDIAG=y
CONFIG_OPENTHREAD_NETWORKKEY=
Expand Down
Binary file modified openthread/lib/cortex-m33/hard-float/v1.3/mtd/oberon/libopenthread-cli-mtd.a
View file
Binary file not shown.
Binary file modified openthread/lib/cortex-m33/hard-float/v1.3/mtd/oberon/libopenthread-mtd.a
View file
Binary file not shown.
9 changes: 1 addition & 8 deletions openthread/lib/cortex-m33/hard-float/v1.3/mtd/oberon/nrf_security_mbedtls_configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@
*
* Comment this macro to disable support for Extended Master Secret.
*/
/* #undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET */
#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET

/**
* \def MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
Expand Down Expand Up @@ -3272,13 +3272,6 @@ it is (2^48 - 1), our restriction is : (int - 0xFFFF - 0xF).*/
*/
//#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED

/**
* Nordic added
*
* Adding back the legacy ECDH context for binary compatibility
*/
#define MBEDTLS_ECDH_LEGACY_CONTEXT

#if defined(CONFIG_MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED)
#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */
#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */
Expand Down
10 changes: 7 additions & 3 deletions openthread/lib/cortex-m33/hard-float/v1.3/mtd/oberon/openthread_lib_configuration.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
OpenThread_commit=v2.0.1-115-ge299df7fc
NRFXLIB_commit=v2.0.1-2-g6ed78933
MBEDTLS_commit=v3.0.0-ncs2-0-gb36261c55
GCC_version: arm-zephyr-eabi-gcc (Zephyr SDK 0.14.1) 10.3.0

OpenThread_commit=thread-reference-20200818-ncs1-rc3-764-g0d19f9112
NRFXLIB_commit=v2.1.0-rc1-12-g9a6637e1
MBEDTLS_commit=v2.26.0-3406-gcfc83308d

CONFIG_OPENTHREAD_BUILD_OUTPUT_STRIPPED=y
CONFIG_OPENTHREAD_CHANNEL=11
Expand Down Expand Up @@ -29,8 +31,10 @@ CONFIG_OPENTHREAD_MAC_SOFTWARE_ACK_TIMEOUT_ENABLE=y
CONFIG_OPENTHREAD_MAC_SOFTWARE_CSMA_BACKOFF_ENABLE=y
CONFIG_OPENTHREAD_MAC_SOFTWARE_RETRANSMIT_ENABLE=y
CONFIG_OPENTHREAD_MANUAL_START=y
CONFIG_OPENTHREAD_MAX_CHILDREN=1
CONFIG_OPENTHREAD_MAX_STATECHANGE_HANDLERS=2
CONFIG_OPENTHREAD_MBEDTLS_LIB_NAME=mbedtls_external
CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE=128
CONFIG_OPENTHREAD_MLR=y
CONFIG_OPENTHREAD_MTD=y
CONFIG_OPENTHREAD_MTD_NETDIAG=y
Expand Down
Binary file modified openthread/lib/cortex-m4/hard-float/v1.3/ftd/oberon/libopenthread-cli-ftd.a
View file
Binary file not shown.
Binary file modified openthread/lib/cortex-m4/hard-float/v1.3/ftd/oberon/libopenthread-ftd.a
View file
Binary file not shown.
9 changes: 1 addition & 8 deletions openthread/lib/cortex-m4/hard-float/v1.3/ftd/oberon/nrf_security_mbedtls_configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@
*
* Comment this macro to disable support for Extended Master Secret.
*/
/* #undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET */
#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET

/**
* \def MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
Expand Down Expand Up @@ -3272,13 +3272,6 @@ it is (2^48 - 1), our restriction is : (int - 0xFFFF - 0xF).*/
*/
//#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED

/**
* Nordic added
*
* Adding back the legacy ECDH context for binary compatibility
*/
#define MBEDTLS_ECDH_LEGACY_CONTEXT

#if defined(CONFIG_MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED)
#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */
#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */
Expand Down
9 changes: 6 additions & 3 deletions openthread/lib/cortex-m4/hard-float/v1.3/ftd/oberon/openthread_lib_configuration.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
OpenThread_commit=v2.0.1-115-ge299df7fc
NRFXLIB_commit=v2.0.1-2-g6ed78933
MBEDTLS_commit=v3.0.0-ncs2-0-gb36261c55
GCC_version: arm-zephyr-eabi-gcc (Zephyr SDK 0.14.1) 10.3.0

OpenThread_commit=thread-reference-20200818-ncs1-rc3-764-g0d19f9112
NRFXLIB_commit=v2.1.0-rc1-12-g9a6637e1
MBEDTLS_commit=v2.26.0-3406-gcfc83308d

CONFIG_OPENTHREAD_BUILD_OUTPUT_STRIPPED=y
CONFIG_OPENTHREAD_CHANNEL=11
Expand Down Expand Up @@ -33,6 +35,7 @@ CONFIG_OPENTHREAD_MAX_CHILDREN=32
CONFIG_OPENTHREAD_MAX_IP_ADDR_PER_CHILD=6
CONFIG_OPENTHREAD_MAX_STATECHANGE_HANDLERS=2
CONFIG_OPENTHREAD_MBEDTLS_LIB_NAME=mbedtls_external
CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE=128
CONFIG_OPENTHREAD_MLR=y
CONFIG_OPENTHREAD_MTD_NETDIAG=y
CONFIG_OPENTHREAD_NETWORKKEY=
Expand Down
Binary file modified openthread/lib/cortex-m4/hard-float/v1.3/master/oberon/libopenthread-cli-ftd.a
View file
Binary file not shown.
Binary file modified openthread/lib/cortex-m4/hard-float/v1.3/master/oberon/libopenthread-ftd.a
View file
Binary file not shown.
9 changes: 1 addition & 8 deletions openthread/lib/cortex-m4/hard-float/v1.3/master/oberon/nrf_security_mbedtls_configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@
*
* Comment this macro to disable support for Extended Master Secret.
*/
/* #undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET */
#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET

/**
* \def MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
Expand Down Expand Up @@ -3272,13 +3272,6 @@ it is (2^48 - 1), our restriction is : (int - 0xFFFF - 0xF).*/
*/
//#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED

/**
* Nordic added
*
* Adding back the legacy ECDH context for binary compatibility
*/
#define MBEDTLS_ECDH_LEGACY_CONTEXT

#if defined(CONFIG_MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED)
#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */
#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */
Expand Down
9 changes: 6 additions & 3 deletions openthread/lib/cortex-m4/hard-float/v1.3/master/oberon/openthread_lib_configuration.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
OpenThread_commit=v2.0.1-115-ge299df7fc
NRFXLIB_commit=v2.0.1-2-g6ed78933
MBEDTLS_commit=v3.0.0-ncs2-0-gb36261c55
GCC_version: arm-zephyr-eabi-gcc (Zephyr SDK 0.14.1) 10.3.0

OpenThread_commit=thread-reference-20200818-ncs1-rc3-764-g0d19f9112
NRFXLIB_commit=v2.1.0-rc1-12-g9a6637e1
MBEDTLS_commit=v2.26.0-3406-gcfc83308d

CONFIG_OPENTHREAD_BUILD_OUTPUT_STRIPPED=y
CONFIG_OPENTHREAD_CHANNEL=11
Expand Down Expand Up @@ -42,6 +44,7 @@ CONFIG_OPENTHREAD_MAX_CHILDREN=32
CONFIG_OPENTHREAD_MAX_IP_ADDR_PER_CHILD=6
CONFIG_OPENTHREAD_MAX_STATECHANGE_HANDLERS=2
CONFIG_OPENTHREAD_MBEDTLS_LIB_NAME=mbedtls_external
CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE=128
CONFIG_OPENTHREAD_MLR=y
CONFIG_OPENTHREAD_MTD_NETDIAG=y
CONFIG_OPENTHREAD_NETWORKKEY=
Expand Down
Binary file modified openthread/lib/cortex-m4/hard-float/v1.3/mtd/oberon/libopenthread-cli-mtd.a
View file
Binary file not shown.
Binary file modified openthread/lib/cortex-m4/hard-float/v1.3/mtd/oberon/libopenthread-mtd.a
View file
Binary file not shown.
9 changes: 1 addition & 8 deletions openthread/lib/cortex-m4/hard-float/v1.3/mtd/oberon/nrf_security_mbedtls_configuration.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1405,7 +1405,7 @@
*
* Comment this macro to disable support for Extended Master Secret.
*/
/* #undef MBEDTLS_SSL_EXTENDED_MASTER_SECRET */
#define MBEDTLS_SSL_EXTENDED_MASTER_SECRET

/**
* \def MBEDTLS_SSL_KEEP_PEER_CERTIFICATE
Expand Down Expand Up @@ -3272,13 +3272,6 @@ it is (2^48 - 1), our restriction is : (int - 0xFFFF - 0xF).*/
*/
//#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED

/**
* Nordic added
*
* Adding back the legacy ECDH context for binary compatibility
*/
#define MBEDTLS_ECDH_LEGACY_CONTEXT

#if defined(CONFIG_MBEDTLS_OPENTHREAD_OPTIMIZATIONS_ENABLED)
#define MBEDTLS_MPI_WINDOW_SIZE 1 /**< Maximum windows size used. */
#define MBEDTLS_MPI_MAX_SIZE 32 /**< Maximum number of bytes for usable MPIs. */
Expand Down
10 changes: 7 additions & 3 deletions openthread/lib/cortex-m4/hard-float/v1.3/mtd/oberon/openthread_lib_configuration.txt
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
OpenThread_commit=v2.0.1-115-ge299df7fc
NRFXLIB_commit=v2.0.1-2-g6ed78933
MBEDTLS_commit=v3.0.0-ncs2-0-gb36261c55
GCC_version: arm-zephyr-eabi-gcc (Zephyr SDK 0.14.1) 10.3.0

OpenThread_commit=thread-reference-20200818-ncs1-rc3-764-g0d19f9112
NRFXLIB_commit=v2.1.0-rc1-12-g9a6637e1
MBEDTLS_commit=v2.26.0-3406-gcfc83308d

CONFIG_OPENTHREAD_BUILD_OUTPUT_STRIPPED=y
CONFIG_OPENTHREAD_CHANNEL=11
Expand Down Expand Up @@ -29,8 +31,10 @@ CONFIG_OPENTHREAD_MAC_SOFTWARE_ACK_TIMEOUT_ENABLE=y
CONFIG_OPENTHREAD_MAC_SOFTWARE_CSMA_BACKOFF_ENABLE=y
CONFIG_OPENTHREAD_MAC_SOFTWARE_RETRANSMIT_ENABLE=y
CONFIG_OPENTHREAD_MANUAL_START=y
CONFIG_OPENTHREAD_MAX_CHILDREN=1
CONFIG_OPENTHREAD_MAX_STATECHANGE_HANDLERS=2
CONFIG_OPENTHREAD_MBEDTLS_LIB_NAME=mbedtls_external
CONFIG_OPENTHREAD_MESSAGE_BUFFER_SIZE=128
CONFIG_OPENTHREAD_MLR=y
CONFIG_OPENTHREAD_MTD=y
CONFIG_OPENTHREAD_MTD_NETDIAG=y
Expand Down

0 comments on commit 11763cf

Please sign in to comment.