commit 989ed38de25b624b6c48d0f36a033c80f7fd12b1
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Sep 13 14:41:45 2013 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Fri Sep 13 15:48:40 2013 +0200
tree bb8ff3fe1753d083a6f07cabc9668d5f76562c82
parent f7dc378ead4f10d2cb9421579087177f8cc87da0

Make CBC an option, step 2: cipher layer

tests/suites/test_suite_cipher.function

diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function
index 898d98d..892036b 100644
--- a/tests/suites/test_suite_cipher.function
+++ b/tests/suites/test_suite_cipher.function
@@ -48,11 +48,15 @@
     TEST_ASSERT( 0 == cipher_setkey( &ctx_dec, key, key_len, POLARSSL_DECRYPT ) );
     TEST_ASSERT( 0 == cipher_setkey( &ctx_enc, key, key_len, POLARSSL_ENCRYPT ) );
 
+#if defined(POLARSSL_CIPHER_MODE_WITH_PADDING)
     if( -1 != pad_mode )
     {
         TEST_ASSERT( 0 == cipher_set_padding_mode( &ctx_dec, pad_mode ) );
         TEST_ASSERT( 0 == cipher_set_padding_mode( &ctx_enc, pad_mode ) );
     }
+#else
+    (void) pad_mode;
+#endif /* POLARSSL_CIPHER_MODE_WITH_PADDING */
 
     /*
      * Do a few encode/decode cycles
@@ -159,7 +163,11 @@
     /* Initialise context */
     TEST_ASSERT( 0 == cipher_init_ctx( &ctx, cipher_info ) );
     TEST_ASSERT( 0 == cipher_setkey( &ctx, key, key_len, POLARSSL_ENCRYPT ) );
+#if defined(POLARSSL_CIPHER_MODE_WITH_PADDING)
     TEST_ASSERT( 0 == cipher_set_padding_mode( &ctx, pad_mode ) );
+#else
+    (void) pad_mode;
+#endif /* POLARSSL_CIPHER_MODE_WITH_PADDING */
     TEST_ASSERT( 0 == cipher_set_iv( &ctx, iv, 16 ) );
     TEST_ASSERT( 0 == cipher_reset( &ctx ) );
 #if defined(POLARSSL_CIPHER_MODE_AEAD)
@@ -351,8 +359,12 @@
     TEST_ASSERT( 0 == cipher_init_ctx( &ctx,
                                        cipher_info_from_type( cipher_id ) ) );
     TEST_ASSERT( 0 == cipher_setkey( &ctx, key, 8 * key_len, POLARSSL_DECRYPT ) );
+#if defined(POLARSSL_CIPHER_MODE_WITH_PADDING)
     if( pad_mode != -1 )
         TEST_ASSERT( 0 == cipher_set_padding_mode( &ctx, pad_mode ) );
+#else
+    (void) pad_mode;
+#endif /* POLARSSL_CIPHER_MODE_WITH_PADDING */
     TEST_ASSERT( 0 == cipher_set_iv( &ctx, iv, iv_len ) );
     TEST_ASSERT( 0 == cipher_reset( &ctx ) );
 #if defined(POLARSSL_CIPHER_MODE_AEAD)
@@ -428,7 +440,7 @@
 }
 /* END_CASE */
 
-/* BEGIN_CASE */
+/* BEGIN_CASE depends_on:POLARSSL_CIPHER_MODE_WITH_PADDING */
 void set_padding( int cipher_id, int pad_mode, int ret )
 {
     const cipher_info_t *cipher_info;
@@ -444,7 +456,7 @@
 }
 /* END_CASE */
 
-/* BEGIN_CASE */
+/* BEGIN_CASE depends_on:POLARSSL_CIPHER_MODE_CBC */
 void check_padding( int pad_mode, char *input_str, int ret, int dlen_check )
 {
     cipher_info_t cipher_info;