From cabf0eed66e5fb73b5fae0d036f39660a9c7dfc3 Mon Sep 17 00:00:00 2001
From: Janos Follath <janos.follath@arm.com>
Date: Tue, 4 Feb 2020 14:42:15 +0000
Subject: [PATCH] Revert "Merge pull request #3012 from
 Patater/dev/jp-bennett/development-2.16"

This reverts commit 7550e857bf85bc169271b9edefb1e8ee04bc3042, reversing
changes made to d0c25753241b0ea2b120bfa506d558f76c8c1430.

stat() will never return S_IFLNK as the file type, as stat()
explicitly follows symlinks.

Fixes #3005.
---
 ChangeLog          | 2 --
 library/x509_crt.c | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a8f9a79b2..f6d31246d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,8 +16,6 @@ Security
      ARMmbed/mbed-crypto#352
 
 Bugfix
-   * Allow loading symlinked certificates. Fixes #3005. Reported and fixed
-     by Jonathan Bennett <JBennett@incomsystems.biz> via #3008.
    * Fix an unchecked call to mbedtls_md() in the x509write module.
 
 = mbed TLS 2.16.4 branch released 2020-01-15
diff --git a/library/x509_crt.c b/library/x509_crt.c
index a4202be37..9c2e36547 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1366,7 +1366,7 @@ cleanup:
             goto cleanup;
         }
 
-        if( !( S_ISREG( sb.st_mode ) || S_ISLNK( sb.st_mode ) ) )
+        if( !S_ISREG( sb.st_mode ) )
             continue;
 
         // Ignore parse errors