mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-01-28 18:32:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply MBEDTLS_PUT_xyz

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-08-26 18:38:58 +08:00
parent e885b76980
commit 2ac64193ad
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/ssl_tls13_client.c
View File

@ -216,8 +216,8 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context *ssl,
* In cTLS the version number is elided. * In cTLS the version number is elided.
*/ */
MBEDTLS_SSL_CHK_BUF_PTR( buf, end, CLIENT_HELLO_VERSION_LEN); MBEDTLS_SSL_CHK_BUF_PTR( buf, end, CLIENT_HELLO_VERSION_LEN);
*buf++ = 0x03; MBEDTLS_PUT_UINT16_BE( 0x0303, buf, 0);
*buf++ = 0x03; buf += 2;
buflen -= CLIENT_HELLO_VERSION_LEN; buflen -= CLIENT_HELLO_VERSION_LEN;
/* Write random bytes */ /* Write random bytes */
@ -295,16 +295,16 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context *ssl,
return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL ); return( MBEDTLS_ERR_SSL_BUFFER_TOO_SMALL );
} }
*buf++ = (unsigned char)( ciphersuites[i] >> 8 ); MBEDTLS_PUT_UINT16_BE( ciphersuites[i], buf, 0);
*buf++ = (unsigned char)( ciphersuites[i] );
buf += 2;
buflen -= 2; buflen -= 2;
} }
/* write ciphersuite length now */ /* write ciphersuite length now */
*ciphersuite_start++ = (unsigned char)( ciphersuite_count*2 >> 8 ); MBEDTLS_PUT_UINT16_BE( ciphersuite_count*2, ciphersuite_start, 0);
*ciphersuite_start++ = (unsigned char)( ciphersuite_count*2 ); ciphersuite_start += 2;
MBEDTLS_SSL_DEBUG_MSG( 3, MBEDTLS_SSL_DEBUG_MSG( 3,
( "client hello, got %" MBEDTLS_PRINTF_SIZET " ciphersuites", ( "client hello, got %" MBEDTLS_PRINTF_SIZET " ciphersuites",
@ -385,8 +385,8 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_DEBUG_BUF( 3, "client hello extensions", extension_start, total_ext_len ); MBEDTLS_SSL_DEBUG_BUF( 3, "client hello extensions", extension_start, total_ext_len );
/* Write extension length */ /* Write extension length */
*extension_start++ = (unsigned char)( ( total_ext_len >> 8 ) & 0xFF ); MBEDTLS_PUT_UINT16_BE( total_ext_len, extension_start, 0);
*extension_start++ = (unsigned char)( ( total_ext_len ) & 0xFF ); extension_start += 2;
*len_with_binders = ( extension_start + total_ext_len ) - start; *len_with_binders = ( extension_start + total_ext_len ) - start;
return( 0 ); return( 0 );
@ -412,12 +412,12 @@ static int ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 7 ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 7 );
*p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS >> 8 ) & 0xFF ); MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS, p, 0);
*p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS ) & 0xFF );
/* total length */ /* total length */
*p++ = 0x00; MBEDTLS_PUT_UINT16_BE( 3, p, 2);
*p++ = 3;
p+=4;
/* length of next field */ /* length of next field */
*p++ = 0x2; *p++ = 0x2;

8
library/ssl_tls13_generic.c
View File

@ -62,10 +62,10 @@ void mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
unsigned char hs_hdr[4]; unsigned char hs_hdr[4];
/* Build HS header for checksum update. */ /* Build HS header for checksum update. */
hs_hdr[0] = hs_type; hs_hdr[0] = MBEDTLS_BYTE_0( hs_type );
hs_hdr[1] = (unsigned char)( total_hs_len >> 16 ); hs_hdr[1] = MBEDTLS_BYTE_2( total_hs_len );
hs_hdr[2] = (unsigned char)( total_hs_len >> 8 ); hs_hdr[2] = MBEDTLS_BYTE_1( total_hs_len );
hs_hdr[3] = (unsigned char)( total_hs_len >> 0 ); hs_hdr[3] = MBEDTLS_BYTE_0( total_hs_len );
ssl->handshake->update_checksum( ssl, hs_hdr, sizeof( hs_hdr ) ); ssl->handshake->update_checksum( ssl, hs_hdr, sizeof( hs_hdr ) );
} }