mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-08-05 19:35:48 +03:00
@@ -1945,9 +1945,7 @@ static int ssl_tls13_session_save( const mbedtls_ssl_session *session,
|
|||||||
|
|
||||||
/* Check size_t overflow */
|
/* Check size_t overflow */
|
||||||
if( session->ticket_len > SIZE_MAX - needed )
|
if( session->ticket_len > SIZE_MAX - needed )
|
||||||
{
|
|
||||||
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
|
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
|
||||||
}
|
|
||||||
|
|
||||||
needed += session->ticket_len; /* ticket */
|
needed += session->ticket_len; /* ticket */
|
||||||
}
|
}
|
||||||
@@ -1955,9 +1953,7 @@ static int ssl_tls13_session_save( const mbedtls_ssl_session *session,
|
|||||||
|
|
||||||
*olen = needed;
|
*olen = needed;
|
||||||
if( needed > buf_len )
|
if( needed > buf_len )
|
||||||
{
|
|
||||||
return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
|
return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
|
||||||
}
|
|
||||||
|
|
||||||
p[0] = session->endpoint;
|
p[0] = session->endpoint;
|
||||||
MBEDTLS_PUT_UINT16_BE( session->ciphersuite, p, 1 );
|
MBEDTLS_PUT_UINT16_BE( session->ciphersuite, p, 1 );
|
||||||
@@ -3073,9 +3069,7 @@ static int ssl_session_save( const mbedtls_ssl_session *session,
|
|||||||
case MBEDTLS_SSL_VERSION_TLS1_3:
|
case MBEDTLS_SSL_VERSION_TLS1_3:
|
||||||
ret = ssl_tls13_session_save( session, p, remaining_len, &out_len );
|
ret = ssl_tls13_session_save( session, p, remaining_len, &out_len );
|
||||||
if( ret != 0 && ret != MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL )
|
if( ret != 0 && ret != MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL )
|
||||||
{
|
|
||||||
return( ret );
|
return( ret );
|
||||||
}
|
|
||||||
used += out_len;
|
used += out_len;
|
||||||
break;
|
break;
|
||||||
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
|
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */
|
||||||
|
@@ -4809,7 +4809,7 @@ void ssl_serialize_session_save_load( int ticket_len, char *crt_file,
|
|||||||
original.resumption_key_len ) == 0 );
|
original.resumption_key_len ) == 0 );
|
||||||
}
|
}
|
||||||
#if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C)
|
#if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C)
|
||||||
if( endpoint_type == MBEDTLS_SSL_IS_SERVER)
|
if( endpoint_type == MBEDTLS_SSL_IS_SERVER )
|
||||||
{
|
{
|
||||||
TEST_ASSERT( original.start == restored.start );
|
TEST_ASSERT( original.start == restored.start );
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user