mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-23 16:25:39 +01:00
3963993e2a
Conflicts and changes: * Files that do not exist in Mbed Crypto and have changed in Mbed TLS: These files should not exist in Mbed Crypto. Keep them deleted. * tests/data_files/test-ca.server1.db: new file in Mbed TLS, don't create it in Mbed Crypto. * tests/data_files/rsa_pkcs1_1024_clear.pem: do create this file in Mbed Crypto. I don't see why it would be kept out. * tests/data_files/Makefile: don't take any of the changes in sections that have been removed in Crypto. Do take in the certificate expiration date updates and the extra .crt.der rules (even if Crypto doesn't actually use those certificates: removing them would be out of scope of the present merge). * tests/suites/helpers.function: consecutive additions, take both (order indifferent). |
||
|---|---|---|
| .. | ||
| 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 | ||