yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-02-25 12:56:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename SSL_PROC_CHK -> MBEDTLS_SSL_CHK

Browse source
This commit is contained in:
Hanno Becker 2019-07-23 14:29:13 +01:00
parent 572d448ab2
commit 868cb586cc
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mbedtls/ssl_internal.h
View file

@ -1817,6 +1817,6 @@ MBEDTLS_ALWAYS_INLINE static inline void mbedtls_ssl_pend_fatal_alert(
ssl->pending_fatal_alert_msg = message; ssl->pending_fatal_alert_msg = message;
} }
#define SSL_PROC_CHK(f) do { if( ( ret = f ) < 0 ) goto cleanup; } while( 0 ) #define MBEDTLS_SSL_CHK(f) do { if( ( ret = f ) < 0 ) goto cleanup; } while( 0 )
#endif /* ssl_internal.h */ #endif /* ssl_internal.h */

16
library/ssl_cli.c
View file

@ -2644,11 +2644,11 @@ static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl )
* Consider: Why don't we do this as post-processing after * Consider: Why don't we do this as post-processing after
* the server certificate has been read? * the server certificate has been read?
*/ */
SSL_PROC_CHK( ssl_server_key_exchange_prepare( ssl ) ); MBEDTLS_SSL_CHK( ssl_server_key_exchange_prepare( ssl ) );
/* Coordination: /* Coordination:
* Check if we expect a ServerKeyExchange */ * Check if we expect a ServerKeyExchange */
SSL_PROC_CHK( ssl_server_key_exchange_coordinate( ssl ) ); MBEDTLS_SSL_CHK( ssl_server_key_exchange_coordinate( ssl ) );
if( ret == SSL_SRV_KEY_EXCHANGE_EXPECTED ) if( ret == SSL_SRV_KEY_EXCHANGE_EXPECTED )
{ {
@ -2670,7 +2670,7 @@ static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl )
} }
else else
{ {
SSL_PROC_CHK( ssl_server_key_exchange_parse( ssl, ssl->in_msg, MBEDTLS_SSL_CHK( ssl_server_key_exchange_parse( ssl, ssl->in_msg,
ssl->in_hslen ) ); ssl->in_hslen ) );
} }
} }
@ -2680,7 +2680,7 @@ static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl )
} }
/* Update state */ /* Update state */
SSL_PROC_CHK( ssl_server_key_exchange_postprocess( ssl ) ); MBEDTLS_SSL_CHK( ssl_server_key_exchange_postprocess( ssl ) );
cleanup: cleanup:
@ -3356,10 +3356,10 @@ static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl )
} }
#endif #endif
SSL_PROC_CHK( ssl_client_key_exchange_prepare( ssl ) ); MBEDTLS_SSL_CHK( ssl_client_key_exchange_prepare( ssl ) );
/* Prepare CertificateVerify message in output buffer. */ /* Prepare CertificateVerify message in output buffer. */
SSL_PROC_CHK( ssl_client_key_exchange_write( ssl, ssl->out_msg, MBEDTLS_SSL_CHK( ssl_client_key_exchange_write( ssl, ssl->out_msg,
MBEDTLS_SSL_MAX_CONTENT_LEN, MBEDTLS_SSL_MAX_CONTENT_LEN,
&ssl->out_msglen ) ); &ssl->out_msglen ) );
@ -3370,11 +3370,11 @@ static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl )
#if defined(MBEDTLS_SSL__ECP_RESTARTABLE) #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
cli_key_exchange_postprocess: cli_key_exchange_postprocess:
#endif #endif
SSL_PROC_CHK( ssl_client_key_exchange_postprocess( ssl ) ); MBEDTLS_SSL_CHK( ssl_client_key_exchange_postprocess( ssl ) );
/* Dispatch message */ /* Dispatch message */
SSL_PROC_CHK( mbedtls_ssl_write_handshake_msg( ssl ) ); MBEDTLS_SSL_CHK( mbedtls_ssl_write_handshake_msg( ssl ) );
/* NOTE: For the new messaging layer, the postprocessing step /* NOTE: For the new messaging layer, the postprocessing step
* might come after the dispatching step if the latter * might come after the dispatching step if the latter

4
library/ssl_srv.c
View file

@ -4088,11 +4088,11 @@ static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl )
goto cleanup; goto cleanup;
} }
SSL_PROC_CHK( ssl_client_key_exchange_parse( ssl, ssl->in_msg, MBEDTLS_SSL_CHK( ssl_client_key_exchange_parse( ssl, ssl->in_msg,
ssl->in_hslen ) ); ssl->in_hslen ) );
/* Update state */ /* Update state */
SSL_PROC_CHK( ssl_client_key_exchange_postprocess( ssl ) ); MBEDTLS_SSL_CHK( ssl_client_key_exchange_postprocess( ssl ) );
cleanup: cleanup: