eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix various format issues

Browse source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-08-26 17:18:15 +08:00
parent 708202b7d0
commit 6f13f64aa6
2 changed files with 47 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/ssl_misc.h
View file

@ -1402,7 +1402,9 @@ void mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
size_t total_hs_len ); size_t total_hs_len );
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)
int mbedtls_ssl_write_signature_algorithms_ext(mbedtls_ssl_context* ssl, unsigned char* buf, unsigned char* end, size_t* olen); int mbedtls_ssl_write_signature_algorithms_ext( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *end,
size_t *olen);
#endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */ #endif /* MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED */
#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */

40
library/ssl_tls13_client.c
View file

@ -30,6 +30,8 @@
#include "ssl_misc.h" #include "ssl_misc.h"
#include <mbedtls/debug.h> #include <mbedtls/debug.h>
#define CLIENT_HELLO_RAND_BYTES_LEN 32
#define CLIENT_HELLO_VERSION_LEN 2
/* Main entry point; orchestrates the other functions */ /* Main entry point; orchestrates the other functions */
static int ssl_client_hello_process( mbedtls_ssl_context *ssl ); static int ssl_client_hello_process( mbedtls_ssl_context *ssl );
@ -109,11 +111,10 @@ cleanup:
static int ssl_client_hello_prepare( mbedtls_ssl_context *ssl ) static int ssl_client_hello_prepare( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
size_t rand_bytes_len;
rand_bytes_len = 32; if( ( ret = ssl->conf->f_rng( ssl->conf->p_rng,
ssl->handshake->randbytes,
if( ( ret = ssl->conf->f_rng( ssl->conf->p_rng, ssl->handshake->randbytes, rand_bytes_len ) ) != 0 ) CLIENT_HELLO_RAND_BYTES_LEN ) ) != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "ssl_generate_random", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "ssl_generate_random", ret );
return( ret ); return( ret );
@ -131,7 +132,7 @@ static int ssl_client_hello_postprocess( mbedtls_ssl_context* ssl )
/* Write extensions */ /* Write extensions */
static void ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl, static int ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
unsigned char *end, unsigned char *end,
size_t *olen ); size_t *olen );
@ -169,10 +170,6 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl,
size_t cur_ext_len; /* Size of the current extension */ size_t cur_ext_len; /* Size of the current extension */
size_t total_ext_len; /* Size of list of extensions */ size_t total_ext_len; /* Size of list of extensions */
/* Length information */
size_t rand_bytes_len;
size_t version_len;
/* Buffer management */ /* Buffer management */
unsigned char* start = buf; unsigned char* start = buf;
unsigned char* end = buf + buflen; unsigned char* end = buf + buflen;
@ -188,8 +185,6 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl,
/* Keeping track of the included extensions */ /* Keeping track of the included extensions */
ssl->handshake->extensions_present = MBEDTLS_SSL_EXT_NONE; ssl->handshake->extensions_present = MBEDTLS_SSL_EXT_NONE;
rand_bytes_len = 32;
/* NOTE: /* NOTE:
* Even for DTLS 1.3, we are writing a TLS handshake header here. * Even for DTLS 1.3, we are writing a TLS handshake header here.
* The actual DTLS 1.3 handshake header is inserted in * The actual DTLS 1.3 handshake header is inserted in
@ -198,7 +193,6 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl,
* For cTLS the length, and the version field * For cTLS the length, and the version field
* are elided. The random bytes are shorter. * are elided. The random bytes are shorter.
*/ */
version_len = 2;
if( ssl->conf->max_major_ver == 0 ) if( ssl->conf->max_major_ver == 0 )
{ {
@ -218,16 +212,18 @@ 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);
*buf++ = 0x03; *buf++ = 0x03;
*buf++ = 0x03; *buf++ = 0x03;
buflen -= version_len; buflen -= CLIENT_HELLO_VERSION_LEN;
/* Write random bytes */ /* Write random bytes */
memcpy( buf, ssl->handshake->randbytes, rand_bytes_len ); MBEDTLS_SSL_CHK_BUF_PTR( buf, end, CLIENT_HELLO_RAND_BYTES_LEN);
MBEDTLS_SSL_DEBUG_BUF( 3, "client hello, random bytes", buf, rand_bytes_len ); memcpy( buf, ssl->handshake->randbytes, CLIENT_HELLO_RAND_BYTES_LEN );
MBEDTLS_SSL_DEBUG_BUF( 3, "client hello, random bytes", buf, CLIENT_HELLO_RAND_BYTES_LEN );
buf += rand_bytes_len; buf += CLIENT_HELLO_RAND_BYTES_LEN;
buflen -= rand_bytes_len; buflen -= CLIENT_HELLO_RAND_BYTES_LEN;
/* Versions of TLS before TLS 1.3 supported a /* Versions of TLS before TLS 1.3 supported a
* "session resumption" feature which has been merged with pre-shared * "session resumption" feature which has been merged with pre-shared
@ -396,7 +392,7 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl,
* ProtocolVersion versions<2..254>; * ProtocolVersion versions<2..254>;
* } SupportedVersions; * } SupportedVersions;
*/ */
static void ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl, static int ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
unsigned char *end, unsigned char *end,
size_t *olen ) size_t *olen )
@ -407,11 +403,7 @@ static void ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported version extension" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported version extension" ) );
if( end < p || (size_t)( end - p ) < 7 ) MBEDTLS_SSL_CHK_BUF_PTR( p, end, 7 );
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "buffer too small" ) );
return;
}
*p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS >> 8 ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS >> 8 ) & 0xFF );
*p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS ) & 0xFF ); *p++ = (unsigned char)( ( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS ) & 0xFF );
@ -432,6 +424,8 @@ static void ssl_write_supported_versions_ext( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_DEBUG_MSG( 3, ( "supported version: [%d:%d]", ssl->conf->max_major_ver, ssl->conf->max_minor_ver ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "supported version: [%d:%d]", ssl->conf->max_major_ver, ssl->conf->max_minor_ver ) );
*olen = 7; *olen = 7;
return( 0 );
} }
#if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_WITH_CERT_ENABLED)