mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2025-03-24 22:15:07 +00:00
Merge remote-tracking branch 'restricted/pr/437' into development-restricted
This commit is contained in:
commit
3af567d4a7
|
@ -1712,6 +1712,8 @@ static int ssl_encrypt_buf( mbedtls_ssl_context *ssl )
|
||||||
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
|
#if defined(MBEDTLS_SSL_ENCRYPT_THEN_MAC)
|
||||||
if( auth_done == 0 )
|
if( auth_done == 0 )
|
||||||
{
|
{
|
||||||
|
unsigned char mac[MBEDTLS_SSL_MAC_ADD];
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* MAC(MAC_write_key, seq_num +
|
* MAC(MAC_write_key, seq_num +
|
||||||
* TLSCipherText.type +
|
* TLSCipherText.type +
|
||||||
|
@ -1734,10 +1736,12 @@ static int ssl_encrypt_buf( mbedtls_ssl_context *ssl )
|
||||||
mbedtls_md_hmac_update( &ssl->transform_out->md_ctx_enc, pseudo_hdr, 13 );
|
mbedtls_md_hmac_update( &ssl->transform_out->md_ctx_enc, pseudo_hdr, 13 );
|
||||||
mbedtls_md_hmac_update( &ssl->transform_out->md_ctx_enc,
|
mbedtls_md_hmac_update( &ssl->transform_out->md_ctx_enc,
|
||||||
ssl->out_iv, ssl->out_msglen );
|
ssl->out_iv, ssl->out_msglen );
|
||||||
mbedtls_md_hmac_finish( &ssl->transform_out->md_ctx_enc,
|
mbedtls_md_hmac_finish( &ssl->transform_out->md_ctx_enc, mac );
|
||||||
ssl->out_iv + ssl->out_msglen );
|
|
||||||
mbedtls_md_hmac_reset( &ssl->transform_out->md_ctx_enc );
|
mbedtls_md_hmac_reset( &ssl->transform_out->md_ctx_enc );
|
||||||
|
|
||||||
|
memcpy( ssl->out_iv + ssl->out_msglen, mac,
|
||||||
|
ssl->transform_out->maclen );
|
||||||
|
|
||||||
ssl->out_msglen += ssl->transform_out->maclen;
|
ssl->out_msglen += ssl->transform_out->maclen;
|
||||||
auth_done++;
|
auth_done++;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue