SwitchEmu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2026-03-12 12:16:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4155 from gilles-peskine-arm/ccm-test-iv-overflow-warning-2.16

Browse Source 
Backport 2.16: Silence gcc-10 warning in test_suite_ccm
This commit is contained in:
Gilles Peskine
2021-02-20 00:12:26 +01:00
committed by GitHub
parent 47e4035e98 e8d7e6c6e4
commit 6c91b7c91e
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/suites/test_suite_ccm.function
View File

@@ -200,12 +200,11 @@ void mbedtls_ccm_star_encrypt_and_tag( int cipher_id,
unsigned char iv[13]; unsigned char iv[13];
unsigned char result[50]; unsigned char result[50];
mbedtls_ccm_context ctx; mbedtls_ccm_context ctx;
size_t i, iv_len, tag_len; size_t iv_len, tag_len;
int ret; int ret;
mbedtls_ccm_init( &ctx ); mbedtls_ccm_init( &ctx );
memset( iv, 0x00, sizeof( iv ) );
memset( result, 0x00, sizeof( result ) ); memset( result, 0x00, sizeof( result ) );
if( sec_level % 4 == 0) if( sec_level % 4 == 0)
@@ -213,12 +212,10 @@ void mbedtls_ccm_star_encrypt_and_tag( int cipher_id,
else else
tag_len = 1 << ( sec_level % 4 + 1); tag_len = 1 << ( sec_level % 4 + 1);
for( i = 0; i < source_address->len; i++ ) TEST_ASSERT( source_address->len == 8 );
iv[i] = source_address->x[i]; TEST_ASSERT( frame_counter->len == 4 );
memcpy( iv, source_address->x, source_address->len );
for( i = 0; i < frame_counter->len; i++ ) memcpy( iv + source_address->len, frame_counter->x, frame_counter->len );
iv[source_address->len + i] = frame_counter->x[i];
iv[source_address->len + frame_counter->len] = sec_level; iv[source_address->len + frame_counter->len] = sec_level;
iv_len = sizeof( iv ); iv_len = sizeof( iv );
@@ -253,7 +250,7 @@ void mbedtls_ccm_star_auth_decrypt( int cipher_id,
unsigned char iv[13]; unsigned char iv[13];
unsigned char result[50]; unsigned char result[50];
mbedtls_ccm_context ctx; mbedtls_ccm_context ctx;
size_t i, iv_len, tag_len; size_t iv_len, tag_len;
int ret; int ret;
mbedtls_ccm_init( &ctx ); mbedtls_ccm_init( &ctx );
@@ -266,12 +263,10 @@ void mbedtls_ccm_star_auth_decrypt( int cipher_id,
else else
tag_len = 1 << ( sec_level % 4 + 1); tag_len = 1 << ( sec_level % 4 + 1);
for( i = 0; i < source_address->len; i++ ) TEST_ASSERT( source_address->len == 8 );
iv[i] = source_address->x[i]; TEST_ASSERT( frame_counter->len == 4 );
memcpy( iv, source_address->x, source_address->len );
for( i = 0; i < frame_counter->len; i++ ) memcpy( iv + source_address->len, frame_counter->x, frame_counter->len );
iv[source_address->len + i] = frame_counter->x[i];
iv[source_address->len + frame_counter->len] = sec_level; iv[source_address->len + frame_counter->len] = sec_level;
iv_len = sizeof( iv ); iv_len = sizeof( iv );