yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-01-09 03:15:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Accept spaces at EOL/buffer in base64_decode()

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-10-23 17:00:26 +02:00
parent a6118741a7
commit 0b12d5e332
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -25,6 +25,7 @@ Changes
RelativeDistinguishedName are not accepted any more.
* ssl_read() now returns POLARSSL_ERR_NET_WANT_READ rather than
POLARSSL_ERR_SSL_UNEXPECTED_MESSAGE on harmless alerts.
* Accept spaces at end of line or end of buffer in base64_decode().
= Version 1.2.11 released 2014-07-11
Features

19
library/base64.c
View file

@ -137,8 +137,21 @@ int base64_decode( unsigned char *dst, size_t *dlen,
uint32_t j, x;
unsigned char *p;
for( i = j = n = 0; i < slen; i++ )
/* First pass: check for validity and get output length */
for( i = n = j = 0; i < slen; i++ )
{
/* Skip spaces before checking for EOL */
x = 0;
while( i < slen && src[i] == ' ' )
{
++i;
++x;
}
/* Spaces at end of buffer are OK */
if( i == slen )
break;
if( ( slen - i ) >= 2 &&
src[i] == '\r' && src[i + 1] == '\n' )
continue;
@ -146,6 +159,10 @@ int base64_decode( unsigned char *dst, size_t *dlen,
if( src[i] == '\n' )
continue;
/* Space inside a line is an error */
if( x != 0 )
return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );
if( src[i] == '=' && ++j > 2 )
return( POLARSSL_ERR_BASE64_INVALID_CHARACTER );