mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2026-11-01 03:47:22 +08:00
Conflicts: * configs/config-psa-crypto.h: modified here, removed in development * tests/suites/test_suite_x509parse.data: all conflicts are in depends_on lines where development made a change unrelated to MBEDTLS_SHAxxx and our branch either changed `MBEDTLS_SHA256_C` to `MBEDTLS_SHA224_C` or `MBEDTLS_SHA512_C:!MBEDTLS_SHA512_NO_SHA384` to ``MBEDTLS_SHA384_C`, with no change to what the test does. Pick the other branch's dependency changes then apply our SHA dpeendency change. |
||
|---|---|---|
| .. | ||
| data_files | ||
| mbedtls_dev | ||
| abi_check.py | ||
| apidoc_full.sh | ||
| assemble_changelog.py | ||
| bump_version.sh | ||
| config.pl | ||
| config.py | ||
| 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 | ||
| memory.sh | ||
| output_env.sh | ||
| rm-calloc-cast.cocci | ||
| tmp_ignore_makefiles.sh | ||
| windows_msbuild.bat | ||