yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-25 18:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid nested if's without braces.

Browse Source 
Creates a potential for confusing code if we later want to add an else clause.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-01-22 11:06:40 +00:00
parent 5d9cde25da
commit 59c6f2ef21
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
library/ssl_cli.c
View File

@ -605,16 +605,18 @@ static int ssl_write_client_hello( ssl_context *ssl )
*/ */
#if defined(POLARSSL_SSL_RENEGOTIATION) #if defined(POLARSSL_SSL_RENEGOTIATION)
if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE ) if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
#endif
if( ssl->session_negotiate->ticket != NULL &&
ssl->session_negotiate->ticket_len != 0 )
{ {
ret = ssl->f_rng( ssl->p_rng, ssl->session_negotiate->id, 32 ); #endif
if( ssl->session_negotiate->ticket != NULL &&
ssl->session_negotiate->ticket_len != 0 )
{
ret = ssl->f_rng( ssl->p_rng, ssl->session_negotiate->id, 32 );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
ssl->session_negotiate->length = n = 32; ssl->session_negotiate->length = n = 32;
}
} }
#endif /* POLARSSL_SSL_SESSION_TICKETS */ #endif /* POLARSSL_SSL_SESSION_TICKETS */

16
library/ssl_srv.c
View File

@ -1248,10 +1248,12 @@ static int ssl_parse_client_hello( ssl_context *ssl )
#if defined(POLARSSL_SSL_RENEGOTIATION) #if defined(POLARSSL_SSL_RENEGOTIATION)
if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE ) if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
#endif #endif
if( ( ret = ssl_fetch_input( ssl, 5 ) ) != 0 )
{ {
SSL_DEBUG_RET( 1, "ssl_fetch_input", ret ); if( ( ret = ssl_fetch_input( ssl, 5 ) ) != 0 )
return( ret ); {
SSL_DEBUG_RET( 1, "ssl_fetch_input", ret );
return( ret );
}
} }
buf = ssl->in_hdr; buf = ssl->in_hdr;
@ -1301,10 +1303,12 @@ static int ssl_parse_client_hello( ssl_context *ssl )
#if defined(POLARSSL_SSL_RENEGOTIATION) #if defined(POLARSSL_SSL_RENEGOTIATION)
if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE ) if( ssl->renegotiation == SSL_INITIAL_HANDSHAKE )
#endif #endif
if( ( ret = ssl_fetch_input( ssl, 5 + n ) ) != 0 )
{ {
SSL_DEBUG_RET( 1, "ssl_fetch_input", ret ); if( ( ret = ssl_fetch_input( ssl, 5 + n ) ) != 0 )
return( ret ); {
SSL_DEBUG_RET( 1, "ssl_fetch_input", ret );
return( ret );
}
} }
buf = ssl->in_msg; buf = ssl->in_msg;