AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prep: allow {in,out}_len != {in,out}_hdr + 3

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-02-13 11:17:34 +01:00 committed by Paul Bakker
parent 7ee6f0e6e5
commit 507e1e410a
2 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/ssl_srv.c
View File

@ -1147,13 +1147,13 @@ static int ssl_parse_client_hello( ssl_context *ssl )
return ssl_parse_client_hello_v2( ssl );
#endif
SSL_DEBUG_BUF( 4, "record header", buf, 5 );
SSL_DEBUG_BUF( 4, "record header", buf, 5 ); // TODO: 13 for DTLS
SSL_DEBUG_MSG( 3, ( "client hello v3, message type: %d",
buf[0] ) );
SSL_DEBUG_MSG( 3, ( "client hello v3, message len.: %d",
( buf[3] << 8 ) | buf[4] ) );
SSL_DEBUG_MSG( 3, ( "client hello v3, protocol ver: [%d:%d]",
( ssl->in_len[0] << 8 ) | ssl->in_len[1] ) );
SSL_DEBUG_MSG( 3, ( "client hello v3, protocol version: [%d:%d]",
buf[1], buf[2] ) );
/*
@ -1182,7 +1182,7 @@ static int ssl_parse_client_hello( ssl_context *ssl )
return( POLARSSL_ERR_SSL_BAD_HS_CLIENT_HELLO );
}
n = ( buf[3] << 8 ) | buf[4];
n = ( ssl->in_len[0] << 8 ) | ssl->in_len[1];
if( n < 45 || n > SSL_MAX_CONTENT_LEN )
{

24
library/ssl_tls.c
View File

@ -1607,8 +1607,8 @@ static int ssl_decrypt_buf( ssl_context *ssl )
ssl->in_msglen -= ( ssl->transform_in->maclen + padlen );
ssl->in_hdr[3] = (unsigned char)( ssl->in_msglen >> 8 );
ssl->in_hdr[4] = (unsigned char)( ssl->in_msglen );
ssl->in_len[0] = (unsigned char)( ssl->in_msglen >> 8 );
ssl->in_len[1] = (unsigned char)( ssl->in_msglen );
memcpy( tmp, ssl->in_msg + ssl->in_msglen, ssl->transform_in->maclen );
@ -1941,8 +1941,9 @@ int ssl_write_record( ssl_context *ssl )
ssl->out_hdr[0] = (unsigned char) ssl->out_msgtype;
ssl_write_version( ssl->major_ver, ssl->minor_ver,
ssl->transport, ssl->out_hdr + 1 );
ssl->out_hdr[3] = (unsigned char)( len >> 8 );
ssl->out_hdr[4] = (unsigned char)( len );
ssl->out_len[0] = (unsigned char)( len >> 8 );
ssl->out_len[1] = (unsigned char)( len );
if( ssl->transform_out != NULL )
{
@ -1953,8 +1954,8 @@ int ssl_write_record( ssl_context *ssl )
}
len = ssl->out_msglen;
ssl->out_hdr[3] = (unsigned char)( len >> 8 );
ssl->out_hdr[4] = (unsigned char)( len );
ssl->out_len[0] = (unsigned char)( len >> 8 );
ssl->out_len[1] = (unsigned char)( len );
}
ssl->out_left = 5 + ssl->out_msglen;
@ -1962,7 +1963,7 @@ int ssl_write_record( ssl_context *ssl )
SSL_DEBUG_MSG( 3, ( "output record: msgtype = %d, "
"version = [%d:%d], msglen = %d",
ssl->out_hdr[0], ssl->out_hdr[1], ssl->out_hdr[2],
( ssl->out_hdr[3] << 8 ) | ssl->out_hdr[4] ) );
( ssl->out_len[0] << 8 ) | ssl->out_len[1] ) );
SSL_DEBUG_BUF( 4, "output record sent to network",
ssl->out_hdr, 5 + ssl->out_msglen );
@ -2034,12 +2035,12 @@ int ssl_read_record( ssl_context *ssl )
}
ssl->in_msgtype = ssl->in_hdr[0];
ssl->in_msglen = ( ssl->in_hdr[3] << 8 ) | ssl->in_hdr[4];
ssl->in_msglen = ( ssl->in_len[0] << 8 ) | ssl->in_len[1];
SSL_DEBUG_MSG( 3, ( "input record: msgtype = %d, "
"version = [%d:%d], msglen = %d",
ssl->in_hdr[0], ssl->in_hdr[1], ssl->in_hdr[2],
( ssl->in_hdr[3] << 8 ) | ssl->in_hdr[4] ) );
( ssl->in_len[0] << 8 ) | ssl->in_len[1] ) );
ssl_read_version( &major_ver, &minor_ver, ssl->transport, ssl->in_hdr + 1 );
@ -2170,8 +2171,9 @@ int ssl_read_record( ssl_context *ssl )
return( ret );
}
ssl->in_hdr[3] = (unsigned char)( ssl->in_msglen >> 8 );
ssl->in_hdr[4] = (unsigned char)( ssl->in_msglen );
// TODO: what's the purpose of these lines? is in_len used?
ssl->in_len[0] = (unsigned char)( ssl->in_msglen >> 8 );
ssl->in_len[1] = (unsigned char)( ssl->in_msglen );
}
#endif /* POLARSSL_ZLIB_SUPPORT */