diff --git a/configure.ac b/configure.ac index 80375dbd3..871621a19 100644 --- a/configure.ac +++ b/configure.ac @@ -651,7 +651,6 @@ AC_ARG_ENABLE(builtin-mbedtls, if test "$enable_builtin_mbedtls" = "yes" -a ! "${MBEDTLS_CPPFLAGS}"; then MBEDTLS_CPPFLAGS="-I\${abs_top_srcdir}/third_party/mbedtls" MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -I\${abs_top_srcdir}/third_party/mbedtls/repo/include" - MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -I\${abs_top_srcdir}/third_party/mbedtls/repo/include/mbedtls" MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -DMBEDTLS_CONFIG_FILE=\\\"mbedtls-config.h\\\"" fi AC_MSG_CHECKING([whether mbed TLS should be enabled]) diff --git a/examples/platforms/efr32/Makefile.am b/examples/platforms/efr32/Makefile.am index 776f68856..54401488e 100644 --- a/examples/platforms/efr32/Makefile.am +++ b/examples/platforms/efr32/Makefile.am @@ -113,6 +113,10 @@ nodist_libopenthread_efr32_a_SOURCES @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/emlib/src/em_usart.c \ @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/radio/rail_lib/hal/efr32/hal_efr.c \ @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/platform/radio/rail_lib/hal/hal_common.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/library/ecp.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_aes.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_ecp.c \ + @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_management.c \ $(NULL) noinst_HEADERS = \ diff --git a/examples/platforms/nrf52840/Makefile.am b/examples/platforms/nrf52840/Makefile.am index 24c6bed4d..6790c7fe4 100644 --- a/examples/platforms/nrf52840/Makefile.am +++ b/examples/platforms/nrf52840/Makefile.am @@ -170,6 +170,13 @@ NORDICSEMI_SOURCES @top_builddir@/third_party/NordicSemiconductor/libraries/app_error/app_error_weak.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/atfifo/nrf_atfifo.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/atomic/nrf_atomic.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_cc310.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_soft.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/cc310_mbedtls.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_alt_cc310.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_curves_alt.c \ + @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/sha256_alt_cc310.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_core.c \ @top_builddir@/third_party/NordicSemiconductor/libraries/usb/app_usbd_string_desc.c \ diff --git a/third_party/mbedtls/Makefile.am b/third_party/mbedtls/Makefile.am index 7c099cdec..a6e680e90 100644 --- a/third_party/mbedtls/Makefile.am +++ b/third_party/mbedtls/Makefile.am @@ -41,36 +41,10 @@ libmbedcrypto_a_CPPFLAGS = \ $(NULL) libmbedcrypto_a_SOURCES = \ - repo/library/md.c \ - repo/library/md_wrap.c \ - repo/library/memory_buffer_alloc.c \ - repo/library/platform.c \ - repo/library/sha256.c \ - $(NULL) - -if OPENTHREAD_EXAMPLES_EFR32 -nodist_libmbedcrypto_a_SOURCES = \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_aes.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_management.c \ - $(NULL) -else -libmbedcrypto_a_SOURCES += \ repo/library/aes.c \ - $(NULL) -endif # OPENTHREAD_EXAMPLES_EFR32 - -if OPENTHREAD_EXAMPLES_NRF52840 -nodist_libmbedcrypto_a_SOURCES = \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_cc310.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/aes_alt_soft.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/sha256_alt_cc310.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/cc310_mbedtls.c \ - $(NULL) -endif # OPENTHREAD_EXAMPLES_NRF52840 - -if OPENTHREAD_ENABLE_DTLS -libmbedcrypto_a_SOURCES += \ + repo/library/asn1parse.c \ + repo/library/asn1write.c \ + repo/library/base64.c \ repo/library/bignum.c \ repo/library/ccm.c \ repo/library/cipher.c \ @@ -78,37 +52,36 @@ libmbedcrypto_a_SOURCES += \ repo/library/cmac.c \ repo/library/ctr_drbg.c \ repo/library/debug.c \ + repo/library/ecdh.c \ + repo/library/ecdsa.c \ repo/library/ecjpake.c \ repo/library/ecp_curves.c \ repo/library/entropy.c \ repo/library/entropy_poll.c \ + repo/library/md.c \ + repo/library/md_wrap.c \ + repo/library/memory_buffer_alloc.c \ + repo/library/oid.c \ + repo/library/pk.c \ + repo/library/pk_wrap.c \ + repo/library/pkparse.c \ + repo/library/platform.c \ + repo/library/sha256.c \ repo/library/ssl_cookie.c \ repo/library/ssl_ciphersuites.c \ repo/library/ssl_cli.c \ repo/library/ssl_srv.c \ repo/library/ssl_ticket.c \ repo/library/ssl_tls.c \ + repo/library/x509.c \ + repo/library/x509_crt.c \ $(NULL) -if OPENTHREAD_EXAMPLES_EFR32 -nodist_libmbedcrypto_a_SOURCES += \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/library/ecp.c \ - @top_builddir@/third_party/silabs/gecko_sdk_suite/v2.3/util/third_party/mbedtls/sl_crypto/src/crypto_ecp.c \ - $(NULL) -else +if !OPENTHREAD_EXAMPLES_EFR32 libmbedcrypto_a_SOURCES += \ repo/library/ecp.c \ $(NULL) -endif # OPENTHREAD_EXAMPLES_EFR32 - -if OPENTHREAD_EXAMPLES_NRF52840 -nodist_libmbedcrypto_a_SOURCES += \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_alt_cc310.c \ - @top_builddir@/third_party/NordicSemiconductor/libraries/crypto/ecp_curves_alt.c \ - $(NULL) -endif # OPENTHREAD_EXAMPLES_NRF52840 - -endif # OPENTHREAD_ENABLE_DTLS +endif if OPENTHREAD_BUILD_COVERAGE Dash = - diff --git a/tools/spi-hdlc-adapter/Makefile.am b/tools/spi-hdlc-adapter/Makefile.am index 19ddc5475..f56813ee5 100644 --- a/tools/spi-hdlc-adapter/Makefile.am +++ b/tools/spi-hdlc-adapter/Makefile.am @@ -35,6 +35,7 @@ bin_PROGRAMS = \ $(NULL) spi_hdlc_adapter_CPPFLAGS = \ + -I$(top_srcdir)/include/openthread \ $(NULL) spi_hdlc_adapter_LDADD = \