mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 19:25:28 +00:00
72c8c5b352
Conflict resolution: * `scripts/config.pl`: Take the exclusion of `MBEDTLS_PSA_CRYPTO_SE_C` from the API branch. Take the removal of `MBEDTLS_PSA_CRYPTO_STORAGE_ITS_C` (obsolete) from the development branch. * `tests/scripts/all.sh`: Multiple instances of factoring a sequence of `config.pl` calls into a mere `config.pl baremetal` in the development branch, and a change in the composition of `baremetal` in the API branch. In each case, take the version from development. * `tests/suites/test_suite_psa_crypto_slot_management.function`: A function became non-static in development and disappeared in the API branch. Keep the version from the API branch. Functions need to be non-static if they're defined but unused in some configurations, which is not the case for any function in this file at the moment. * `tests/suites/test_suite_psa_crypto.function`: Consecutive changes in the two branches, reconciled. |
||
|---|---|---|
| .. | ||
| 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_query_config.pl | ||
| generate_visualc_files.pl | ||
| massif_max.pl | ||
| output_env.sh | ||
| rename.pl | ||
| rm-calloc-cast.cocci | ||
| tmp_ignore_makefiles.sh | ||