[mbedtls] apply patch to check-in source (#2074)

This commit applies the patch directly to checked-in source files rather
than at build time.  This commit helps to simplify the build process.

This commit also introduces a shell script that allows anyone to reproduce
the patched mbedtls source.

configure.ac

@@ -582,8 +582,8 @@ AC_ARG_ENABLE(builtin-mbedtls,
 
 if test "$enable_builtin_mbedtls" = "yes" -a ! "${MBEDTLS_CPPFLAGS}"; then
     MBEDTLS_CPPFLAGS="-I\${abs_top_srcdir}/third_party/mbedtls"
-    MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -I\${abs_top_srcdir}/third_party/mbedtls/repo/include"
-    MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -I\${abs_top_srcdir}/third_party/mbedtls/repo/include/mbedtls"
+    MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -I\${abs_top_srcdir}/third_party/mbedtls/repo.patched/include"
+    MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -I\${abs_top_srcdir}/third_party/mbedtls/repo.patched/include/mbedtls"
     MBEDTLS_CPPFLAGS="${MBEDTLS_CPPFLAGS} -DMBEDTLS_CONFIG_FILE=\\\"mbedtls-config.h\\\""
 fi
 AC_MSG_CHECKING([whether mbed TLS should be enabled])

etc/visual-studio/UnitTests.vcxproj

@@ -43,7 +43,7 @@
         ..\..\src;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
+        ..\..\third_party\mbedtls\repo.patched\include;
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>
         %(PreprocessorDefinitions)

etc/visual-studio/libopenthread-cli.vcxproj

@@ -49,7 +49,7 @@
         ..\..\src;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
+        ..\..\third_party\mbedtls\repo.patched\include;
       </AdditionalIncludeDirectories>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>

etc/visual-studio/libopenthread-ncp-spi.vcxproj

@@ -51,7 +51,7 @@
         ..\..\src;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
+        ..\..\third_party\mbedtls\repo.patched\include;
       </AdditionalIncludeDirectories>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>

etc/visual-studio/libopenthread-ncp-uart.vcxproj

@@ -51,7 +51,7 @@
         ..\..\src;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
+        ..\..\third_party\mbedtls\repo.patched\include;
       </AdditionalIncludeDirectories>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>

etc/visual-studio/libopenthread.vcxproj

@@ -48,7 +48,7 @@
         ..\..\include;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
+        ..\..\third_party\mbedtls\repo.patched\include;
       </AdditionalIncludeDirectories>
       <WarningLevel>Level3</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>

etc/visual-studio/libopenthread_k.vcxproj

@@ -53,7 +53,7 @@
         ..\..\examples\drivers\windows\include;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
+        ..\..\third_party\mbedtls\repo.patched\include;
         ..\..\examples\drivers\windows\include_c99;
       </AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4100;4706;4748;%(DisableSpecificWarnings)</DisableSpecificWarnings>

etc/visual-studio/mbedtls.vcxproj

@@ -45,8 +45,8 @@
         ..\..\include;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
-        ..\..\third_party\mbedtls\repo\include\mbedtls
+        ..\..\third_party\mbedtls\repo.patched\include;
+        ..\..\third_party\mbedtls\repo.patched\include\mbedtls
       </AdditionalIncludeDirectories>
       <WarningLevel>Level3</WarningLevel>
       <TreatWarningAsError>true</TreatWarningAsError>
@@ -55,30 +55,30 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\third_party\mbedtls\hardware_entropy.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\aes.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\bignum.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ccm.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher_wrap.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cmac.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ctr_drbg.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\debug.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecjpake.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp_curves.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy_poll.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md_wrap.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\memory_buffer_alloc.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\platform.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\sha256.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ciphersuites.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cli.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cookie.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_srv.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ticket.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_tls.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\aes.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\bignum.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ccm.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher_wrap.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cmac.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ctr_drbg.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\debug.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecjpake.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp_curves.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy_poll.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md_wrap.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\memory_buffer_alloc.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\platform.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\sha256.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ciphersuites.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cli.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cookie.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_srv.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ticket.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_tls.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

etc/visual-studio/mbedtls.vcxproj.filters

@@ -5,10 +5,10 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Source Files\repo">
+    <Filter Include="Source Files\repo.patched">
       <UniqueIdentifier>{0a2ce77e-dccf-408c-aea0-7a781284a936}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\repo\library">
+    <Filter Include="Source Files\repo.patched\library">
       <UniqueIdentifier>{859819dc-e84e-4854-ad32-2819d60da38b}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -16,77 +16,77 @@
     <ClCompile Include="..\..\third_party\mbedtls\hardware_entropy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\aes.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\aes.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\bignum.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\bignum.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ccm.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ccm.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher_wrap.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher_wrap.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cmac.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cmac.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ctr_drbg.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ctr_drbg.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\debug.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\debug.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecjpake.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecjpake.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp_curves.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp_curves.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy_poll.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy_poll.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md_wrap.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md_wrap.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\memory_buffer_alloc.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\memory_buffer_alloc.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\platform.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\platform.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\sha256.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\sha256.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ciphersuites.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ciphersuites.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cli.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cli.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cookie.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cookie.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_srv.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_srv.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ticket.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ticket.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_tls.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_tls.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>

etc/visual-studio/mbedtls_k.vcxproj

@@ -40,8 +40,8 @@
         ..\..\include;
         ..\..\src\core;
         ..\..\third_party\mbedtls;
-        ..\..\third_party\mbedtls\repo\include;
-        ..\..\third_party\mbedtls\repo\include\mbedtls;
+        ..\..\third_party\mbedtls\repo.patched\include;
+        ..\..\third_party\mbedtls\repo.patched\include\mbedtls;
         ..\..\examples\drivers\windows\include_c99;
       </AdditionalIncludeDirectories>
       <PreprocessorDefinitions>
@@ -58,30 +58,30 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\third_party\mbedtls\hardware_entropy.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\aes.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\bignum.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ccm.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher_wrap.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cmac.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ctr_drbg.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\debug.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecjpake.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp_curves.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy_poll.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md_wrap.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\memory_buffer_alloc.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\platform.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\sha256.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ciphersuites.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cli.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cookie.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_srv.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ticket.c" />
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_tls.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\aes.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\bignum.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ccm.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher_wrap.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cmac.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ctr_drbg.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\debug.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecjpake.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp_curves.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy_poll.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md_wrap.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\memory_buffer_alloc.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\platform.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\sha256.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ciphersuites.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cli.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cookie.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_srv.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ticket.c" />
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_tls.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />

etc/visual-studio/mbedtls_k.vcxproj.filters

@@ -5,10 +5,10 @@
       <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
       <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
     </Filter>
-    <Filter Include="Source Files\repo">
+    <Filter Include="Source Files\repo.patched">
       <UniqueIdentifier>{0a2ce77e-dccf-408c-aea0-7a781284a936}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\repo\library">
+    <Filter Include="Source Files\repo.patched\library">
       <UniqueIdentifier>{87ec68b3-5bec-4c60-b764-c2daf3ffcfb2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -16,77 +16,77 @@
     <ClCompile Include="..\..\third_party\mbedtls\hardware_entropy.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\aes.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\aes.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\bignum.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\bignum.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ccm.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ccm.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cipher_wrap.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cipher_wrap.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\cmac.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\cmac.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ctr_drbg.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ctr_drbg.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\debug.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\debug.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecjpake.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecjpake.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ecp_curves.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ecp_curves.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\entropy_poll.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\entropy_poll.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\md_wrap.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\md_wrap.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\memory_buffer_alloc.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\memory_buffer_alloc.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\platform.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\platform.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\sha256.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\sha256.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ciphersuites.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ciphersuites.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cli.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cli.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_cookie.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_cookie.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_srv.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_srv.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_ticket.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_ticket.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\third_party\mbedtls\repo\library\ssl_tls.c">
-      <Filter>Source Files\repo\library</Filter>
+    <ClCompile Include="..\..\third_party\mbedtls\repo.patched\library\ssl_tls.c">
+      <Filter>Source Files\repo.patched\library</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>

examples/Makefile-cc2650

@@ -56,7 +56,7 @@ CC2650_MBEDTLS_CPPFLAGS  = -DMBEDTLS_CONFIG_FILE='\"cc2650-mbedtls-config.h\"'
 CC2650_MBEDTLS_CPPFLAGS += -I$(PWD)/examples/platforms/cc2650/crypto
 CC2650_MBEDTLS_CPPFLAGS += -I$(PWD)/third_party/ti/devices/cc26x0
 CC2650_MBEDTLS_CPPFLAGS += -I$(PWD)/third_party/mbedtls
-CC2650_MBEDTLS_CPPFLAGS += -I$(PWD)/third_party/mbedtls/repo/include
+CC2650_MBEDTLS_CPPFLAGS += -I$(PWD)/third_party/mbedtls/repo.patched/include
 
 CC2650_CONFIG_FILE_CPPFLAGS  = -DOPENTHREAD_PROJECT_CORE_CONFIG_FILE='\"openthread-core-cc2650-config.h\"'
 CC2650_CONFIG_FILE_CPPFLAGS += -I$(PWD)/examples/platforms/cc2650/

examples/Makefile-cc2652

@@ -58,7 +58,7 @@ CC2652_MBEDTLS_CPPFLAGS                                    = \
     -I$(PWD)/examples/platforms/cc2652/crypto                \
     -I$(PWD)/third_party/ti/devices/cc26x2                   \
     -I$(PWD)/third_party/mbedtls                             \
-    -I$(PWD)/third_party/mbedtls/repo/include                \
+    -I$(PWD)/third_party/mbedtls/repo.patched/include        \
     $(NULL)
 
 CC2652_CONFIG_FILE_CPPFLAGS                                =                    \

examples/Makefile-efr32

@@ -66,8 +66,8 @@ EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suit
 EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v1.1/platform/Device/SiliconLabs/EFR32MG12P/Include
 EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/silabs/gecko_sdk_suite/v1.1/platform/emlib/inc
 EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls
-EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo/include
-EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo/include/mbedtls
+EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo.patched/include
+EFR32_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo.patched/include/mbedtls
 
 CONFIG_FILE      = OPENTHREAD_PROJECT_CORE_CONFIG_FILE='\"openthread-core-efr32-config.h\"'
 CONFIG_FILE_PATH = $(AbsTopSourceDir)/examples/platforms/efr32/

examples/Makefile-nrf52840

@@ -64,8 +64,8 @@ NRF52840_MBEDTLS_CPPFLAGS  = -DMBEDTLS_CONFIG_FILE='\"mbedtls-config.h\"'
 NRF52840_MBEDTLS_CPPFLAGS += -DMBEDTLS_USER_CONFIG_FILE='\"nrf52840-mbedtls-config.h\"'
 NRF52840_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/examples/platforms/nrf52840/crypto
 NRF52840_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls
-NRF52840_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo/include
-NRF52840_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo/include/mbedtls
+NRF52840_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo.patched/include
+NRF52840_MBEDTLS_CPPFLAGS += -I$(AbsTopSourceDir)/third_party/mbedtls/repo.patched/include/mbedtls
 
 CONFIG_FILE      = OPENTHREAD_PROJECT_CORE_CONFIG_FILE='\"openthread-core-nrf52840-config.h\"'
 CONFIG_FILE_PATH = $(AbsTopSourceDir)/examples/platforms/nrf52840/

src/core/Makefile.am

@@ -35,8 +35,6 @@ lib_LIBRARIES                       = \
 
 CPPFLAGS_COMMON                     = \
     -I$(top_srcdir)/include           \
-    -I${abs_top_srcdir}/third_party/mbedtls/repo/include \
-    $(MBEDTLS_CPPFLAGS)               \
     $(OPENTHREAD_TARGET_DEFINES)      \
     $(NULL)
 

tests/unit/Makefile.am

@@ -74,10 +74,6 @@ COMMON_LDADD                                                        = \
 endif # OPENTHREAD_ENABLE_NCP
 
 if OPENTHREAD_ENABLE_BUILTIN_MBEDTLS
-AM_CPPFLAGS                                                        += \
-    -I$(top_srcdir)/third_party/mbedtls/repo/include                  \
-    $(NULL)
-
 COMMON_LDADD                                                       += \
     $(top_builddir)/third_party/mbedtls/libmbedcrypto.a               \
     $(NULL)

third_party/mbedtls/Makefile.am

@@ -18,7 +18,7 @@ include $(abs_top_nlbuild_autotools_dir)/automake/pre.am
 
 EXTRA_DIST                                    = \
     mbedtls-config.h                            \
-    repo/include                                \
+    repo.patched/include                        \
     $(NULL)
 
 lib_LIBRARIES                                 = libmbedcrypto.a
@@ -31,7 +31,7 @@ override CXXFLAGS                            := $(filter-out -Wconversion,$(CXXF
 override CFLAGS                              := $(filter-out -pedantic-errors,$(CFLAGS))
 override CXXFLAGS                            := $(filter-out -pedantic-errors,$(CXXFLAGS))
 
-MBEDTLS_SRCDIR                                = $(top_srcdir)/third_party/mbedtls/repo
+MBEDTLS_SRCDIR                                = $(top_srcdir)/third_party/mbedtls/repo.patched
 
 libmbedcrypto_a_CPPFLAGS                      = \
     -I$(top_srcdir)/include                     \
@@ -42,11 +42,11 @@ libmbedcrypto_a_CPPFLAGS                      = \
 
 libmbedcrypto_a_SOURCES                       = \
     hardware_entropy.c                          \
-    repo/library/md.c                           \
-    repo/library/md_wrap.c                      \
-    repo/library/memory_buffer_alloc.c          \
-    repo/library/platform.c                     \
-    repo/library/sha256.c                       \
+    repo.patched/library/md.c                   \
+    repo.patched/library/md_wrap.c              \
+    repo.patched/library/memory_buffer_alloc.c  \
+    repo.patched/library/platform.c             \
+    repo.patched/library/sha256.c               \
     $(NULL)
 
 if OPENTHREAD_EXAMPLES_EFR32
@@ -55,29 +55,29 @@ nodist_libmbedcrypto_a_SOURCES                = \
     $(NULL)
 else
 libmbedcrypto_a_SOURCES                      += \
-    repo/library/aes.c                          \
+    repo.patched/library/aes.c                  \
     $(NULL)
 endif  # OPENTHREAD_EXAMPLES_EFR32
 
 if OPENTHREAD_ENABLE_DTLS
 libmbedcrypto_a_SOURCES                      += \
-    repo/library/bignum.c                       \
-    repo/library/ccm.c                          \
-    repo/library/cipher.c                       \
-    repo/library/cipher_wrap.c                  \
-    repo/library/cmac.c                         \
-    repo/library/ctr_drbg.c                     \
-    repo/library/debug.c                        \
-    repo/library/ecjpake.c                      \
-    repo/library/ecp_curves.c                   \
-    repo/library/entropy.c                      \
-    repo/library/entropy_poll.c                 \
-    repo/library/ssl_cookie.c                   \
-    repo/library/ssl_ciphersuites.c             \
-    repo/library/ssl_cli.c                      \
-    repo/library/ssl_srv.c                      \
-    repo/library/ssl_ticket.c                   \
-    repo/library/ssl_tls.c                      \
+    repo.patched/library/bignum.c               \
+    repo.patched/library/ccm.c                  \
+    repo.patched/library/cipher.c               \
+    repo.patched/library/cipher_wrap.c          \
+    repo.patched/library/cmac.c                 \
+    repo.patched/library/ctr_drbg.c             \
+    repo.patched/library/debug.c                \
+    repo.patched/library/ecjpake.c              \
+    repo.patched/library/ecp_curves.c           \
+    repo.patched/library/entropy.c              \
+    repo.patched/library/entropy_poll.c         \
+    repo.patched/library/ssl_cookie.c           \
+    repo.patched/library/ssl_ciphersuites.c     \
+    repo.patched/library/ssl_cli.c              \
+    repo.patched/library/ssl_srv.c              \
+    repo.patched/library/ssl_ticket.c           \
+    repo.patched/library/ssl_tls.c              \
     $(NULL)
 
 if OPENTHREAD_EXAMPLES_EFR32
@@ -87,47 +87,10 @@ nodist_libmbedcrypto_a_SOURCES               += \
     $(NULL)
 else
 libmbedcrypto_a_SOURCES                      += \
-    repo/library/ecp.c                          \
+    repo.patched/library/ecp.c                  \
     $(NULL)
 endif  # OPENTHREAD_EXAMPLES_EFR32
 
-#
-# mbedtls patches
-#
-
-MBEDTLS_ABS_SRCDIR                           := $(abspath $(top_srcdir)/third_party/mbedtls)
-
-EXTRA_DIST                                                         += \
-    patch/0001-Fix-commissioning-problem-with-retransmissions.patch   \
-    patch/0002-Fix-warning-dead-store.patch                           \
-    $(NULL)
-
-repo/library/libmbedcrypto_a-ssl_tls.$(OBJEXT): $(MBEDTLS_SRCDIR)/library/ssl_tls.c.patched
-
-$(MBEDTLS_SRCDIR)/library/ssl_tls.c.patched: $(MBEDTLS_ABS_SRCDIR)/patch/0001-Fix-commissioning-problem-with-retransmissions.patch
-	chmod u+w $(MBEDTLS_ABS_SRCDIR)/repo/library/
-	chmod u+w $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_tls.c
-	if [ -e $@ ]; then patch -R $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_tls.c $@; fi
-	patch $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_tls.c $<
-	cp $(MBEDTLS_ABS_SRCDIR)/patch/0001-Fix-commissioning-problem-with-retransmissions.patch $@
-
-repo/library/libmbedcrypto_a-ssl_srv.$(OBJEXT): $(MBEDTLS_SRCDIR)/library/ssl_srv.c.patched
-
-$(MBEDTLS_SRCDIR)/library/ssl_srv.c.patched: $(MBEDTLS_ABS_SRCDIR)/patch/0002-Fix-warning-dead-store.patch
-	chmod u+w $(MBEDTLS_ABS_SRCDIR)/repo/library/
-	chmod u+w $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_srv.c
-	if [ -e $@ ]; then patch -R $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_srv.c $@; fi
-	patch $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_srv.c $<
-	cp $(MBEDTLS_ABS_SRCDIR)/patch/0002-Fix-warning-dead-store.patch $@
-
-all-local: libmbedcrypto.a
-	if [ -e $(MBEDTLS_SRCDIR)/library/ssl_tls.c.patched ]; then patch -R $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_tls.c $(MBEDTLS_ABS_SRCDIR)/patch/0001-Fix-commissioning-problem-with-retransmissions.patch; rm -f $(MBEDTLS_SRCDIR)/library/ssl_tls.c.patched; fi
-	if [ -e $(MBEDTLS_SRCDIR)/library/ssl_srv.c.patched ]; then patch -R $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_srv.c $(MBEDTLS_ABS_SRCDIR)/patch/0002-Fix-warning-dead-store.patch; rm -f $(MBEDTLS_SRCDIR)/library/ssl_srv.c.patched; fi
-
-clean-local:
-	if [ -e $(MBEDTLS_SRCDIR)/library/ssl_tls.c.patched ]; then patch -R $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_tls.c $(MBEDTLS_ABS_SRCDIR)/patch/0001-Fix-commissioning-problem-with-retransmissions.patch; rm -f $(MBEDTLS_SRCDIR)/library/ssl_tls.c.patched; fi
-	if [ -e $(MBEDTLS_SRCDIR)/library/ssl_srv.c.patched ]; then patch -R $(MBEDTLS_ABS_SRCDIR)/repo/library/ssl_srv.c $(MBEDTLS_ABS_SRCDIR)/patch/0002-Fix-warning-dead-store.patch; rm -f $(MBEDTLS_SRCDIR)/library/ssl_srv.c.patched; fi
-
 endif  # OPENTHREAD_ENABLE_DTLS
 
 if OPENTHREAD_BUILD_COVERAGE

third_party/mbedtls/README.md

@@ -22,3 +22,10 @@ mbed TLS (formerly known as PolarSSL) makes it trivially easy for
 developers to include cryptographic and SSL/TLS capabilities in their
 (embedded) products, facilitating this functionality with a minimal
 coding footprint.
+
+## Modifications
+
+The patches in `third_party/mbedtls/patch` were applied to the
+original mbed TLS source.  The patched source in
+`third_party/mbedtls/repo.patched` was generated by executing
+`third_party/mbedtls/patch.sh`.

third_party/mbedtls/patch.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+REPO_DIR=repo.patched
+
+rm -r ${REPO_DIR}
+mkdir ${REPO_DIR}
+
+curl -L http://github.com/ARMmbed/mbedtls/archive/mbedtls-2.4.1.tar.gz | tar zx - -C ${REPO_DIR} --strip-components=1
+
+patch ${REPO_DIR}/library/ssl_tls.c patch/0001-Fix-commissioning-problem-with-retransmissions.patch
+patch ${REPO_DIR}/library/ssl_srv.c patch/0002-Fix-warning-dead-store.patch 

third_party/mbedtls/patch/0001-Fix-commissioning-problem-with-retransmissions.patch

@@ -1,7 +1,7 @@
-diff --git a/third_party/mbedtls/repo/library/ssl_tls.c b/third_party/mbedtls/repo/library/ssl_tls.c
+diff --git a/third_party/mbedtls/repo.patched/library/ssl_tls.c b/third_party/mbedtls/repo.patched/library/ssl_tls.c
 index 84a04ae..2153c80 100644
---- a/third_party/mbedtls/repo/library/ssl_tls.c
-+++ b/third_party/mbedtls/repo/library/ssl_tls.c
+--- a/third_party/mbedtls/repo.patched/library/ssl_tls.c
++++ b/third_party/mbedtls/repo.patched/library/ssl_tls.c
 @@ -3608,6 +3608,24 @@ static int ssl_parse_record_header( mbedtls_ssl_context *ssl )
                                          "expected %d, received %d",
                                          ssl->in_epoch, rec_epoch ) );

third_party/mbedtls/patch/0002-Fix-warning-dead-store.patch

@@ -1,7 +1,7 @@
-diff --git a/third_party/mbedtls/repo/library/ssl_srv.c b/third_party/mbedtls/repo/library/ssl_srv.c
+diff --git a/third_party/mbedtls/repo.patched/library/ssl_srv.c b/third_party/mbedtls/repo.patched/library/ssl_srv.c
 index fc0d2d7b..fad54dd8 100644
---- a/third_party/mbedtls/repo/library/ssl_srv.c
-+++ b/third_party/mbedtls/repo/library/ssl_srv.c
+--- a/third_party/mbedtls/repo.patched/library/ssl_srv.c
++++ b/third_party/mbedtls/repo.patched/library/ssl_srv.c
 @@ -3017,6 +3017,9 @@ curve_matching_done:
            MBEDTLS_KEY_EXCHANGE_ECDHE_RSA_ENABLED ||
            MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED */