mbedtls/library
Gilles Peskine 9afbfdc833 Merge remote-tracking branch 'myfork-public/development' into merge-crypto-development-20191115
First deal with deleted files.

* Files deleted by us: keep them deleted.
* Files deleted by them, whether modified by us or not: keep our version.

```
git rm $(git status -s | sed -n 's/^DU //p')
git reset -- $(git status -s | sed -n 's/^D  //p')
git checkout -- $(git status -s | sed -n 's/^ D //p')
git add -- $(git status -s | sed -n 's/^UD //p')
```

Individual files with conflicts:

* `3rdparty/everest/library/Hacl_Curve25519_joined.c`: spurious conflict because git mistakenly identified this file as a rename. Keep our version.
* `README.md`: conflict due to their change in a paragraph that doesn't exist in our version. Keep our version of this paragraph.
* `docs/architecture/Makefile`: near-identical additions. Adapt the definition of `all_markdown` and include the clean target.
* `doxygen/input/docs_mainpage.h`: conflict in the version number. Keep our version number.
* `include/mbedtls/config.h`: two delete/modify conflicts. Keep the removed chunks out.
* `library/CMakeLists.txt`: discard all their changes as they are not relevant.
* `library/Makefile`:
    * Discard the added chunk about the crypto submodule starting with `INCLUDING_FROM_MBEDTLS:=1`.
    * delete/modify: keep the removed chunk out.
    * library build: This is almost delete/modify. Their changes are mostly not applicable. Do keep the `libmbedcrypto.$(DLEXT): | libmbedcrypto.a` order dependency.
    * `.c.o`: `-o` was added on both sides but in a different place. Change to their place.
* `library/error.c`: to be regenerated.
* `library/version_features.c`: to be regenerated.
* `programs/Makefile`: Most of the changes are not relevant. The one relevant change is in the `clean` target for Windows; adapt it by removing `/S` from our version.
* `programs/test/query_config.c`: to be regenerated.
* `scripts/config.py`: added in parallel on both sides. Keep our version.
* `scripts/footprint.sh`: parallel changes. Keep our version.
* `scripts/generate_visualc_files.pl`: one delete/modify conflict. Keep the removed chunks out.
* `tests/Makefile`: discard all of their changes.
* `tests/scripts/all.sh`:
    * `pre_initialize_variables` add `append_outcome`: add it.
    * `pre_initialize_variables` add `ASAN_CFLAGS`: already there, keep our version.
    * `pre_parse_command_line` add `--no-append-outcome`: add it.
    * `pre_parse_command_line` add `--outcome-file`: add it.
    * `pre_print_configuration`: add `MBEDTLS_TEST_OUTCOME_FILE`.
    * Several changes in SSL-specific components: keep our version without them.
    * Several changes where `config.pl` was changed to `config.py` and there was an adjacent difference: keep our version.
    * Changes regarding the inclusion of `MBEDTLS_MEMORY_xxx`: ignore them here, they will be normalized in a subsequent commit.
    * `component_test_full_cmake_gcc_asan`: add it without the TLS tests.
    * `component_test_no_use_psa_crypto_full_cmake_asan`: keep the fixed `msg`, discard other changes.
    * `component_test_memory_buffer_allocator_backtrace`, `component_test_memory_buffer_allocator`: add them without the TLS tests.
    * `component_test_m32_everest`: added in parallel on both sides. Keep our version.
* `tests/scripts/check-names.sh`, `tests/scripts/list-enum-consts.pl`, `tests/scripts/list-identifiers.sh`, ``tests/scripts/list-macros.sh`: discard all of their changes.
* `tests/scripts/test-ref-configs.pl`: the change in the conflict is not relevant, so keep our version there.
* `visualc/VS2010/*.vcxproj`: to be regenerated.

Regenerate files:

```
scripts/generate_visualc_files.pl
git add visualc/VS2010/*.vcxproj
scripts/generate_errors.pl
git add library/error.c
scripts/generate_features.pl
git add library/version_features.c
scripts/generate_query_config.pl
git add programs/test/query_config.c
```

Rejected changes in non-conflicting files:

* `CMakeLists.txt`: discard their addition which has already been side-ported.
* `doxygen/mbedtls.doxyfile`: keep the version number change. Discard the changes related to `../crypto` paths.

Keep the following changes after examination:

* `.travis.yml`: all of their changes are relevant.
* `include/mbedtls/error.h`: do keep their changes. Even though Crypto doesn't use TLS errors, it must not encroach on TLS's allocated numbers.
* `tests/scripts/check-test-cases.py`: keep the code dealing with `ssl-opt.sh`. It works correctly when the file is not present.
2019-11-15 11:47:14 +01:00
..
.gitignore Split libs with make + general make cleanups 2015-06-25 10:59:56 +02:00
aes.c Remove crypto C files 2019-08-15 15:44:50 +01:00
aesni.c Remove crypto C files 2019-08-15 15:44:50 +01:00
arc4.c Remove crypto C files 2019-08-15 15:44:50 +01:00
aria.c Remove crypto C files 2019-08-15 15:44:50 +01:00
asn1parse.c mbedtls_asn1_get_int: fix int overflow 2019-10-10 19:29:27 +02:00
asn1write.c mbedtls_asn1_store_named_data: clarify val allocation behavior 2019-09-11 15:46:45 +02:00
base64.c Remove crypto C files 2019-08-15 15:44:50 +01:00
bignum.c Merge remote-tracking branch 'origin/pr/2623' into development 2019-09-05 14:43:46 +01:00
blowfish.c Remove crypto C files 2019-08-15 15:44:50 +01:00
camellia.c Remove crypto C files 2019-08-15 15:44:50 +01:00
ccm.c Remove crypto C files 2019-08-15 15:44:50 +01:00
chacha20.c Remove crypto C files 2019-08-15 15:44:50 +01:00
chachapoly.c Remove crypto C files 2019-08-15 15:44:50 +01:00
cipher.c Remove crypto C files 2019-08-15 15:44:50 +01:00
cipher_wrap.c Remove crypto C files 2019-08-15 15:44:50 +01:00
cmac.c Remove crypto C files 2019-08-15 15:44:50 +01:00
CMakeLists.txt Bump Mbed TLS version to 2.19.1 2019-09-18 13:42:36 +01:00
ctr_drbg.c CTR_DRBG: grab a nonce from the entropy source if needed 2019-10-23 19:46:57 +02:00
des.c des: Reduce number of self-test iterations 2019-09-04 10:11:45 +01:00
dhm.c Remove crypto C files 2019-08-15 15:44:50 +01:00
ecdh.c Fix code style 2019-08-19 13:37:46 +01:00
ecdsa.c Correct deterministic ECDSA behavior 2019-09-05 11:18:58 +01:00
ecjpake.c Remove crypto C files 2019-08-15 15:44:50 +01:00
ecp.c 3rdparty: Adjust use of Everest in ecp_supported_curves 2019-08-19 13:37:46 +01:00
ecp_curves.c Replace 0 by MBEDTLS_ECP_DP_NONE to avoid IAR compiler complains 2019-09-10 17:58:20 +03:00
entropy.c Prefer initializing ret to error values 2019-09-30 17:29:54 +02:00
entropy_poll.c Remove crypto C files 2019-08-15 15:44:50 +01:00
error.c Update error.c after a crypto submodule update 2019-10-04 19:23:00 +02:00
gcm.c Remove crypto C files 2019-08-15 15:44:50 +01:00
havege.c Remove crypto C files 2019-08-15 15:44:50 +01:00
hkdf.c Remove crypto C files 2019-08-15 15:44:50 +01:00
hmac_drbg.c Merge pull request #284 from gilles-peskine-arm/bk-warning-fixes-crypto 2019-11-12 19:45:13 +01:00
Makefile Merge remote-tracking branch 'myfork-public/development' into merge-crypto-development-20191115 2019-11-15 11:47:14 +01:00
md.c Remove crypto C files 2019-08-15 15:44:50 +01:00
md2.c Remove crypto C files 2019-08-15 15:44:50 +01:00
md4.c Remove crypto C files 2019-08-15 15:44:50 +01:00
md5.c Remove crypto C files 2019-08-15 15:44:50 +01:00
memory_buffer_alloc.c Remove crypto C files 2019-08-15 15:44:50 +01:00
nist_kw.c Remove crypto C files 2019-08-15 15:44:50 +01:00
oid.c Remove crypto C files 2019-08-15 15:44:50 +01:00
padlock.c Remove crypto C files 2019-08-15 15:44:50 +01:00
pem.c Remove crypto C files 2019-08-15 15:44:50 +01:00
pk.c Remove crypto C files 2019-08-15 15:44:50 +01:00
pk_wrap.c Fix output buffer length check in pk_opaque_sign_wrap 2019-11-13 10:57:59 +01:00
pkcs5.c Improve speed of PBKDF2 by caching the digest state of the passphrase 2019-09-23 19:15:54 -04:00
pkcs12.c Remove crypto C files 2019-08-15 15:44:50 +01:00
pkparse.c Remove crypto C files 2019-08-15 15:44:50 +01:00
pkwrite.c Fix pk_write with an EC key to write a constant-length private value 2019-11-05 15:32:53 +01:00
platform.c Remove crypto C files 2019-08-15 15:44:50 +01:00
platform_util.c Check for zero length and NULL buffer pointer. 2019-09-04 11:31:35 +01:00
poly1305.c Remove crypto C files 2019-08-15 15:44:50 +01:00
psa_crypto.c Merge pull request #298 from gilles-peskine-arm/config-symmetric-only 2019-11-12 19:37:13 +01:00
psa_crypto_core.h Rename internal macro to pass check-names.sh 2019-08-08 10:58:09 +02:00
psa_crypto_invasive.h Add a facility to configure entropy sources 2018-11-23 22:58:38 +01:00
psa_crypto_its.h Add psa_trusted_storage_linux persistent storage support for v1.0.0 APIs 2019-07-23 17:30:37 +01:00
psa_crypto_se.c SE driver: Fix loading of persistent data 2019-10-01 16:55:29 +02:00
psa_crypto_se.h SE driver: call the p_init method during psa_crypto_init() 2019-10-01 15:22:29 +02:00
psa_crypto_service_integration.h Add common header for crypto service integration 2019-02-19 15:09:14 +02:00
psa_crypto_slot_management.c Make psa_close_key(0) and psa_destroy_key(0) succeed 2019-10-08 15:57:27 +02:00
psa_crypto_slot_management.h Rename psa_internal_allocate_key_slot to psa_get_empty_key_slot 2019-08-08 10:58:09 +02:00
psa_crypto_storage.c Stop transactions from being reentrant 2019-10-28 15:25:10 +00:00
psa_crypto_storage.h Switch storage functions over to psa_core_key_attributes_t 2019-07-31 14:15:27 +02:00
psa_its_file.c Add an input check in psa_its_set 2019-09-05 09:34:34 -04:00
ripemd160.c Remove crypto C files 2019-08-15 15:44:50 +01:00
rsa.c Remove crypto C files 2019-08-15 15:44:50 +01:00
rsa_internal.c Remove crypto C files 2019-08-15 15:44:50 +01:00
sha1.c Remove crypto C files 2019-08-15 15:44:50 +01:00
sha256.c Remove crypto C files 2019-08-15 15:44:50 +01:00
sha512.c Remove crypto C files 2019-08-15 15:44:50 +01:00
threading.c Remove crypto C files 2019-08-15 15:44:50 +01:00
timing.c Remove crypto C files 2019-08-15 15:44:50 +01:00
version.c Fix missing void argument declarations #678 2016-11-04 23:05:56 +01:00
version_features.c Move MBEDTLS_CTR_DRBG_USE_128_BIT_KEY to the correct section 2019-10-04 11:16:24 +02:00
xtea.c Remove crypto C files 2019-08-15 15:44:50 +01:00