From 8339c8f5bd50e96ba0d7cc2e5541e15f5c0f0a0c Mon Sep 17 00:00:00 2001
From: Brendan Shanks <brendan@bslabs.net>
Date: Fri, 6 Apr 2018 16:47:43 -0700
Subject: [PATCH 1/2] x509.c: Remove unused includes

Remove unused includes guarded by MBEDTLS_FS_IO, which doesn't appear
anywhere else in the file.
---
 library/x509.c | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/library/x509.c b/library/x509.c
index 371d6da1d..264c7fb0c 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -70,15 +70,6 @@
 #include <time.h>
 #endif
 
-#if defined(MBEDTLS_FS_IO)
-#include <stdio.h>
-#if !defined(_WIN32)
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#endif
-#endif
-
 #define CHECK(code) if( ( ret = code ) != 0 ){ return( ret ); }
 #define CHECK_RANGE(min, max, val) if( val < min || val > max ){ return( ret ); }
 

From 05fa46e6b7638bb7e1d4c5e2810aa6aa50e42a92 Mon Sep 17 00:00:00 2001
From: Simon Butcher <simon.butcher@arm.com>
Date: Mon, 2 Jul 2018 12:00:54 +0100
Subject: [PATCH 2/2] Add ChangeLog entry for #992 fix

---
 ChangeLog | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 9ee82c685..4240c8538 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ mbed TLS ChangeLog (Sorted per branch, date)
 
 = mbed TLS x.x.x branch released xxxx-xx-xx
 
+Bugfix
+   * Remove unused headers included in x509.c. Found by Chris Hanson and fixed
+     by Brendan Shanks. Part of a fix for #992.
+
 Security
    * Fix a bug in the X.509 module potentially leading to a buffer overread
      during CRT verification or to invalid or omitted checks for certificate