Skip to content

Commit

Permalink
Roll MbedTLS to 2.28 (#17790)
Browse files Browse the repository at this point in the history
MbedTLS 2.25 is out of support.
  • Loading branch information
mspang authored May 24, 2022
1 parent 0573d7e commit b4586be
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions third_party/ameba/mbedtls.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions third_party/bouffalolab/bl602_sdk/bl602_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions third_party/mbedtls/mbedtls.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion third_party/mbedtls/repo
Submodule repo updated from 1c54b5 to 988391
1 change: 1 addition & 0 deletions third_party/qpg_sdk/qpg_sdk.gni
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit b4586be

Please sign in to comment.