mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-23 16:45:43 +01: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. |
||
---|---|---|
.. | ||
all-in-docker.sh | ||
all.sh | ||
basic-build-test.sh | ||
basic-in-docker.sh | ||
check-doxy-blocks.pl | ||
check-files.py | ||
check-generated-files.sh | ||
check-names.sh | ||
check-python-files.sh | ||
curves.pl | ||
depends-hashes.pl | ||
depends-pkalgs.pl | ||
docker_env.sh | ||
doxygen.sh | ||
gen_ctr_drbg.pl | ||
gen_gcm_decrypt.pl | ||
gen_gcm_encrypt.pl | ||
gen_pkcs1_v21_sign_verify.pl | ||
generate_test_code.py | ||
generate-afl-tests.sh | ||
list-enum-consts.pl | ||
list-identifiers.sh | ||
list-macros.sh | ||
list-symbols.sh | ||
mbedtls_test.py | ||
recursion.pl | ||
run-test-suites.pl | ||
test_generate_test_code.py | ||
test_psa_constant_names.py | ||
test_zeroize.gdb | ||
test-ref-configs.pl |