Add TEST_FAIL() condition to aes_128_cbc_encrypt/decrypt()

This enables more error path testing.

Signed-off-by: Jouni Malinen <j@w1.fi>

diff --git a/src/crypto/aes-cbc.c b/src/crypto/aes-cbc.c
index 2833cfcc840d91b4e8409a812e85c5335fd2320b..0835f2cfb77ec31f609e5f06bfe6fb3ad9c1e978 100644 (file)
--- a/src/crypto/aes-cbc.c
+++ b/src/crypto/aes-cbc.c
@@ -28,6 +28,9 @@ int aes_128_cbc_encrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
        u8 *pos = data;
        int i, j, blocks;
 
+       if (TEST_FAIL())
+               return -1;
+
        ctx = aes_encrypt_init(key, 16);
        if (ctx == NULL)
                return -1;
@@ -61,6 +64,9 @@ int aes_128_cbc_decrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
        u8 *pos = data;
        int i, j, blocks;
 
+       if (TEST_FAIL())
+               return -1;
+
        ctx = aes_decrypt_init(key, 16);
        if (ctx == NULL)
                return -1;

diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
index 9e344d1de8e0080bcf48cc29dc7f44935777f1fb..ad2d2d4a2c78ad31b071d5752e7e8a4eedb17404 100644 (file)
--- a/src/crypto/crypto_openssl.c
+++ b/src/crypto/crypto_openssl.c
@@ -345,6 +345,9 @@ int aes_128_cbc_encrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
        int clen, len;
        u8 buf[16];
 
+       if (TEST_FAIL())
+               return -1;
+
        EVP_CIPHER_CTX_init(&ctx);
        if (EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv) != 1)
                return -1;
@@ -370,6 +373,9 @@ int aes_128_cbc_decrypt(const u8 *key, const u8 *iv, u8 *data, size_t data_len)
        int plen, len;
        u8 buf[16];
 
+       if (TEST_FAIL())
+               return -1;
+
        EVP_CIPHER_CTX_init(&ctx);
        if (EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, key, iv) != 1)
                return -1;