commit 721f06d49d5935c587597857052c14b9db96163f
author Paul Bakker <p.j.bakker@polarssl.org> Wed Jun 19 12:07:42 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Wed Jun 19 12:07:42 2013 +0200
tree 92e8cb48321d86109018d1a8974e6c33c96de0c3
parent 03a85bca4c1e2ce4e74e0c9ecd6a5bb64e5cc29f

x509parse_crt() now better handles PEM error situations

Because of new pem_read_buffer() handling of when it writes use_len,
x509parse_crt() is able to better handle situations where a PEM blob
results in an error but the other blobs can still be parsed.
(cherry picked from commit 6417186365f4a73a719fff754fefe8edcef2bc28)

Conflicts:
	ChangeLog

library/x509parse.c

diff --git a/library/x509parse.c b/library/x509parse.c
index 7fd1672..42ddd70 100644
--- a/library/x509parse.c
+++ b/library/x509parse.c
@@ -1349,10 +1349,20 @@
                 buflen -= use_len;
                 buf += use_len;
             }
+            else if( ret == POLARSSL_ERR_PEM_BAD_INPUT_DATA )
+            {
+                return( ret );
+            }
             else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
             {
                 pem_free( &pem );
 
+                /*
+                 * PEM header and footer were found
+                 */
+                buflen -= use_len;
+                buf += use_len;
+
                 if( first_error == 0 )
                     first_error = ret;