Accept a trailing space at end of PEM lines

With certs being copy-pasted from webmails and all, this will probably become
more and more common.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-07-31 11:09:59 +02:00 committed by Manuel Pégourié-Gonnard
parent ebb9cf9cc6
commit faf44abf2a
2 changed files with 3 additions and 0 deletions

View file

@ -19,6 +19,7 @@ Bugfix
Changes
* Add SSL_MIN_DHM_BYTES configuration parameter in config.h to choose the
minimum size of Diffie-Hellman parameters accepted by the client.
* The PEM parser now accepts a trailing space at end of lines (#226).
= Version 1.2.14 released 2015-06-26

View file

@ -208,12 +208,14 @@ int pem_read_buffer( pem_context *ctx, char *header, char *footer, const unsigne
return( POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
s1 += strlen( header );
if( *s1 == ' ' ) s1++;
if( *s1 == '\r' ) s1++;
if( *s1 == '\n' ) s1++;
else return( POLARSSL_ERR_PEM_NO_HEADER_FOOTER_PRESENT );
end = s2;
end += strlen( footer );
if( *end == ' ' ) end++;
if( *end == '\r' ) end++;
if( *end == '\n' ) end++;
*use_len = end - data;