yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 21:45:40 +01:00
Code Issues Packages Projects Releases Wiki Activity
2579675935
mbedtls/scripts
History
Gilles Peskine 2579675935 Merge remote-tracking branch 'upstream-public/development' into development 
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.
2020-02-03 18:52:36 +01:00
..
data_files Merge remote-tracking branch 'upstream-public/development' into development 2020-02-03 18:52:36 +01:00
abi_check.py Change worktree_rev to HEAD for rev-parse 2019-07-25 14:33:33 +01:00
apidoc_full.sh Invoke config.py instead of config.pl 2019-11-13 14:33:33 +00:00
bump_version.sh Only build libmbedcrypto 2019-04-25 11:46:21 +01:00
config.pl If python3 fails, make it clear that this isn't fatal 2019-11-26 13:30:16 +01:00
config.py Declare new config.h option MBEDTLS_SHA512_NO_SHA384 2020-01-06 11:40:23 +01:00
ecc-heap.sh Invoke config.py instead of config.pl 2019-11-13 14:33:33 +00:00
find-mem-leak.cocci Remove malloc references in mbedtls/scripts 2017-07-06 10:34:12 +01:00
footprint.sh Invoke config.py instead of config.pl 2019-11-13 14:33:33 +00:00
generate_errors.pl Add two error codes to the Error module 2019-12-16 15:15:16 +00:00
generate_features.pl revert changes to generate_features.pl and generate_query_config.pl 2019-04-12 09:43:04 -04:00
generate_psa_constants.py Change key types to a 16-bit encoding 2020-01-31 10:24:21 +01:00
generate_query_config.pl revert changes to generate_features.pl and generate_query_config.pl 2019-04-12 09:43:04 -04:00
generate_visualc_files.pl ECDH: Add Everest Curve25519 to VS project files 2019-08-29 16:12:38 +01:00
massif_max.pl Use "#!/usr/bin/env perl" as shebang line. 2018-04-04 21:44:29 +00:00
output_env.sh Remove tests that depend on TLS or X.509 2019-03-11 16:49:26 +00:00
rename.pl Use "#!/usr/bin/env perl" as shebang line. 2018-04-04 21:44:29 +00:00
rm-calloc-cast.cocci Remove malloc references in mbedtls/scripts 2017-07-06 10:34:12 +01:00
tmp_ignore_makefiles.sh