yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'development' into development-restricted

Browse source 
* development:
  Upgrade yotta dependency versions
  Fix compile error in net.c with musl libc
  Add missing warning in doc
This commit is contained in:
Manuel Pégourié-Gonnard 2015-10-05 14:47:43 +01:00
commit 899ac849d0
4 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -33,6 +33,10 @@ Security
unless you allow third parties to pick trust CAs for client auth. unless you allow third parties to pick trust CAs for client auth.
Found by Guido Vranken, Intelworks. Found by Guido Vranken, Intelworks.
Bugfix
* Fix compile error in net.c with musl libc. Found and patch provided by
zhasha (#278).
Changes Changes
* Added checking of hostname length in mbedtls_ssl_set_hostname() to ensure * Added checking of hostname length in mbedtls_ssl_set_hostname() to ensure
domain names are compliant with RFC 1035. domain names are compliant with RFC 1035.

2
include/mbedtls/config.h
View file

@ -1246,6 +1246,8 @@
* If set, the X509 parser will not break-off when parsing an X509 certificate * If set, the X509 parser will not break-off when parsing an X509 certificate
* and encountering an unknown critical extension. * and encountering an unknown critical extension.
* *
* \warning Depending on your PKI use, enabling this can be a security risk!
*
* Uncomment to prevent an error. * Uncomment to prevent an error.
*/ */
//#define MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION //#define MBEDTLS_X509_ALLOW_UNSUPPORTED_CRITICAL_EXTENSION

2
library/net.c
View file

@ -292,7 +292,7 @@ int mbedtls_net_accept( mbedtls_net_context *bind_ctx,
struct sockaddr_storage client_addr; struct sockaddr_storage client_addr;
#if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \ #if defined(__socklen_t_defined) || defined(_SOCKLEN_T) || \
defined(_SOCKLEN_T_DECLARED) defined(_SOCKLEN_T_DECLARED) || defined(__DEFINED_socklen_t)
socklen_t n = (socklen_t) sizeof( client_addr ); socklen_t n = (socklen_t) sizeof( client_addr );
socklen_t type_len = (socklen_t) sizeof( type ); socklen_t type_len = (socklen_t) sizeof( type );
#else #else

4
yotta/data/module.json
View file

@ -10,9 +10,9 @@
], ],
"dependencies": {}, "dependencies": {},
"targetDependencies": { "targetDependencies": {
"mbed": { "cmsis-core": "~0.2.3" } "mbed": { "cmsis-core": "~0.3.0" }
}, },
"testTargetDependencies": { "testTargetDependencies": {
"mbed": { "sockets": "~0.4.0" } "mbed": { "sockets": "~0.5.0" }
} }
} }