mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 13:25:28 +00:00
Variables in proper block or within proper defines in ssl_decrypt_buf()
This commit is contained in:
parent
474c2ce05f
commit
1e5369c7fa
|
@ -1314,8 +1314,12 @@ static int ssl_encrypt_buf( ssl_context *ssl )
|
||||||
|
|
||||||
static int ssl_decrypt_buf( ssl_context *ssl )
|
static int ssl_decrypt_buf( ssl_context *ssl )
|
||||||
{
|
{
|
||||||
size_t i, padlen = 0, correct = 1;
|
size_t i;
|
||||||
unsigned char tmp[POLARSSL_SSL_MAX_MAC_SIZE];
|
#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER) || \
|
||||||
|
( defined(POLARSSL_CIPHER_MODE_CBC) && \
|
||||||
|
( defined(POLARSSL_AES_C) || defined(POLARSSL_CAMELLIA_C) ) )
|
||||||
|
size_t padlen = 0, correct = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
SSL_DEBUG_MSG( 2, ( "=> decrypt buf" ) );
|
SSL_DEBUG_MSG( 2, ( "=> decrypt buf" ) );
|
||||||
|
|
||||||
|
@ -1388,8 +1392,6 @@ static int ssl_decrypt_buf( ssl_context *ssl )
|
||||||
unsigned char add_data[13];
|
unsigned char add_data[13];
|
||||||
int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
|
int ret = POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE;
|
||||||
|
|
||||||
padlen = 0;
|
|
||||||
|
|
||||||
dec_msglen = ssl->in_msglen - ( ssl->transform_in->ivlen -
|
dec_msglen = ssl->in_msglen - ( ssl->transform_in->ivlen -
|
||||||
ssl->transform_in->fixed_ivlen );
|
ssl->transform_in->fixed_ivlen );
|
||||||
dec_msglen -= 16;
|
dec_msglen -= 16;
|
||||||
|
@ -1651,6 +1653,8 @@ static int ssl_decrypt_buf( ssl_context *ssl )
|
||||||
if( ssl->transform_in->cipher_ctx_dec.cipher_info->mode !=
|
if( ssl->transform_in->cipher_ctx_dec.cipher_info->mode !=
|
||||||
POLARSSL_MODE_GCM )
|
POLARSSL_MODE_GCM )
|
||||||
{
|
{
|
||||||
|
unsigned char tmp[POLARSSL_SSL_MAX_MAC_SIZE];
|
||||||
|
|
||||||
ssl->in_msglen -= ( ssl->transform_in->maclen + padlen );
|
ssl->in_msglen -= ( ssl->transform_in->maclen + padlen );
|
||||||
|
|
||||||
ssl->in_hdr[3] = (unsigned char)( ssl->in_msglen >> 8 );
|
ssl->in_hdr[3] = (unsigned char)( ssl->in_msglen >> 8 );
|
||||||
|
|
Loading…
Reference in a new issue