Clarify a few comments

The "+" sign could be misinterpreted as addition.
This commit is contained in:
Manuel Pégourié-Gonnard 2018-07-11 12:30:40 +02:00
parent e12f0acc4c
commit 8744a02357

View file

@ -1442,7 +1442,7 @@ static int ssl_encrypt_buf( mbedtls_ssl_context *ssl )
*/ */
if( transform->ivlen == 12 && transform->fixed_ivlen == 4 ) if( transform->ivlen == 12 && transform->fixed_ivlen == 4 )
{ {
/* GCM and CCM: concatenate fixed + explicit (=seqnum) */ /* GCM and CCM: fixed || explicit (=seqnum) */
memcpy( iv, transform->iv_enc, transform->fixed_ivlen ); memcpy( iv, transform->iv_enc, transform->fixed_ivlen );
memcpy( iv + transform->fixed_ivlen, ssl->out_ctr, 8 ); memcpy( iv + transform->fixed_ivlen, ssl->out_ctr, 8 );
memcpy( ssl->out_iv, ssl->out_ctr, 8 ); memcpy( ssl->out_iv, ssl->out_ctr, 8 );
@ -1450,7 +1450,7 @@ static int ssl_encrypt_buf( mbedtls_ssl_context *ssl )
} }
else if( transform->ivlen == 12 && transform->fixed_ivlen == 12 ) else if( transform->ivlen == 12 && transform->fixed_ivlen == 12 )
{ {
/* ChachaPoly: XOR fixed + sequence number */ /* ChachaPoly: fixed XOR sequence number */
unsigned char i; unsigned char i;
memcpy( iv, transform->iv_enc, transform->fixed_ivlen ); memcpy( iv, transform->iv_enc, transform->fixed_ivlen );
@ -1745,14 +1745,14 @@ static int ssl_decrypt_buf( mbedtls_ssl_context *ssl )
*/ */
if( transform->ivlen == 12 && transform->fixed_ivlen == 4 ) if( transform->ivlen == 12 && transform->fixed_ivlen == 4 )
{ {
/* GCM and CCM: concatenate fixed + explicit (transmitted) */ /* GCM and CCM: fixed || explicit (transmitted) */
memcpy( iv, transform->iv_dec, transform->fixed_ivlen ); memcpy( iv, transform->iv_dec, transform->fixed_ivlen );
memcpy( iv + transform->fixed_ivlen, ssl->in_iv, 8 ); memcpy( iv + transform->fixed_ivlen, ssl->in_iv, 8 );
} }
else if( transform->ivlen == 12 && transform->fixed_ivlen == 12 ) else if( transform->ivlen == 12 && transform->fixed_ivlen == 12 )
{ {
/* ChachaPoly: XOR fixed + sequence number */ /* ChachaPoly: fixed XOR sequence number */
unsigned char i; unsigned char i;
memcpy( iv, transform->iv_dec, transform->fixed_ivlen ); memcpy( iv, transform->iv_dec, transform->fixed_ivlen );