Fix merge errors in ChangeLog
diff --git a/ChangeLog b/ChangeLog
index eea6919..5559564 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,22 +2,6 @@
= mbed TLS x.x.x branch released xxxx-xx-xx
-Bugfix
- * Add a check if iv_len is zero, and return an error if it is zero. reported
- by roberto. #716
- * Replace preproccessor condition from #if defined(MBEDTLS_THREADING_PTHREAD)
- to #if defined(MBEDTLS_THREADING_C) as the library cannot assume they will
- always be implemented by pthread support. Fix for #696
- * Fix resource leak on windows platform, in mbedtls_x509_crt_parse_path.
- In case of failure, when an error occures, goto cleanup.
- Found by redplait #590
- * Add MBEDTLS_MPI_CHK to check for error value of mbedtls_mpi_fill_random.
- Reported and fix suggested by guidovranken in #740
- * Fix a potential integer overflow in the version verification for DER
- encoded X509 CRLs. The overflow would enable maliciously constructed CRLs
- to bypass the version verification check. Found by Peng Li/Yueh-Hsun Lin,
- KNOX Security, Samsung Research America
-
Features
* Add the functions mbedtls_platform_setup() and mbedtls_platform_teardown()
and the context struct mbedtls_platform_context to perform
@@ -46,10 +30,17 @@
Reported and fix suggested by guidovranken in #740
* Fix conditional preprocessor directives in bignum.h to enable 64-bit
compilation when using ARM Compiler 6.
+ * Fix a potential integer overflow in the version verification for DER
+ encoded X509 CRLs. The overflow would enable maliciously constructed CRLs
+ to bypass the version verification check. Found by Peng Li/Yueh-Hsun Lin,
+ KNOX Security, Samsung Research America
* Fix potential integer overflow in the version verification for DER
encoded X509 CSRs. The overflow would enable maliciously constructed CSRs
to bypass the version verification check. Found by Peng Li/Yueh-Hsun Lin,
KNOX Security, Samsung Research America
+ * Fix a potential integer overflow in the version verification for DER
+ encoded X509 certificates. The overflow would enable maliciously
+ constructed certificates to bypass the certificate verification check.
Security
* Fix authentication bypass in SSL/TLS: when auth_mode is set to optional,
@@ -232,9 +223,6 @@
digits. Found and fixed by Guido Vranken.
* Fix unlisted DES configuration dependency in some pkparse test cases. Found
by inestlerode. #555
- * Fix a potential integer overflow in the version verification for DER
- encoded X509 certificates. The overflow would enable maliciously
- constructed certificates to bypass the certificate verification check.
= mbed TLS 2.4.1 branch released 2016-12-13
