yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

- Require different input and output buffer in cipher_update()

Browse source 
- Fixed style typos
This commit is contained in:
Paul Bakker 2011-01-20 16:35:05 +00:00
parent 1f14d08cf9
commit a885d6835f
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/cipher.c
View file

@ -197,8 +197,11 @@ int cipher_update( cipher_context_t *ctx, const unsigned char *input, int ilen,
{ {
int copy_len = 0; int copy_len = 0;
if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen ) if( NULL == ctx || NULL == ctx->cipher_info || NULL == olen ||
input == output )
{
return 1; return 1;
}
*olen = 0; *olen = 0;
@ -295,16 +298,16 @@ static int get_pkcs_padding( unsigned char *input, unsigned char input_len,
int i = 0; int i = 0;
unsigned char padding_len = 0; unsigned char padding_len = 0;
if ( NULL == input || NULL == data_len ) if( NULL == input || NULL == data_len )
return 1; return 1;
padding_len = input[input_len - 1]; padding_len = input[input_len - 1];
if ( padding_len > input_len ) if( padding_len > input_len )
return 2; return 2;
for ( i = input_len - padding_len; i < input_len; i++ ) for( i = input_len - padding_len; i < input_len; i++ )
if ( input[i] != padding_len ) if( input[i] != padding_len )
return 2; return 2;
*data_len = input_len - padding_len; *data_len = input_len - padding_len;