Roll MbedTLS to 2.28 (#17790)

MbedTLS 2.25 is out of support.
project-chip · Jul 21, 2022 · 5904133 · 5904133
1 parent 39837f3
commit 5904133
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 2 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -17,7 +17,7 @@
 [submodule "mbedtls"]
 	path = third_party/mbedtls/repo
 	url = https://github.com/ARMmbed/mbedtls.git
-	branch  = mbedtls-2.25.0
+	branch = mbedtls-2.28
 [submodule "qrcode"]
 	path = examples/common/QRCode/repo
 	url = https://github.com/nayuki/QR-Code-generator.git

diff --git a/third_party/ameba/mbedtls.cmake b/third_party/ameba/mbedtls.cmake
@@ -27,6 +27,7 @@ list(
     ${dir_mbedtlschip}/cipher.c
     ${dir_mbedtlschip}/cipher_wrap.c
     ${dir_mbedtlschip}/cmac.c
+    ${dir_mbedtlschip}/constant_time.c
     ${dir_mbedtlschip}/ctr_drbg.c
     ${dir_mbedtlschip}/debug.c
     ${dir_mbedtlschip}/des.c

diff --git a/third_party/bouffalolab/bl602_sdk/bl602_sdk.gni b/third_party/bouffalolab/bl602_sdk/bl602_sdk.gni
@@ -305,6 +305,7 @@ template("bl602_sdk") {
       "${chip_root}/third_party/mbedtls/repo/library/ccm.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/constant_time.c",
       "${chip_root}/third_party/mbedtls/repo/library/ctr_drbg.c",
       "${chip_root}/third_party/mbedtls/repo/library/ecdh.c",
       "${chip_root}/third_party/mbedtls/repo/library/ecdsa.c",

diff --git a/third_party/mbedtls/mbedtls.gni b/third_party/mbedtls/mbedtls.gni
@@ -57,6 +57,7 @@ template("mbedtls_target") {
       "${_mbedtls_root}/library/cipher.c",
       "${_mbedtls_root}/library/cipher_wrap.c",
       "${_mbedtls_root}/library/cmac.c",
+      "${_mbedtls_root}/library/constant_time.c",
       "${_mbedtls_root}/library/ctr_drbg.c",
       "${_mbedtls_root}/library/debug.c",
       "${_mbedtls_root}/library/des.c",

diff --git a/third_party/mbedtls/repo b/third_party/mbedtls/repo
diff --git a/third_party/qpg_sdk/qpg_sdk.gni b/third_party/qpg_sdk/qpg_sdk.gni
@@ -129,6 +129,7 @@ template("qpg_sdk") {
       "${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",
+      "${chip_root}/third_party/mbedtls/repo/library/constant_time.c",
       "${chip_root}/third_party/mbedtls/repo/library/ctr_drbg.c",
       "${chip_root}/third_party/mbedtls/repo/library/debug.c",
       "${chip_root}/third_party/mbedtls/repo/library/des.c",