commit ac5361f7dc85346064991bd797f6a3378ffb87a0
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jun 24 01:08:09 2015 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Jun 24 01:08:09 2015 +0200
tree 95ee099b1909a4dc956946321757b742bfb75bdb
parent bcc030849a1615528287fa5a7276cf3335be51d2

Fix small issues in tests found by Coverity

tests/suites/test_suite_cipher.function

diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 30f154c..967a6a0 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -95,7 +95,7 @@
 void enc_dec_buf( int cipher_id, char *cipher_string, int key_len,
                   int length_val, int pad_mode )
 {
-    size_t length = length_val, outlen, total_len, i;
+    size_t length = length_val, outlen, total_len, i, block_size;
     unsigned char key[32];
     unsigned char iv[16];
     unsigned char ad[13];
@@ -162,14 +162,17 @@
     TEST_ASSERT( 0 == mbedtls_cipher_update_ad( &ctx_enc, ad, sizeof( ad ) - i ) );
 #endif
 
+    block_size = mbedtls_cipher_get_block_size( &ctx_enc );
+    TEST_ASSERT( block_size != 0 );
+
     /* encode length number of bytes from inbuf */
     TEST_ASSERT( 0 == mbedtls_cipher_update( &ctx_enc, inbuf, length, encbuf, &outlen ) );
     total_len = outlen;
 
     TEST_ASSERT( total_len == length ||
-                 ( total_len % mbedtls_cipher_get_block_size( &ctx_enc ) == 0 &&
+                 ( total_len % block_size == 0 &&
                    total_len < length &&
-                   total_len + mbedtls_cipher_get_block_size( &ctx_enc ) > length ) );
+                   total_len + block_size > length ) );
 
     TEST_ASSERT( 0 == mbedtls_cipher_finish( &ctx_enc, encbuf + outlen, &outlen ) );
     total_len += outlen;
@@ -179,18 +182,18 @@
 #endif
 
     TEST_ASSERT( total_len == length ||
-                 ( total_len % mbedtls_cipher_get_block_size( &ctx_enc ) == 0 &&
+                 ( total_len % block_size == 0 &&
                    total_len > length &&
-                   total_len <= length + mbedtls_cipher_get_block_size( &ctx_enc ) ) );
+                   total_len <= length + block_size ) );
 
     /* decode the previously encoded string */
     TEST_ASSERT( 0 == mbedtls_cipher_update( &ctx_dec, encbuf, total_len, decbuf, &outlen ) );
     total_len = outlen;
 
     TEST_ASSERT( total_len == length ||
-                 ( total_len % mbedtls_cipher_get_block_size( &ctx_dec ) == 0 &&
+                 ( total_len % block_size == 0 &&
                    total_len < length &&
-                   total_len + mbedtls_cipher_get_block_size( &ctx_dec ) >= length ) );
+                   total_len + block_size >= length ) );
 
     TEST_ASSERT( 0 == mbedtls_cipher_finish( &ctx_dec, decbuf + outlen, &outlen ) );
     total_len += outlen;
@@ -322,6 +325,7 @@
     size_t first_length = first_length_val;
     size_t second_length = second_length_val;
     size_t length = first_length + second_length;
+    size_t block_size;
     unsigned char key[32];
     unsigned char iv[16];
 
@@ -367,31 +371,34 @@
     TEST_ASSERT( 0 == mbedtls_cipher_update_ad( &ctx_enc, NULL, 0 ) );
 #endif
 
+    block_size = mbedtls_cipher_get_block_size( &ctx_enc );
+    TEST_ASSERT( block_size != 0 );
+
     /* encode length number of bytes from inbuf */
     TEST_ASSERT( 0 == mbedtls_cipher_update( &ctx_enc, inbuf, first_length, encbuf, &outlen ) );
     totaloutlen = outlen;
     TEST_ASSERT( 0 == mbedtls_cipher_update( &ctx_enc, inbuf + first_length, second_length, encbuf + totaloutlen, &outlen ) );
     totaloutlen += outlen;
     TEST_ASSERT( totaloutlen == length ||
-                 ( totaloutlen % mbedtls_cipher_get_block_size( &ctx_enc ) == 0 &&
+                 ( totaloutlen % block_size == 0 &&
                    totaloutlen < length &&
-                   totaloutlen + mbedtls_cipher_get_block_size( &ctx_enc ) > length ) );
+                   totaloutlen + block_size > length ) );
 
     TEST_ASSERT( 0 == mbedtls_cipher_finish( &ctx_enc, encbuf + totaloutlen, &outlen ) );
     totaloutlen += outlen;
     TEST_ASSERT( totaloutlen == length ||
-                 ( totaloutlen % mbedtls_cipher_get_block_size( &ctx_enc ) == 0 &&
+                 ( totaloutlen % block_size == 0 &&
                    totaloutlen > length &&
-                   totaloutlen <= length + mbedtls_cipher_get_block_size( &ctx_enc ) ) );
+                   totaloutlen <= length + block_size ) );
 
     /* decode the previously encoded string */
     TEST_ASSERT( 0 == mbedtls_cipher_update( &ctx_dec, encbuf, totaloutlen, decbuf, &outlen ) );
     totaloutlen = outlen;
 
     TEST_ASSERT( totaloutlen == length ||
-                 ( totaloutlen % mbedtls_cipher_get_block_size( &ctx_dec ) == 0 &&
+                 ( totaloutlen % block_size == 0 &&
                    totaloutlen < length &&
-                   totaloutlen + mbedtls_cipher_get_block_size( &ctx_dec ) >= length ) );
+                   totaloutlen + block_size >= length ) );
 
     TEST_ASSERT( 0 == mbedtls_cipher_finish( &ctx_dec, decbuf + outlen, &outlen ) );
     totaloutlen += outlen;