mirror of
https://git.suyu.dev/suyu/mbedtls.git
synced 2025-12-24 00:06:32 +01:00
Conflict resolution:
* ChangeLog: put the new entry from my branch in the proper place.
* include/mbedtls/error.h: counted high-level module error codes again.
* include/mbedtls/ssl.h: picked different numeric codes for the
concurrently added errors; made the new error a full sentence per
current standards.
* library/error.c: ran scripts/generate_errors.pl.
* library/ssl_srv.c:
* ssl_prepare_server_key_exchange "DHE key exchanges": the conflict
was due to style corrections in development
(
|
||
|---|---|---|
| .. | ||
| all.sh | ||
| basic-build-test.sh | ||
| check-doxy-blocks.pl | ||
| check-generated-files.sh | ||
| check-names.sh | ||
| curves.pl | ||
| depends-hashes.pl | ||
| depends-pkalgs.pl | ||
| doxygen.sh | ||
| gen_ctr_drbg.pl | ||
| gen_gcm_decrypt.pl | ||
| gen_gcm_encrypt.pl | ||
| gen_pkcs1_v21_sign_verify.pl | ||
| generate-afl-tests.sh | ||
| generate_code.pl | ||
| key-exchanges.pl | ||
| list-enum-consts.pl | ||
| list-identifiers.sh | ||
| list-macros.sh | ||
| list-symbols.sh | ||
| recursion.pl | ||
| run-test-suites.pl | ||
| tcp_client.pl | ||
| test-ref-configs.pl | ||
| travis-log-failure.sh | ||
| yotta-build.sh | ||