mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-11-23 03:45:39 +01:00
b99bd39b4e
Merge `unremove-non-crypto` into `mbedtls/development`. The branch
`unremove-non-crypto` was obtained by starting from `mbed-crypto/development`,
then reverting many commits that removed X.509 and TLS functionality when Mbed
Crypto forked from Mbed TLS (the “unremoval”), then make a few tweaks to
facilitate the merge.
The unremoval step restored old versions of some tls files. If a file doesn't
exist in mbed-crypto, check out the mbedtls version, regardless of what
happened during the unremoval of tls files in the crypto tree. Also
unconditionally take the mbedtls version of a few files where the
modifications are completely project-specific and are not relevant in
mbed-crypto:
* `.github/issue_template.md`: completely different. We may want to reconcile
them independently as a follow-up.
* `.travis.yml`: would only be reverted to an earlier tls version.
* `README.md`: completely different. We may want to reconcile them
independently as a follow-up.
* `doxygen/input/doc_mainpage.h`: the changes in crypto were minimal and not
relevant except as a stopgap as mbed-crypto did not have its own product
versioning in the Doxygen documentation.
* `tests/.jenkins/Jenkinsfile`: completely different.
* `tests/data_files/Makefile`: there were no changes in mbed-crypto,
but the unremoval step restored an old version.
Shell script for everything to do after the merge apart from the conflict
resolution:
```
tls_files=($(comm -23 <(git ls-tree -r --name-only HEAD) <(git ls-tree -r --name-only $(git merge-base upstream-crypto/development MERGE_HEAD))))
tls_files+=($tls_files .github/issue_template.md .travis.yml README.md doxygen/input/doc_mainpage.h tests/.jenkins/Jenkinsfile tests/data_files/Makefile)
git checkout --theirs HEAD -- $tls_files
git add -- $tls_files
```
Resolve the remaining conflicts:
* `library/CMakeLists.txt`:
* Keep the TLS definition of `src_crypto`
* `USE_SHARED_MBEDTLS_LIBRARY`: keep all three libraries, with both
`include` and `crypto/include` in `target_include_directories`, all with
version `2.21.0`.
* `programs/Makefile`:
* Reconcile the APPS lists (add/add from a differently-formatted common
ancestor): insert the `psa/*` from crypto into the tls list.
* Keep the `fuzz` target defined only in tls version.
* Keep the recipe (only in tls version) cleaning `ssl_pthread_server`
stuff for the `clean` target.
* `scripts/config.py`:
* `include_in_full`: add/add conflict. Keep both.
* `tests/scripts/all.sh`:
* `component_test_no_use_psa_crypto_full_cmake_asan`: partially old
version in crypto. Take the tls version.
* `component_test_malloc_0_null` and more: take
`component_test_malloc_0_null` from crypto (with `config.py` rather than
`config.pl`, and with `$ASAN_FLAGS` rather than an explicit list), but
add the call to `ssl-opt.sh` from tls. Take the other components from
crypto.
With this commit, building and running the unit tests with both `make ` and
`cmake` work in the default configuration on Linux. Other platforms, build
systems and configurations are likely not to work, and there is some
regression in test coverage.
There is some loss of functionality because the unremoval step restored older
versions of tls content. This commit contains the latest tls version of
tls-only files, but some changes from the tls side in files that existed on
both sides have regressed. Most problematic changes are hunks that remove some
tls-specific feature and contain either a C preprocessor symbol identifying a
tls-specific module or option, or the name of a tls-specific file. Hunks
that remove a tls-specific preprocessor symbol can be identified with the
regular expression `^-.*MBEDTLS_(ERR_)?(PKCS11|X509|NET|SSL)_`.
Subsequent commits will revert a few parts of the patch from this merge commit
in order to restore the tls functionality that it removes, ensure that the
test coverage includes what was covered in either branch, and fix test
failures.
|
||
|---|---|---|
| .. | ||
| helpers.function | ||
| host_test.function | ||
| main_test.function | ||
| target_test.function | ||
| test_suite_aes.cbc.data | ||
| test_suite_aes.cfb.data | ||
| test_suite_aes.ecb.data | ||
| test_suite_aes.function | ||
| test_suite_aes.ofb.data | ||
| test_suite_aes.rest.data | ||
| test_suite_aes.xts.data | ||
| test_suite_arc4.data | ||
| test_suite_arc4.function | ||
| test_suite_aria.data | ||
| test_suite_aria.function | ||
| test_suite_asn1parse.data | ||
| test_suite_asn1parse.function | ||
| test_suite_asn1write.data | ||
| test_suite_asn1write.function | ||
| test_suite_base64.data | ||
| test_suite_base64.function | ||
| test_suite_blowfish.data | ||
| test_suite_blowfish.function | ||
| test_suite_camellia.data | ||
| test_suite_camellia.function | ||
| test_suite_ccm.data | ||
| test_suite_ccm.function | ||
| test_suite_chacha20.data | ||
| test_suite_chacha20.function | ||
| test_suite_chachapoly.data | ||
| test_suite_chachapoly.function | ||
| test_suite_cipher.aes.data | ||
| test_suite_cipher.arc4.data | ||
| test_suite_cipher.aria.data | ||
| test_suite_cipher.blowfish.data | ||
| test_suite_cipher.camellia.data | ||
| test_suite_cipher.ccm.data | ||
| test_suite_cipher.chacha20.data | ||
| test_suite_cipher.chachapoly.data | ||
| test_suite_cipher.des.data | ||
| test_suite_cipher.function | ||
| test_suite_cipher.gcm.data | ||
| test_suite_cipher.misc.data | ||
| test_suite_cipher.nist_kw.data | ||
| test_suite_cipher.null.data | ||
| test_suite_cipher.padding.data | ||
| test_suite_cmac.data | ||
| test_suite_cmac.function | ||
| test_suite_ctr_drbg.data | ||
| test_suite_ctr_drbg.function | ||
| test_suite_debug.data | ||
| test_suite_debug.function | ||
| test_suite_des.data | ||
| test_suite_des.function | ||
| test_suite_dhm.data | ||
| test_suite_dhm.function | ||
| test_suite_ecdh.data | ||
| test_suite_ecdh.function | ||
| test_suite_ecdsa.data | ||
| test_suite_ecdsa.function | ||
| test_suite_ecjpake.data | ||
| test_suite_ecjpake.function | ||
| test_suite_ecp.data | ||
| test_suite_ecp.function | ||
| test_suite_entropy.data | ||
| test_suite_entropy.function | ||
| test_suite_error.data | ||
| test_suite_error.function | ||
| test_suite_gcm.aes128_de.data | ||
| test_suite_gcm.aes128_en.data | ||
| test_suite_gcm.aes192_de.data | ||
| test_suite_gcm.aes192_en.data | ||
| test_suite_gcm.aes256_de.data | ||
| test_suite_gcm.aes256_en.data | ||
| test_suite_gcm.camellia.data | ||
| test_suite_gcm.function | ||
| test_suite_gcm.misc.data | ||
| test_suite_hkdf.data | ||
| test_suite_hkdf.function | ||
| test_suite_hmac_drbg.function | ||
| test_suite_hmac_drbg.misc.data | ||
| test_suite_hmac_drbg.no_reseed.data | ||
| test_suite_hmac_drbg.nopr.data | ||
| test_suite_hmac_drbg.pr.data | ||
| test_suite_md.data | ||
| test_suite_md.function | ||
| test_suite_mdx.data | ||
| test_suite_mdx.function | ||
| test_suite_memory_buffer_alloc.data | ||
| test_suite_memory_buffer_alloc.function | ||
| test_suite_mpi.data | ||
| test_suite_mpi.function | ||
| test_suite_nist_kw.data | ||
| test_suite_nist_kw.function | ||
| test_suite_oid.data | ||
| test_suite_oid.function | ||
| test_suite_pem.data | ||
| test_suite_pem.function | ||
| test_suite_pk.data | ||
| test_suite_pk.function | ||
| test_suite_pkcs1_v15.data | ||
| test_suite_pkcs1_v15.function | ||
| test_suite_pkcs1_v21.data | ||
| test_suite_pkcs1_v21.function | ||
| test_suite_pkcs5.data | ||
| test_suite_pkcs5.function | ||
| test_suite_pkparse.data | ||
| test_suite_pkparse.function | ||
| test_suite_pkwrite.data | ||
| test_suite_pkwrite.function | ||
| test_suite_poly1305.data | ||
| test_suite_poly1305.function | ||
| test_suite_psa_crypto_entropy.data | ||
| test_suite_psa_crypto_entropy.function | ||
| test_suite_psa_crypto_hash.data | ||
| test_suite_psa_crypto_hash.function | ||
| test_suite_psa_crypto_init.data | ||
| test_suite_psa_crypto_init.function | ||
| test_suite_psa_crypto_metadata.data | ||
| test_suite_psa_crypto_metadata.function | ||
| test_suite_psa_crypto_persistent_key.data | ||
| test_suite_psa_crypto_persistent_key.function | ||
| test_suite_psa_crypto_se_driver_hal_mocks.data | ||
| test_suite_psa_crypto_se_driver_hal_mocks.function | ||
| test_suite_psa_crypto_se_driver_hal.data | ||
| test_suite_psa_crypto_se_driver_hal.function | ||
| test_suite_psa_crypto_slot_management.data | ||
| test_suite_psa_crypto_slot_management.function | ||
| test_suite_psa_crypto.data | ||
| test_suite_psa_crypto.function | ||
| test_suite_psa_its.data | ||
| test_suite_psa_its.function | ||
| test_suite_rsa.data | ||
| test_suite_rsa.function | ||
| test_suite_shax.data | ||
| test_suite_shax.function | ||
| test_suite_ssl.data | ||
| test_suite_ssl.function | ||
| test_suite_timing.data | ||
| test_suite_timing.function | ||
| test_suite_version.data | ||
| test_suite_version.function | ||
| test_suite_x509parse.data | ||
| test_suite_x509parse.function | ||
| test_suite_x509write.data | ||
| test_suite_x509write.function | ||
| test_suite_xtea.data | ||
| test_suite_xtea.function | ||