From 753662813af093e794d0422f604b9c02fbfd07e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Damian=20Kr=C3=B3lik?= <66667989+Damian-Nordic@users.noreply.github.com> Date: Mon, 28 Jun 2021 23:18:29 +0200 Subject: [PATCH] [mbedtls] Bump version from 2.18 to 2.25 (#7311) * [mbedtls] update to 2.25 * bump the QPG SDK to support mbedtls 2.25 Co-authored-by: Lukasz Duda Co-authored-by: Thomas Cuyckens --- third_party/mbedtls/mbedtls.gni | 22 +++++++++++++++++----- third_party/mbedtls/repo | 2 +- third_party/qpg_sdk/qpg6100_sdk.gni | 24 +++++++++++++++++++++++- third_party/qpg_sdk/repo | 2 +- 4 files changed, 42 insertions(+), 8 deletions(-) diff --git a/third_party/mbedtls/mbedtls.gni b/third_party/mbedtls/mbedtls.gni index 2ca76311b82e04..8fb409e6e6ad35 100644 --- a/third_party/mbedtls/mbedtls.gni +++ b/third_party/mbedtls/mbedtls.gni @@ -41,6 +41,7 @@ template("mbedtls_target") { "${_mbedtls_root}/library/aes.c", "${_mbedtls_root}/library/aesni.c", "${_mbedtls_root}/library/arc4.c", + "${_mbedtls_root}/library/aria.c", "${_mbedtls_root}/library/asn1parse.c", "${_mbedtls_root}/library/asn1write.c", "${_mbedtls_root}/library/base64.c", @@ -67,16 +68,22 @@ template("mbedtls_target") { "${_mbedtls_root}/library/entropy_poll.c", "${_mbedtls_root}/library/error.c", "${_mbedtls_root}/library/gcm.c", + "${_mbedtls_root}/library/havege.c", "${_mbedtls_root}/library/hkdf.c", "${_mbedtls_root}/library/hmac_drbg.c", "${_mbedtls_root}/library/md.c", + "${_mbedtls_root}/library/md2.c", + "${_mbedtls_root}/library/md4.c", "${_mbedtls_root}/library/md5.c", - "${_mbedtls_root}/library/md_wrap.c", + "${_mbedtls_root}/library/memory_buffer_alloc.c", + "${_mbedtls_root}/library/net_sockets.c", + "${_mbedtls_root}/library/nist_kw.c", "${_mbedtls_root}/library/oid.c", "${_mbedtls_root}/library/padlock.c", "${_mbedtls_root}/library/pem.c", "${_mbedtls_root}/library/pk.c", "${_mbedtls_root}/library/pk_wrap.c", + "${_mbedtls_root}/library/pkcs11.c", "${_mbedtls_root}/library/pkcs12.c", "${_mbedtls_root}/library/pkcs5.c", "${_mbedtls_root}/library/pkparse.c", @@ -84,6 +91,12 @@ template("mbedtls_target") { "${_mbedtls_root}/library/platform.c", "${_mbedtls_root}/library/platform_util.c", "${_mbedtls_root}/library/poly1305.c", + "${_mbedtls_root}/library/psa_crypto.c", + "${_mbedtls_root}/library/psa_crypto_driver_wrappers.c", + "${_mbedtls_root}/library/psa_crypto_se.c", + "${_mbedtls_root}/library/psa_crypto_slot_management.c", + "${_mbedtls_root}/library/psa_crypto_storage.c", + "${_mbedtls_root}/library/psa_its_file.c", "${_mbedtls_root}/library/ripemd160.c", "${_mbedtls_root}/library/rsa.c", "${_mbedtls_root}/library/rsa_internal.c", @@ -94,10 +107,13 @@ template("mbedtls_target") { "${_mbedtls_root}/library/ssl_ciphersuites.c", "${_mbedtls_root}/library/ssl_cli.c", "${_mbedtls_root}/library/ssl_cookie.c", + "${_mbedtls_root}/library/ssl_msg.c", "${_mbedtls_root}/library/ssl_srv.c", "${_mbedtls_root}/library/ssl_ticket.c", "${_mbedtls_root}/library/ssl_tls.c", + "${_mbedtls_root}/library/ssl_tls13_keys.c", "${_mbedtls_root}/library/threading.c", + "${_mbedtls_root}/library/timing.c", "${_mbedtls_root}/library/version.c", "${_mbedtls_root}/library/version_features.c", "${_mbedtls_root}/library/x509.c", @@ -110,10 +126,6 @@ template("mbedtls_target") { "${_mbedtls_root}/library/xtea.c", ] - if (current_os != "freertos") { - sources += [ "${_mbedtls_root}/library/timing.c" ] - } - if (!defined(configs)) { configs = [] } diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo index ca933c7e0c9e84..1c54b5410fd48d 160000 --- a/third_party/mbedtls/repo +++ b/third_party/mbedtls/repo @@ -1 +1 @@ -Subproject commit ca933c7e0c9e84738b168b6b0feb89af4183a60a +Subproject commit 1c54b5410fd48d6bcada97e30cac417c5c7eea67 diff --git a/third_party/qpg_sdk/qpg6100_sdk.gni b/third_party/qpg_sdk/qpg6100_sdk.gni index 7ae8b0ac0918fb..3b59a710dfa83a 100644 --- a/third_party/qpg_sdk/qpg6100_sdk.gni +++ b/third_party/qpg_sdk/qpg6100_sdk.gni @@ -90,6 +90,7 @@ template("qpg6100_sdk") { "${chip_root}/third_party/mbedtls/repo/library/aes.c", "${chip_root}/third_party/mbedtls/repo/library/aesni.c", "${chip_root}/third_party/mbedtls/repo/library/arc4.c", + "${chip_root}/third_party/mbedtls/repo/library/aria.c", "${chip_root}/third_party/mbedtls/repo/library/asn1parse.c", "${chip_root}/third_party/mbedtls/repo/library/asn1write.c", "${chip_root}/third_party/mbedtls/repo/library/base64.c", @@ -98,6 +99,8 @@ template("qpg6100_sdk") { "${chip_root}/third_party/mbedtls/repo/library/camellia.c", "${chip_root}/third_party/mbedtls/repo/library/ccm.c", "${chip_root}/third_party/mbedtls/repo/library/certs.c", + "${chip_root}/third_party/mbedtls/repo/library/chacha20.c", + "${chip_root}/third_party/mbedtls/repo/library/chachapoly.c", "${chip_root}/third_party/mbedtls/repo/library/cipher.c", "${chip_root}/third_party/mbedtls/repo/library/cipher_wrap.c", "${chip_root}/third_party/mbedtls/repo/library/cmac.c", @@ -114,22 +117,38 @@ template("qpg6100_sdk") { "${chip_root}/third_party/mbedtls/repo/library/entropy_poll.c", "${chip_root}/third_party/mbedtls/repo/library/error.c", "${chip_root}/third_party/mbedtls/repo/library/gcm.c", + "${chip_root}/third_party/mbedtls/repo/library/havege.c", "${chip_root}/third_party/mbedtls/repo/library/hkdf.c", "${chip_root}/third_party/mbedtls/repo/library/hmac_drbg.c", "${chip_root}/third_party/mbedtls/repo/library/md.c", + "${chip_root}/third_party/mbedtls/repo/library/md2.c", + "${chip_root}/third_party/mbedtls/repo/library/md4.c", "${chip_root}/third_party/mbedtls/repo/library/md5.c", - "${chip_root}/third_party/mbedtls/repo/library/md_wrap.c", + "${chip_root}/third_party/mbedtls/repo/library/memory_buffer_alloc.c", + "${chip_root}/third_party/mbedtls/repo/library/net_sockets.c", + "${chip_root}/third_party/mbedtls/repo/library/nist_kw.c", "${chip_root}/third_party/mbedtls/repo/library/oid.c", + "${chip_root}/third_party/mbedtls/repo/library/padlock.c", "${chip_root}/third_party/mbedtls/repo/library/pem.c", "${chip_root}/third_party/mbedtls/repo/library/pk.c", "${chip_root}/third_party/mbedtls/repo/library/pk_wrap.c", + "${chip_root}/third_party/mbedtls/repo/library/pkcs11.c", "${chip_root}/third_party/mbedtls/repo/library/pkcs12.c", "${chip_root}/third_party/mbedtls/repo/library/pkcs5.c", "${chip_root}/third_party/mbedtls/repo/library/pkparse.c", "${chip_root}/third_party/mbedtls/repo/library/pkwrite.c", "${chip_root}/third_party/mbedtls/repo/library/platform.c", "${chip_root}/third_party/mbedtls/repo/library/platform_util.c", + "${chip_root}/third_party/mbedtls/repo/library/poly1305.c", + "${chip_root}/third_party/mbedtls/repo/library/psa_crypto.c", + "${chip_root}/third_party/mbedtls/repo/library/psa_crypto_driver_wrappers.c", + "${chip_root}/third_party/mbedtls/repo/library/psa_crypto_se.c", + "${chip_root}/third_party/mbedtls/repo/library/psa_crypto_slot_management.c", + "${chip_root}/third_party/mbedtls/repo/library/psa_crypto_storage.c", + "${chip_root}/third_party/mbedtls/repo/library/psa_its_file.c", "${chip_root}/third_party/mbedtls/repo/library/ripemd160.c", + "${chip_root}/third_party/mbedtls/repo/library/rsa.c", + "${chip_root}/third_party/mbedtls/repo/library/rsa_internal.c", "${chip_root}/third_party/mbedtls/repo/library/sha1.c", "${chip_root}/third_party/mbedtls/repo/library/sha256.c", "${chip_root}/third_party/mbedtls/repo/library/sha512.c", @@ -137,9 +156,11 @@ template("qpg6100_sdk") { "${chip_root}/third_party/mbedtls/repo/library/ssl_ciphersuites.c", "${chip_root}/third_party/mbedtls/repo/library/ssl_cli.c", "${chip_root}/third_party/mbedtls/repo/library/ssl_cookie.c", + "${chip_root}/third_party/mbedtls/repo/library/ssl_msg.c", "${chip_root}/third_party/mbedtls/repo/library/ssl_srv.c", "${chip_root}/third_party/mbedtls/repo/library/ssl_ticket.c", "${chip_root}/third_party/mbedtls/repo/library/ssl_tls.c", + "${chip_root}/third_party/mbedtls/repo/library/ssl_tls13_keys.c", "${chip_root}/third_party/mbedtls/repo/library/threading.c", "${chip_root}/third_party/mbedtls/repo/library/timing.c", "${chip_root}/third_party/mbedtls/repo/library/version.c", @@ -147,6 +168,7 @@ template("qpg6100_sdk") { "${chip_root}/third_party/mbedtls/repo/library/x509.c", "${chip_root}/third_party/mbedtls/repo/library/x509_create.c", "${chip_root}/third_party/mbedtls/repo/library/x509_crl.c", + "${chip_root}/third_party/mbedtls/repo/library/x509_crt.c", "${chip_root}/third_party/mbedtls/repo/library/x509_csr.c", "${chip_root}/third_party/mbedtls/repo/library/x509write_crt.c", "${chip_root}/third_party/mbedtls/repo/library/x509write_csr.c", diff --git a/third_party/qpg_sdk/repo b/third_party/qpg_sdk/repo index ff229154942d02..357b234a3eb0fa 160000 --- a/third_party/qpg_sdk/repo +++ b/third_party/qpg_sdk/repo @@ -1 +1 @@ -Subproject commit ff229154942d0290242464f59095d18144962259 +Subproject commit 357b234a3eb0fa5ecece14ee3a10b565916403c0