yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 09:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Comment formatting and whitespace fixes

Browse Source
This commit is contained in:
Gilles Peskine 2018-04-25 23:35:42 +02:00
parent df13d5c7a6
commit 168dae8567
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/ssl_srv.c
View File

@ -2856,8 +2856,8 @@ static int ssl_resume_server_key_exchange( mbedtls_ssl_context *ssl,
defined(MBEDTLS_SSL_ASYNC_PRIVATE) */ defined(MBEDTLS_SSL_ASYNC_PRIVATE) */
/* Prepare the ServerKeyExchange message, up to and including /* Prepare the ServerKeyExchange message, up to and including
calculating the signature if any, but excluding formatting the * calculating the signature if any, but excluding formatting the
signature and sending the message. */ * signature and sending the message. */
static int ssl_prepare_server_key_exchange( mbedtls_ssl_context *ssl, static int ssl_prepare_server_key_exchange( mbedtls_ssl_context *ssl,
size_t *signature_len ) size_t *signature_len )
{ {
@ -3212,9 +3212,9 @@ curve_matching_done:
} }
/* Prepare the ServerKeyExchange message and send it. For ciphersuites /* Prepare the ServerKeyExchange message and send it. For ciphersuites
that do not include a ServerKeyExchange message, do nothing. Either * that do not include a ServerKeyExchange message, do nothing. Either
way, if successful, move on to the next step in the SSL state * way, if successful, move on to the next step in the SSL state
machine */ * machine. */
static int ssl_write_server_key_exchange( mbedtls_ssl_context *ssl ) static int ssl_write_server_key_exchange( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
@ -3251,7 +3251,7 @@ static int ssl_write_server_key_exchange( mbedtls_ssl_context *ssl )
#if defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED) && \ #if defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED) && \
defined(MBEDTLS_SSL_ASYNC_PRIVATE) defined(MBEDTLS_SSL_ASYNC_PRIVATE)
/* If we have already prepared the message and there is an ongoing /* If we have already prepared the message and there is an ongoing
signature operation, resume signing. */ * signature operation, resume signing. */
if( ssl->handshake->async_in_progress != 0 ) if( ssl->handshake->async_in_progress != 0 )
{ {
MBEDTLS_SSL_DEBUG_MSG( 2, ( "resuming signature operation" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "resuming signature operation" ) );
@ -3275,8 +3275,8 @@ static int ssl_write_server_key_exchange( mbedtls_ssl_context *ssl )
} }
/* If there is a signature, write its length. /* If there is a signature, write its length.
ssl_prepare_server_key_exchange already wrote the signature * ssl_prepare_server_key_exchange already wrote the signature
itself at its proper place in the output buffer. */ * itself at its proper place in the output buffer. */
#if defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED)
if( signature_len != 0 ) if( signature_len != 0 )
{ {
@ -3412,7 +3412,7 @@ static int ssl_decrypt_encrypted_pms( mbedtls_ssl_context *ssl,
#if defined(MBEDTLS_SSL_ASYNC_PRIVATE) #if defined(MBEDTLS_SSL_ASYNC_PRIVATE)
/* If we have already started decoding the message and there is an ongoing /* If we have already started decoding the message and there is an ongoing
decryption operation, resume signing. */ * decryption operation, resume signing. */
if( ssl->handshake->async_in_progress != 0 ) if( ssl->handshake->async_in_progress != 0 )
{ {
MBEDTLS_SSL_DEBUG_MSG( 2, ( "resuming decryption operation" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "resuming decryption operation" ) );
@ -3476,7 +3476,6 @@ static int ssl_decrypt_encrypted_pms( mbedtls_ssl_context *ssl,
if( ! mbedtls_pk_can_do( private_key, MBEDTLS_PK_RSA ) ) if( ! mbedtls_pk_can_do( private_key, MBEDTLS_PK_RSA ) )
{ {
/* */
MBEDTLS_SSL_DEBUG_MSG( 1, ( "got no RSA private key" ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "got no RSA private key" ) );
return( MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED ); return( MBEDTLS_ERR_SSL_PRIVATE_KEY_REQUIRED );
} }
@ -3655,7 +3654,7 @@ static int ssl_parse_client_key_exchange( mbedtls_ssl_context *ssl )
{ {
/* We've already read a record and there is an asynchronous /* We've already read a record and there is an asynchronous
* operation in progress to decrypt it. So skip reading the * operation in progress to decrypt it. So skip reading the
record. */ * record. */
MBEDTLS_SSL_DEBUG_MSG( 3, ( "will resume decryption of previously-read record" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "will resume decryption of previously-read record" ) );
} }
else else

2
tests/ssl-opt.sh
View File

@ -4184,7 +4184,7 @@ run_test "SSL async private: slot 0 used with key2" \
requires_config_enabled MBEDTLS_SSL_ASYNC_PRIVATE requires_config_enabled MBEDTLS_SSL_ASYNC_PRIVATE
run_test "SSL async private: slot 1 used" \ run_test "SSL async private: slot 1 used" \
"$P_SRV \ "$P_SRV \
async_operations=s async_private_delay1=1 async_private_delay2=1\ async_operations=s async_private_delay1=1 async_private_delay2=1 \
key_file=data_files/server5.key crt_file=data_files/server5.crt \ key_file=data_files/server5.key crt_file=data_files/server5.crt \
key_file2=data_files/server2.key crt_file2=data_files/server2.crt" \ key_file2=data_files/server2.key crt_file2=data_files/server2.crt" \
"$P_CLI force_ciphersuite=TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256" \ "$P_CLI force_ciphersuite=TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256" \