From cb6af00e2a10e43fc7eb5cb90249769edefb39a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Mon, 5 Oct 2015 12:12:39 +0100
Subject: [PATCH 1/3] Add missing warning in doc

Found by Nicholas Wilson

fixes #288
---
 include/mbedtls/config.h | 2 ++
 1 file changed, 2 insertions(+)

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

From 0431735299031100c2d80ffdb522487bff2ad811 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Mon, 5 Oct 2015 12:16:06 +0100
Subject: [PATCH 2/3] Fix compile error in net.c with musl libc

fixes #278
---
 ChangeLog     | 4 ++++
 library/net.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 68b1255b9..e3353d0d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ mbed TLS ChangeLog (Sorted per branch, date)
 
 = mbed TLS 2.1.2 released 2015-10-xx
 
+Bugfix
+   * Fix compile error in net.c with musl libc. Found and patch provided by
+     zhasha (#278).
+
 Changes
    * Fixed paths for check_config.h in example config files. (Found by bachp)
      (#291)
diff --git a/library/net.c b/library/net.c
index b5d06888b..a77268c55 100644
--- a/library/net.c
+++ b/library/net.c
@@ -292,7 +292,7 @@ int mbedtls_net_accept( mbedtls_net_context *bind_ctx,
     struct sockaddr_storage client_addr;
 
 #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 type_len = (socklen_t) sizeof( type );
 #else

From 2347bdd7b5e15780c06c1ac2085c2627e09f3e03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= <mpg2@elzevir.fr>
Date: Mon, 5 Oct 2015 14:06:48 +0100
Subject: [PATCH 3/3] Upgrade yotta dependency versions

---
 yotta/data/module.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yotta/data/module.json b/yotta/data/module.json
index 9a9e8a164..843667544 100644
--- a/yotta/data/module.json
+++ b/yotta/data/module.json
@@ -10,9 +10,9 @@
     ],
     "dependencies": {},
     "targetDependencies": {
-        "mbed": { "cmsis-core": "~0.2.3" }
+        "mbed": { "cmsis-core": "~0.3.0" }
     },
     "testTargetDependencies": {
-        "mbed": { "sockets": "~0.4.0" }
+        "mbed": { "sockets": "~0.5.0" }
     }
 }