mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-10-24 09:38:13 +00:00
2579675935
Files deleted by us: keep them deleted.
```
git rm $(git status -s | sed -n 's/^DU //p')
```
Individual files with conflicts:
* `README.md`: keep the crypto version.
* `doxygen/input/doc_mainpage.h`: keep the crypto version (with an obsolete Mbed Crypto version number).
* `include/mbedtls/error.h`:
* `ERROR`: similar additions made through parallel commits, with only whitespace differences. Align with the tls version.
* `library/CMakeLists.txt`: keep the crypto version.
* `library/Makefile`: keep the crypto version.
* `scripts/generate_errors.pl`: keep the crypto version (the relevant changes were made through parallel commits).
* `tests/scripts/check-test-cases.py`:
* `Results`: keep the crypto version, which has both the new argument to the constructor (added in crypto only) and the class docstring (added through parallel commits).
* `tests/suites/helpers.function`:
* `ARRAY_LENGTH`, `ASSERT_ALLOC`: additions in the same location. Keep both, in indifferent order.
* `tests/suites/target_test.function`:
* `receive_uint32`: keep the crypto version which has an additional bug fix. The tls changes made in tls are irrelevant after this bug fix.
* `visualc/VS2010/mbedTLS.vcxproj`: run `scripts/generate_visualc_files.pl`.
Review of non-conflicting changes:
* `all.sh`: 1 change.
* zlib test components: don't add them.
* `include/CMakeLists.txt`: 1 change.
* `target_include_directories`: doesn't work as is (different target name). Don't take the change.
* All other non-conflicting changes: take them.
|
||
|---|---|---|
| .. | ||
| data_files | ||
| abi_check.py | ||
| apidoc_full.sh | ||
| 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 | ||
| output_env.sh | ||
| rename.pl | ||
| rm-calloc-cast.cocci | ||
| tmp_ignore_makefiles.sh | ||