lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-08 17:42:09 +03:00
Code Activity

Merge branch 'development' into ccm_chunked

Browse Source 
Conflicts:
	library/ccm.c

Conflict resolved by re-applying the MBEDTLS_BYTE_0 macro.
Conflict resolved by ignoring the MBEDTLS_PUT_UINT16_BE macro
used in development branch on the 'b' buffer, because the 'b'
buffer is removed in current branch.
This commit is contained in:
Mateusz Starzyk
2021-08-24 15:14:23 +02:00
parent 3879c345ec d951db478a
commit cbefb6ba4d
54 changed files with 2140 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/ccm.c
View File

@@ -171,7 +171,7 @@ static int ccm_calculate_first_block_if_ready(mbedtls_ccm_context *ctx)
ctx->y[0] |= ctx->q - 1;
for( i = 0, len_left = ctx->plaintext_len; i < ctx->q; i++, len_left >>= 8 )
ctx->y[15-i] = (unsigned char)( len_left & 0xFF );
ctx->y[15-i] = MBEDTLS_BYTE_0( len_left );
if( len_left > 0 )
{