mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-01-27 06:35:22 +00:00
521dbc67da
Merge Mbed TLS at f790a6cbeea4 into Mbed Crypto. Resolve conflicts by performing the following: - Reject changes to README.md - Don't add crypto as a submodule - Remove test/ssl_cert_test from programs/Makefile - Add cipher.nist_kw test to tests/CMakeLists.txt - Reject removal of crypto-specific all.sh tests - Reject update to SSL-specific portion of component_test_valgrind in all.sh - Reject addition of ssl-opt.sh testing to component_test_m32_o1 in all.sh * tls/development: (87 commits) Call mbedtls_cipher_free() to reset a cipher context Don't call mbedtls_cipher_setkey twice Update crypto submodule Minor fixes in get certificate policies oid test Add certificate policy oid x509 extension cpp_dummy_build: Add missing header psa_util.h Clarify comment mangled by an earlier refactoring Add an "out-of-box" component Run ssl-opt.sh on 32-bit runtime Don't use debug level 1 for informational messages Skip uncritical unsupported extensions Give credit to OSS-Fuzz for #2404 all.sh: remove component_test_new_ecdh_context Remove crypto-only related components from all.sh Remove ssl_cert_test sample app Make CRT callback tests more robust Rename constant in client2.c Document and test flags in x509_verify Fix style issues and a typo Fix a rebase error ...