mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-03-26 14:05:04 +00:00
Tidy up ssl_*.c grouped MBEDTLS_BYTE_x macros
exchange groups of the byte reading macros with MBEDTLS_PUT_UINTxyz and then shift the pointer afterwards. Easier to read as you can see how big the data is that you are putting in, and in the case of UINT32 AND UINT64 it saves some vertical space. Signed-off-by: Joe Subbiani <joe.subbiani@arm.com>
This commit is contained in:
Joe Subbiani
parent
23fec2538e
commit
2f98d791c3
|
|
@ -136,18 +136,19 @@ static int ssl_write_hostname_ext( mbedtls_ssl_context *ssl,
|
|||
* } ServerNameList;
|
||||
*
|
||||
*/
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SERVERNAME );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SERVERNAME );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SERVERNAME, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( hostname_len + 5);
|
||||
*p++ = MBEDTLS_BYTE_0( hostname_len + 5);
|
||||
MBEDTLS_PUT_UINT16_BE( hostname_len + 5, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( hostname_len + 3 );
|
||||
*p++ = MBEDTLS_BYTE_0( hostname_len + 3 );
|
||||
MBEDTLS_PUT_UINT16_BE( hostname_len + 3, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SERVERNAME_HOSTNAME );
|
||||
*p++ = MBEDTLS_BYTE_1( hostname_len );
|
||||
*p++ = MBEDTLS_BYTE_0( hostname_len );
|
||||
|
||||
MBEDTLS_PUT_UINT16_BE( hostname_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
memcpy( p, ssl->hostname, hostname_len );
|
||||
|
||||
|
|
@ -181,8 +182,8 @@ static int ssl_write_renegotiation_ext( mbedtls_ssl_context *ssl,
|
|||
/*
|
||||
* Secure renegotiation
|
||||
*/
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->verify_data_len + 1 );
|
||||
|
|
@ -281,14 +282,14 @@ static int ssl_write_signature_algorithms_ext( mbedtls_ssl_context *ssl,
|
|||
* SignatureAndHashAlgorithm
|
||||
* supported_signature_algorithms<2..2^16-2>;
|
||||
*/
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SIG_ALG );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SIG_ALG );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SIG_ALG, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( sig_alg_len + 2 );
|
||||
*p++ = MBEDTLS_BYTE_0( sig_alg_len + 2 );
|
||||
MBEDTLS_PUT_UINT16_BE( sig_alg_len + 2, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( sig_alg_len );
|
||||
*p++ = MBEDTLS_BYTE_0( sig_alg_len );
|
||||
MBEDTLS_PUT_UINT16_BE( sig_alg_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*olen = 6 + sig_alg_len;
|
||||
|
||||
|
|
@ -356,14 +357,14 @@ static int ssl_write_supported_elliptic_curves_ext( mbedtls_ssl_context *ssl,
|
|||
elliptic_curve_list[elliptic_curve_len++] = MBEDTLS_BYTE_0( info->tls_id );
|
||||
}
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_ELLIPTIC_CURVES, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( elliptic_curve_len + 2 );
|
||||
*p++ = MBEDTLS_BYTE_0( elliptic_curve_len + 2 );
|
||||
MBEDTLS_PUT_UINT16_BE( elliptic_curve_len + 2, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( elliptic_curve_len );
|
||||
*p++ = MBEDTLS_BYTE_0( elliptic_curve_len );
|
||||
MBEDTLS_PUT_UINT16_BE( elliptic_curve_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*olen = 6 + elliptic_curve_len;
|
||||
|
||||
|
|
@ -384,8 +385,8 @@ static int ssl_write_supported_point_formats_ext( mbedtls_ssl_context *ssl,
|
|||
( "client hello, adding supported_point_formats extension" ) );
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 6 );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 2;
|
||||
|
|
@ -421,8 +422,8 @@ static int ssl_write_ecjpake_kkpp_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_ECJPAKE_KKPP, p, 0 );
|
||||
p += 2;
|
||||
|
||||
/*
|
||||
* We may need to send ClientHello multiple times for Hello verification.
|
||||
|
|
@ -464,8 +465,8 @@ static int ssl_write_ecjpake_kkpp_ext( mbedtls_ssl_context *ssl,
|
|||
memcpy( p + 2, ssl->handshake->ecjpake_cache, kkpp_len );
|
||||
}
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( kkpp_len );
|
||||
*p++ = MBEDTLS_BYTE_0( kkpp_len );
|
||||
MBEDTLS_PUT_UINT16_BE( kkpp_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*olen = kkpp_len + 4;
|
||||
|
||||
|
|
@ -504,11 +505,11 @@ static int ssl_write_cid_ext( mbedtls_ssl_context *ssl,
|
|||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, (unsigned)( ssl->own_cid_len + 5 ) );
|
||||
|
||||
/* Add extension ID + size */
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_CID );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_CID );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_CID, p, 0 );
|
||||
p += 2;
|
||||
ext_len = (size_t) ssl->own_cid_len + 1;
|
||||
*p++ = MBEDTLS_BYTE_1( ext_len );
|
||||
*p++ = MBEDTLS_BYTE_0( ext_len );
|
||||
MBEDTLS_PUT_UINT16_BE( ext_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = (uint8_t) ssl->own_cid_len;
|
||||
memcpy( p, ssl->own_cid, ssl->own_cid_len );
|
||||
|
|
@ -537,8 +538,8 @@ static int ssl_write_max_fragment_length_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 5 );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 1;
|
||||
|
|
@ -569,8 +570,8 @@ static int ssl_write_truncated_hmac_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_TRUNCATED_HMAC );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_TRUNCATED_HMAC );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_TRUNCATED_HMAC, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 0x00;
|
||||
|
|
@ -600,8 +601,8 @@ static int ssl_write_encrypt_then_mac_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 0x00;
|
||||
|
|
@ -631,8 +632,8 @@ static int ssl_write_extended_ms_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 0x00;
|
||||
|
|
@ -663,11 +664,11 @@ static int ssl_write_session_ticket_ext( mbedtls_ssl_context *ssl,
|
|||
/* The addition is safe here since the ticket length is 16 bit. */
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 4 + tlen );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SESSION_TICKET );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SESSION_TICKET );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SESSION_TICKET, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( tlen );
|
||||
*p++ = MBEDTLS_BYTE_0( tlen );
|
||||
MBEDTLS_PUT_UINT16_BE( tlen, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*olen = 4;
|
||||
|
||||
|
|
@ -707,8 +708,8 @@ static int ssl_write_alpn_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 6 + alpnlen );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ALPN );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ALPN );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_ALPN, p, 0 );
|
||||
p += 2;
|
||||
|
||||
/*
|
||||
* opaque ProtocolName<1..2^8-1>;
|
||||
|
|
@ -790,12 +791,11 @@ static int ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl,
|
|||
*/
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, ext_len + 4 );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_USE_SRTP );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_USE_SRTP );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_USE_SRTP, p, 0 );
|
||||
p += 2;
|
||||
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( ext_len );
|
||||
*p++ = MBEDTLS_BYTE_0( ext_len );
|
||||
MBEDTLS_PUT_UINT16_BE( ext_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
/* protection profile length: 2*(ssl->conf->dtls_srtp_profile_list_len) */
|
||||
/* micro-optimization:
|
||||
|
|
@ -818,8 +818,9 @@ static int ssl_write_use_srtp_ext( mbedtls_ssl_context *ssl,
|
|||
{
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "ssl_write_use_srtp_ext, add profile: %04x",
|
||||
profile_value ) );
|
||||
*p++ = MBEDTLS_BYTE_1( profile_value );
|
||||
*p++ = MBEDTLS_BYTE_0( profile_value );
|
||||
MBEDTLS_PUT_UINT16_BE( profile_value, p, 0 );
|
||||
p += 2;
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -887,10 +888,8 @@ static int ssl_generate_random( mbedtls_ssl_context *ssl )
|
|||
|
||||
#if defined(MBEDTLS_HAVE_TIME)
|
||||
t = mbedtls_time( NULL );
|
||||
*p++ = MBEDTLS_BYTE_3( t );
|
||||
*p++ = MBEDTLS_BYTE_2( t );
|
||||
*p++ = MBEDTLS_BYTE_1( t );
|
||||
*p++ = MBEDTLS_BYTE_0( t );
|
||||
MBEDTLS_PUT_UINT32_BE( t, p, 0 );
|
||||
p += 4;
|
||||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, current time: %" MBEDTLS_PRINTF_LONGLONG,
|
||||
(long long) t ) );
|
||||
|
|
@ -1180,8 +1179,8 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
|
|||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 );
|
||||
|
||||
n++;
|
||||
*p++ = MBEDTLS_BYTE_1( ciphersuites[i] );
|
||||
*p++ = MBEDTLS_BYTE_0( ciphersuites[i] );
|
||||
MBEDTLS_PUT_UINT16_BE( ciphersuites[i], p, 0 );
|
||||
p += 2;
|
||||
}
|
||||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3,
|
||||
|
|
@ -1196,8 +1195,8 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
|
|||
{
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "adding EMPTY_RENEGOTIATION_INFO_SCSV" ) );
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 );
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_SSL_EMPTY_RENEGOTIATION_INFO );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_SSL_EMPTY_RENEGOTIATION_INFO );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_SSL_EMPTY_RENEGOTIATION_INFO, p, 0 );
|
||||
p += 2;
|
||||
n++;
|
||||
}
|
||||
|
||||
|
|
@ -1208,8 +1207,8 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
|
|||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "adding FALLBACK_SCSV" ) );
|
||||
|
||||
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 );
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_SSL_FALLBACK_SCSV_VALUE );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_SSL_FALLBACK_SCSV_VALUE );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_SSL_FALLBACK_SCSV_VALUE, p, 0 );
|
||||
p += 2;
|
||||
n++;
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1415,8 +1414,8 @@ static int ssl_write_client_hello( mbedtls_ssl_context *ssl )
|
|||
{
|
||||
/* No need to check for space here, because the extension
|
||||
* writing functions already took care of that. */
|
||||
*p++ = MBEDTLS_BYTE_1( ext_len );
|
||||
*p++ = MBEDTLS_BYTE_0( ext_len );
|
||||
MBEDTLS_PUT_UINT16_BE( ext_len, p, 0 );
|
||||
p += 2;
|
||||
p += ext_len;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2290,8 +2290,8 @@ static void ssl_write_truncated_hmac_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding truncated hmac extension" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_TRUNCATED_HMAC );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_TRUNCATED_HMAC );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_TRUNCATED_HMAC, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 0x00;
|
||||
|
|
@ -2334,12 +2334,11 @@ static void ssl_write_cid_ext( mbedtls_ssl_context *ssl,
|
|||
* opaque cid<0..2^8-1>;
|
||||
* } ConnectionId;
|
||||
*/
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_CID );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_CID );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_CID, p, 0 );
|
||||
p += 2;
|
||||
ext_len = (size_t) ssl->own_cid_len + 1;
|
||||
*p++ = MBEDTLS_BYTE_1( ext_len );
|
||||
*p++ = MBEDTLS_BYTE_0( ext_len );
|
||||
MBEDTLS_PUT_UINT16_BE( ext_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = (uint8_t) ssl->own_cid_len;
|
||||
memcpy( p, ssl->own_cid, ssl->own_cid_len );
|
||||
|
|
@ -2381,8 +2380,8 @@ static void ssl_write_encrypt_then_mac_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding encrypt then mac extension" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_ENCRYPT_THEN_MAC, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 0x00;
|
||||
|
|
@ -2408,8 +2407,8 @@ static void ssl_write_extended_ms_ext( mbedtls_ssl_context *ssl,
|
|||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding extended master secret "
|
||||
"extension" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_EXTENDED_MASTER_SECRET, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 0x00;
|
||||
|
|
@ -2433,8 +2432,8 @@ static void ssl_write_session_ticket_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, adding session ticket extension" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SESSION_TICKET );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SESSION_TICKET );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SESSION_TICKET, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 0x00;
|
||||
|
|
@ -2457,8 +2456,8 @@ static void ssl_write_renegotiation_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, secure renegotiation extension" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_RENEGOTIATION_INFO, p, 0 );
|
||||
p += 2;
|
||||
|
||||
#if defined(MBEDTLS_SSL_RENEGOTIATION)
|
||||
if( ssl->renego_status != MBEDTLS_SSL_INITIAL_HANDSHAKE )
|
||||
|
|
@ -2498,8 +2497,8 @@ static void ssl_write_max_fragment_length_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, max_fragment_length extension" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_MAX_FRAGMENT_LENGTH, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 1;
|
||||
|
|
@ -2528,8 +2527,8 @@ static void ssl_write_supported_point_formats_ext( mbedtls_ssl_context *ssl,
|
|||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, supported_point_formats extension" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_POINT_FORMATS, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = 0x00;
|
||||
*p++ = 2;
|
||||
|
|
@ -2566,8 +2565,8 @@ static void ssl_write_ecjpake_kkpp_ext( mbedtls_ssl_context *ssl,
|
|||
return;
|
||||
}
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
|
||||
*p++ = MBEDTLS_BYTE_0( MBEDTLS_TLS_EXT_ECJPAKE_KKPP );
|
||||
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_ECJPAKE_KKPP, p, 0 );
|
||||
p += 2;
|
||||
|
||||
ret = mbedtls_ecjpake_write_round_one( &ssl->handshake->ecjpake_ctx,
|
||||
p + 2, end - p - 2, &kkpp_len,
|
||||
|
|
@ -2578,8 +2577,8 @@ static void ssl_write_ecjpake_kkpp_ext( mbedtls_ssl_context *ssl,
|
|||
return;
|
||||
}
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( kkpp_len );
|
||||
*p++ = MBEDTLS_BYTE_0( kkpp_len );
|
||||
MBEDTLS_PUT_UINT16_BE( kkpp_len, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*olen = kkpp_len + 4;
|
||||
}
|
||||
|
|
@ -2855,10 +2854,8 @@ static int ssl_write_server_hello( mbedtls_ssl_context *ssl )
|
|||
|
||||
#if defined(MBEDTLS_HAVE_TIME)
|
||||
t = mbedtls_time( NULL );
|
||||
*p++ = MBEDTLS_BYTE_3( t );
|
||||
*p++ = MBEDTLS_BYTE_2( t );
|
||||
*p++ = MBEDTLS_BYTE_1( t );
|
||||
*p++ = MBEDTLS_BYTE_0( t );
|
||||
MBEDTLS_PUT_UINT32_BE( t, p, 0 );
|
||||
p += 4;
|
||||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, current time: %" MBEDTLS_PRINTF_LONGLONG,
|
||||
(long long) t ) );
|
||||
|
|
@ -2939,8 +2936,8 @@ static int ssl_write_server_hello( mbedtls_ssl_context *ssl )
|
|||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "%s session has been resumed",
|
||||
ssl->handshake->resume ? "a" : "no" ) );
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( ssl->session_negotiate->ciphersuite );
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->session_negotiate->ciphersuite );
|
||||
MBEDTLS_PUT_UINT16_BE( ssl->session_negotiate->ciphersuite, p, 0 );
|
||||
p += 2;
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->session_negotiate->compression );
|
||||
|
||||
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, chosen ciphersuite: %s",
|
||||
|
|
@ -3020,8 +3017,8 @@ static int ssl_write_server_hello( mbedtls_ssl_context *ssl )
|
|||
|
||||
if( ext_len > 0 )
|
||||
{
|
||||
*p++ = MBEDTLS_BYTE_1( ext_len );
|
||||
*p++ = MBEDTLS_BYTE_0( ext_len );
|
||||
MBEDTLS_PUT_UINT16_BE( ext_len, p, 0 );
|
||||
p += 2;
|
||||
p += ext_len;
|
||||
}
|
||||
|
||||
|
|
@ -3201,8 +3198,8 @@ static int ssl_write_certificate_request( mbedtls_ssl_context *ssl )
|
|||
break;
|
||||
}
|
||||
|
||||
*p++ = MBEDTLS_BYTE_1( dn_size );
|
||||
*p++ = MBEDTLS_BYTE_0( dn_size );
|
||||
MBEDTLS_PUT_UINT16_BE( dn_size, p, 0 );
|
||||
p += 2;
|
||||
memcpy( p, crt->subject_raw.p, dn_size );
|
||||
p += dn_size;
|
||||
|
||||
|
|
|
|||
|
|
@ -5360,14 +5360,8 @@ static int ssl_session_save( const mbedtls_ssl_session *session,
|
|||
{
|
||||
start = (uint64_t) session->start;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_7( start );
|
||||
*p++ = MBEDTLS_BYTE_6( start );
|
||||
*p++ = MBEDTLS_BYTE_5( start );
|
||||
*p++ = MBEDTLS_BYTE_4( start );
|
||||
*p++ = MBEDTLS_BYTE_3( start );
|
||||
*p++ = MBEDTLS_BYTE_2( start );
|
||||
*p++ = MBEDTLS_BYTE_1( start );
|
||||
*p++ = MBEDTLS_BYTE_0( start );
|
||||
MBEDTLS_PUT_UINT64_BE( start, p, 0 );
|
||||
p += 8;
|
||||
}
|
||||
#endif /* MBEDTLS_HAVE_TIME */
|
||||
|
||||
|
|
@ -5383,8 +5377,8 @@ static int ssl_session_save( const mbedtls_ssl_session *session,
|
|||
|
||||
if( used <= buf_len )
|
||||
{
|
||||
*p++ = MBEDTLS_BYTE_1( session->ciphersuite );
|
||||
*p++ = MBEDTLS_BYTE_0( session->ciphersuite );
|
||||
MBEDTLS_PUT_UINT16_BE( session->ciphersuite, p, 0 );
|
||||
p += 2;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_0( session->compression );
|
||||
|
||||
|
|
@ -5395,10 +5389,8 @@ static int ssl_session_save( const mbedtls_ssl_session *session,
|
|||
memcpy( p, session->master, 48 );
|
||||
p += 48;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_3( session->verify_result );
|
||||
*p++ = MBEDTLS_BYTE_2( session->verify_result );
|
||||
*p++ = MBEDTLS_BYTE_1( session->verify_result );
|
||||
*p++ = MBEDTLS_BYTE_0( session->verify_result );
|
||||
MBEDTLS_PUT_UINT32_BE( session->verify_result, p, 0 );
|
||||
p += 4;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -5468,10 +5460,8 @@ static int ssl_session_save( const mbedtls_ssl_session *session,
|
|||
p += session->ticket_len;
|
||||
}
|
||||
|
||||
*p++ = MBEDTLS_BYTE_3( session->ticket_lifetime );
|
||||
*p++ = MBEDTLS_BYTE_2( session->ticket_lifetime );
|
||||
*p++ = MBEDTLS_BYTE_1( session->ticket_lifetime );
|
||||
*p++ = MBEDTLS_BYTE_0( session->ticket_lifetime );
|
||||
MBEDTLS_PUT_UINT32_BE( session->ticket_lifetime, p, 0 );
|
||||
p += 4;
|
||||
}
|
||||
#endif /* MBEDTLS_SSL_SESSION_TICKETS && MBEDTLS_SSL_CLI_C */
|
||||
|
||||
|
|
@ -6294,10 +6284,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
|
|||
used += 4 + session_len;
|
||||
if( used <= buf_len )
|
||||
{
|
||||
*p++ = MBEDTLS_BYTE_3( session_len );
|
||||
*p++ = MBEDTLS_BYTE_2( session_len );
|
||||
*p++ = MBEDTLS_BYTE_1( session_len );
|
||||
*p++ = MBEDTLS_BYTE_0( session_len );
|
||||
MBEDTLS_PUT_UINT32_BE( session_len, p, 0 );
|
||||
p += 4;
|
||||
|
||||
ret = ssl_session_save( ssl->session, 1,
|
||||
p, session_len, &session_len );
|
||||
|
|
@ -6339,10 +6327,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
|
|||
used += 4;
|
||||
if( used <= buf_len )
|
||||
{
|
||||
*p++ = MBEDTLS_BYTE_3( ssl->badmac_seen );
|
||||
*p++ = MBEDTLS_BYTE_2( ssl->badmac_seen );
|
||||
*p++ = MBEDTLS_BYTE_1( ssl->badmac_seen );
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->badmac_seen );
|
||||
MBEDTLS_PUT_UINT32_BE( ssl->badmac_seen, p, 0 );
|
||||
p += 4;
|
||||
}
|
||||
#endif /* MBEDTLS_SSL_DTLS_BADMAC_LIMIT */
|
||||
|
||||
|
|
@ -6350,23 +6336,11 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
|
|||
used += 16;
|
||||
if( used <= buf_len )
|
||||
{
|
||||
*p++ = MBEDTLS_BYTE_7( ssl->in_window_top );
|
||||
*p++ = MBEDTLS_BYTE_6( ssl->in_window_top );
|
||||
*p++ = MBEDTLS_BYTE_5( ssl->in_window_top );
|
||||
*p++ = MBEDTLS_BYTE_4( ssl->in_window_top );
|
||||
*p++ = MBEDTLS_BYTE_3( ssl->in_window_top );
|
||||
*p++ = MBEDTLS_BYTE_2( ssl->in_window_top );
|
||||
*p++ = MBEDTLS_BYTE_1( ssl->in_window_top );
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->in_window_top );
|
||||
MBEDTLS_PUT_UINT64_BE( ssl->in_window_top, p, 0 );
|
||||
p += 8;
|
||||
|
||||
*p++ = MBEDTLS_BYTE_7( ssl->in_window );
|
||||
*p++ = MBEDTLS_BYTE_6( ssl->in_window );
|
||||
*p++ = MBEDTLS_BYTE_5( ssl->in_window );
|
||||
*p++ = MBEDTLS_BYTE_4( ssl->in_window );
|
||||
*p++ = MBEDTLS_BYTE_3( ssl->in_window );
|
||||
*p++ = MBEDTLS_BYTE_2( ssl->in_window );
|
||||
*p++ = MBEDTLS_BYTE_1( ssl->in_window );
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->in_window );
|
||||
MBEDTLS_PUT_UINT64_BE( ssl->in_window, p, 0 );
|
||||
p += 8;
|
||||
}
|
||||
#endif /* MBEDTLS_SSL_DTLS_ANTI_REPLAY */
|
||||
|
||||
|
|
@ -6389,8 +6363,8 @@ int mbedtls_ssl_context_save( mbedtls_ssl_context *ssl,
|
|||
used += 2;
|
||||
if( used <= buf_len )
|
||||
{
|
||||
*p++ = MBEDTLS_BYTE_1( ssl->mtu );
|
||||
*p++ = MBEDTLS_BYTE_0( ssl->mtu );
|
||||
MBEDTLS_PUT_UINT16_BE( ssl->mtu, p, 0 );
|
||||
p += 2;
|
||||
}
|
||||
#endif /* MBEDTLS_SSL_PROTO_DTLS */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue