Suyu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2026-01-08 15:39:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'development' into development-restricted

Browse source
This commit is contained in:
Jaeden Amero 2018-01-24 15:17:15 +00:00
commit 3c082ce293
3 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/cipher.c
View file

@ -516,14 +516,14 @@ static int get_one_and_zeros_padding( unsigned char *input, size_t input_len,
if( NULL == input || NULL == data_len )
return( MBEDTLS_ERR_CIPHER_BAD_INPUT_DATA );
bad = 0xFF;
bad = 0x80;
*data_len = 0;
for( i = input_len; i > 0; i-- )
{
prev_done = done;
done |= ( input[i-1] != 0 );
done |= ( input[i - 1] != 0 );
*data_len |= ( i - 1 ) * ( done != prev_done );
bad &= ( input[i-1] ^ 0x80 ) | ( done == prev_done );
bad ^= input[i - 1] * ( done != prev_done );
}
return( MBEDTLS_ERR_CIPHER_INVALID_PADDING * ( bad != 0 ) );