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

Start refining parameters of populate_transform()

Browse Source 
Parameters 'handshake' and 'ssl' will be replaced with more fine-grained
inputs in follow-up commits.
This commit is contained in:
Manuel Pégourié-Gonnard 2019-05-06 12:55:40 +02:00 committed by Jarno Lamsa
parent d73b47fe2e
commit cba40d92bd
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
library/ssl_tls.c
View File

@ -978,12 +978,21 @@ int mbedtls_ssl_tls_prf( const mbedtls_tls_prf_types prf,
} }
/* /*
* This function will ultimetaly only be responsible for populating a * Populate a transform structure with session keys and all the other
* transform structure from data passed as explicit parameters. * necessary information.
* *
* For now however it's doing rather more in a rather less explicit way. * Parameters:
* - [in/out]: transform: structure to populate
* [in] must be just initialised with mbedtls_ssl_transform_init()
* [out] fully populate, ready for use by mbedtls_ssl_{en,de}crypt_buf()
* - [in] session: used members: encrypt_then_max, master, compression
* - [in] handshake: used members: prf, ciphersuite_info, randbytes
* - [in]: ssl: used members: minor_ver, conf->endpoint
*/ */
static int ssl_populate_transform( mbedtls_ssl_context *ssl ) static int ssl_populate_transform( mbedtls_ssl_transform *transform,
const mbedtls_ssl_session *session,
const mbedtls_ssl_handshake_params *handshake,
const mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = 0;
#if defined(MBEDTLS_USE_PSA_CRYPTO) #if defined(MBEDTLS_USE_PSA_CRYPTO)
@ -1001,10 +1010,6 @@ static int ssl_populate_transform( mbedtls_ssl_context *ssl )
const mbedtls_cipher_info_t *cipher_info; const mbedtls_cipher_info_t *cipher_info;
const mbedtls_md_info_t *md_info; const mbedtls_md_info_t *md_info;
mbedtls_ssl_session *session = ssl->session_negotiate;
mbedtls_ssl_transform *transform = ssl->transform_negotiate;
mbedtls_ssl_handshake_params *handshake = ssl->handshake;
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) && \ #if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC) && \
defined(MBEDTLS_SSL_SOME_MODES_USE_MAC) defined(MBEDTLS_SSL_SOME_MODES_USE_MAC)
transform->encrypt_then_mac = session->encrypt_then_mac; transform->encrypt_then_mac = session->encrypt_then_mac;
@ -1732,7 +1737,10 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
} }
/* Populate transform structure */ /* Populate transform structure */
ret = ssl_populate_transform( ssl ); ret = ssl_populate_transform( ssl->transform_negotiate,
ssl->session_negotiate,
ssl->handshake,
ssl );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "ssl_populate_transform", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "ssl_populate_transform", ret );