commit 7dd82f8fd5eac3f7e9e7bfa12c40d645aafd5247
author Simon Butcher <simon.butcher@arm.com> Wed Sep 16 16:21:38 2015 +0100
committer Simon Butcher <simon.butcher@arm.com> Wed Sep 16 16:21:38 2015 +0100
tree 5cf64c97178c4cad0fcafd5f50820bd4539d8b3b
parent 9aa72188ddf718a790bf4e914d3420b3900d9791
parent ea4b76d54a074e89d24c59da6248747507142127

Merge branch 'development' with bugfix branch

Conflicts:
	ChangeLog

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index aa5890e..915c718 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
 
 Bugfix
    * Fix warning when using a 64bit platform. (found by embedthis) (#275)
+   * Fix off-by-one error in parsing Supported Point Format extension that
+     caused some handshakes to fail.
 
 Changes
    * Made X509 profile pointer const in mbedtls_ssl_conf_cert_profile() to allow

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index ca1e7b8..b48a609 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -299,7 +299,7 @@
         return( MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO );
     }
 
-    p = buf + 2;
+    p = buf + 1;
     while( list_size > 0 )
     {
         if( p[0] == MBEDTLS_ECP_PF_UNCOMPRESSED ||