Commit 30520fe5 authored by Sergio Rodriguez's avatar Sergio Rodriguez Committed by Anas Nashif
Browse files

ext: lib: mbedtls : Upgrading mbedTLS library 

Upgrading mbedTLS to version 2.4 from 2.3

Origin: https://tls.mbed.org/download/start/mbedtls-2.4.0-apache.tgz



Jira: ZEP-1292
Jira: ZEP-734

Change-Id: I32d81304f5d568810e271b8e9fc2135def1dda0a
Signed-off-by: default avatarSergio Rodriguez <sergio.sf.rodriguez@intel.com>
parent dca0e24b

ext/lib/crypto/mbedtls/Kbuild

+29 −28
Original line number Diff line number Diff line 


include $(srctree)/ext/lib/crypto/mbedtls/Makefile.include



obj-y += library/ssl_tls.o

obj-y += library/ssl_cache.o

obj-y += library/ssl_ciphersuites.o

obj-y += library/ssl_cli.o

obj-y += library/ssl_cookie.o

obj-y += library/ssl_srv.o

obj-y += library/ssl_ticket.o

obj-y += library/debug.o

obj-y += library/net.o

obj-y += library/memory_buffer_alloc.o

obj-y += library/platform.o

obj-y += library/threading.o

obj-y += library/timing.o

obj-y += library/version.o

obj-y += library/version_features.o

obj-y += library/entropy.o

obj-y += library/entropy_poll.o

obj-y += library/error.o

obj-y += library/cipher.o

obj-y += library/cipher_wrap.o

obj-y += library/bignum.o

obj-y += library/aes.o

obj-y += library/aesni.o

obj-y += library/padlock.o

obj-y += library/arc4.o

obj-y += library/asn1parse.o

obj-y += library/asn1write.o

obj-y += library/base64.o

obj-y += library/bignum.o

obj-y += library/blowfish.o

obj-y += library/camellia.o

obj-y += library/ccm.o

obj-y += library/certs.o

obj-y += library/cipher.o

obj-y += library/cipher_wrap.o

obj-y += library/cmac.o

obj-y += library/ctr_drbg.o

obj-y += library/debug.o

obj-y += library/des.o

obj-y += library/dhm.o

obj-y += library/ecdh.o
@@ -39,31 +24,46 @@ obj-y += library/ecdsa.o 
obj-y += library/ecjpake.o

obj-y += library/ecp.o

obj-y += library/ecp_curves.o

obj-y += library/ctr_drbg.o

obj-y += library/entropy.o

obj-y += library/entropy_poll.o

obj-y += library/error.o

obj-y += library/gcm.o

obj-y += library/havege.o

obj-y += library/hmac_drbg.o

obj-y += library/md.o

obj-y += library/md2.o

obj-y += library/md4.o

obj-y += library/md5.o

obj-y += library/md.o

obj-y += library/md_wrap.o

obj-y += library/memory_buffer_alloc.o

obj-y += library/net_sockets.o

obj-y += library/oid.o

obj-y += library/padlock.o

obj-y += library/pem.o

obj-y += library/pk.o

obj-y += library/pk_wrap.o

obj-y += library/pkcs11.o

obj-y += library/pkcs12.o

obj-y += library/pkcs5.o

obj-y += library/pkparse.o

obj-y += library/pk_wrap.o

obj-y += library/pkwrite.o

obj-y += library/platform.o

obj-y += library/ripemd160.o

obj-y += library/rsa.o

obj-y += library/sha1.o

obj-y += library/sha256.o

obj-y += library/sha512.o

obj-y += library/xtea.o

obj-y += library/pkcs11.o

obj-y += library/certs.o

obj-y += library/ssl_cache.o

obj-y += library/ssl_ciphersuites.o

obj-y += library/ssl_cli.o

obj-y += library/ssl_cookie.o

obj-y += library/ssl_srv.o

obj-y += library/ssl_ticket.o

obj-y += library/ssl_tls.o

obj-y += library/threading.o

obj-y += library/timing.o

obj-y += library/version.o

obj-y += library/version_features.o

obj-y += library/x509.o

obj-y += library/x509_create.o

obj-y += library/x509_crl.o
@@ -71,3 +71,4 @@ obj-y += library/x509_crt.o 
obj-y += library/x509_csr.o

obj-y += library/x509write_crt.o

obj-y += library/x509write_csr.o

obj-y += library/xtea.o

ext/lib/crypto/mbedtls/README

+2 −2
Original line number Diff line number Diff line 
The mbed TLS library in Zephyr is a downstream of an externally maintained

open source project.  The original upstream code can be found at:



https://tls.mbed.org/download/start/mbedtls-2.3.0-apache.tgz

https://tls.mbed.org/download/start/mbedtls-2.4.0-apache.tgz



At version  2.3.0

At version  2.4.0



The following is the license information for this code:

ext/lib/crypto/mbedtls/configs/config-ccm-psk-tls1_2.h

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 
#define MBEDTLS_NO_PLATFORM_ENTROPY

#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES

#define MBEDTLS_PLATFORM_PRINTF_ALT

#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO int



#if defined(CONFIG_MBEDTLS_TEST)

#define MBEDTLS_SELF_TEST

ext/lib/crypto/mbedtls/configs/config-threadnet.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ 
#define MBEDTLS_NO_PLATFORM_ENTROPY

#define MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES

#define MBEDTLS_PLATFORM_PRINTF_ALT

#define MBEDTLS_PLATFORM_TIME_TYPE_MACRO int



#if !defined(CONFIG_ARM)

#define MBEDTLS_HAVE_ASM
@@ -77,6 +76,7 @@ 
#define MBEDTLS_CCM_C

#define MBEDTLS_CIPHER_C

#define MBEDTLS_CTR_DRBG_C

#define MBEDTLS_CMAC_C

#define MBEDTLS_ECJPAKE_C

#define MBEDTLS_ECP_C

#define MBEDTLS_HMAC_DRBG_C

ext/lib/crypto/mbedtls/include/mbedtls/check_config.h

+41 −0
Original line number Diff line number Diff line
@@ -77,6 +77,11 @@ 
#error "MBEDTLS_DHM_C defined, but not all prerequisites"

#endif



#if defined(MBEDTLS_CMAC_C) && \

    !defined(MBEDTLS_AES_C) && !defined(MBEDTLS_DES_C)

#error "MBEDTLS_CMAC_C defined, but not all prerequisites"

#endif



#if defined(MBEDTLS_ECDH_C) && !defined(MBEDTLS_ECP_C)

#error "MBEDTLS_ECDH_C defined, but not all prerequisites"

#endif
@@ -256,6 +261,36 @@ 
#error "MBEDTLS_PLATFORM_EXIT_MACRO and MBEDTLS_PLATFORM_STD_EXIT/MBEDTLS_PLATFORM_EXIT_ALT cannot be defined simultaneously"

#endif



#if defined(MBEDTLS_PLATFORM_TIME_ALT) &&\

    ( !defined(MBEDTLS_PLATFORM_C) ||\

        !defined(MBEDTLS_HAVE_TIME) )

#error "MBEDTLS_PLATFORM_TIME_ALT defined, but not all prerequisites"

#endif



#if defined(MBEDTLS_PLATFORM_TIME_MACRO) &&\

    ( !defined(MBEDTLS_PLATFORM_C) ||\

        !defined(MBEDTLS_HAVE_TIME) )

#error "MBEDTLS_PLATFORM_TIME_MACRO defined, but not all prerequisites"

#endif



#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO) &&\

    ( !defined(MBEDTLS_PLATFORM_C) ||\

        !defined(MBEDTLS_HAVE_TIME) )

#error "MBEDTLS_PLATFORM_TIME_TYPE_MACRO defined, but not all prerequisites"

#endif



#if defined(MBEDTLS_PLATFORM_TIME_MACRO) &&\

    ( defined(MBEDTLS_PLATFORM_STD_TIME) ||\

        defined(MBEDTLS_PLATFORM_TIME_ALT) )

#error "MBEDTLS_PLATFORM_TIME_MACRO and MBEDTLS_PLATFORM_STD_TIME/MBEDTLS_PLATFORM_TIME_ALT cannot be defined simultaneously"

#endif



#if defined(MBEDTLS_PLATFORM_TIME_TYPE_MACRO) &&\

    ( defined(MBEDTLS_PLATFORM_STD_TIME) ||\

        defined(MBEDTLS_PLATFORM_TIME_ALT) )

#error "MBEDTLS_PLATFORM_TIME_TYPE_MACRO and MBEDTLS_PLATFORM_STD_TIME/MBEDTLS_PLATFORM_TIME_ALT cannot be defined simultaneously"

#endif



#if defined(MBEDTLS_PLATFORM_FPRINTF_ALT) && !defined(MBEDTLS_PLATFORM_C)

#error "MBEDTLS_PLATFORM_FPRINTF_ALT defined, but not all prerequisites"

#endif
@@ -352,6 +387,12 @@ 
#error "MBEDTLS_PLATFORM_STD_EXIT defined, but not all prerequisites"

#endif



#if defined(MBEDTLS_PLATFORM_STD_TIME) &&\

    ( !defined(MBEDTLS_PLATFORM_TIME_ALT) ||\

        !defined(MBEDTLS_HAVE_TIME) )

#error "MBEDTLS_PLATFORM_STD_TIME defined, but not all prerequisites"

#endif



#if defined(MBEDTLS_PLATFORM_STD_FPRINTF) &&\

    !defined(MBEDTLS_PLATFORM_FPRINTF_ALT)

#error "MBEDTLS_PLATFORM_STD_FPRINTF defined, but not all prerequisites"

CRA Git | Maintained and supported by SUSTech CRA and CCSE