yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-07-07 16:10:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

x509parse_crt() now better handles PEM error situations

Browse source 
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 6417186365)

Conflicts:
	ChangeLog
This commit is contained in:
Paul Bakker 2013-06-19 12:07:42 +02:00
parent 03a85bca4c
commit 721f06d49d
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -4,6 +4,9 @@ PolarSSL ChangeLog
Changes Changes
* HAVEGE random generator disabled by default * HAVEGE random generator disabled by default
Bugfix
* x509parse_crt() now better handles PEM error situations
= Version 1.1.6 released on 2013-03-11 = Version 1.1.6 released on 2013-03-11
Bugfix Bugfix
* Fixed net_bind() for specified IP addresses on little endian systems * Fixed net_bind() for specified IP addresses on little endian systems

10
library/x509parse.c
View file

@ -1349,10 +1349,20 @@ int x509parse_crt( x509_cert *chain, const unsigned char *buf, size_t buflen )
buflen -= use_len; buflen -= use_len;
buf += 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 ) else if( ret != POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT )
{ {
pem_free( &pem ); pem_free( &pem );
/*
* PEM header and footer were found
*/
buflen -= use_len;
buf += use_len;
if( first_error == 0 ) if( first_error == 0 )
first_error = ret; first_error = ret;