Merge branch 'bugfix' into development

This commit is contained in:
Simon Butcher 2015-09-16 16:19:45 +01:00
commit 9aa72188dd
2 changed files with 4 additions and 2 deletions

View file

@ -4,6 +4,8 @@ mbed TLS ChangeLog (Sorted per branch, date)
Bugfix Bugfix
* Fix warning when using a 64bit platform. (found by embedthis) (#275) * 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 Changes
* Made X509 profile pointer const in mbedtls_ssl_conf_cert_profile() to allow * Made X509 profile pointer const in mbedtls_ssl_conf_cert_profile() to allow

View file

@ -299,7 +299,7 @@ static int ssl_parse_supported_point_formats( mbedtls_ssl_context *ssl,
return( MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO ); return( MBEDTLS_ERR_SSL_BAD_HS_CLIENT_HELLO );
} }
p = buf + 2; p = buf + 1;
while( list_size > 0 ) while( list_size > 0 )
{ {
if( p[0] == MBEDTLS_ECP_PF_UNCOMPRESSED || if( p[0] == MBEDTLS_ECP_PF_UNCOMPRESSED ||