Re-enable passing CIDs to record transforms

This commit is contained in:
Hanno Becker 2019-05-03 15:23:51 +01:00
parent 687e0fb568
commit 4932f9f229

View File

@ -742,13 +742,11 @@ int mbedtls_ssl_derive_keys( mbedtls_ssl_context *ssl )
{ {
MBEDTLS_SSL_DEBUG_MSG( 3, ( "Copy CIDs into SSL transform" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "Copy CIDs into SSL transform" ) );
/* Uncomment this once CID-parsing and support for a change transform->in_cid_len = ssl->own_cid_len;
* record content type during record decryption are added. */ transform->out_cid_len = ssl->handshake->peer_cid_len;
/* transform->in_cid_len = ssl->own_cid_len; */ memcpy( transform->in_cid, ssl->own_cid, ssl->own_cid_len );
/* transform->out_cid_len = ssl->handshake->peer_cid_len; */ memcpy( transform->out_cid, ssl->handshake->peer_cid,
/* memcpy( transform->in_cid, ssl->own_cid, ssl->own_cid_len ); */ ssl->handshake->peer_cid_len );
/* memcpy( transform->out_cid, ssl->handshake->peer_cid, */
/* ssl->handshake->peer_cid_len ); */
MBEDTLS_SSL_DEBUG_BUF( 3, "Outgoing CID", transform->out_cid, MBEDTLS_SSL_DEBUG_BUF( 3, "Outgoing CID", transform->out_cid,
transform->out_cid_len ); transform->out_cid_len );