mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 19:25:28 +00:00
67ea2c5e6d
Resolve conflicts by performing the following.
- Take the upstream Mbed TLS ChangeLog verbatim.
- Reject changes to Makefiles and CMake that are related to using Mbed
Crypto as a submodule. It doesn't make sense to use Mbed Crypto as a
submodule of itself.
- Reject README changes, as Mbed Crypto has its own, different README.
- Reject PSA-related changes to config.h. We don't want to disable the
availability of the PSA Crypto API by default in the Mbed Crypto
config.h.
- Don't inadvertently revert dead code removal in
mbedtls_cipher_write_tag() which was added in
|
||
---|---|---|
.. | ||
data_files | ||
abi_check.py | ||
apidoc_full.sh | ||
bump_version.sh | ||
config.pl | ||
ecc-heap.sh | ||
find-mem-leak.cocci | ||
footprint.sh | ||
generate_errors.pl | ||
generate_features.pl | ||
generate_psa_constants.py | ||
generate_visualc_files.pl | ||
massif_max.pl | ||
memory.sh | ||
output_env.sh | ||
rename.pl | ||
rm-calloc-cast.cocci | ||
tmp_ignore_makefiles.sh |