Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[mbedtls] Bump version from 2.18 to 2.25 #7311

Merged
merged 2 commits into from
Jun 28, 2021
Merged

[mbedtls] Bump version from 2.18 to 2.25 #7311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a314ef3
[mbedtls] update to 2.25
LuDuda Apr 24, 2021
626043a
bump the QPG SDK to support mbedtls 2.25
thcu-gp Jun 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions third_party/mbedtls/mbedtls.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -67,23 +68,35 @@ 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",
"${_mbedtls_root}/library/pkwrite.c",
"${_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",
Expand All @@ -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",
Expand All @@ -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 = []
}
Expand Down
2 changes: 1 addition & 1 deletion third_party/mbedtls/repo
Open in desktop
Submodule repo updated from ca933c to 1c54b5
24 changes: 23 additions & 1 deletion third_party/qpg_sdk/qpg6100_sdk.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -114,39 +117,58 @@ 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",
"${chip_root}/third_party/mbedtls/repo/library/ssl_cache.c",
"${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",
"${chip_root}/third_party/mbedtls/repo/library/version_features.c",
"${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",
Expand Down
2 changes: 1 addition & 1 deletion third_party/qpg_sdk/repo
Open in desktop
Submodule repo updated from ff2291 to 357b23