lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00
Code Activity

Accept spaces at end of line/buffer in base64

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard
2014-10-15 21:45:39 +02:00
parent 7f4ed67a97
commit 64938c63f0
6 changed files with 118 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
library/base64.c
View File

@ -147,8 +147,21 @@ int base64_decode( unsigned char *dst, size_t *dlen,
uint32_t j, x;
unsigned char *p;
/* 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;
@ -156,6 +169,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 );
@ -182,7 +199,7 @@ int base64_decode( unsigned char *dst, size_t *dlen,
for( j = 3, n = x = 0, p = dst; i > 0; i--, src++ )
{
if( *src == '\r' || *src == '\n' )
if( *src == '\r' || *src == '\n' || *src == ' ' )
continue;
j -= ( base64_dec_map[*src] == 64 );