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

Fix for the RFC erratum

Browse Source
This commit is contained in:
Manuel Pégourié-Gonnard 2014-11-04 14:40:21 +01:00
parent 313d796e80
commit 08558e5b46
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
library/ssl_tls.c
View File

@ -1357,17 +1357,18 @@ static int ssl_encrypt_buf( ssl_context *ssl )
* MAC(MAC_write_key, seq_num + * MAC(MAC_write_key, seq_num +
* TLSCipherText.type + * TLSCipherText.type +
* TLSCipherText.version + * TLSCipherText.version +
* TLSCipherText.length + * length_of( (IV +) ENC(...) ) +
* IV + // except for TLS 1.0 * IV + // except for TLS 1.0
* ENC(content + padding + padding_length)); * ENC(content + padding + padding_length));
*/ */
size_t final_len = ssl->out_msglen + ssl->transform_out->maclen;
unsigned char pseudo_hdr[13]; unsigned char pseudo_hdr[13];
memcpy( pseudo_hdr + 0, ssl->out_ctr, 8 ); memcpy( pseudo_hdr + 0, ssl->out_ctr, 8 );
memcpy( pseudo_hdr + 8, ssl->out_hdr, 3 ); memcpy( pseudo_hdr + 8, ssl->out_hdr, 3 );
pseudo_hdr[11] = (unsigned char)( ( final_len >> 8 ) & 0xFF ); pseudo_hdr[11] = (unsigned char)( ( ssl->out_msglen >> 8 ) & 0xFF );
pseudo_hdr[12] = (unsigned char)( ( final_len ) & 0xFF ); pseudo_hdr[12] = (unsigned char)( ( ssl->out_msglen ) & 0xFF );
SSL_DEBUG_BUF( 4, "MAC'd meta-data", pseudo_hdr, 13 );
md_hmac_update( &ssl->transform_out->md_ctx_enc, pseudo_hdr, 13 ); md_hmac_update( &ssl->transform_out->md_ctx_enc, pseudo_hdr, 13 );
md_hmac_update( &ssl->transform_out->md_ctx_enc, md_hmac_update( &ssl->transform_out->md_ctx_enc,
@ -1570,13 +1571,19 @@ static int ssl_decrypt_buf( ssl_context *ssl )
if( mac_order == MAC_CIPHERTEXT ) if( mac_order == MAC_CIPHERTEXT )
{ {
unsigned char computed_mac[POLARSSL_SSL_MAX_MAC_SIZE]; unsigned char computed_mac[POLARSSL_SSL_MAX_MAC_SIZE];
unsigned char pseudo_hdr[13];
dec_msglen -= ssl->transform_in->maclen; dec_msglen -= ssl->transform_in->maclen;
ssl->in_msglen -= ssl->transform_in->maclen; ssl->in_msglen -= ssl->transform_in->maclen;
// TODO: adjust for DTLS memcpy( pseudo_hdr + 0, ssl->in_ctr, 8 );
md_hmac_update( &ssl->transform_in->md_ctx_dec, memcpy( pseudo_hdr + 8, ssl->in_hdr, 3 );
ssl->in_ctr, 13 ); pseudo_hdr[11] = (unsigned char)( ( ssl->in_msglen >> 8 ) & 0xFF );
pseudo_hdr[12] = (unsigned char)( ( ssl->in_msglen ) & 0xFF );
SSL_DEBUG_BUF( 4, "MAC'd meta-data", pseudo_hdr, 13 );
md_hmac_update( &ssl->transform_in->md_ctx_dec, pseudo_hdr, 13 );
md_hmac_update( &ssl->transform_in->md_ctx_dec, md_hmac_update( &ssl->transform_in->md_ctx_dec,
ssl->in_iv, ssl->in_msglen ); ssl->in_iv, ssl->in_msglen );
md_hmac_finish( &ssl->transform_in->md_ctx_dec, computed_mac ); md_hmac_finish( &ssl->transform_in->md_ctx_dec, computed_mac );