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

Avoid collision of ssl_xxx_key_exchange_yyy() func names in cli/srv

Browse Source 
This makes grepping the functions more difficult, and also leads to compilation failures
when trying to build the library from a single source file (which might be useful for
code-size reasons).
This commit is contained in:
Hanno Becker 2019-08-12 15:04:59 +01:00
parent 48e526b380
commit 7d552fad65
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
library/ssl_cli.c
View File

@ -2605,7 +2605,7 @@ cleanup:
*/ */
/* Main entry point; orchestrates the other functions. */ /* Main entry point; orchestrates the other functions. */
static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl ); static int ssl_process_in_server_key_exchange( mbedtls_ssl_context *ssl );
/* Coordination: /* Coordination:
* Check if a ServerKeyExchange message is expected, and skip if not. * Check if a ServerKeyExchange message is expected, and skip if not.
@ -2616,23 +2616,23 @@ static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl );
*/ */
#define SSL_SRV_KEY_EXCHANGE_SKIP 0 #define SSL_SRV_KEY_EXCHANGE_SKIP 0
#define SSL_SRV_KEY_EXCHANGE_EXPECTED 1 #define SSL_SRV_KEY_EXCHANGE_EXPECTED 1
static int ssl_server_key_exchange_coordinate( mbedtls_ssl_context *ssl ); static int ssl_in_server_key_exchange_coordinate( mbedtls_ssl_context *ssl );
/* Preparation /* Preparation
* If applicable, prepare DH parameters from Server certificate. */ * If applicable, prepare DH parameters from Server certificate. */
static int ssl_server_key_exchange_prepare( mbedtls_ssl_context *ssl ); static int ssl_in_server_key_exchange_prepare( mbedtls_ssl_context *ssl );
/* Parse SrvKeyExchange message and store contents /* Parse SrvKeyExchange message and store contents
* (PSK or DH parameters) in handshake structure. */ * (PSK or DH parameters) in handshake structure. */
static int ssl_server_key_exchange_parse( mbedtls_ssl_context *ssl, static int ssl_in_server_key_exchange_parse( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen ); size_t buflen );
/* Update the handshake state */ /* Update the handshake state */
static int ssl_server_key_exchange_postprocess( mbedtls_ssl_context *ssl ); static int ssl_in_server_key_exchange_postprocess( mbedtls_ssl_context *ssl );
/* /*
* Implementation * Implementation
*/ */
static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl ) static int ssl_process_in_server_key_exchange( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> parse server key exchange" ) );
@ -2643,11 +2643,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?
*/ */
MBEDTLS_SSL_CHK( ssl_server_key_exchange_prepare( ssl ) ); MBEDTLS_SSL_CHK( ssl_in_server_key_exchange_prepare( ssl ) );
/* Coordination: /* Coordination:
* Check if we expect a ServerKeyExchange */ * Check if we expect a ServerKeyExchange */
MBEDTLS_SSL_CHK( ssl_server_key_exchange_coordinate( ssl ) ); MBEDTLS_SSL_CHK( ssl_in_server_key_exchange_coordinate( ssl ) );
if( ret == SSL_SRV_KEY_EXCHANGE_EXPECTED ) if( ret == SSL_SRV_KEY_EXCHANGE_EXPECTED )
{ {
@ -2669,7 +2669,7 @@ static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl )
} }
else else
{ {
MBEDTLS_SSL_CHK( ssl_server_key_exchange_parse( ssl, ssl->in_msg, MBEDTLS_SSL_CHK( ssl_in_server_key_exchange_parse( ssl, ssl->in_msg,
ssl->in_hslen ) ); ssl->in_hslen ) );
} }
} }
@ -2679,7 +2679,7 @@ static int ssl_process_server_key_exchange( mbedtls_ssl_context *ssl )
} }
/* Update state */ /* Update state */
MBEDTLS_SSL_CHK( ssl_server_key_exchange_postprocess( ssl ) ); MBEDTLS_SSL_CHK( ssl_in_server_key_exchange_postprocess( ssl ) );
cleanup: cleanup:
@ -2692,7 +2692,7 @@ cleanup:
return( ret ); return( ret );
} }
static int ssl_server_key_exchange_prepare( mbedtls_ssl_context *ssl ) static int ssl_in_server_key_exchange_prepare( mbedtls_ssl_context *ssl )
{ {
mbedtls_ssl_ciphersuite_handle_t ciphersuite_info = mbedtls_ssl_ciphersuite_handle_t ciphersuite_info =
mbedtls_ssl_handshake_get_ciphersuite( ssl->handshake ); mbedtls_ssl_handshake_get_ciphersuite( ssl->handshake );
@ -2723,7 +2723,7 @@ static int ssl_server_key_exchange_prepare( mbedtls_ssl_context *ssl )
return( 0 ); return( 0 );
} }
static int ssl_server_key_exchange_coordinate( mbedtls_ssl_context *ssl ) static int ssl_in_server_key_exchange_coordinate( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
mbedtls_ssl_ciphersuite_handle_t ciphersuite_info = mbedtls_ssl_ciphersuite_handle_t ciphersuite_info =
@ -2786,7 +2786,7 @@ static int ssl_server_key_exchange_coordinate( mbedtls_ssl_context *ssl )
return( SSL_SRV_KEY_EXCHANGE_EXPECTED ); return( SSL_SRV_KEY_EXCHANGE_EXPECTED );
} }
static int ssl_server_key_exchange_parse( mbedtls_ssl_context *ssl, static int ssl_in_server_key_exchange_parse( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen ) size_t buflen )
{ {
@ -3087,7 +3087,7 @@ static int ssl_server_key_exchange_parse( mbedtls_ssl_context *ssl,
return( 0 ); return( 0 );
} }
static int ssl_server_key_exchange_postprocess( mbedtls_ssl_context *ssl ) static int ssl_in_server_key_exchange_postprocess( mbedtls_ssl_context *ssl )
{ {
ssl->state = MBEDTLS_SSL_CERTIFICATE_REQUEST; ssl->state = MBEDTLS_SSL_CERTIFICATE_REQUEST;
return( 0 ); return( 0 );
@ -3326,25 +3326,25 @@ static int ssl_parse_server_hello_done( mbedtls_ssl_context *ssl )
*/ */
/* Main entry point; orchestrates the other functions */ /* Main entry point; orchestrates the other functions */
static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl ); static int ssl_process_out_client_key_exchange( mbedtls_ssl_context *ssl );
/* Preparation /* Preparation
* - For ECDH: Generate client params and derive premaster secret * - For ECDH: Generate client params and derive premaster secret
* - For RSA-suites: Encrypt PMS * - For RSA-suites: Encrypt PMS
* - For ECJPAKE: Do Round 2 * - For ECJPAKE: Do Round 2
*/ */
static int ssl_client_key_exchange_prepare( mbedtls_ssl_context *ssl ); static int ssl_out_client_key_exchange_prepare( mbedtls_ssl_context *ssl );
static int ssl_client_key_exchange_write( mbedtls_ssl_context *ssl, static int ssl_out_client_key_exchange_write( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen, size_t buflen,
size_t *olen ); size_t *olen );
static int ssl_client_key_exchange_postprocess( mbedtls_ssl_context *ssl ); static int ssl_out_client_key_exchange_postprocess( mbedtls_ssl_context *ssl );
/* /*
* Implementation * Implementation
*/ */
static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl ) static int ssl_process_out_client_key_exchange( mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = 0;
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> process client key exchange" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> process client key exchange" ) );
@ -3357,10 +3357,10 @@ static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl )
mbedtls_ecdh_enable_restart( &ssl->handshake->ecdh_ctx ); mbedtls_ecdh_enable_restart( &ssl->handshake->ecdh_ctx );
#endif #endif
MBEDTLS_SSL_CHK( ssl_client_key_exchange_prepare( ssl ) ); MBEDTLS_SSL_CHK( ssl_out_client_key_exchange_prepare( ssl ) );
/* Prepare CertificateVerify message in output buffer. */ /* Prepare CertificateVerify message in output buffer. */
MBEDTLS_SSL_CHK( ssl_client_key_exchange_write( ssl, ssl->out_msg, MBEDTLS_SSL_CHK( ssl_out_client_key_exchange_write( ssl, ssl->out_msg,
MBEDTLS_SSL_MAX_CONTENT_LEN, MBEDTLS_SSL_MAX_CONTENT_LEN,
&ssl->out_msglen ) ); &ssl->out_msglen ) );
@ -3375,7 +3375,7 @@ static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl )
cli_key_exchange_postprocess: cli_key_exchange_postprocess:
#endif #endif
ret = ssl_client_key_exchange_postprocess( ssl ); ret = ssl_out_client_key_exchange_postprocess( ssl );
#if defined(MBEDTLS_SSL__ECP_RESTARTABLE) #if defined(MBEDTLS_SSL__ECP_RESTARTABLE)
if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS ) if( ret == MBEDTLS_ERR_ECP_IN_PROGRESS )
ret = MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS; ret = MBEDTLS_ERR_SSL_CRYPTO_IN_PROGRESS;
@ -3403,7 +3403,7 @@ cleanup:
static int ssl_client_key_exchange_prepare( mbedtls_ssl_context *ssl ) static int ssl_out_client_key_exchange_prepare( mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = 0;
mbedtls_ssl_ciphersuite_handle_t ciphersuite_info = mbedtls_ssl_ciphersuite_handle_t ciphersuite_info =
@ -3460,7 +3460,7 @@ static int ssl_client_key_exchange_prepare( mbedtls_ssl_context *ssl )
return( 0 ); return( 0 );
} }
static int ssl_client_key_exchange_write( mbedtls_ssl_context *ssl, static int ssl_out_client_key_exchange_write( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen, size_t buflen,
size_t *olen ) size_t *olen )
@ -3479,7 +3479,7 @@ static int ssl_client_key_exchange_write( mbedtls_ssl_context *ssl,
* It is therefore not suitable to be registered as a callback * It is therefore not suitable to be registered as a callback
* for retransmission, if such get introduced at some point. * for retransmission, if such get introduced at some point.
* *
* Also see the documentation of ssl_client_key_exchange_prepare(). * Also see the documentation of ssl_out_client_key_exchange_prepare().
*/ */
p = buf + 4; p = buf + 4;
@ -3712,7 +3712,7 @@ static int ssl_client_key_exchange_write( mbedtls_ssl_context *ssl,
return( 0 ); return( 0 );
} }
static int ssl_client_key_exchange_postprocess( mbedtls_ssl_context *ssl ) static int ssl_out_client_key_exchange_postprocess( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
@ -4104,7 +4104,7 @@ int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl )
break; break;
case MBEDTLS_SSL_SERVER_KEY_EXCHANGE: case MBEDTLS_SSL_SERVER_KEY_EXCHANGE:
ret = ssl_process_server_key_exchange( ssl ); ret = ssl_process_in_server_key_exchange( ssl );
break; break;
case MBEDTLS_SSL_CERTIFICATE_REQUEST: case MBEDTLS_SSL_CERTIFICATE_REQUEST:
@ -4127,7 +4127,7 @@ int mbedtls_ssl_handshake_client_step( mbedtls_ssl_context *ssl )
break; break;
case MBEDTLS_SSL_CLIENT_KEY_EXCHANGE: case MBEDTLS_SSL_CLIENT_KEY_EXCHANGE:
ret = ssl_process_client_key_exchange( ssl ); ret = ssl_process_out_client_key_exchange( ssl );
break; break;
case MBEDTLS_SSL_CERTIFICATE_VERIFY: case MBEDTLS_SSL_CERTIFICATE_VERIFY:

18
library/ssl_srv.c
View File

@ -4051,19 +4051,19 @@ static int ssl_parse_client_psk_identity( mbedtls_ssl_context *ssl, unsigned cha
*/ */
/* Main entry point; orchestrates the other functions. */ /* Main entry point; orchestrates the other functions. */
static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl ); static int ssl_process_in_client_key_exchange( mbedtls_ssl_context *ssl );
static int ssl_client_key_exchange_parse( mbedtls_ssl_context *ssl, static int ssl_in_client_key_exchange_parse( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen ); size_t buflen );
/* Update the handshake state */ /* Update the handshake state */
static int ssl_client_key_exchange_postprocess( mbedtls_ssl_context *ssl ); static int ssl_in_client_key_exchange_postprocess( mbedtls_ssl_context *ssl );
/* /*
* Implementation * Implementation
*/ */
static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl ) static int ssl_process_in_client_key_exchange( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> process client key exchange" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> process client key exchange" ) );
@ -4088,11 +4088,11 @@ static int ssl_process_client_key_exchange( mbedtls_ssl_context *ssl )
goto cleanup; goto cleanup;
} }
MBEDTLS_SSL_CHK( ssl_client_key_exchange_parse( ssl, ssl->in_msg, MBEDTLS_SSL_CHK( ssl_in_client_key_exchange_parse( ssl, ssl->in_msg,
ssl->in_hslen ) ); ssl->in_hslen ) );
/* Update state */ /* Update state */
MBEDTLS_SSL_CHK( ssl_client_key_exchange_postprocess( ssl ) ); MBEDTLS_SSL_CHK( ssl_in_client_key_exchange_postprocess( ssl ) );
cleanup: cleanup:
@ -4105,7 +4105,7 @@ cleanup:
return( ret ); return( ret );
} }
static int ssl_client_key_exchange_parse( mbedtls_ssl_context *ssl, static int ssl_in_client_key_exchange_parse( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen ) size_t buflen )
{ {
@ -4292,7 +4292,7 @@ static int ssl_client_key_exchange_parse( mbedtls_ssl_context *ssl,
} }
/* Update the handshake state */ /* Update the handshake state */
static int ssl_client_key_exchange_postprocess( mbedtls_ssl_context *ssl ) static int ssl_in_client_key_exchange_postprocess( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
@ -4684,7 +4684,7 @@ int mbedtls_ssl_handshake_server_step( mbedtls_ssl_context *ssl )
break; break;
case MBEDTLS_SSL_CLIENT_KEY_EXCHANGE: case MBEDTLS_SSL_CLIENT_KEY_EXCHANGE:
ret = ssl_process_client_key_exchange( ssl ); ret = ssl_process_in_client_key_exchange( ssl );
break; break;
case MBEDTLS_SSL_CERTIFICATE_VERIFY: case MBEDTLS_SSL_CERTIFICATE_VERIFY: