test/crypto: change cipher offset for ESN vector
[dpdk.git] / app / test / test_cryptodev_aes_test_vectors.h
index 1c68f93..f56bbdd 100644 (file)
@@ -1,33 +1,5 @@
-/*
- *   BSD LICENSE
- *
- *   Copyright(c) 2016 Intel Corporation. All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *      * Redistributions of source code must retain the above copyright
- *        notice, this list of conditions and the following disclaimer.
- *      * Redistributions in binary form must reproduce the above copyright
- *        notice, this list of conditions and the following disclaimer in
- *        the documentation and/or other materials provided with the
- *        distribution.
- *      * Neither the name of Intel Corporation nor the names of its
- *        contributors may be used to endorse or promote products derived
- *        from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2016-2019 Intel Corporation
  */
 
 #ifndef TEST_CRYPTODEV_AES_TEST_VECTORS_H_
@@ -56,6 +28,47 @@ static const uint8_t ciphertext64_aes128ctr[] = {
        0x79, 0x21, 0x70, 0xA0, 0xF3, 0x00, 0x9C, 0xEE
 };
 
+static const uint8_t ciphertext64_aes128ctr_IV_12bytes[] = {
+       0x28, 0x80, 0x28, 0xC7, 0x15, 0x99, 0xC5, 0xA8,
+       0xDD, 0x53, 0xC2, 0x67, 0x1B, 0x86, 0xB8, 0x13,
+       0xAB, 0x25, 0x39, 0x7A, 0xD2, 0x1F, 0x8B, 0x4B,
+       0x94, 0x89, 0x2B, 0x65, 0xCF, 0x89, 0x1E, 0xDD,
+       0xD4, 0x7C, 0xFD, 0x8D, 0x0E, 0xCD, 0x23, 0xA4,
+       0xEB, 0x8C, 0x05, 0x58, 0x45, 0x4A, 0x63, 0x44,
+       0x11, 0x42, 0x07, 0x17, 0xB4, 0xD2, 0xCC, 0x75,
+       0xB7, 0x23, 0x99, 0xA9, 0xC5, 0x89, 0x7F, 0x66
+};
+
+static const uint8_t plaintext_aes_docsis_bpi_cfb[] = {
+       0x00, 0x01, 0x02, 0x88, 0xEE, 0x59, 0x7E
+};
+
+static const uint8_t ciphertext_aes_docsis_bpi_cfb[] = {
+       0xFC, 0x68, 0xA3, 0x55, 0x60, 0x37, 0xDC
+};
+
+static const uint8_t ciphertext_aes256_docsis_bpi_cfb[] = {
+       0xE3, 0x75, 0xF2, 0x30, 0x1F, 0x75, 0x9A
+};
+
+static const uint8_t plaintext_aes_docsis_bpi_cbc_cfb[] = {
+       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x91,
+       0xD2, 0xD1, 0x9F
+};
+
+static const uint8_t ciphertext_aes_docsis_bpi_cbc_cfb[] = {
+       0x9D, 0xD1, 0x67, 0x4B, 0xBA, 0x61, 0x10, 0x1B,
+       0x56, 0x75, 0x64, 0x74, 0x36, 0x4F, 0x10, 0x1D,
+       0x44, 0xD4, 0x73
+};
+
+static const uint8_t ciphertext_aes256_docsis_bpi_cbc_cfb[] = {
+       0xD1, 0x28, 0x73, 0x1F, 0xB5, 0x28, 0xB5, 0x18,
+       0xAB, 0x51, 0xAB, 0xC8, 0x98, 0x3D, 0xD1, 0xEE,
+       0xE4, 0x43, 0x59
+};
+
 static const uint8_t plaintext_aes192ctr[] = {
        0x01, 0x0F, 0x10, 0x1F, 0x20, 0x1C, 0x0E, 0xB8,
        0xFB, 0x5C, 0xCD, 0xCC, 0x1F, 0xF9, 0xAF, 0x0B,
@@ -78,6 +91,17 @@ static const uint8_t ciphertext64_aes192ctr[] = {
        0x59, 0x5E, 0x9E, 0xA5, 0x7B, 0x2D, 0xD7, 0xF0
 };
 
+static const uint8_t ciphertext64_aes192ctr_IV_12bytes[] = {
+       0x67, 0x65, 0xa9, 0xee, 0xfd, 0x31, 0x62, 0xfc,
+       0xad, 0xfd, 0xc7, 0x25, 0xb7, 0x25, 0x16, 0xbe,
+       0x25, 0xce, 0xc0, 0x1d, 0xda, 0xa9, 0xd3, 0xda,
+       0x1b, 0x7d, 0x68, 0x6a, 0x6f, 0x06, 0xea, 0x47,
+       0xa0, 0xe0, 0x15, 0xf4, 0xbd, 0x1b, 0x70, 0x34,
+       0xd4, 0x6d, 0x1c, 0x84, 0x17, 0x91, 0x46, 0x0c,
+       0xe8, 0xbc, 0x7a, 0xfb, 0x9f, 0x2a, 0x8f, 0xb4,
+       0xd4, 0xf3, 0x6e, 0x5b, 0x75, 0xa0, 0xce, 0x32
+};
+
 static const uint8_t plaintext_aes256ctr[] = {
        0x6B, 0xC1, 0xBE, 0xE2, 0x2E, 0x40, 0x9F, 0x96,
        0xE9, 0x3D, 0x7E, 0x11, 0x73, 0x93, 0x17, 0x2A,
@@ -100,6 +124,17 @@ static const uint8_t ciphertext64_aes256ctr[] = {
        0x13, 0xC2, 0xDD, 0x08, 0x45, 0x79, 0x41, 0xA6
 };
 
+static const uint8_t ciphertext64_aes256ctr_IV_12bytes[] = {
+       0x7B, 0x7A, 0x7D, 0x83, 0x85, 0xF8, 0x81, 0xF3,
+       0x32, 0x33, 0xD9, 0xFB, 0x04, 0x73, 0xD4, 0x2F,
+       0x70, 0xDE, 0x90, 0x3E, 0xD0, 0xA9, 0x93, 0x8A,
+       0x91, 0xF3, 0xB5, 0x29, 0x4D, 0x2A, 0x74, 0xD0,
+       0xDC, 0x4E, 0x5C, 0x9B, 0x97, 0x24, 0xD8, 0x02,
+       0xFE, 0xAB, 0x38, 0xE8, 0x73, 0x51, 0x29, 0x7E,
+       0xF1, 0xF9, 0x40, 0x78, 0xB1, 0x04, 0x7A, 0x78,
+       0x61, 0x07, 0x47, 0xE6, 0x8C, 0x0F, 0xA8, 0x76
+};
+
 static const uint8_t plaintext_aes_common[] = {
        "What a lousy earth! He wondered how many people "
        "were destitute that same night even in his own "
@@ -196,6 +231,208 @@ static const uint8_t ciphertext512_aes128cbc[] = {
        0xBB, 0xFF, 0xAE, 0xB5, 0x99, 0x6E, 0xCB, 0x0C
 };
 
+/* NULL cipher NULL auth 8-byte multiple test vector */
+static const struct blockcipher_test_data null_test_data_chain_x8_multiple = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_NULL,
+       .cipher_key = { /* arbitrary data - shouldn't be used */
+               .data = {
+                       0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+                       0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
+               },
+               .len = 16
+       },
+       .iv = {                 /* arbitrary data - shouldn't be used */
+               .data = {
+                       0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+                       0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_common,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = plaintext_aes_common,
+               .len = 512
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_NULL,
+       .auth_key = {           /* arbitrary data - shouldn't be used */
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00
+               },
+               .len = 20,
+               .truncated_len = 12
+       }
+};
+
+/* NULL cipher NULL auth 4-byte multiple test vector */
+static const struct blockcipher_test_data null_test_data_chain_x4_multiple = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_NULL,
+       .cipher_key = { /* arbitrary data - shouldn't be used */
+               .data = {
+                       0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+                       0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
+               },
+               .len = 16
+       },
+       .iv = {                 /* arbitrary data - shouldn't be used */
+               .data = {
+                       0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+                       0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes128ctr,
+               .len = 20
+       },
+       .ciphertext = {
+               .data = plaintext_aes128ctr,
+               .len = 20
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_NULL,
+       .auth_key = {           /* arbitrary data - shouldn't be used */
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00
+               },
+               .len = 20,
+               .truncated_len = 12
+       }
+};
+
+/* NULL cipher NULL auth 1-byte multiple test vector */
+static const struct blockcipher_test_data null_test_data_chain_x1_multiple = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_NULL,
+       .cipher_key = { /* arbitrary data - shouldn't be used */
+               .data = {
+                       0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+                       0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
+               },
+               .len = 16
+       },
+       .iv = {                 /* arbitrary data - shouldn't be used */
+               .data = {
+                       0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+                       0xF8, 0xF9, 0xFA, 0xFB, 0xFC, 0xFD, 0xFE, 0xFF
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes128ctr,
+               .len = 21
+       },
+       .ciphertext = {
+               .data = plaintext_aes128ctr,
+               .len = 21
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_NULL,
+       .auth_key = {           /* arbitrary data - shouldn't be used */
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                       0x00, 0x00, 0x00, 0x00
+               },
+               .len = 20,
+               .truncated_len = 12
+       }
+};
+
+static const uint8_t ciphertext512_aes128cbc_aad[] = {
+       0x57, 0x68, 0x61, 0x74, 0x20, 0x61, 0x20, 0x6C,
+       0x1D, 0x7C, 0x76, 0xED, 0xC2, 0x10, 0x3C, 0xB5,
+       0x14, 0x07, 0x3C, 0x33, 0x7B, 0xBE, 0x9E, 0xA9,
+       0x01, 0xC5, 0xAA, 0xA6, 0xB6, 0x7A, 0xE1, 0xDB,
+       0x39, 0xAA, 0xAA, 0xF4, 0xEE, 0xA7, 0x71, 0x71,
+       0x78, 0x0D, 0x5A, 0xD4, 0xF9, 0xCD, 0x75, 0xD1,
+       0x9C, 0x7F, 0xC8, 0x58, 0x46, 0x7A, 0xD1, 0x81,
+       0xEA, 0xCC, 0x08, 0xDC, 0x82, 0x73, 0x22, 0x08,
+       0x11, 0x73, 0x7C, 0xB1, 0x84, 0x6A, 0x8E, 0x67,
+       0x3F, 0x5D, 0xDB, 0x0E, 0xE2, 0xC2, 0xCB, 0x6D,
+       0x88, 0xEC, 0x3F, 0x50, 0x44, 0xD3, 0x47, 0x6E,
+       0xDD, 0x42, 0xDC, 0x2A, 0x5E, 0x5C, 0x50, 0x24,
+       0x57, 0x8A, 0xE7, 0xC5, 0x53, 0x6D, 0x89, 0x33,
+       0x21, 0x65, 0x82, 0xD6, 0xE9, 0xE7, 0x77, 0x10,
+       0xC2, 0x09, 0x91, 0xC1, 0x42, 0x62, 0x36, 0xF4,
+       0x43, 0x37, 0x95, 0xB3, 0x7E, 0x21, 0xC5, 0x3E,
+       0x65, 0xCB, 0xB6, 0xAA, 0xEC, 0xA5, 0xC6, 0x5C,
+       0x4D, 0xBE, 0x14, 0xF1, 0x98, 0xBF, 0x6C, 0x8A,
+       0x9E, 0x9F, 0xD4, 0xB4, 0xF2, 0x22, 0x96, 0x99,
+       0x37, 0x32, 0xB6, 0xC1, 0x04, 0x66, 0x52, 0x37,
+       0x5D, 0x5F, 0x58, 0x92, 0xC9, 0x97, 0xEA, 0x60,
+       0x60, 0x27, 0x57, 0xF9, 0x47, 0x4F, 0xBC, 0xDF,
+       0x05, 0xBD, 0x37, 0x87, 0xBB, 0x09, 0xA5, 0xBE,
+       0xC1, 0xFC, 0x32, 0x86, 0x6A, 0xB7, 0x8B, 0x1E,
+       0x6B, 0xCE, 0x8D, 0x81, 0x63, 0x4C, 0xF2, 0x7F,
+       0xD1, 0x45, 0x82, 0xE8, 0x0D, 0x1C, 0x4D, 0xA8,
+       0xBF, 0x2D, 0x2B, 0x52, 0xE5, 0xDB, 0xAB, 0xFD,
+       0x04, 0xA2, 0xA1, 0x1E, 0x21, 0x1D, 0x06, 0x9A,
+       0xC2, 0x7D, 0x99, 0xFC, 0xB4, 0x72, 0x89, 0x41,
+       0x55, 0x69, 0xFA, 0x1F, 0x78, 0x2F, 0x35, 0x59,
+       0xD7, 0x59, 0x6D, 0xA6, 0x45, 0xC9, 0x2B, 0x06,
+       0x6C, 0xEC, 0x83, 0x34, 0xA5, 0x08, 0xDB, 0x6F,
+       0xDE, 0x75, 0x21, 0x9B, 0xB0, 0xCB, 0x0A, 0xAE,
+       0x22, 0x99, 0x74, 0x1C, 0x9D, 0x37, 0x0E, 0xC6,
+       0x3A, 0x45, 0x49, 0xE5, 0xE3, 0x21, 0x11, 0xEA,
+       0x34, 0x25, 0xD5, 0x76, 0xB0, 0x30, 0x19, 0x87,
+       0x14, 0x3A, 0x10, 0x6F, 0x6D, 0xDD, 0xE9, 0x60,
+       0x6A, 0x00, 0x6A, 0x4C, 0x5B, 0x85, 0x3E, 0x1A,
+       0x41, 0xFA, 0xDE, 0x2D, 0x2F, 0x2E, 0x5B, 0x79,
+       0x09, 0x66, 0x65, 0xD0, 0xDB, 0x32, 0x05, 0xB5,
+       0xEA, 0xFB, 0x6A, 0xD5, 0x43, 0xF8, 0xBD, 0x98,
+       0x7B, 0x8E, 0x3B, 0x85, 0x89, 0x5D, 0xC5, 0x59,
+       0x54, 0x22, 0x75, 0xA8, 0x60, 0xDC, 0x0A, 0x37,
+       0x8C, 0xD8, 0x05, 0xEA, 0x62, 0x62, 0x71, 0x98,
+       0x0C, 0xCB, 0xCE, 0x0A, 0xD9, 0xE6, 0xE8, 0xA7,
+       0xB3, 0x2D, 0x89, 0xA7, 0x60, 0xF0, 0x42, 0xA7,
+       0x3D, 0x80, 0x44, 0xE7, 0xC1, 0xA6, 0x88, 0xB1,
+       0x4F, 0xC0, 0xB1, 0xAF, 0x40, 0xF3, 0x54, 0x72,
+       0x8F, 0xAF, 0x47, 0x96, 0x19, 0xEB, 0xA5, 0x5C,
+       0x00, 0x3B, 0x36, 0xC8, 0x3F, 0x1E, 0x63, 0x54,
+       0xF3, 0x3D, 0x85, 0x44, 0x9B, 0x9B, 0x20, 0xE3,
+       0x9D, 0xEF, 0x62, 0x21, 0xA1, 0x0B, 0x78, 0xF4,
+       0x2B, 0x89, 0x66, 0x5E, 0x97, 0xC6, 0xC4, 0x55,
+       0x35, 0x32, 0xD7, 0x44, 0x95, 0x9A, 0xE7, 0xF2,
+       0x57, 0x52, 0x5B, 0x92, 0x86, 0x8F, 0x8B, 0xCF,
+       0x41, 0x89, 0xF6, 0x2A, 0xD3, 0x42, 0x87, 0x43,
+       0x56, 0x1F, 0x0E, 0x49, 0xF1, 0x32, 0x6D, 0xA8,
+       0x62, 0xDF, 0x47, 0xBB, 0xB6, 0x53, 0xF8, 0x5C,
+       0x36, 0xDA, 0x34, 0x34, 0x2D, 0x2E, 0x1D, 0x33,
+       0xAF, 0x6A, 0x1E, 0xF1, 0xC9, 0x72, 0xB5, 0x3C,
+       0x64, 0x4C, 0x96, 0x12, 0x78, 0x67, 0x6A, 0xE5,
+       0x8B, 0x05, 0x80, 0xAE, 0x7D, 0xE5, 0x9B, 0x24,
+       0xDB, 0xFF, 0x1E, 0xB8, 0x36, 0x6D, 0x3D, 0x5D,
+       0x73, 0x65, 0x72, 0x73, 0x2C, 0x20, 0x73, 0x75
+};
+
 /* AES128-CTR-SHA1 test vector */
 static const struct blockcipher_test_data aes_test_data_1 = {
        .crypto_algo = RTE_CRYPTO_CIPHER_AES_CTR,
@@ -332,6 +569,141 @@ static const struct blockcipher_test_data aes_test_data_3 = {
        }
 };
 
+/* AES128-CTR-SHA1 test vector (12-byte IV) */
+static const struct blockcipher_test_data aes_test_data_1_IV_12_bytes = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CTR,
+       .cipher_key = {
+               .data = {
+                       0x2B, 0x7E, 0x15, 0x16, 0x28, 0xAE, 0xD2, 0xA6,
+                       0xAB, 0xF7, 0x15, 0x88, 0x09, 0xCF, 0x4F, 0x3C
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+                       0xF8, 0xF9, 0xFA, 0xFB
+               },
+               .len = 12
+       },
+       .plaintext = {
+               .data = plaintext_aes128ctr,
+               .len = 64
+       },
+       .ciphertext = {
+               .data = ciphertext64_aes128ctr_IV_12bytes,
+               .len = 64
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x5C, 0x34, 0x6B, 0xE4, 0x9A, 0x7F, 0x4A, 0xC3,
+                       0x82, 0xBE, 0xA0, 0x12, 0xD1, 0xF0, 0x15, 0xFA,
+                       0xCF, 0xC8, 0x7F, 0x60
+               },
+               .len = 20,
+               .truncated_len = 12
+       }
+};
+
+/** AES-192-CTR XCBC test vector (12-byte IV) */
+static const struct blockcipher_test_data aes_test_data_2_IV_12_bytes = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CTR,
+       .cipher_key = {
+               .data = {
+                       0xCB, 0xC5, 0xED, 0x5B, 0xE7, 0x7C, 0xBD, 0x8C,
+                       0x50, 0xD9, 0x30, 0xF2, 0xB5, 0x6A, 0x0E, 0x5F,
+                       0xAA, 0xAE, 0xAD, 0xA2, 0x1F, 0x49, 0x52, 0xD4
+               },
+               .len = 24
+       },
+       .iv = {
+               .data = {
+                       0x3F, 0x69, 0xA8, 0xCD, 0xE8, 0xF0, 0xEF, 0x40,
+                       0xB8, 0x7A, 0x4B, 0xED
+               },
+               .len = 12
+       },
+       .plaintext = {
+               .data = plaintext_aes192ctr,
+               .len = 64
+       },
+       .ciphertext = {
+               .data = ciphertext64_aes192ctr_IV_12bytes,
+               .len = 64
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_AES_XCBC_MAC,
+       .auth_key = {
+               .data = {
+                       0x87, 0x61, 0x54, 0x53, 0xC4, 0x6D, 0xDD, 0x51,
+                       0xE1, 0x9F, 0x86, 0x64, 0x39, 0x0A, 0xE6, 0x59
+               },
+               .len = 16
+       },
+       .digest = {
+               .data = {
+                       0x0C, 0xA1, 0xA5, 0xAF, 0x3E, 0x41, 0xD2, 0xF4,
+                       0x4C, 0x4C, 0xAB, 0x13
+               },
+               .len = 12,
+               .truncated_len = 12
+       }
+};
+
+/** AES-256-CTR SHA1 test vector (12-byte IV) */
+static const struct blockcipher_test_data aes_test_data_3_IV_12_bytes = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CTR,
+       .cipher_key = {
+               .data = {
+                       0x60, 0x3D, 0xEB, 0x10, 0x15, 0xCA, 0x71, 0xBE,
+                       0x2B, 0x73, 0xAE, 0xF0, 0x85, 0x7D, 0x77, 0x81,
+                       0x1F, 0x35, 0x2C, 0x07, 0x3B, 0x61, 0x08, 0xD7,
+                       0x2D, 0x98, 0x10, 0xA3, 0x09, 0x14, 0xDF, 0xF4
+               },
+               .len = 32
+       },
+       .iv = {
+               .data = {
+                       0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,
+                       0xF8, 0xF9, 0xFA, 0xFB
+               },
+               .len = 12
+       },
+       .plaintext = {
+               .data = plaintext_aes256ctr,
+               .len = 64
+       },
+       .ciphertext = {
+               .data = ciphertext64_aes256ctr_IV_12bytes,
+               .len = 64
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x57, 0x9A, 0x52, 0x6E, 0x31, 0x17, 0x57, 0x49,
+                       0xE7, 0xA1, 0x88, 0x6C, 0x2E, 0x36, 0x67, 0x63,
+                       0x3F, 0x2D, 0xA3, 0xEF
+               },
+               .len = 20,
+               .truncated_len = 12
+       }
+};
 /** AES-128-CBC SHA1 test vector */
 static const struct blockcipher_test_data aes_test_data_4 = {
        .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
@@ -825,96 +1197,615 @@ static const struct blockcipher_test_data aes_test_data_11 = {
        }
 };
 
-static const struct blockcipher_test_case aes_chain_test_cases[] = {
-       {
-               .test_descr = "AES-128-CTR HMAC-SHA1 Encryption Digest",
-               .test_data = &aes_test_data_1,
-               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
-       },
-       {
-               .test_descr = "AES-128-CTR HMAC-SHA1 Decryption Digest "
-                       "Verify",
-               .test_data = &aes_test_data_1,
-               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
+/** AES-128-CBC SHA256 HMAC test vector (160 bytes) */
+static const struct blockcipher_test_data aes_test_data_12 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
+               },
+               .len = 16
        },
-       {
-               .test_descr = "AES-192-CTR XCBC Encryption Digest",
-               .test_data = &aes_test_data_2,
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_common,
+               .len = 160
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc,
+               .len = 160
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA256_HMAC,
+       .auth_key = {
+               .data = {
+                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+                       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA,
+                       0x58, 0x34, 0x85, 0x61, 0x1C, 0x42, 0x10, 0x76,
+                       0x9A, 0x4F, 0x88, 0x1B, 0xB6, 0x8F, 0xD8, 0x60
+               },
+               .len = 32
+       },
+       .digest = {
+               .data = {
+                       0x92, 0xEC, 0x65, 0x9A, 0x52, 0xCC, 0x50, 0xA5,
+                       0xEE, 0x0E, 0xDF, 0x1E, 0xA4, 0xC9, 0xC1, 0x04,
+                       0xD5, 0xDC, 0x78, 0x90, 0xF4, 0xE3, 0x35, 0x62,
+                       0xAD, 0x95, 0x45, 0x28, 0x5C, 0xF8, 0x8C, 0x0B
+               },
+               .len = 32,
+               .truncated_len = 16
+       }
+};
+
+/** AES-128-CBC SHA1 HMAC test vector (160 bytes) */
+static const struct blockcipher_test_data aes_test_data_13 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_common,
+               .len = 160
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc,
+               .len = 160
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x4F, 0x16, 0xEA, 0xF7, 0x4A, 0x88, 0xD3, 0xE0,
+                       0x0E, 0x12, 0x8B, 0xE7, 0x05, 0xD0, 0x86, 0x48,
+                       0x22, 0x43, 0x30, 0xA7
+               },
+               .len = 20,
+               .truncated_len = 12
+       }
+};
+
+/** XTS-AES-128 test vector (2 keys * 128 bit) */
+static const uint8_t plaintext_aes128xts_16bytes[] = {
+       0xEB, 0xAB, 0xCE, 0x95, 0xB1, 0x4D, 0x3C, 0x8D,
+       0x6F, 0xB3, 0x50, 0x39, 0x07, 0x90, 0x31, 0x1C
+};
+static const uint8_t ciphertext_aes128xts_16bytes[] = {
+       0x77, 0x8A, 0xE8, 0xB4, 0x3C, 0xB9, 0x8D, 0x5A,
+       0x82, 0x50, 0x81, 0xD5, 0xBE, 0x47, 0x1C, 0x63
+};
+static const struct
+blockcipher_test_data aes_test_data_xts_key_32_pt_16 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_XTS,
+       .cipher_key = {
+               .data = {
+                       0xA1, 0xB9, 0x0C, 0xBA, 0x3F, 0x06, 0xAC, 0x35,
+                       0x3B, 0x2C, 0x34, 0x38, 0x76, 0x08, 0x17, 0x62,
+                       0x09, 0x09, 0x23, 0x02, 0x6E, 0x91, 0x77, 0x18,
+                       0x15, 0xF2, 0x9D, 0xAB, 0x01, 0x93, 0x2F, 0x2F
+               },
+               .len = 32
+       },
+       .iv = {
+               .data = {
+                       0x4F, 0xAE, 0xF7, 0x11, 0x7C, 0xDA, 0x59, 0xC6,
+                       0x6E, 0x4B, 0x92, 0x01, 0x3E, 0x76, 0x8A, 0xD5
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes128xts_16bytes,
+               .len = 16
+       },
+       .ciphertext = {
+               .data = ciphertext_aes128xts_16bytes,
+               .len = 16
+       }
+};
+static const uint8_t plaintext_aes128xts_32bytes[] = {
+       0xB0, 0x4D, 0x84, 0xDA, 0x85, 0x6B, 0x9A, 0x59,
+       0xCE, 0x2D, 0x62, 0x67, 0x46, 0xF6, 0x89, 0xA8,
+       0x05, 0x1D, 0xAC, 0xD6, 0xBC, 0xE3, 0xB9, 0x90,
+       0xAA, 0x90, 0x1E, 0x40, 0x30, 0x64, 0x88, 0x79
+};
+static const uint8_t ciphertext_aes128xts_32bytes[] = {
+       0xF9, 0x41, 0x03, 0x9E, 0xBA, 0xB8, 0xCA, 0xC3,
+       0x9D, 0x59, 0x24, 0x7C, 0xBB, 0xCB, 0x4D, 0x81,
+       0x6C, 0x72, 0x6D, 0xAE, 0xD1, 0x15, 0x77, 0x69,
+       0x2C, 0x55, 0xE4, 0xAC, 0x6D, 0x3E, 0x68, 0x20
+};
+static const struct
+blockcipher_test_data aes_test_data_xts_key_32_pt_32 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_XTS,
+       .cipher_key = {
+               .data = {
+                       0x78, 0x3A, 0x83, 0xEC, 0x52, 0xA2, 0x74, 0x05,
+                       0xDF, 0xF9, 0xDE, 0x4C, 0x57, 0xF9, 0xC9, 0x79,
+                       0xB3, 0x60, 0xB6, 0xA5, 0xDF, 0x88, 0xD6, 0x7E,
+                       0xC1, 0xA0, 0x52, 0xE6, 0xF5, 0x82, 0xA7, 0x17
+               },
+               .len = 32
+       },
+       .iv = {
+               .data = {
+                       0x88, 0x6E, 0x97, 0x5B, 0x29, 0xBD, 0xF6, 0xF0,
+                       0xC0, 0x1B, 0xB4, 0x7F, 0x61, 0xF6, 0xF0, 0xF5
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes128xts_32bytes,
+               .len = 32
+       },
+       .ciphertext = {
+               .data = ciphertext_aes128xts_32bytes,
+               .len = 32
+       }
+};
+
+/** XTS-AES-256 test vector (2 keys * 256 bit) */
+/* Encryption */
+static const uint8_t plaintext_aes256xts_32bytes[] = {
+       0x2E, 0xED, 0xEA, 0x52, 0xCD, 0x82, 0x15, 0xE1,
+       0xAC, 0xC6, 0x47, 0xE8, 0x10, 0xBB, 0xC3, 0x64,
+       0x2E, 0x87, 0x28, 0x7F, 0x8D, 0x2E, 0x57, 0xE3,
+       0x6C, 0x0A, 0x24, 0xFB, 0xC1, 0x2A, 0x20, 0x2E
+};
+static const uint8_t ciphertext_aes256xts_32bytes[] = {
+       0xCB, 0xAA, 0xD0, 0xE2, 0xF6, 0xCE, 0xA3, 0xF5,
+       0x0B, 0x37, 0xF9, 0x34, 0xD4, 0x6A, 0x9B, 0x13,
+       0x0B, 0x9D, 0x54, 0xF0, 0x7E, 0x34, 0xF3, 0x6A,
+       0xF7, 0x93, 0xE8, 0x6F, 0x73, 0xC6, 0xD7, 0xDB
+};
+static const struct
+blockcipher_test_data aes_test_data_xts_key_64_pt_32 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_XTS,
+       .cipher_key = {
+               .data = {
+                       0x1E, 0xA6, 0x61, 0xC5, 0x8D, 0x94, 0x3A, 0x0E,
+                       0x48, 0x01, 0xE4, 0x2F, 0x4B, 0x09, 0x47, 0x14,
+                       0x9E, 0x7F, 0x9F, 0x8E, 0x3E, 0x68, 0xD0, 0xC7,
+                       0x50, 0x52, 0x10, 0xBD, 0x31, 0x1A, 0x0E, 0x7C,
+                       0xD6, 0xE1, 0x3F, 0xFD, 0xF2, 0x41, 0x8D, 0x8D,
+                       0x19, 0x11, 0xC0, 0x04, 0xCD, 0xA5, 0x8D, 0xA3,
+                       0xD6, 0x19, 0xB7, 0xE2, 0xB9, 0x14, 0x1E, 0x58,
+                       0x31, 0x8E, 0xEA, 0x39, 0x2C, 0xF4, 0x1B, 0x08
+               },
+               .len = 64
+       },
+       .iv = {
+               .data = {
+                       0xAD, 0xF8, 0xD9, 0x26, 0x27, 0x46, 0x4A, 0xD2,
+                       0xF0, 0x42, 0x8E, 0x84, 0xA9, 0xF8, 0x75, 0x64
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes256xts_32bytes,
+               .len = 32
+       },
+       .ciphertext = {
+               .data = ciphertext_aes256xts_32bytes,
+               .len = 32
+       }
+};
+static const uint8_t plaintext_aes256xts_48bytes[] = {
+       0xBB, 0xB2, 0x34, 0xDB, 0x01, 0xBE, 0x79, 0xD3,
+       0xDC, 0x7D, 0xCF, 0x49, 0xBC, 0x53, 0xB8, 0xEF,
+       0xC6, 0x2F, 0xE7, 0x17, 0x94, 0x39, 0x06, 0x1D,
+       0x73, 0xA6, 0xB2, 0x0E, 0xDB, 0x9B, 0x7D, 0xA0,
+       0x45, 0x0B, 0x19, 0xF0, 0x20, 0x82, 0x02, 0x09,
+       0xAF, 0xE0, 0x81, 0x12, 0xAE, 0x4A, 0xFD, 0xD3
+};
+static const uint8_t ciphertext_aes256xts_48bytes[] = {
+       0xCB, 0xF6, 0x88, 0x48, 0xC4, 0x20, 0x49, 0xEF,
+       0xB1, 0x46, 0xE2, 0xD1, 0xE4, 0x11, 0x5F, 0x62,
+       0xE4, 0xFA, 0xA4, 0xEF, 0xFF, 0x19, 0x8F, 0x1A,
+       0x0A, 0xA0, 0xC9, 0x8B, 0xA0, 0x2C, 0xC4, 0x4D,
+       0xA3, 0x76, 0xD7, 0x62, 0xD6, 0x15, 0x1F, 0x23,
+       0x45, 0x87, 0xBF, 0x12, 0x8B, 0x6A, 0x7F, 0xFA
+};
+static const struct
+blockcipher_test_data aes_test_data_xts_key_64_pt_48 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_XTS,
+       .cipher_key = {
+               .data = {
+                       0x7F, 0xB0, 0x92, 0x2F, 0xCE, 0x09, 0xED, 0xDD,
+                       0x36, 0x65, 0xA1, 0x1F, 0x52, 0x35, 0xD5, 0x1E,
+                       0xF7, 0x72, 0x06, 0xA7, 0xDE, 0x45, 0x47, 0x75,
+                       0xB6, 0x9D, 0xCC, 0x54, 0x59, 0xAC, 0xDB, 0x24,
+                       0xCC, 0xF0, 0x5C, 0x41, 0x5A, 0xF5, 0xAB, 0x8A,
+                       0x06, 0x62, 0x3D, 0x19, 0x8D, 0x5B, 0x91, 0x85,
+                       0x95, 0xA9, 0xDC, 0xAA, 0xF5, 0x39, 0x2E, 0xE7,
+                       0x17, 0xC1, 0x04, 0x7F, 0x2F, 0x08, 0xF6, 0x2B
+               },
+               .len = 64
+       },
+       .iv = {
+               .data = {
+                       0x8E, 0xA3, 0x63, 0x8B, 0x9D, 0x40, 0x62, 0xF1,
+                       0x69, 0x19, 0x6F, 0xF4, 0x55, 0x5A, 0xD0, 0xAF
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes256xts_48bytes,
+               .len = 48
+       },
+       .ciphertext = {
+               .data = ciphertext_aes256xts_48bytes,
+               .len = 48
+       }
+};
+
+/* AES-DOCSIS-BPI test vectors */
+
+/* Multiple of AES block size */
+static const struct blockcipher_test_data aes_test_data_docsis_1 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_common,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc,
+               .len = 512
+       }
+};
+
+/* Less than AES block size */
+static const struct blockcipher_test_data aes_test_data_docsis_2 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
+       .cipher_key = {
+               .data = {
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A,
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_docsis_bpi_cfb,
+               .len = 7
+       },
+       .ciphertext = {
+               .data = ciphertext_aes_docsis_bpi_cfb,
+               .len = 7
+       }
+};
+
+/* Not multiple of AES block size */
+static const struct blockcipher_test_data aes_test_data_docsis_3 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
+       .cipher_key = {
+               .data = {
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A,
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_docsis_bpi_cbc_cfb,
+               .len = 19
+       },
+       .ciphertext = {
+               .data = ciphertext_aes_docsis_bpi_cbc_cfb,
+               .len = 19
+       }
+};
+
+/* Multiple of AES 256 block size */
+static const struct blockcipher_test_data aes_test_data_docsis_4 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A,
+                       0xD4, 0xC3, 0xA3, 0xAA, 0x33, 0x62, 0x61, 0xE0,
+                       0x37, 0x07, 0xB8, 0x23, 0xA2, 0xA3, 0xB5, 0x8D
+               },
+               .len = 32
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_common,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes256cbc,
+               .len = 512
+       }
+};
+
+/* Less than AES 256 block size */
+static const struct blockcipher_test_data aes_test_data_docsis_5 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
+       .cipher_key = {
+               .data = {
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB
+               },
+               .len = 32
+       },
+       .iv = {
+               .data = {
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A,
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_docsis_bpi_cfb,
+               .len = 7
+       },
+       .ciphertext = {
+               .data = ciphertext_aes256_docsis_bpi_cfb,
+               .len = 7
+       }
+};
+
+/* Not multiple of AES 256 block size */
+static const struct blockcipher_test_data aes_test_data_docsis_6 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI,
+       .cipher_key = {
+               .data = {
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB,
+                       0xE6, 0x60, 0x0F, 0xD8, 0x85, 0x2E, 0xF5, 0xAB
+               },
+               .len = 32
+       },
+       .iv = {
+               .data = {
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A,
+                       0x81, 0x0E, 0x52, 0x8E, 0x1C, 0x5F, 0xDA, 0x1A
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_docsis_bpi_cbc_cfb,
+               .len = 19
+       },
+       .ciphertext = {
+               .data = ciphertext_aes256_docsis_bpi_cbc_cfb,
+               .len = 19
+       }
+};
+
+static const uint8_t
+cipher_aescbc_offset_16[] = {
+       0x57, 0x68, 0x61, 0x74, 0x20, 0x61, 0x20, 0x6C,
+       0x6F, 0x75, 0x73, 0x79, 0x20, 0x65, 0x61, 0x72,
+       0x68, 0x2A, 0x6A, 0x82, 0xE0, 0x73, 0xC7, 0x51,
+       0x81, 0xF4, 0x47, 0x27, 0x1A, 0xEF, 0x76, 0x15,
+       0x1C, 0xE1, 0x38, 0x5F, 0xE1, 0x81, 0x77, 0xC7,
+       0x8B, 0xF0, 0x69, 0xC3, 0x3C, 0x45, 0x1C, 0x0A,
+       0xA3, 0x93, 0xBF, 0x60, 0x57, 0x88, 0xD2, 0xFF,
+       0xE1, 0x8F, 0xC0, 0x64, 0x2C, 0x42, 0xC5, 0x22,
+       0xE3, 0x5F, 0x71, 0x1F, 0xF7, 0x62, 0xA2, 0x7E,
+       0x0D, 0x42, 0xD9, 0xE7, 0xF3, 0x10, 0xB0, 0xEE,
+};
+
+/** AES-128-CBC SHA1 OOP test vector for swapping src/dst */
+static const struct blockcipher_test_data aes_test_data_14 = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_aes_common,
+               .len = 80
+       },
+       .cipher_offset = 16,
+       .auth_offset = 0,
+       .ciphertext = {
+               .data = cipher_aescbc_offset_16,
+               .len = 80
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0xCC, 0x15, 0x83, 0xF7, 0x23, 0x87, 0x96, 0xA7,
+                       0x29, 0x34, 0x32, 0xE4, 0x4C, 0x06, 0xE8, 0xEB,
+                       0x70, 0x72, 0x4B, 0xAD
+               },
+               .len = 20,
+               .truncated_len = 12
+       }
+};
+
+static const struct blockcipher_test_case aes_chain_test_cases[] = {
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
+                       "Verify OOP Offset",
+               .test_data = &aes_test_data_14,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+               {
+               .test_descr = "AES-128-CTR HMAC-SHA1 Encryption Digest",
+               .test_data = &aes_test_data_1,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+       },
+       {
+               .test_descr = "AES-128-CTR HMAC-SHA1 Decryption Digest "
+                       "Verify",
+               .test_data = &aes_test_data_1,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+       },
+       {
+               .test_descr = "AES-192-CTR XCBC Encryption Digest",
+               .test_data = &aes_test_data_2,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-192-CTR XCBC Decryption Digest Verify",
                .test_data = &aes_test_data_2,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
+       },
+       {
+               .test_descr = "AES-192-CTR XCBC Decryption Digest Verify "
+                               "Scatter Gather",
+               .test_data = &aes_test_data_2,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_SG |
+                       BLOCKCIPHER_TEST_FEATURE_OOP,
        },
        {
                .test_descr = "AES-256-CTR HMAC-SHA1 Encryption Digest",
                .test_data = &aes_test_data_3,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-256-CTR HMAC-SHA1 Decryption Digest "
                        "Verify",
                .test_data = &aes_test_data_3,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest",
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
+                       "(short buffers)",
+               .test_data = &aes_test_data_13,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
+                               "Scatter Gather",
+               .test_data = &aes_test_data_4,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_SG |
+                       BLOCKCIPHER_TEST_FEATURE_OOP,
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
                        "Verify",
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
+                       "Verify Scatter Gather",
+               .test_data = &aes_test_data_4,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_SG,
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
+                       "Verify (short buffers)",
+               .test_data = &aes_test_data_13,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA256 Encryption Digest",
                .test_data = &aes_test_data_5,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA256 Encryption Digest "
+                       "(short buffers)",
+               .test_data = &aes_test_data_12,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA256 Decryption Digest "
                        "Verify",
                .test_data = &aes_test_data_5,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA256 Decryption Digest "
+                       "Verify (short buffers)",
+               .test_data = &aes_test_data_12,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Encryption Digest",
                .test_data = &aes_test_data_6,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Encryption Digest "
@@ -922,31 +1813,39 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .test_data = &aes_test_data_6,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
                .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA512 Encryption Digest "
+                               "Scatter Gather Sessionless",
+               .test_data = &aes_test_data_6,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS |
+                       BLOCKCIPHER_TEST_FEATURE_SG |
+                       BLOCKCIPHER_TEST_FEATURE_OOP,
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA512 Decryption Digest "
                        "Verify",
                .test_data = &aes_test_data_6,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA512 Decryption Digest "
+                       "Verify Scatter Gather",
+               .test_data = &aes_test_data_6,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_SG |
+                       BLOCKCIPHER_TEST_FEATURE_OOP,
        },
        {
                .test_descr = "AES-128-CBC XCBC Encryption Digest",
                .test_data = &aes_test_data_7,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC XCBC Decryption Digest Verify",
                .test_data = &aes_test_data_7,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
@@ -954,8 +1853,13 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
                .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_QAT |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+       },
+       {
+               .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
+                       "OOP Offset",
+               .test_data = &aes_test_data_14,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Decryption Digest "
@@ -963,42 +1867,28 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
                .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_QAT |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA224 Encryption Digest",
                .test_data = &aes_test_data_8,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA224 Decryption Digest "
                        "Verify",
                .test_data = &aes_test_data_8,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA384 Encryption Digest",
                .test_data = &aes_test_data_9,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA384 Decryption Digest "
                        "Verify",
                .test_data = &aes_test_data_9,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_MB |
-                       BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL |
-                       BLOCKCIPHER_TEST_TARGET_PMD_QAT
        },
        {
                .test_descr = "AES-128-CBC HMAC-SHA1 Encryption Digest "
@@ -1006,7 +1896,6 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
                .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr =
@@ -1015,7 +1904,72 @@ static const struct blockcipher_test_case aes_chain_test_cases[] = {
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
                .feature_mask = BLOCKCIPHER_TEST_FEATURE_SESSIONLESS,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+       },
+       {
+               .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x8byte",
+               .test_data = &null_test_data_chain_x8_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+       },
+       {
+               .test_descr = "NULL-AUTH-NULL-CIPHER verify & decrypt x8byte",
+               .test_data = &null_test_data_chain_x8_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+       },
+       {
+               .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x8byte - OOP",
+               .test_data = &null_test_data_chain_x8_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "NULL-AUTH-NULL-CIPHER verify & decrypt x8byte - OOP",
+               .test_data = &null_test_data_chain_x8_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x4byte",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+       },
+       {
+               .test_descr = "NULL-AUTH-NULL-CIPHER verify & decrypt x4byte",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+       },
+       {
+               .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x4byte - OOP",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "NULL-AUTH-NULL-CIPHER verify & decrypt x4byte - OOP",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x1byte",
+               .test_data = &null_test_data_chain_x1_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+       },
+       {
+               .test_descr = "NULL-AUTH-NULL-CIPHER verify & decrypt x1byte",
+               .test_data = &null_test_data_chain_x1_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+       },
+       {
+               .test_descr = "NULL-CIPHER-NULL-AUTH encrypt & gen x1byte - OOP",
+               .test_data = &null_test_data_chain_x1_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENC_AUTH_GEN,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "NULL-AUTH-NULL-CIPHER verify & decrypt x1byte - OOP",
+               .test_data = &null_test_data_chain_x1_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_AUTH_VERIFY_DEC,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
        },
 };
 
@@ -1024,74 +1978,321 @@ static const struct blockcipher_test_case aes_cipheronly_test_cases[] = {
                .test_descr = "AES-128-CBC Encryption",
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-128-CBC Decryption",
                .test_data = &aes_test_data_4,
                .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-192-CBC Encryption",
                .test_data = &aes_test_data_10,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+       },
+       {
+               .test_descr = "AES-192-CBC Encryption Scater gather",
+               .test_data = &aes_test_data_10,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_SG |
+                       BLOCKCIPHER_TEST_FEATURE_OOP,
        },
        {
                .test_descr = "AES-192-CBC Decryption",
                .test_data = &aes_test_data_10,
                .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+       },
+       {
+               .test_descr = "AES-192-CBC Decryption Scatter Gather",
+               .test_data = &aes_test_data_10,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_SG,
        },
        {
                .test_descr = "AES-256-CBC Encryption",
                .test_data = &aes_test_data_11,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-256-CBC Decryption",
                .test_data = &aes_test_data_11,
                .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+       },
+       {
+               .test_descr = "AES-256-CBC OOP Encryption",
+               .test_data = &aes_test_data_11,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-256-CBC OOP Decryption",
+               .test_data = &aes_test_data_11,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
        },
        {
                .test_descr = "AES-128-CTR Encryption",
                .test_data = &aes_test_data_1,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-128-CTR Decryption",
                .test_data = &aes_test_data_1,
                .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-192-CTR Encryption",
                .test_data = &aes_test_data_2,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-192-CTR Decryption",
                .test_data = &aes_test_data_2,
                .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-256-CTR Encryption",
                .test_data = &aes_test_data_3,
                .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
        },
        {
                .test_descr = "AES-256-CTR Decryption",
                .test_data = &aes_test_data_3,
                .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
-               .pmd_mask = BLOCKCIPHER_TEST_TARGET_PMD_OPENSSL
+       },
+       {
+               .test_descr = "AES-128-CTR Encryption (12-byte IV)",
+               .test_data = &aes_test_data_1_IV_12_bytes,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-192-CTR Encryption (12-byte IV)",
+               .test_data = &aes_test_data_2_IV_12_bytes,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-256-CTR Encryption (12-byte IV)",
+               .test_data = &aes_test_data_3_IV_12_bytes,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-128-XTS Encryption (16-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_32_pt_16,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-128-XTS Decryption (16-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_32_pt_16,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-128-XTS Encryption (32-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_32_pt_32,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-128-XTS Decryption (32-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_32_pt_32,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-256-XTS Encryption (32-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_64_pt_32,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-256-XTS Decryption (32-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_64_pt_32,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-256-XTS Encryption (48-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_64_pt_48,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-256-XTS Decryption (48-byte plaintext)",
+               .test_data = &aes_test_data_xts_key_64_pt_48,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "cipher-only - NULL algo - x8 - encryption",
+               .test_data = &null_test_data_chain_x8_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "cipher-only - NULL algo - x8 - decryption",
+               .test_data = &null_test_data_chain_x8_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "cipher-only - NULL algo - x4 - encryption",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "cipher-only - NULL algo - x4 - decryption",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "cipher-only - NULL algo - x4 - encryption - OOP",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "cipher-only - NULL algo - x4 - decryption - OOP",
+               .test_data = &null_test_data_chain_x4_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+               },
+       {
+               .test_descr = "cipher-only - NULL algo - x1 - encryption",
+               .test_data = &null_test_data_chain_x1_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "cipher-only - NULL algo - x1 - decryption",
+               .test_data = &null_test_data_chain_x1_multiple,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
        },
 };
 
+static const struct blockcipher_test_case aes_docsis_test_cases[] = {
+
+       {
+               .test_descr = "AES-DOCSIS-BPI Full Block Encryption",
+               .test_data = &aes_test_data_docsis_1,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI Runt Block Encryption",
+               .test_data = &aes_test_data_docsis_2,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI Uneven Encryption",
+               .test_data = &aes_test_data_docsis_3,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI Full Block Decryption",
+               .test_data = &aes_test_data_docsis_1,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI Runt Block Decryption",
+               .test_data = &aes_test_data_docsis_2,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI Uneven Decryption",
+               .test_data = &aes_test_data_docsis_3,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI OOP Full Block Encryption",
+               .test_data = &aes_test_data_docsis_1,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI OOP Runt Block Encryption",
+               .test_data = &aes_test_data_docsis_2,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+
+       {
+               .test_descr = "AES-DOCSIS-BPI OOP Uneven Block Encryption",
+               .test_data = &aes_test_data_docsis_3,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI OOP Full Block Decryption",
+               .test_data = &aes_test_data_docsis_1,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI OOP Runt Block Decryption",
+               .test_data = &aes_test_data_docsis_2,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-DOCSIS-BPI OOP Uneven Block Decryption",
+               .test_data = &aes_test_data_docsis_3,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       /* AES 256 */
+       {
+               .test_descr = "AES-256-DOCSIS-BPI Full Block Encryption",
+               .test_data = &aes_test_data_docsis_4,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI Runt Block Encryption",
+               .test_data = &aes_test_data_docsis_5,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI Uneven Encryption",
+               .test_data = &aes_test_data_docsis_6,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI Full Block Decryption",
+               .test_data = &aes_test_data_docsis_4,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI Runt Block Decryption",
+               .test_data = &aes_test_data_docsis_5,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI Uneven Decryption",
+               .test_data = &aes_test_data_docsis_6,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI OOP Full Block Encryption",
+               .test_data = &aes_test_data_docsis_4,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI OOP Runt Block Encryption",
+               .test_data = &aes_test_data_docsis_5,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI OOP Uneven Block Encryption",
+               .test_data = &aes_test_data_docsis_6,
+               .op_mask = BLOCKCIPHER_TEST_OP_ENCRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI OOP Full Block Decryption",
+               .test_data = &aes_test_data_docsis_4,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI OOP Runt Block Decryption",
+               .test_data = &aes_test_data_docsis_5,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+       {
+               .test_descr = "AES-256-DOCSIS-BPI OOP Uneven Block Decryption",
+               .test_data = &aes_test_data_docsis_6,
+               .op_mask = BLOCKCIPHER_TEST_OP_DECRYPT,
+               .feature_mask = BLOCKCIPHER_TEST_FEATURE_OOP,
+       },
+};
 #endif /* TEST_CRYPTODEV_AES_TEST_VECTORS_H_ */