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

TLS1.3: Alignment coding styles based on comments

Browse source 
Fix kinds of alignment issues in fetch handshake messages.

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2021-09-27 09:30:17 +00:00
parent 6b226b0874
commit 16c61aa738
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
library/ssl_misc.h
View file

@ -1493,9 +1493,9 @@ static inline void mbedtls_ssl_handshake_set_state( mbedtls_ssl_context *ssl,
* Fetch TLS 1.3 handshake message header * Fetch TLS 1.3 handshake message header
*/ */
int mbedtls_ssl_tls1_3_fetch_handshake_msg( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls1_3_fetch_handshake_msg( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,
unsigned char **buf, unsigned char **buf,
size_t *buf_len ); size_t *buf_len );
/* /*
* Write TLS 1.3 handshake message header * Write TLS 1.3 handshake message header

11
library/ssl_tls13_generic.c
View file

@ -29,9 +29,9 @@
#include "ssl_misc.h" #include "ssl_misc.h"
int mbedtls_ssl_tls1_3_fetch_handshake_msg( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls1_3_fetch_handshake_msg( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,
unsigned char **buf, unsigned char **buf,
size_t *buflen ) size_t *buflen )
{ {
int ret; int ret;
@ -41,10 +41,10 @@ int mbedtls_ssl_tls1_3_fetch_handshake_msg( mbedtls_ssl_context *ssl,
goto cleanup; goto cleanup;
} }
if( ssl->in_msgtype != MBEDTLS_SSL_MSG_HANDSHAKE || if( ssl->in_msgtype != MBEDTLS_SSL_MSG_HANDSHAKE ||
ssl->in_msg[0] != hs_type ) ssl->in_msg[0] != hs_type )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "bad certificate verify message" ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "Receive unexpected handshake message." ) );
MBEDTLS_SSL_PEND_FATAL_ALERT( MBEDTLS_SSL_ALERT_MSG_UNEXPECTED_MESSAGE, MBEDTLS_SSL_PEND_FATAL_ALERT( MBEDTLS_SSL_ALERT_MSG_UNEXPECTED_MESSAGE,
MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE ); MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE );
ret = MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE; ret = MBEDTLS_ERR_SSL_UNEXPECTED_MESSAGE;
@ -54,7 +54,6 @@ int mbedtls_ssl_tls1_3_fetch_handshake_msg( mbedtls_ssl_context *ssl,
*buf = ssl->in_msg + 4; *buf = ssl->in_msg + 4;
*buflen = ssl->in_hslen - 4; *buflen = ssl->in_hslen - 4;
cleanup: cleanup:
return( ret ); return( ret );