Merge branch 'mbedtls-1.3'
diff --git a/ChangeLog b/ChangeLog
index 5099081..b46c728 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,7 +17,8 @@
when verifying the validity of a key on secp224k1. This could be
triggered remotely for example with a maliciously constructed certificate
and potentially could lead to remote code execution on some platforms.
- Reported independently by rongsaws and Regina Wilson. #569 CVE-2017-2784
+ Reported independently by rongsaws and Aleksandar Nikolic, Cisco Talos
+ team. #569 CVE-2017-2784
Bugfix
* Fix output certificate verification flags set by x509_crt_verify_top() when
@@ -49,6 +50,8 @@
* Fix 1 byte buffer overflow in mpi_write_string() when the MPI number to
write in hexadecimal is negative and requires an odd number of digits.
Found and fixed by Guido Vranken.
+ * Fix unlisted DES configuration dependency in some pkparse test cases. Found
+ by inestlerode. #555
= mbed TLS 1.3.18 branch 2016-10-17