yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 08:04:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Re-arrange some code in ssl_derive_keys()

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-06-18 15:34:40 +02:00 committed by Paul Bakker
parent ee415031e5
commit e800cd81d7
1 changed files with 28 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
library/ssl_tls.c
View File

@ -511,34 +511,31 @@ int ssl_derive_keys( ssl_context *ssl )
* Determine the appropriate key, IV and MAC length.
*/
transform->keylen = cipher_info->key_length / 8;
if( cipher_info->mode == POLARSSL_MODE_GCM ||
cipher_info->mode == POLARSSL_MODE_CCM )
{
transform->keylen = cipher_info->key_length;
transform->keylen /= 8;
transform->minlen = 1;
transform->maclen = 0;
transform->ivlen = 12;
transform->fixed_ivlen = 4;
transform->maclen = 0;
transform->minlen = 1; // FIXME
}
else
{
if( md_info->type != POLARSSL_MD_NONE )
{
int ret;
if( ( ret = md_init_ctx( &transform->md_ctx_enc, md_info ) ) != 0 )
{
SSL_DEBUG_RET( 1, "md_init_ctx", ret );
return( ret );
}
if( ( ret = md_init_ctx( &transform->md_ctx_dec, md_info ) ) != 0 )
/* Initialize HMAC contexts */
if( ( ret = md_init_ctx( &transform->md_ctx_enc, md_info ) ) != 0 ||
( ret = md_init_ctx( &transform->md_ctx_dec, md_info ) ) != 0 )
{
SSL_DEBUG_RET( 1, "md_init_ctx", ret );
return( ret );
}
/* Get MAC length */
transform->maclen = md_get_size( md_info );
#if defined(POLARSSL_SSL_TRUNCATED_HMAC)
@ -550,12 +547,11 @@ int ssl_derive_keys( ssl_context *ssl )
if( session->trunc_hmac == SSL_TRUNC_HMAC_ENABLED )
transform->maclen = SSL_TRUNCATED_HMAC_LEN;
#endif /* POLARSSL_SSL_TRUNCATED_HMAC */
}
transform->keylen = cipher_info->key_length;
transform->keylen /= 8;
/* IV length */
transform->ivlen = cipher_info->iv_size;
/* Minimum length: FIXME */
transform->minlen = transform->keylen;
if( transform->minlen < transform->maclen )
{