Clean up of formatting, and potential integer overflow fix
diff --git a/include/mbedtls/cmac.h b/include/mbedtls/cmac.h
index d94c015..f64ae69 100644
--- a/include/mbedtls/cmac.h
+++ b/include/mbedtls/cmac.h
@@ -48,7 +48,7 @@
/** Internal state of the CMAC algorithm */
unsigned char state[MBEDTLS_CIPHER_BLKSIZE_MAX];
- /** Unprocessed data - either data that was not block aligned and is still
+ /** Unprocessed data - either data that was not block aligned and is still
* pending to be processed, or the final block */
unsigned char unprocessed_block[MBEDTLS_CIPHER_BLKSIZE_MAX];
diff --git a/library/cmac.c b/library/cmac.c
index 9e4dc89..03d9392 100644
--- a/library/cmac.c
+++ b/library/cmac.c
@@ -245,7 +245,7 @@
{
mbedtls_cmac_context_t* cmac_ctx;
unsigned char *state;
- int n, j, ret = 0;
+ int n, j, ret = 0;
size_t olen, block_size;
if( ctx == NULL || ctx->cipher_info == NULL || input == NULL ||
@@ -259,7 +259,7 @@
/* Is their data still to process from the last call, that's equal to
* or greater than a block? */
if( cmac_ctx->unprocessed_len > 0 &&
- ilen + cmac_ctx->unprocessed_len > block_size )
+ ilen > block_size - cmac_ctx->unprocessed_len )
{
memcpy( &cmac_ctx->unprocessed_block[cmac_ctx->unprocessed_len],
input,
@@ -387,7 +387,7 @@
/* Reset the internal state */
cmac_ctx->unprocessed_len = 0;
mbedtls_zeroize( cmac_ctx->unprocessed_block,
- sizeof( cmac_ctx->unprocessed_block ));
+ sizeof( cmac_ctx->unprocessed_block ) );
mbedtls_zeroize( cmac_ctx->state,
sizeof( cmac_ctx->state ) );
cmac_ctx->padding_flag = 1;
@@ -822,7 +822,7 @@
for( i = 0; i < num_tests; i++ )
{
if( verbose != 0 )
- mbedtls_printf( " %s CMAC #%u: ", testname, i +1 );
+ mbedtls_printf( " %s CMAC #%u: ", testname, i + 1 );
if( ( ret = mbedtls_cipher_cmac( cipher_info, key, keybits, messages,
message_lengths[i], output ) ) != 0 )
diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c
index 22a878d..eb578e7 100644
--- a/programs/test/benchmark.c
+++ b/programs/test/benchmark.c
@@ -494,8 +494,8 @@
cipher_info = mbedtls_cipher_info_from_type( cipher_type );
TIME_AND_TSC( title,
- mbedtls_cipher_cmac( cipher_info, tmp, keysize,
- buf, BUFSIZE, output ) );
+ mbedtls_cipher_cmac( cipher_info, tmp, keysize,
+ buf, BUFSIZE, output ) );
}
memset( buf, 0, sizeof( buf ) );
diff --git a/tests/Makefile b/tests/Makefile
index 23c68ec..4787f25 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -50,7 +50,7 @@
test_suite_arc4$(EXEXT) test_suite_asn1write$(EXEXT) \
test_suite_base64$(EXEXT) test_suite_blowfish$(EXEXT) \
test_suite_camellia$(EXEXT) test_suite_ccm$(EXEXT) \
- test_suite_cmac$(EXEXT) \
+ test_suite_cmac$(EXEXT) \
test_suite_cipher.aes$(EXEXT) \
test_suite_cipher.arc4$(EXEXT) test_suite_cipher.ccm$(EXEXT) \
test_suite_cipher.gcm$(EXEXT) \
