commit 158fc33368c7e00a2ce368b4b241f406b716aabf
author Gilles Peskine <Gilles.Peskine@arm.com> Sun Mar 11 00:47:54 2018 +0100
committer Gilles Peskine <Gilles.Peskine@arm.com> Sun Mar 11 00:47:54 2018 +0100
tree d3ffc8e1b76cebf429b15afbf84dee89a5dec66a
parent c0826f1625471eed7b7687c7db23612720803485
parent 3f1b89d251bd654c77cd61ddf3aac64ebee9be21

Merge remote-tracking branch 'upstream-public/pr/1296' into HEAD

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 372d801..ae9f21a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
 = mbed TLS x.x.x branch released xxxx-xx-xx
 
+Bugfix
+   * Fix setting version TLSv1 as minimal version, even if TLS 1
+     is not enabled. Set MBEDTLS_SSL_MIN_MAJOR_VERSION
+     and MBEDTLS_SSL_MIN_MINOR_VERSION instead of
+     MBEDTLS_SSL_MAJOR_VERSION_3 and MBEDTLS_SSL_MINOR_VERSION_1. #664
+
 Changes
    * Clarify the documentation of mbedtls_ssl_setup.