Make CBC an option, step 2: cipher layer
diff --git a/tests/suites/test_suite_cipher.padding.data b/tests/suites/test_suite_cipher.padding.data
index c17ab2e..96ae120 100644
--- a/tests/suites/test_suite_cipher.padding.data
+++ b/tests/suites/test_suite_cipher.padding.data
@@ -1,5 +1,5 @@
 Set padding with AES-CBC
-depends_on:POLARSSL_AES_C
+depends_on:POLARSSL_AES_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_AES_128_CBC:POLARSSL_PADDING_PKCS7:0
 
 Set padding with AES-CFB
@@ -11,7 +11,7 @@
 set_padding:POLARSSL_CIPHER_AES_128_CTR:POLARSSL_PADDING_PKCS7:POLARSSL_ERR_CIPHER_BAD_INPUT_DATA
 
 Set padding with CAMELLIA-CBC
-depends_on:POLARSSL_CAMELLIA_C
+depends_on:POLARSSL_CAMELLIA_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_CAMELLIA_128_CBC:POLARSSL_PADDING_PKCS7:0
 
 Set padding with CAMELLIA-CFB
@@ -23,11 +23,11 @@
 set_padding:POLARSSL_CIPHER_CAMELLIA_128_CTR:POLARSSL_PADDING_PKCS7:POLARSSL_ERR_CIPHER_BAD_INPUT_DATA
 
 Set padding with DES-CBC
-depends_on:POLARSSL_DES_C
+depends_on:POLARSSL_DES_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_DES_CBC:POLARSSL_PADDING_PKCS7:0
 
 Set padding with BLOWFISH-CBC
-depends_on:POLARSSL_BLOWFISH_C
+depends_on:POLARSSL_BLOWFISH_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_BLOWFISH_CBC:POLARSSL_PADDING_PKCS7:0
 
 Set padding with BLOWFISH-CFB
@@ -43,19 +43,19 @@
 set_padding:POLARSSL_CIPHER_NULL:POLARSSL_PADDING_PKCS7:POLARSSL_ERR_CIPHER_BAD_INPUT_DATA
 
 Set non-existent padding with AES-CBC
-depends_on:POLARSSL_AES_C
+depends_on:POLARSSL_AES_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_AES_128_CBC:-1:POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE
 
 Set non-existent padding with CAMELLIA-CBC
-depends_on:POLARSSL_CAMELLIA_C
+depends_on:POLARSSL_CAMELLIA_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_CAMELLIA_128_CBC:-1:POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE
 
 Set non-existent padding with DES-CBC
-depends_on:POLARSSL_DES_C
+depends_on:POLARSSL_DES_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_DES_CBC:-1:POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE
 
 Set non-existent padding with BLOWFISH-CBC
-depends_on:POLARSSL_BLOWFISH_C
+depends_on:POLARSSL_BLOWFISH_C:POLARSSL_CIPHER_MODE_CBC
 set_padding:POLARSSL_CIPHER_BLOWFISH_CBC:-1:POLARSSL_ERR_CIPHER_FEATURE_UNAVAILABLE
 
 Check PKCS padding #1 (correct)