1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00

Fix wrong usage of counter len macro

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu
2021-09-29 17:46:51 +08:00
parent d9a94fe3d0
commit d96a5c2d86
4 changed files with 14 additions and 13 deletions

View File

@ -2821,7 +2821,7 @@ int mbedtls_ssl_write_finished( mbedtls_ssl_context *ssl )
/* Remember current epoch settings for resending */
ssl->handshake->alt_transform_out = ssl->transform_out;
memcpy( ssl->handshake->alt_out_ctr, ssl->cur_out_ctr,
sizeof( ssl->cur_out_ctr ) );
sizeof( ssl->handshake->alt_out_ctr ) );
/* Set sequence_number to zero */
mbedtls_platform_zeroize( &ssl->cur_out_ctr[2],
@ -5778,11 +5778,11 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
}
#endif /* MBEDTLS_SSL_PROTO_DTLS */
used += 8;
used += MBEDTLS_SSL_COUNTER_LEN;
if( used <= buf_len )
{
memcpy( p, ssl->cur_out_ctr, sizeof( ssl->cur_out_ctr ) );
p += 8;
memcpy( p, ssl->cur_out_ctr, MBEDTLS_SSL_COUNTER_LEN );
p += MBEDTLS_SSL_COUNTER_LEN;
}
#if defined(MBEDTLS_SSL_PROTO_DTLS)
@ -6040,7 +6040,6 @@ static int ssl_context_load( mbedtls_ssl_context *ssl,
if( (size_t)( end - p ) < sizeof( ssl->cur_out_ctr ) )
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
memcpy( ssl->cur_out_ctr, p, sizeof( ssl->cur_out_ctr ) );
p += sizeof( ssl->cur_out_ctr );