From 9e31693f679c22ae7113f150416efad0ad6fdbe4 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 3cfa1d1e97..aaf7f7e88e 100644
--- a/library/x509.c
+++ b/library/x509.c
@@ -65,15 +65,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 4b57a1f182274a14b71d81501eb13e07e39f44d8 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 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 24d20503a0..7ed394de45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,8 @@ Bugfix
      return value. Found by @davidwu2000. #839
    * Fix the key_app_writer example which was writing a leading zero byte which
      was creating an invalid ASN.1 tag. Found by Aryeh R. Fixes #1257
+   * Remove unused headers included in x509.c. Found by Chris Hanson and fixed
+     by Brendan Shanks. Part of a fix for #992.
 
 Changes
    * Change the shebang line in Perl scripts to look up perl in the PATH.