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

Get rid of useless handshake field out_async_start

Browse Source 
The location where the signature goes is now tracked via
ssl->out_msglen, which makes ssl->handshake->out_async_start redundant.
This commit is contained in:
Gilles Peskine 2018-01-06 03:13:12 +01:00
parent ab50f83a93
commit d04d292b64
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbedtls/ssl_internal.h
View File

@ -220,7 +220,6 @@ struct mbedtls_ssl_handshake_params
#endif /* MBEDTLS_X509_CRT_PARSE_C */ #endif /* MBEDTLS_X509_CRT_PARSE_C */
#if defined(MBEDTLS_SSL_ASYNC_PRIVATE_C) #if defined(MBEDTLS_SSL_ASYNC_PRIVATE_C)
void *p_async_operation_ctx; /*!< asynchronous operation context */ void *p_async_operation_ctx; /*!< asynchronous operation context */
unsigned char *out_async_start; /*!< pointer where the asynchronous operation must write in the output buffer */
#endif /* MBEDTLS_SSL_ASYNC_PRIVATE_C */ #endif /* MBEDTLS_SSL_ASYNC_PRIVATE_C */
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)

4
library/ssl_srv.c
View File

@ -2846,10 +2846,9 @@ static int ssl_prepare_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_C) defined(MBEDTLS_SSL_ASYNC_PRIVATE_C)
if( ssl->handshake->out_async_start != NULL ) if( ssl->handshake->p_async_operation_ctx != NULL )
{ {
MBEDTLS_SSL_DEBUG_MSG( 2, ( "resuming signature operation" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "resuming signature operation" ) );
p = ssl->handshake->out_async_start;
goto async_resume; goto async_resume;
} }
#endif /* defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED) && #endif /* defined(MBEDTLS_KEY_EXCHANGE__WITH_SERVER_SIGNATURE__ENABLED) &&
@ -3215,7 +3214,6 @@ curve_matching_done:
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS: case MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS:
ssl->handshake->out_async_start = ssl->out_msg + ssl->out_msglen;
MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= write server key exchange (pending)" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "<= write server key exchange (pending)" ) );
return( MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS ); return( MBEDTLS_ERR_SSL_ASYNC_IN_PROGRESS );
default: default: