mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-01-26 21:35:35 +00:00
9d20e1f2c4
Resolve conflicts by performing the following actions: - Reject changes to ChangeLog, as Mbed Crypto doesn't have one - Reject changes to tests/compat.sh, as Mbed Crypto doesn't have it - Reject changes to programs/fuzz/onefile.c, as Mbed Crypto doesn't have it - Resolve minor whitespace differences in library/ecdsa.c by taking the version from Mbed TLS upstream. * origin/development: Honor MBEDTLS_CONFIG_FILE in fuzz tests Test that a shared library build produces a dynamically linked executable Test that the shared library build with CMake works Add a test of MBEDTLS_CONFIG_FILE Exclude DTLS 1.2 only with older OpenSSL Document the rationale for the armel build Switch armel build to -Os Add a build on ARMv5TE in ARM mode Add changelog entry for ARM assembly fix bn_mul.h: require at least ARMv6 to enable the ARM DSP code Adapt ChangeLog ECP restart: Don't calculate address of sub ctx if ctx is NULL