Implement stages except write_partial

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-08-18 16:46:28 +08:00
parent 65dd2ccfe6
commit c8a392c47e
2 changed files with 42 additions and 16 deletions

@ -99,7 +99,6 @@ static int ssl_client_hello_process( mbedtls_ssl_context* ssl )
MBEDTLS_SSL_PROC_CHK( ssl_client_hello_postprocess, ( ssl ) ); MBEDTLS_SSL_PROC_CHK( ssl_client_hello_postprocess, ( ssl ) );
MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_finish_handshake_msg, ( ssl, buf_len, msg_len ) ); MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_finish_handshake_msg, ( ssl, buf_len, msg_len ) );
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_SERVER_HELLO );
cleanup: cleanup:
@ -111,8 +110,31 @@ cleanup:
static int ssl_client_hello_prepare( mbedtls_ssl_context* ssl ) static int ssl_client_hello_prepare( mbedtls_ssl_context* ssl )
{ {
((void) ssl); int ret;
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE ); size_t rand_bytes_len;
if( ssl->conf->f_rng == NULL )
{
MBEDTLS_SSL_DEBUG_MSG( 1, ( "no RNG provided" ) );
return( MBEDTLS_ERR_SSL_NO_RNG );
}
rand_bytes_len = 32;
if( ( ret = ssl->conf->f_rng( ssl->conf->p_rng, ssl->handshake->randbytes, rand_bytes_len ) ) != 0 )
{
MBEDTLS_SSL_DEBUG_RET( 1, "ssl_generate_random", ret );
return( ret );
}
return( 0 );
}
static int ssl_client_hello_postprocess( mbedtls_ssl_context* ssl )
{
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_SERVER_HELLO );
return( 0 );
} }
static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl, static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl,
@ -128,11 +150,7 @@ static int ssl_client_hello_write_partial( mbedtls_ssl_context* ssl,
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE ); return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
} }
static int ssl_client_hello_postprocess( mbedtls_ssl_context* ssl )
{
((void) ssl);
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE );
}
#endif /* MBEDTLS_SSL_CLI_C */ #endif /* MBEDTLS_SSL_CLI_C */

@ -23,6 +23,8 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) #if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
#include "mbedtls/error.h"
#include "ssl_misc.h" #include "ssl_misc.h"
int mbedtls_ssl_start_handshake_msg( mbedtls_ssl_context *ssl, int mbedtls_ssl_start_handshake_msg( mbedtls_ssl_context *ssl,
@ -30,21 +32,27 @@ int mbedtls_ssl_start_handshake_msg( mbedtls_ssl_context *ssl,
unsigned char **buf, unsigned char **buf,
size_t *buflen ) size_t *buflen )
{ {
((void) ssl); *buf = ssl->out_msg + 4;
((void) hs_type); *buflen = MBEDTLS_SSL_OUT_CONTENT_LEN - 4;
((void) buf);
((void) buflen); ssl->out_msgtype = MBEDTLS_SSL_MSG_HANDSHAKE;
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE ); ssl->out_msg[0] = hs_type;
return( 0 );
} }
int mbedtls_ssl_finish_handshake_msg( mbedtls_ssl_context *ssl, int mbedtls_ssl_finish_handshake_msg( mbedtls_ssl_context *ssl,
size_t buf_len, size_t buf_len,
size_t msg_len ) size_t msg_len )
{ {
((void) ssl); int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
((void) buf_len); ((void) buf_len);
((void) msg_len);
return( MBEDTLS_ERR_SSL_FEATURE_UNAVAILABLE ); ssl->out_msglen = msg_len + 4;
MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_write_handshake_msg_ext, ( ssl, 0 ) );
cleanup:
return( ret );
} }
void mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl, void mbedtls_ssl_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,