commit 755548538ea2d90ba9c862206394d87a3d2f1ba4
author Janos Follath <janos.follath@arm.com> Wed Feb 05 15:12:46 2020 +0000
committer GitHub <noreply@github.com> Wed Feb 05 15:12:46 2020 +0000
tree 10edb628b1ac28a6c6208053dabe00bd2a7a368c
parent c64eb63aaae9932978513cb0da1032e0bc698dc8
parent 85de7a60186c23f4cc9fc10ff71a8bdcc17986bb

Merge pull request #3033 from yanesca/revert_pr_3008

Revert "Merge pull request #3008 from jp-bennett/development"

ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 51478d5..07880b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,8 +11,6 @@
      PKCS#11 token such as a smartcard.
 
 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.
    * Fix build failure with MBEDTLS_ZLIB_SUPPORT enabled. Reported by
      Jack Lloyd in #2859. Fix submitted by jiblime in #2963.

library/x509_crt.c

diff --git a/library/x509_crt.c b/library/x509_crt.c
index ca60011..38e69cc 100644
--- a/library/x509_crt.c
+++ b/library/x509_crt.c
@@ -1613,7 +1613,7 @@
             goto cleanup;
         }
 
-        if( !( S_ISREG( sb.st_mode ) || S_ISLNK( sb.st_mode ) ) )
+        if( !S_ISREG( sb.st_mode ) )
             continue;
 
         // Ignore parse errors