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.

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

[v4] Squashed commit upgrading to mbedtls-3.4.0 #6351

Merged
merged 1 commit into from
Oct 12, 2023

Conversation

jenswi-linaro
Copy link
Contributor

Squash merging branch import/mbedtls-3.4.0

@jenswi-linaro jenswi-linaro changed the title Squashed commit upgrading to mbedtls-3.4.0 [v4] Squashed commit upgrading to mbedtls-3.4.0 Oct 6, 2023
@jenswi-linaro
Copy link
Contributor Author

Depends on OP-TEE/optee_test#697

@jforissier
Copy link
Contributor

Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (vexpress-qemu_armv8a)

Fot the record, the test command I used: make -j$(nproc) check CFG_CRYPTOLIB_NAME=mbedtls CFG_CRYPTOLIB_DIR=lib/libmbedtls check XTEST_ARGS="-x pkcs11_1021 -x pkcs11_1022 -x pkcs11_1023 -x pkcs11_1026"

Hopefully people interested in using the PKCS#11 TA with MBedTLS as the core crypto library will troubleshoot and fix the issues 😉 they are not new (#5418).

@jenswi-linaro
Copy link
Contributor Author

Tags applied

@jforissier
Copy link
Contributor

jforissier commented Oct 10, 2023

The CI error with clang (in the make (multi-platform) job):

error: unknown warning option '-Wno-unused-functions'; did you mean '-Wno-unused-function'? [-Werror,-Wunknown-warning-option]

...is a valid error that should be fixed (and also in the import branch...)

@jenswi-linaro
Copy link
Contributor Author

I'll push the supplied fix to the import branch if we're OK with it.

@jforissier
Copy link
Contributor

For "libmbedtls: fix unrecognized compiler option":

Reviewed-by: Jerome Forissier <jerome.forissier@linaro.org>

I'll push the supplied fix to the import branch if we're OK with it.

Fine with me. It's the proper way things should be done actually 😉

Squash merging branch import/mbedtls-3.4.0

8225713 ("libmbedtls: fix unrecognized compiler option")
f037308 ("core: ltc: configure internal MD5")
2b0d0c5 ("core: ltc: configure internal SHA-1 and SHA-224")
0e48a6e ("libmedtls: core: update to mbedTLS 3.4.0 API")
049882b ("libutee: update to mbedTLS 3.4.0 API")
982307b ("core: LTC mpi_desc.c: update to mbedTLS 3.4.0 API")
33218e9 ("ta: pkcs11: update to mbedTLS 3.4.0 API")
6956420 ("libmbedtls: fix cipher_wrap.c for NIST AES Key Wrap mode")
ad67ef0 ("libmbedtls: fix cipher_wrap.c for chacha20 and chachapoly")
7300f4d ("libmbedtls: add fault mitigation in mbedtls_rsa_rsassa_pkcs1_v15_verify()")
cec89b6 ("libmbedtls: add fault mitigation in mbedtls_rsa_rsassa_pss_verify_ext()")
e7e0487 ("libmbedtls: add SM2 curve")
096beff ("libmbedtls: mbedtls_mpi_exp_mod(): optimize mempool usage")
7108668 ("libmbedtls: mbedtls_mpi_exp_mod(): reduce stack usage")
0ba4eb8 ("libmbedtls: mbedtls_mpi_exp_mod() initialize W")
3fd6ecf ("libmbedtls: fix no CRT issue")
d5ea7e9 ("libmbedtls: add interfaces in mbedtls for context memory operation")
2b0fb3f ("libmedtls: mpi_miller_rabin: increase count limit")
2c3301a ("libmbedtls: add mbedtls_mpi_init_mempool()")
9a111f0 ("libmbedtls: make mbedtls_mpi_mont*() available")
804fe3a ("mbedtls: configure mbedtls to reach for config")
b28a415 ("mbedtls: remove default include/mbedtls/config.h")
dfafe50 ("Import mbedtls-3.4.0")

Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Tested-by: Jerome Forissier <jerome.forissier@linaro.org> (vexpress-qemu_armv8a)
@jenswi-linaro
Copy link
Contributor Author

Pushed "libmbedtls: fix unrecognized compiler option" to the import branch.

Updated the squashed merge to include "libmbedtls: fix unrecognized compiler option". Updated the commit message to see if checkpatch could be made a bit less unhappy.

@jforissier jforissier merged commit 32b3180 into OP-TEE:master Oct 12, 2023
1 of 7 checks passed
@jenswi-linaro jenswi-linaro deleted the mbed-3.4.0 branch October 12, 2023 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants