commit 343a870daad730ab08d92194cc41974686a2cdd0
author Paul Bakker <p.j.bakker@polarssl.org> Thu Jun 09 14:27:58 2011 +0000
committer Paul Bakker <p.j.bakker@polarssl.org> Thu Jun 09 14:27:58 2011 +0000
tree 5076d8403a84967b48a93295e4e6fc30264327d5
parent 1ef71dffc7f33c9cee95d6f39ea8fac3986cc3d6

 - Expanded generic cipher layer with support for CTR and CFB128 modes of operation.

tests/suites/test_suite_cipher.function

diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 504155f..c580095 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -48,20 +48,59 @@
     TEST_ASSERT( 0 == cipher_reset( &ctx_dec, iv ) );
     TEST_ASSERT( 0 == cipher_reset( &ctx_enc, iv ) );
 
-    enclen = cipher_get_block_size( &ctx_enc )
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        enclen = cipher_get_block_size( &ctx_enc )
                     * ( 1 + length / cipher_get_block_size( &ctx_enc ) );
+    }
+    else
+    {
+        enclen = length;
+    }
 
     /* encode length number of bytes from inbuf */
     TEST_ASSERT( 0 == cipher_update( &ctx_enc, inbuf, length, encbuf, &outlen ) );
-    TEST_ASSERT( outlen == enclen - cipher_get_block_size ( &ctx_enc ) );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( outlen == enclen - cipher_get_block_size ( &ctx_enc ) );
+    }
+    else
+    {
+        TEST_ASSERT( outlen == enclen );
+    }
+
     TEST_ASSERT( 0 == cipher_finish( &ctx_enc, encbuf + outlen, &outlen ) );
-    TEST_ASSERT( outlen == cipher_get_block_size ( &ctx_enc ) );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( outlen == cipher_get_block_size ( &ctx_enc ) );
+    }
+    else
+    {
+        TEST_ASSERT( outlen == 0 );
+    }
+
 
     /* decode the previously encoded string */
     TEST_ASSERT( 0 == cipher_update( &ctx_dec, encbuf, enclen, decbuf, &outlen ) );
-    TEST_ASSERT( enclen - cipher_get_block_size ( &ctx_enc ) == outlen );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( enclen - cipher_get_block_size ( &ctx_enc ) == outlen );
+    }
+    else
+    {
+        TEST_ASSERT( enclen == outlen );
+    }
+
     TEST_ASSERT( 0 == cipher_finish( &ctx_dec, decbuf + outlen, &outlen ) );
-    TEST_ASSERT( length - enclen + cipher_get_block_size ( &ctx_enc ) == outlen );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( length - enclen + cipher_get_block_size ( &ctx_enc ) == outlen );
+    }
+    else
+    {
+        TEST_ASSERT( outlen == 0 );
+    }
+
 
     TEST_ASSERT( 0 == memcmp(inbuf, decbuf, length) );
 
@@ -152,24 +191,59 @@
     TEST_ASSERT( 0 == cipher_reset( &ctx_dec, iv ) );
     TEST_ASSERT( 0 == cipher_reset( &ctx_enc, iv ) );
 
-    enclen = cipher_get_block_size(&ctx_enc )
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        enclen = cipher_get_block_size(&ctx_enc )
                     * ( 1 + length / cipher_get_block_size( &ctx_enc ) );
+    }
+    else
+    {
+        enclen = length;
+    }
 
     /* encode length number of bytes from inbuf */
     TEST_ASSERT( 0 == cipher_update( &ctx_enc, inbuf, first_length, encbuf, &outlen ) );
     totaloutlen = outlen;
     TEST_ASSERT( 0 == cipher_update( &ctx_enc, inbuf + first_length, second_length, encbuf + totaloutlen, &outlen ) );
     totaloutlen += outlen;
-    TEST_ASSERT( totaloutlen == enclen - cipher_get_block_size ( &ctx_enc ) );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( totaloutlen == enclen - cipher_get_block_size ( &ctx_enc ) );
+    }
+    else
+    {
+        TEST_ASSERT( totaloutlen == enclen );
+    }
     TEST_ASSERT( 0 == cipher_finish( &ctx_enc, encbuf + totaloutlen, &outlen ) );
     totaloutlen += outlen;
-    TEST_ASSERT( outlen == cipher_get_block_size ( &ctx_enc ) );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( outlen == cipher_get_block_size ( &ctx_enc ) );
+    }
+    else
+    {
+        TEST_ASSERT( outlen == 0 );
+    }
 
     /* decode the previously encoded string */
     TEST_ASSERT( 0 == cipher_update( &ctx_dec, encbuf, enclen, decbuf, &outlen ) );
-    TEST_ASSERT( enclen - cipher_get_block_size ( &ctx_enc ) == outlen );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( enclen - cipher_get_block_size ( &ctx_enc ) == outlen );
+    }
+    else
+    {
+        TEST_ASSERT( enclen == outlen );
+    }
     TEST_ASSERT( 0 == cipher_finish( &ctx_dec, decbuf + outlen, &outlen ) );
-    TEST_ASSERT( length - enclen + cipher_get_block_size ( &ctx_enc ) == outlen );
+    if( POLARSSL_MODE_CBC == cipher_info->mode )
+    {
+        TEST_ASSERT( length - enclen + cipher_get_block_size ( &ctx_enc ) == outlen );
+    }
+    else
+    {
+        TEST_ASSERT( outlen == 0 );
+    }
     
 
     TEST_ASSERT( 0 == memcmp(inbuf, decbuf, length) );