commit 9aa72188ddf718a790bf4e914d3420b3900d9791
author Simon Butcher <simon.butcher@arm.com> Wed Sep 16 16:19:45 2015 +0100
committer Simon Butcher <simon.butcher@arm.com> Wed Sep 16 16:19:45 2015 +0100
tree 2e808ec69b21f0db8612ec5e319cf06f80e0ba63
parent a1a1128f7d916d3574c92e03a54cdb8f8103f2ef
parent f7022d1131243a4aa745261a436eebab81c0757d

Merge branch 'bugfix' into development

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 37c79f6..be38614 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,9 @@
 
 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
      use of mbedtls_x509_crt_profile_next. (found by NWilson)

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 ||