| commit | 0c692cda8bdef1118ebd01e2a557d534d6bf8864 | [log] [tgz] |
|---|---|---|
| author | Jaeden Amero <jaeden.amero@arm.com> | Thu Mar 29 11:02:52 2018 +0100 |
| committer | Jaeden Amero <jaeden.amero@arm.com> | Thu Mar 29 11:02:52 2018 +0100 |
| tree | d1ae6cc4aa0b821bf1b1a79ef1fef312467e3441 | |
| parent | 38e37bdd56f81f379f0400cb6728f6e42f9d092b [diff] [blame] | |
| parent | 065ecf587f3bf1fc59df46e4e1c1adb01074c1b8 [diff] [blame] |
Merge remote-tracking branch 'upstream-public/pr/758' into mbedtls-2.7-proposed
diff --git a/ChangeLog b/ChangeLog index 9eda6c6..9a63525 100644 --- a/ChangeLog +++ b/ChangeLog
@@ -39,6 +39,8 @@ * Provide an empty implementation of mbedtls_pkcs5_pbes2() when MBEDTLS_ASN1_PARSE_C is not enabled. This allows the use of PBKDF2 without PBES2. Fixed by Marcos Del Sol Vives. + * Improve the documentation of mbedtls_net_accept(). Contributed by Ivan + Krylov. = mbed TLS 2.7.2 branch released 2018-03-16