test/crypto: enable feature flag for security
[dpdk.git] / app / test / test_cryptodev.c
index 2ff2041..70bf6fe 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2017 Intel Corporation
+ * Copyright(c) 2015-2020 Intel Corporation
  */
 
 #include <time.h>
@@ -11,6 +11,7 @@
 #include <rte_memcpy.h>
 #include <rte_pause.h>
 #include <rte_bus_vdev.h>
+#include <rte_ether.h>
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
 #include "test_cryptodev_zuc_test_vectors.h"
 #include "test_cryptodev_aead_test_vectors.h"
 #include "test_cryptodev_hmac_test_vectors.h"
+#include "test_cryptodev_mixed_test_vectors.h"
+#ifdef RTE_LIBRTE_SECURITY
+#include "test_cryptodev_security_pdcp_test_vectors.h"
+#include "test_cryptodev_security_pdcp_test_func.h"
+#include "test_cryptodev_security_docsis_test_vectors.h"
+#endif
 
 #define VDEV_ARGS_SIZE 100
-#define MAX_NB_SESSIONS            4
+#define MAX_NB_SESSIONS 4
+
+#define IN_PLACE 0
+#define OUT_OF_PLACE 1
 
 static int gbl_driver_id;
 
+static enum rte_security_session_action_type gbl_action_type =
+       RTE_SECURITY_ACTION_TYPE_NONE;
+
 struct crypto_testsuite_params {
        struct rte_mempool *mbuf_pool;
        struct rte_mempool *large_mbuf_pool;
@@ -61,9 +74,19 @@ struct crypto_unittest_params {
        struct rte_crypto_sym_xform cipher_xform;
        struct rte_crypto_sym_xform auth_xform;
        struct rte_crypto_sym_xform aead_xform;
+#ifdef RTE_LIBRTE_SECURITY
+       struct rte_security_docsis_xform docsis_xform;
+#endif
 
-       struct rte_cryptodev_sym_session *sess;
-
+       union {
+               struct rte_cryptodev_sym_session *sess;
+#ifdef RTE_LIBRTE_SECURITY
+               struct rte_security_session *sec_session;
+#endif
+       };
+#ifdef RTE_LIBRTE_SECURITY
+       enum rte_security_session_action_type type;
+#endif
        struct rte_crypto_op *op;
 
        struct rte_mbuf *obuf, *ibuf;
@@ -124,11 +147,101 @@ ceil_byte_length(uint32_t num_bits)
                return (num_bits >> 3);
 }
 
+static void
+process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->aead.data.offset,
+               sop->aead.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->aead.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
+static void
+process_cpu_crypt_auth_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->auth.data.offset,
+               sop->auth.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->auth.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+       ofs.ofs.cipher.head = sop->cipher.data.offset - sop->auth.data.offset;
+       ofs.ofs.cipher.tail = (sop->auth.data.offset + sop->auth.data.length) -
+               (sop->cipher.data.offset + sop->cipher.data.length);
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
 static struct rte_crypto_op *
 process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
 {
+
+       RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);
+
        if (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) {
-               printf("Error sending packet for encryption");
+               RTE_LOG(ERR, USER1, "Error sending packet for encryption\n");
                return NULL;
        }
 
@@ -137,6 +250,11 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
        while (rte_cryptodev_dequeue_burst(dev_id, 0, &op, 1) == 0)
                rte_pause();
 
+       if (op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               RTE_LOG(DEBUG, USER1, "Operation status %d\n", op->status);
+               return NULL;
+       }
+
        return op;
 }
 
@@ -378,7 +496,7 @@ testsuite_setup(void)
                        strcpy(temp_str, vdev_args);
                        strlcat(temp_str, ";", sizeof(temp_str));
                        slave_core_count++;
-                       socket_id = lcore_config[i].socket_id;
+                       socket_id = rte_lcore_to_socket_id(i);
                }
                if (slave_core_count != 2) {
                        RTE_LOG(ERR, USER1,
@@ -408,8 +526,8 @@ testsuite_setup(void)
 
        nb_devs = rte_cryptodev_count();
        if (nb_devs < 1) {
-               RTE_LOG(ERR, USER1, "No crypto devices found?\n");
-               return TEST_FAILED;
+               RTE_LOG(WARNING, USER1, "No crypto devices found?\n");
+               return TEST_SKIPPED;
        }
 
        /* Create list of valid crypto devs */
@@ -430,6 +548,7 @@ testsuite_setup(void)
 
        ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
        ts_params->conf.socket_id = SOCKET_ID_ANY;
+       ts_params->conf.ff_disable = RTE_CRYPTODEV_FF_SECURITY;
 
        unsigned int session_size =
                rte_cryptodev_sym_get_private_session_size(dev_id);
@@ -469,7 +588,7 @@ testsuite_setup(void)
                        "Failed to configure cryptodev %u with %u qps",
                        dev_id, ts_params->conf.nb_queue_pairs);
 
-       ts_params->qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
+       ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
        ts_params->qp_conf.mp_session = ts_params->session_mpool;
        ts_params->qp_conf.mp_session_private = ts_params->session_priv_mpool;
 
@@ -512,7 +631,7 @@ testsuite_teardown(void)
 }
 
 static int
-ut_setup(void)
+dev_configure_and_start(uint64_t ff_disable)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -524,6 +643,7 @@ ut_setup(void)
 
        /* Reconfigure device to default parameters */
        ts_params->conf.socket_id = SOCKET_ID_ANY;
+       ts_params->conf.ff_disable = ff_disable;
        ts_params->qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT;
        ts_params->qp_conf.mp_session = ts_params->session_mpool;
        ts_params->qp_conf.mp_session_private = ts_params->session_priv_mpool;
@@ -553,6 +673,20 @@ ut_setup(void)
        return TEST_SUCCESS;
 }
 
+static int
+ut_setup(void)
+{
+       /* Configure and start the device with security feature disabled */
+       return dev_configure_and_start(RTE_CRYPTODEV_FF_SECURITY);
+}
+
+static int
+ut_setup_security(void)
+{
+       /* Configure and start the device with no features disabled */
+       return dev_configure_and_start(0);
+}
+
 static void
 ut_teardown(void)
 {
@@ -561,11 +695,24 @@ ut_teardown(void)
        struct rte_cryptodev_stats stats;
 
        /* free crypto session structure */
-       if (ut_params->sess) {
-               rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
-                               ut_params->sess);
-               rte_cryptodev_sym_session_free(ut_params->sess);
-               ut_params->sess = NULL;
+#ifdef RTE_LIBRTE_SECURITY
+       if (ut_params->type == RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) {
+               if (ut_params->sec_session) {
+                       rte_security_session_destroy(rte_cryptodev_get_sec_ctx
+                                               (ts_params->valid_devs[0]),
+                                               ut_params->sec_session);
+                       ut_params->sec_session = NULL;
+               }
+       } else
+#endif
+       {
+               if (ut_params->sess) {
+                       rte_cryptodev_sym_session_clear(
+                                       ts_params->valid_devs[0],
+                                       ut_params->sess);
+                       rte_cryptodev_sym_session_free(ut_params->sess);
+                       ut_params->sess = NULL;
+               }
        }
 
        /* free crypto operation structure */
@@ -642,17 +789,16 @@ test_device_configure_invalid_queue_pair_ids(void)
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       /* valid - one queue pairs */
-       ts_params->conf.nb_queue_pairs = 1;
+       /* valid - max value queue pairs */
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev: dev_id %u, qp_id %u",
                        ts_params->valid_devs[0], ts_params->conf.nb_queue_pairs);
 
-
-       /* valid - max value queue pairs */
-       ts_params->conf.nb_queue_pairs = orig_nb_qps;
+       /* valid - one queue pairs */
+       ts_params->conf.nb_queue_pairs = 1;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -703,19 +849,14 @@ static int
 test_queue_pair_descriptor_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct rte_cryptodev_info dev_info;
        struct rte_cryptodev_qp_conf qp_conf = {
                .nb_descriptors = MAX_NUM_OPS_INFLIGHT
        };
-
        uint16_t qp_id;
 
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev %u",
@@ -769,36 +910,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 2 */
-       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT + 2;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
-       /* invalid number of descriptors - max value of parameter */
-       qp_conf.nb_descriptors = UINT32_MAX-1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
 
        for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
@@ -813,21 +924,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 1 */
-       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT + 1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        /* test invalid queue pair id */
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
 
@@ -1318,6 +1414,19 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        /* Generate test mbuf data and space for digest */
        ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
                        catch_22_quote, QUOTE_512_BYTES, 0);
@@ -1387,8 +1496,14 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1538,8 +1653,14 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                               process_crypto_request(ts_params->valid_devs[0],
+                                       ut_params->op),
+                                       "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1561,7 +1682,7 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
 }
 
 static int
-test_AES_cipheronly_mb_all(void)
+test_blockcipher(enum blockcipher_test_type test_type)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        int status;
@@ -1570,9 +1691,10 @@ test_AES_cipheronly_mb_all(void)
                ts_params->op_mpool,
                ts_params->session_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+               test_type);
+
+       if (status == -ENOTSUP)
+               return status;
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
@@ -1580,1711 +1702,1763 @@ test_AES_cipheronly_mb_all(void)
 }
 
 static int
-test_AES_docsis_mb_all(void)
+test_AES_cipheronly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AES_CIPHERONLY_TYPE);
 }
 
 static int
-test_AES_docsis_qat_all(void)
+test_AES_docsis_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AES_DOCSIS_TYPE);
 }
 
 static int
-test_DES_docsis_qat_all(void)
+test_DES_docsis_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_DES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_DES_DOCSIS_TYPE);
 }
 
 static int
-test_authonly_mb_all(void)
+test_DES_cipheronly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_DES_CIPHERONLY_TYPE);
 }
 
 static int
-test_authonly_qat_all(void)
+test_authonly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AUTHONLY_TYPE);
 }
+
 static int
-test_AES_chain_mb_all(void)
+test_AES_chain_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AES_CHAIN_TYPE);
 }
 
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
-
 static int
-test_AES_cipheronly_scheduler_all(void)
+test_3DES_chain_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_3DES_CHAIN_TYPE);
 }
 
 static int
-test_AES_chain_scheduler_all(void)
+test_3DES_cipheronly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_3DES_CIPHERONLY_TYPE);
 }
 
+/* ***** SNOW 3G Tests ***** */
 static int
-test_authonly_scheduler_all(void)
+create_wireless_algo_hash_session(uint8_t dev_id,
+       const uint8_t *key, const uint8_t key_len,
+       const uint8_t iv_len, const uint8_t auth_len,
+       enum rte_crypto_auth_operation op,
+       enum rte_crypto_auth_algorithm algo)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t hash_key[key_len];
        int status;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
+       memcpy(hash_key, key, key_len);
 
-static int
-test_AES_chain_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       ut_params->auth_xform.auth.op = op;
+       ut_params->auth_xform.auth.algo = algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       ut_params->auth_xform.auth.key.data = hash_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+       ut_params->auth_xform.auth.iv.length = iv_len;
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       return TEST_SUCCESS;
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
 }
 
 static int
-test_AES_cipheronly_openssl_all(void)
+create_wireless_algo_cipher_session(uint8_t dev_id,
+                       enum rte_crypto_cipher_operation op,
+                       enum rte_crypto_cipher_algorithm algo,
+                       const uint8_t *key, const uint8_t key_len,
+                       uint8_t iv_len)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t cipher_key[key_len];
        int status;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       memcpy(cipher_key, key, key_len);
 
-       return TEST_SUCCESS;
-}
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
 
-static int
-test_AES_chain_ccp_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       ut_params->cipher_xform.cipher.algo = algo;
+       ut_params->cipher_xform.cipher.op = op;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = iv_len;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Create Crypto session */
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       return TEST_SUCCESS;
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
 }
 
 static int
-test_AES_cipheronly_ccp_all(void)
+create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
+                       unsigned int cipher_len,
+                       unsigned int cipher_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                               "Failed to allocate pktmbuf offload");
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       return TEST_SUCCESS;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
+
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = cipher_offset;
+       return 0;
 }
 
 static int
-test_AES_chain_qat_all(void)
+create_wireless_algo_cipher_operation_oop(const uint8_t *iv, uint8_t iv_len,
+                       unsigned int cipher_len,
+                       unsigned int cipher_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                               "Failed to allocate pktmbuf offload");
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       return TEST_SUCCESS;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
+       sym_op->m_dst = ut_params->obuf;
+
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = cipher_offset;
+       return 0;
 }
 
 static int
-test_AES_cipheronly_qat_all(void)
+create_wireless_algo_cipher_auth_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const uint8_t *key, uint8_t key_len,
+               uint8_t auth_iv_len, uint8_t auth_len,
+               uint8_t cipher_iv_len)
+
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t cipher_auth_key[key_len];
        int status;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       return TEST_SUCCESS;
-}
+       memcpy(cipher_auth_key, key, key_len);
 
-static int
-test_AES_cipheronly_virtio_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       /* Hash key = cipher key */
+       ut_params->auth_xform.auth.key.data = cipher_auth_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
 
-       return TEST_SUCCESS;
-}
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-static int
-test_AES_chain_caam_jr_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return status;
 
-       return TEST_SUCCESS;
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       return 0;
 }
 
 static int
-test_AES_cipheronly_caam_jr_all(void)
+create_wireless_cipher_auth_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const struct wireless_test_data *tdata)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       const uint8_t key_len = tdata->key.len;
+       uint8_t cipher_auth_key[key_len];
        int status;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       const uint8_t *key = tdata->key.data;
+       const uint8_t auth_len = tdata->digest.len;
+       uint8_t cipher_iv_len = tdata->cipher_iv.len;
+       uint8_t auth_iv_len = tdata->auth_iv.len;
 
-       return TEST_SUCCESS;
-}
+       memcpy(cipher_auth_key, key, key_len);
 
-static int
-test_authonly_caam_jr_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       /* Hash key = cipher key */
+       ut_params->auth_xform.auth.key.data = cipher_auth_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
 
-       return TEST_SUCCESS;
-}
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
 
-static int
-test_AES_chain_dpaa_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return status;
 
-       return TEST_SUCCESS;
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
 }
 
 static int
-test_AES_cipheronly_dpaa_sec_all(void)
+create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
+               const struct wireless_test_data *tdata)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return create_wireless_cipher_auth_session(dev_id,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_ZUC_EIA3,
+               RTE_CRYPTO_CIPHER_ZUC_EEA3, tdata);
 }
 
 static int
-test_authonly_dpaa_sec_all(void)
+create_wireless_algo_auth_cipher_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const uint8_t *key, const uint8_t key_len,
+               uint8_t auth_iv_len, uint8_t auth_len,
+               uint8_t cipher_iv_len)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t auth_cipher_key[key_len];
        int status;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       memcpy(auth_cipher_key, key, key_len);
 
-       return TEST_SUCCESS;
-}
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.next = &ut_params->cipher_xform;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       ut_params->auth_xform.auth.key.data = auth_cipher_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
 
-static int
-test_AES_chain_dpaa2_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = auth_cipher_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       return TEST_SUCCESS;
-}
+       if (cipher_op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {
+               ut_params->auth_xform.next = NULL;
+               ut_params->cipher_xform.next = &ut_params->auth_xform;
+               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->cipher_xform,
+                               ts_params->session_priv_mpool);
 
-static int
-test_AES_cipheronly_dpaa2_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       } else
+               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       if (status == -ENOTSUP)
+               return status;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
 static int
-test_authonly_dpaa2_sec_all(void)
+create_wireless_algo_hash_operation(const uint8_t *auth_tag,
+               unsigned int auth_tag_len,
+               const uint8_t *iv, unsigned int iv_len,
+               unsigned int data_pad_len,
+               enum rte_crypto_auth_operation op,
+               unsigned int auth_len, unsigned int auth_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       return TEST_SUCCESS;
-}
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+               "Failed to allocate pktmbuf offload");
 
-static int
-test_authonly_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       return TEST_SUCCESS;
-}
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                                       ut_params->ibuf, auth_tag_len);
 
-static int
-test_authonly_ccp_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                               "no room to append auth tag");
+       ut_params->digest = sym_op->auth.digest.data;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, data_pad_len);
+       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       else
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       sym_op->auth.data.length = auth_len;
+       sym_op->auth.data.offset = auth_offset;
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
 static int
-test_AES_chain_armv8_all(void)
+create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
+       enum rte_crypto_auth_operation op)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       const uint8_t *auth_tag = tdata->digest.data;
+       const unsigned int auth_tag_len = tdata->digest.len;
+       unsigned int plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       unsigned int data_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       const uint8_t *cipher_iv = tdata->cipher_iv.data;
+       const uint8_t cipher_iv_len = tdata->cipher_iv.len;
+       const uint8_t *auth_iv = tdata->auth_iv.data;
+       const uint8_t auth_iv_len = tdata->auth_iv.len;
+       const unsigned int cipher_len = tdata->validCipherLenInBits.len;
+       const unsigned int auth_len = tdata->validAuthLenInBits.len;
 
-       return TEST_SUCCESS;
-}
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-static int
-test_AES_chain_mrvl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, auth_tag_len);
 
-       return TEST_SUCCESS;
-}
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+       ut_params->digest = sym_op->auth.digest.data;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, data_pad_len);
+       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       else
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-static int
-test_AES_cipheronly_mrvl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       /* Copy cipher and auth IVs at the end of the crypto operation */
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
+                                               IV_OFFSET);
+       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
+       iv_ptr += cipher_iv_len;
+       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = 0;
+       sym_op->auth.data.length = auth_len;
+       sym_op->auth.data.offset = 0;
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
 static int
-test_authonly_mrvl_all(void)
+create_zuc_cipher_hash_generate_operation(
+               const struct wireless_test_data *tdata)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return create_wireless_cipher_hash_operation(tdata,
+               RTE_CRYPTO_AUTH_OP_GENERATE);
 }
 
 static int
-test_3DES_chain_mrvl_all(void)
+create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
+               const unsigned auth_tag_len,
+               const uint8_t *auth_iv, uint8_t auth_iv_len,
+               unsigned data_pad_len,
+               enum rte_crypto_auth_operation op,
+               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
+               const unsigned cipher_len, const unsigned cipher_offset,
+               const unsigned auth_len, const unsigned auth_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       enum rte_crypto_cipher_algorithm cipher_algo =
+                       ut_params->cipher_xform.cipher.algo;
+       enum rte_crypto_auth_algorithm auth_algo =
+                       ut_params->auth_xform.auth.algo;
 
-       return TEST_SUCCESS;
-}
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-static int
-test_3DES_cipheronly_mrvl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, auth_tag_len);
 
-       return TEST_SUCCESS;
-}
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+       ut_params->digest = sym_op->auth.digest.data;
 
-static int
-test_AES_chain_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       if (rte_pktmbuf_is_contiguous(ut_params->ibuf)) {
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                               ut_params->ibuf, data_pad_len);
+       } else {
+               struct rte_mbuf *m = ut_params->ibuf;
+               unsigned int offset = data_pad_len;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool, ts_params->session_mpool,
-               ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+               while (offset > m->data_len && m->next != NULL) {
+                       offset -= m->data_len;
+                       m = m->next;
+               }
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       m, offset);
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       else
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-       return TEST_SUCCESS;
-}
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
 
-static int
-test_AES_cipheronly_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Copy cipher and auth IVs at the end of the crypto operation */
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
+                                               IV_OFFSET);
+       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
+       iv_ptr += cipher_iv_len;
+       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool, ts_params->session_mpool,
-               ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       if (cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3) {
+               sym_op->cipher.data.length = cipher_len;
+               sym_op->cipher.data.offset = cipher_offset;
+       } else {
+               sym_op->cipher.data.length = cipher_len >> 3;
+               sym_op->cipher.data.offset = cipher_offset >> 3;
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       if (auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+               auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+               auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3) {
+               sym_op->auth.data.length = auth_len;
+               sym_op->auth.data.offset = auth_offset;
+       } else {
+               sym_op->auth.data.length = auth_len >> 3;
+               sym_op->auth.data.offset = auth_offset >> 3;
+       }
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
 static int
-test_3DES_chain_octeontx_all(void)
+create_wireless_algo_auth_cipher_operation(
+               const uint8_t *auth_tag, unsigned int auth_tag_len,
+               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
+               const uint8_t *auth_iv, uint8_t auth_iv_len,
+               unsigned int data_pad_len,
+               unsigned int cipher_len, unsigned int cipher_offset,
+               unsigned int auth_len, unsigned int auth_offset,
+               uint8_t op_mode, uint8_t do_sgl, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool, ts_params->session_mpool,
-               ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       enum rte_crypto_cipher_algorithm cipher_algo =
+                       ut_params->cipher_xform.cipher.algo;
+       enum rte_crypto_auth_algorithm auth_algo =
+                       ut_params->auth_xform.auth.algo;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
 
-       return TEST_SUCCESS;
-}
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-static int
-test_3DES_cipheronly_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool, ts_params->session_mpool,
-               ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       /* set crypto operation mbufs */
+       sym_op->m_src = ut_params->ibuf;
+       if (op_mode == OUT_OF_PLACE)
+               sym_op->m_dst = ut_params->obuf;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* digest */
+       if (!do_sgl) {
+               sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(
+                       (op_mode == IN_PLACE ?
+                               ut_params->ibuf : ut_params->obuf),
+                       uint8_t *, data_pad_len);
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       (op_mode == IN_PLACE ?
+                               ut_params->ibuf : ut_params->obuf),
+                       data_pad_len);
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       } else {
+               uint16_t remaining_off = (auth_offset >> 3) + (auth_len >> 3);
+               struct rte_mbuf *sgl_buf = (op_mode == IN_PLACE ?
+                               sym_op->m_src : sym_op->m_dst);
+               while (remaining_off >= rte_pktmbuf_data_len(sgl_buf)) {
+                       remaining_off -= rte_pktmbuf_data_len(sgl_buf);
+                       sgl_buf = sgl_buf->next;
+               }
+               sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(sgl_buf,
+                               uint8_t *, remaining_off);
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(sgl_buf,
+                               remaining_off);
+               memset(sym_op->auth.digest.data, 0, remaining_off);
+               while (sgl_buf->next != NULL) {
+                       memset(rte_pktmbuf_mtod(sgl_buf, uint8_t *),
+                               0, rte_pktmbuf_data_len(sgl_buf));
+                       sgl_buf = sgl_buf->next;
+               }
+       }
 
-       return TEST_SUCCESS;
-}
+       /* Copy digest for the verification */
+       if (verify)
+               memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-static int
-test_authonly_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Copy cipher and auth IVs at the end of the crypto operation */
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(
+                       ut_params->op, uint8_t *, IV_OFFSET);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool, ts_params->session_mpool,
-               ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
+       iv_ptr += cipher_iv_len;
+       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       if (cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3) {
+               sym_op->cipher.data.length = cipher_len;
+               sym_op->cipher.data.offset = cipher_offset;
+       } else {
+               sym_op->cipher.data.length = cipher_len >> 3;
+               sym_op->cipher.data.offset = cipher_offset >> 3;
+       }
 
-       return TEST_SUCCESS;
+       if (auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+               auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+               auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3) {
+               sym_op->auth.data.length = auth_len;
+               sym_op->auth.data.offset = auth_offset;
+       } else {
+               sym_op->auth.data.length = auth_len >> 3;
+               sym_op->auth.data.offset = auth_offset >> 3;
+       }
+
+       return 0;
 }
 
-/* ***** SNOW 3G Tests ***** */
 static int
-create_wireless_algo_hash_session(uint8_t dev_id,
-       const uint8_t *key, const uint8_t key_len,
-       const uint8_t iv_len, const uint8_t auth_len,
-       enum rte_crypto_auth_operation op,
-       enum rte_crypto_auth_algorithm algo)
+test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
 {
-       uint8_t hash_key[key_len];
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(hash_key, key, key_len);
-
-       debug_hexdump(stdout, "key:", key, key_len);
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       ut_params->auth_xform.auth.op = op;
-       ut_params->auth_xform.auth.algo = algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       ut_params->auth_xform.auth.key.data = hash_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
-       ut_params->auth_xform.auth.iv.length = iv_len;
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-create_wireless_algo_cipher_session(uint8_t dev_id,
-                       enum rte_crypto_cipher_operation op,
-                       enum rte_crypto_cipher_algorithm algo,
-                       const uint8_t *key, const uint8_t key_len,
-                       uint8_t iv_len)
-{
-       uint8_t cipher_key[key_len];
+       /* Create SNOW 3G session */
+       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2);
+       if (retval < 0)
+               return retval;
 
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       memcpy(cipher_key, key, key_len);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       ut_params->cipher_xform.cipher.algo = algo;
-       ut_params->cipher_xform.cipher.op = op;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = iv_len;
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len,
+                       tdata->auth_iv.data, tdata->auth_iv.len,
+                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                       tdata->validAuthLenInBits.len,
+                       0);
+       if (retval < 0)
+               return retval;
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op);
+       ut_params->obuf = ut_params->op->sym->m_src;
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                       + plaintext_pad_len;
 
-       /* Create Crypto session */
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       ut_params->digest,
+       tdata->digest.data,
+       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+       "SNOW 3G Generated auth tag not as expected");
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 static int
-create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
-                       unsigned int cipher_len,
-                       unsigned int cipher_offset)
+test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                               "Failed to allocate pktmbuf offload");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
 
-       /* iv */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       iv, iv_len);
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = cipher_offset;
-       return 0;
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-create_wireless_algo_cipher_operation_oop(const uint8_t *iv, uint8_t iv_len,
-                       unsigned int cipher_len,
-                       unsigned int cipher_offset)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       /* Create SNOW 3G session */
+       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
+                               tdata->key.data, tdata->key.len,
+                               tdata->auth_iv.len, tdata->digest.len,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               RTE_CRYPTO_AUTH_SNOW3G_UIA2);
+       if (retval < 0)
+               return retval;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                               "Failed to allocate pktmbuf offload");
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_hash_operation(tdata->digest.data,
+                       tdata->digest.len,
+                       tdata->auth_iv.data, tdata->auth_iv.len,
+                       plaintext_pad_len,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       tdata->validAuthLenInBits.len,
+                       0);
+       if (retval < 0)
+               return retval;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-       sym_op->m_dst = ut_params->obuf;
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+       ut_params->obuf = ut_params->op->sym->m_src;
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                               + plaintext_pad_len;
+
+       /* Validate obuf */
+       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
+               return 0;
+       else
+               return -1;
 
-       /* iv */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       iv, iv_len);
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = cipher_offset;
        return 0;
 }
 
 static int
-create_wireless_algo_cipher_auth_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const uint8_t *key, uint8_t key_len,
-               uint8_t auth_iv_len, uint8_t auth_len,
-               uint8_t cipher_iv_len)
-
+test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
 {
-       uint8_t cipher_auth_key[key_len];
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(cipher_auth_key, key, key_len);
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.algo = auth_algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       /* Hash key = cipher key */
-       ut_params->auth_xform.auth.key.data = cipher_auth_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       /* Auth IV will be after cipher IV */
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
-       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+       /* Create KASUMI session */
+       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
+                       tdata->key.data, tdata->key.len,
+                       0, tdata->digest.len,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_KASUMI_F9);
+       if (retval < 0)
+               return retval;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len,
+                       NULL, 0,
+                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                       tdata->plaintext.len,
+                       0);
+       if (retval < 0)
+               return retval;
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+
+       ut_params->obuf = ut_params->op->sym->m_src;
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                       + plaintext_pad_len;
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       ut_params->digest,
+       tdata->digest.data,
+       DIGEST_BYTE_LENGTH_KASUMI_F9,
+       "KASUMI Generated auth tag not as expected");
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 static int
-create_wireless_cipher_auth_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const struct wireless_test_data *tdata)
+test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
 {
-       const uint8_t key_len = tdata->key.len;
-       uint8_t cipher_auth_key[key_len];
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       const uint8_t *key = tdata->key.data;
-       const uint8_t auth_len = tdata->digest.len;
-       uint8_t cipher_iv_len = tdata->cipher_iv.len;
-       uint8_t auth_iv_len = tdata->auth_iv.len;
 
-       memcpy(cipher_auth_key, key, key_len);
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.algo = auth_algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       /* Hash key = cipher key */
-       ut_params->auth_xform.auth.key.data = cipher_auth_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       /* Auth IV will be after cipher IV */
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
-       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+       /* Create KASUMI session */
+       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
+                               tdata->key.data, tdata->key.len,
+                               0, tdata->digest.len,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               RTE_CRYPTO_AUTH_KASUMI_F9);
+       if (retval < 0)
+               return retval;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_hash_operation(tdata->digest.data,
+                       tdata->digest.len,
+                       NULL, 0,
+                       plaintext_pad_len,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       tdata->plaintext.len,
+                       0);
+       if (retval < 0)
+               return retval;
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+       ut_params->obuf = ut_params->op->sym->m_src;
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                               + plaintext_pad_len;
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
+       /* Validate obuf */
+       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
+               return 0;
+       else
+               return -1;
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 static int
-create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
-               const struct wireless_test_data *tdata)
+test_snow3g_hash_generate_test_case_1(void)
 {
-       return create_wireless_cipher_auth_session(dev_id,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_ZUC_EIA3,
-               RTE_CRYPTO_CIPHER_ZUC_EEA3, tdata);
+       return test_snow3g_authentication(&snow3g_hash_test_case_1);
 }
 
 static int
-create_wireless_algo_auth_cipher_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const uint8_t *key, const uint8_t key_len,
-               uint8_t auth_iv_len, uint8_t auth_len,
-               uint8_t cipher_iv_len)
+test_snow3g_hash_generate_test_case_2(void)
 {
-       uint8_t auth_cipher_key[key_len];
+       return test_snow3g_authentication(&snow3g_hash_test_case_2);
+}
 
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+static int
+test_snow3g_hash_generate_test_case_3(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_3);
+}
 
-       memcpy(auth_cipher_key, key, key_len);
+static int
+test_snow3g_hash_generate_test_case_4(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_4);
+}
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
-       ut_params->auth_xform.auth.algo = auth_algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       ut_params->auth_xform.auth.key.data = auth_cipher_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       /* Auth IV will be after cipher IV */
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
-       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+static int
+test_snow3g_hash_generate_test_case_5(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_5);
+}
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = auth_cipher_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+static int
+test_snow3g_hash_generate_test_case_6(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_6);
+}
 
-       debug_hexdump(stdout, "key:", key, key_len);
+static int
+test_snow3g_hash_verify_test_case_1(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_1);
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+}
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
+static int
+test_snow3g_hash_verify_test_case_2(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_2);
+}
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+static int
+test_snow3g_hash_verify_test_case_3(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_3);
+}
 
-       return 0;
+static int
+test_snow3g_hash_verify_test_case_4(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_4);
 }
 
 static int
-create_wireless_algo_hash_operation(const uint8_t *auth_tag,
-               unsigned int auth_tag_len,
-               const uint8_t *iv, unsigned int iv_len,
-               unsigned int data_pad_len,
-               enum rte_crypto_auth_operation op,
-               unsigned int auth_len, unsigned int auth_offset)
+test_snow3g_hash_verify_test_case_5(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_5);
+}
 
-       struct crypto_unittest_params *ut_params = &unittest_params;
+static int
+test_snow3g_hash_verify_test_case_6(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_6);
+}
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-               "Failed to allocate pktmbuf offload");
+static int
+test_kasumi_hash_generate_test_case_1(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_1);
+}
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+static int
+test_kasumi_hash_generate_test_case_2(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_2);
+}
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+static int
+test_kasumi_hash_generate_test_case_3(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_3);
+}
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+static int
+test_kasumi_hash_generate_test_case_4(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_4);
+}
 
-       /* iv */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       iv, iv_len);
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                                       ut_params->ibuf, auth_tag_len);
+static int
+test_kasumi_hash_generate_test_case_5(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_5);
+}
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                               "no room to append auth tag");
-       ut_params->digest = sym_op->auth.digest.data;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, data_pad_len);
-       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
-               memset(sym_op->auth.digest.data, 0, auth_tag_len);
-       else
-               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
+static int
+test_kasumi_hash_generate_test_case_6(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_6);
+}
 
-       debug_hexdump(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+static int
+test_kasumi_hash_verify_test_case_1(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_1);
+}
 
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = auth_offset;
+static int
+test_kasumi_hash_verify_test_case_2(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_2);
+}
 
-       return 0;
+static int
+test_kasumi_hash_verify_test_case_3(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_3);
 }
 
 static int
-create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
-       enum rte_crypto_auth_operation op)
+test_kasumi_hash_verify_test_case_4(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_4);
+}
+
+static int
+test_kasumi_hash_verify_test_case_5(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_5);
+}
+
+static int
+test_kasumi_encryption(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       const uint8_t *auth_tag = tdata->digest.data;
-       const unsigned int auth_tag_len = tdata->digest.len;
-       unsigned int plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       unsigned int data_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-
-       const uint8_t *cipher_iv = tdata->cipher_iv.data;
-       const uint8_t cipher_iv_len = tdata->cipher_iv.len;
-       const uint8_t *auth_iv = tdata->auth_iv.data;
-       const uint8_t auth_iv_len = tdata->auth_iv.len;
-       const unsigned int cipher_len = tdata->validCipherLenInBits.len;
-       const unsigned int auth_len = tdata->validAuthLenInBits.len;
+       int retval;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
-       ut_params->digest = sym_op->auth.digest.data;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, data_pad_len);
-       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
-               memset(sym_op->auth.digest.data, 0, auth_tag_len);
-       else
-               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       debug_hexdump(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Copy cipher and auth IVs at the end of the crypto operation */
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
-                                               IV_OFFSET);
-       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
-       iv_ptr += cipher_iv_len;
-       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
+       if (retval < 0)
+               return retval;
 
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = 0;
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = 0;
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       return 0;
-}
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
 
-static int
-create_zuc_cipher_hash_generate_operation(
-               const struct wireless_test_data *tdata)
-{
-       return create_wireless_cipher_hash_operation(tdata,
-               RTE_CRYPTO_AUTH_OP_GENERATE);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
+       return 0;
 }
 
 static int
-create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
-               const unsigned auth_tag_len,
-               const uint8_t *auth_iv, uint8_t auth_iv_len,
-               unsigned data_pad_len,
-               enum rte_crypto_auth_operation op,
-               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
-               const unsigned cipher_len, const unsigned cipher_offset,
-               const unsigned auth_len, const unsigned auth_offset)
+test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       int retval;
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
-       ut_params->digest = sym_op->auth.digest.data;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, data_pad_len);
-       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
-               memset(sym_op->auth.digest.data, 0, auth_tag_len);
-       else
-               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
 
-       debug_hexdump(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+       uint8_t buffer[10000];
+       const uint8_t *ciphertext;
 
-       /* Copy cipher and auth IVs at the end of the crypto operation */
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
-                                               IV_OFFSET);
-       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
-       iv_ptr += cipher_iv_len;
-       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
+       struct rte_cryptodev_info dev_info;
 
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = cipher_offset;
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = auth_offset;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       return 0;
-}
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-static int
-create_wireless_algo_auth_cipher_operation(unsigned int auth_tag_len,
-               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
-               const uint8_t *auth_iv, uint8_t auth_iv_len,
-               unsigned int data_pad_len,
-               unsigned int cipher_len, unsigned int cipher_offset,
-               unsigned int auth_len, unsigned int auth_offset)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
+       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+               printf("Device doesn't support in-place scatter-gather. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 10, 0);
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, data_pad_len);
+       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
 
-       memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
+       if (retval < 0)
+               return retval;
 
-       debug_hexdump(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       auth_tag_len);
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       /* Copy cipher and auth IVs at the end of the crypto operation */
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
-                                               IV_OFFSET);
-       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
-       iv_ptr += cipher_iv_len;
-       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
+       ut_params->obuf = ut_params->op->sym->m_dst;
 
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = cipher_offset;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                               plaintext_len, buffer);
+       else
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
+                               tdata->validCipherOffsetInBits.len >> 3,
+                               plaintext_len, buffer);
 
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = auth_offset;
+       /* Validate obuf */
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
+test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
+       uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
-       uint8_t *plaintext;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
-                       tdata->key.data, tdata->key.len,
-                       tdata->auth_iv.len, tdata->digest.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_SNOW3G_UIA2);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
-       /* alloc mbuf and set payload */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len,
-                       tdata->auth_iv.data, tdata->auth_iv.len,
-                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata->validAuthLenInBits.len,
-                       0);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
-       ut_params->obuf = ut_params->op->sym->m_src;
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + plaintext_pad_len;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-       ut_params->digest,
-       tdata->digest.data,
-       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-       "SNOW 3G Generated auth tag not as expected");
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
 
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
+test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
-                               tdata->key.data, tdata->key.len,
-                               tdata->auth_iv.len, tdata->digest.len,
-                               RTE_CRYPTO_AUTH_OP_VERIFY,
-                               RTE_CRYPTO_AUTH_SNOW3G_UIA2);
+       const uint8_t *ciphertext;
+       uint8_t buffer[2048];
+
+       struct rte_cryptodev_info dev_info;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+               printf("Device doesn't support out-of-place scatter-gather "
+                               "in both input and output mbufs. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
-       /* alloc mbuf and set payload */
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_hash_operation(tdata->digest.data,
-                       tdata->digest.len,
-                       tdata->auth_iv.data, tdata->auth_iv.len,
-                       plaintext_pad_len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       tdata->validAuthLenInBits.len,
-                       0);
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 10, 0);
+       ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 3, 0);
+
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                               + plaintext_pad_len;
 
-       /* Validate obuf */
-       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
-               return 0;
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                               plaintext_pad_len, buffer);
        else
-               return -1;
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
+                               tdata->validCipherOffsetInBits.len >> 3,
+                               plaintext_pad_len, buffer);
 
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
+
 static int
-test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
+test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        /* Create KASUMI session */
-       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
-                       tdata->key.data, tdata->key.len,
-                       0, tdata->digest.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_KASUMI_F9);
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
-       /* alloc mbuf and set payload */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create KASUMI operation */
-       retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len,
-                       NULL, 0,
-                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata->plaintext.len,
-                       0);
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
-       ut_params->obuf = ut_params->op->sym->m_src;
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + plaintext_pad_len;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-       ut_params->digest,
-       tdata->digest.data,
-       DIGEST_BYTE_LENGTH_KASUMI_F9,
-       "KASUMI Generated auth tag not as expected");
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
+       const uint8_t *reference_plaintext = tdata->plaintext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               plaintext,
+               reference_plaintext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext data not as expected");
        return 0;
 }
 
 static int
-test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
+test_kasumi_decryption(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        /* Create KASUMI session */
-       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
-                               tdata->key.data, tdata->key.len,
-                               0, tdata->digest.len,
-                               RTE_CRYPTO_AUTH_OP_VERIFY,
-                               RTE_CRYPTO_AUTH_KASUMI_F9);
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
-       /* alloc mbuf and set payload */
+
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
        /* Append data which is padded to a multiple */
        /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create KASUMI operation */
-       retval = create_wireless_algo_hash_operation(tdata->digest.data,
-                       tdata->digest.len,
-                       NULL, 0,
-                       plaintext_pad_len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       tdata->plaintext.len,
-                       0);
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->ciphertext.len,
+                                       tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                               + plaintext_pad_len;
 
-       /* Validate obuf */
-       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
-               return 0;
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               return -1;
-
-       return 0;
-}
-
-static int
-test_snow3g_hash_generate_test_case_1(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_1);
-}
-
-static int
-test_snow3g_hash_generate_test_case_2(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_2);
-}
-
-static int
-test_snow3g_hash_generate_test_case_3(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_3);
-}
-
-static int
-test_snow3g_hash_generate_test_case_4(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_4);
-}
-
-static int
-test_snow3g_hash_generate_test_case_5(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_5);
-}
-
-static int
-test_snow3g_hash_generate_test_case_6(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_6);
-}
-
-static int
-test_snow3g_hash_verify_test_case_1(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_1);
-
-}
+               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
 
-static int
-test_snow3g_hash_verify_test_case_2(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_2);
-}
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
-static int
-test_snow3g_hash_verify_test_case_3(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_3);
+       const uint8_t *reference_plaintext = tdata->plaintext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               plaintext,
+               reference_plaintext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext data not as expected");
+       return 0;
 }
 
 static int
-test_snow3g_hash_verify_test_case_4(void)
+test_snow3g_encryption(const struct snow3g_test_data *tdata)
 {
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_4);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_snow3g_hash_verify_test_case_5(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_5);
-}
+       int retval;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
-static int
-test_snow3g_hash_verify_test_case_6(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_6);
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-test_kasumi_hash_generate_test_case_1(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_1);
-}
+       /* Create SNOW 3G session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-static int
-test_kasumi_hash_generate_test_case_2(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_2);
-}
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-static int
-test_kasumi_hash_generate_test_case_3(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_3);
-}
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-test_kasumi_hash_generate_test_case_4(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_4);
-}
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-static int
-test_kasumi_hash_generate_test_case_5(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_5);
-}
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-static int
-test_kasumi_hash_generate_test_case_6(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_6);
-}
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       0);
+       if (retval < 0)
+               return retval;
 
-static int
-test_kasumi_hash_verify_test_case_1(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_1);
-}
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-static int
-test_kasumi_hash_verify_test_case_2(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_2);
-}
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               ciphertext = plaintext;
 
-static int
-test_kasumi_hash_verify_test_case_3(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_3);
-}
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-static int
-test_kasumi_hash_verify_test_case_4(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_4);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
+               "SNOW 3G Ciphertext data not as expected");
+       return 0;
 }
 
-static int
-test_kasumi_hash_verify_test_case_5(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_5);
-}
 
 static int
-test_kasumi_encryption(const struct kasumi_test_data *tdata)
+test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
 
        int retval;
-       uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
-       /* Create KASUMI session */
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
 
        /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       0);
        if (retval < 0)
                return retval;
 
@@ -3296,73 +3470,83 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata)
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
+               ciphertext = plaintext;
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
+               "SNOW 3G Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
+test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
-
        uint8_t buffer[10000];
        const uint8_t *ciphertext;
 
        struct rte_cryptodev_info dev_info;
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
        uint64_t feat_flags = dev_info.feature_flags;
 
-       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
-               printf("Device doesn't support in-place scatter-gather. "
+       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+               printf("Device doesn't support out-of-place scatter-gather "
+                               "in both input and output mbufs. "
                                "Test Skipped.\n");
-               return 0;
+               return -ENOTSUP;
        }
 
-       /* Create KASUMI session */
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-
-
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
        ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
                        plaintext_pad_len, 10, 0);
+       ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 3, 0);
+
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
 
        pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       0);
        if (retval < 0)
                return retval;
 
@@ -3371,44 +3555,79 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
        ut_params->obuf = ut_params->op->sym->m_dst;
-
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
                                plaintext_len, buffer);
        else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
-                               tdata->validCipherOffsetInBits.len >> 3,
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
                                plaintext_len, buffer);
 
-       /* Validate obuf */
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
+               "SNOW 3G Ciphertext data not as expected");
+
        return 0;
 }
 
+/* Shift right a buffer by "offset" bits, "offset" < 8 */
+static void
+buffer_shift_right(uint8_t *buffer, uint32_t length, uint8_t offset)
+{
+       uint8_t curr_byte, prev_byte;
+       uint32_t length_in_bytes = ceil_byte_length(length + offset);
+       uint8_t lower_byte_mask = (1 << offset) - 1;
+       unsigned i;
+
+       prev_byte = buffer[0];
+       buffer[0] >>= offset;
+
+       for (i = 1; i < length_in_bytes; i++) {
+               curr_byte = buffer[i];
+               buffer[i] = ((prev_byte & lower_byte_mask) << (8 - offset)) |
+                               (curr_byte >> offset);
+               prev_byte = curr_byte;
+       }
+}
+
 static int
-test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
+test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-
-       int retval;
        uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+       int retval;
+       uint32_t plaintext_len;
+       uint32_t plaintext_pad_len;
+       uint8_t extra_offset = 4;
+       uint8_t *expected_ciphertext_shifted;
+       struct rte_cryptodev_info dev_info;
 
-       /* Create KASUMI session */
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validDataLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
@@ -3417,26 +3636,38 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
        ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
+
        /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len + extra_offset);
+       /*
+        * Append data which is padded to a
+        * multiple of the algorithms block size
+        */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+
+       plaintext = (uint8_t *) rte_pktmbuf_append(ut_params->ibuf,
+                                               plaintext_pad_len);
+
        rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       memcpy(plaintext, tdata->plaintext.data, (tdata->plaintext.len >> 3));
+       buffer_shift_right(plaintext, tdata->plaintext.len, extra_offset);
 
-       /* Create KASUMI operation */
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+#endif
+       /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       extra_offset);
        if (retval < 0)
                return retval;
 
@@ -3448,117 +3679,125 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
+               ciphertext = plaintext;
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+#endif
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
+       expected_ciphertext_shifted = rte_malloc(NULL, plaintext_len, 8);
+
+       TEST_ASSERT_NOT_NULL(expected_ciphertext_shifted,
+                       "failed to reserve memory for ciphertext shifted\n");
+
+       memcpy(expected_ciphertext_shifted, tdata->ciphertext.data,
+                       ceil_byte_length(tdata->ciphertext.len));
+       buffer_shift_right(expected_ciphertext_shifted, tdata->ciphertext.len,
+                       extra_offset);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
                ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+               expected_ciphertext_shifted,
+               tdata->validDataLenInBits.len,
+               extra_offset,
+               "SNOW 3G Ciphertext data not as expected");
        return 0;
 }
 
-static int
-test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata)
+static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       unsigned int plaintext_pad_len;
-       unsigned int plaintext_len;
-
-       const uint8_t *ciphertext;
-       uint8_t buffer[2048];
-
-       struct rte_cryptodev_info dev_info;
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint8_t *plaintext, *ciphertext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
 
-       uint64_t feat_flags = dev_info.feature_flags;
-       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
-               printf("Device doesn't support out-of-place scatter-gather "
-                               "in both input and output mbufs. "
-                               "Test Skipped.\n");
-               return 0;
-       }
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Create KASUMI session */
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 10, 0);
-       ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 3, 0);
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
+
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       tdata->cipher.offset_bits);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
-                               plaintext_pad_len, buffer);
+               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
-                               tdata->validCipherOffsetInBits.len >> 3,
-                               plaintext_pad_len, buffer);
+               plaintext = ciphertext;
+
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
+                               tdata->plaintext.data,
+                               tdata->validDataLenInBits.len,
+                               "SNOW 3G Plaintext data not as expected");
        return 0;
 }
 
-
-static int
-test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
+static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       uint8_t *ciphertext, *plaintext;
+
+       uint8_t *plaintext, *ciphertext;
        unsigned ciphertext_pad_len;
        unsigned ciphertext_len;
 
-       /* Create KASUMI session */
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_DECRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
@@ -3567,14 +3806,22 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
        ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer");
+
        /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
+       memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                      rte_pktmbuf_tailroom(ut_params->obuf));
+
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
        ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                ciphertext_pad_len);
        rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
@@ -3582,129 +3829,85 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
-       /* Create KASUMI operation */
+       /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       0);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
                plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+               plaintext = ciphertext;
 
        debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
-       const uint8_t *reference_plaintext = tdata->plaintext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               plaintext,
-               reference_plaintext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Plaintext data not as expected");
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
+                               tdata->plaintext.data,
+                               tdata->validDataLenInBits.len,
+                               "SNOW 3G Plaintext data not as expected");
        return 0;
 }
 
 static int
-test_kasumi_decryption(const struct kasumi_test_data *tdata)
+test_zuc_cipher_auth(const struct wireless_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       uint8_t *ciphertext, *plaintext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
-
-       /* Create KASUMI session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               ciphertext_pad_len);
-       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
-
-       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       uint8_t *plaintext, *ciphertext;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->ciphertext.len,
-                                       tdata->validCipherOffsetInBits.len);
-       if (retval < 0)
-               return retval;
+       struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8 != 0) ||
+                       (tdata->validDataLenInBits.len % 8 != 0))) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
 
-       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
+       /* Check if device supports ZUC EEA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
 
-       const uint8_t *reference_plaintext = tdata->plaintext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               plaintext,
-               reference_plaintext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Plaintext data not as expected");
-       return 0;
-}
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-test_snow3g_encryption(const struct snow3g_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       /* Check if device supports ZUC EIA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
 
-       int retval;
-       uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
+       /* Create ZUC session */
+       retval = create_zuc_cipher_auth_encrypt_generate_session(
+                       ts_params->valid_devs[0],
+                       tdata);
        if (retval < 0)
                return retval;
-
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* Clear mbuf payload */
+       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
        /* Append data which is padded to a multiple of */
@@ -3716,67 +3919,81 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+       /* Create ZUC operation */
+       retval = create_zuc_cipher_hash_generate_operation(tdata);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
-       ut_params->obuf = ut_params->op->sym->m_dst;
+       ut_params->obuf = ut_params->op->sym->m_src;
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
                ciphertext = plaintext;
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "ZUC Ciphertext data not as expected");
+
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+           + plaintext_pad_len;
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       4,
+                       "ZUC Generated auth tag not as expected");
        return 0;
 }
 
-
 static int
-test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
+test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *plaintext, *ciphertext;
 
        int retval;
+
+       uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
+       retval = create_wireless_algo_cipher_auth_session(ts_params->valid_devs[0],
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
-
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer in mempool");
 
-       /* Clear mbuf payload */
+       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
        /* Append data which is padded to a multiple of */
@@ -3784,459 +4001,797 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
        plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
-       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+       retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data,
+                       tdata->digest.len, tdata->auth_iv.data,
+                       tdata->auth_iv.len,
+                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                       tdata->cipher_iv.data, tdata->cipher_iv.len,
+                       tdata->validCipherLenInBits.len,
+                       0,
+                       tdata->validAuthLenInBits.len,
+                       0
+                       );
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
-       ut_params->obuf = ut_params->op->sym->m_dst;
+       ut_params->obuf = ut_params->op->sym->m_src;
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
                ciphertext = plaintext;
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
-       return 0;
-}
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "SNOW 3G Ciphertext data not as expected");
 
-static int
-test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+           + plaintext_pad_len;
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                       "SNOW 3G Generated auth tag not as expected");
+       return 0;
+}
+
+static int
+test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
+
+       uint8_t *plaintext = NULL, *ciphertext = NULL;
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
-       uint8_t buffer[10000];
-       const uint8_t *ciphertext;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
 
        struct rte_cryptodev_info dev_info;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
        uint64_t feat_flags = dev_info.feature_flags;
 
-       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
-               printf("Device doesn't support out-of-place scatter-gather "
-                               "in both input and output mbufs. "
-                               "Test Skipped.\n");
-               return 0;
+       if (op_mode == OUT_OF_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
        }
 
        /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
        if (retval < 0)
                return retval;
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (op_mode == OUT_OF_PLACE)
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 10, 0);
-       ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 3, 0);
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+               rte_pktmbuf_tailroom(ut_params->ibuf));
+       if (op_mode == OUT_OF_PLACE)
+               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->obuf));
 
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer in mempool");
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+       if (verify) {
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       ciphertext_pad_len);
+               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       plaintext_pad_len);
+               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+               debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       }
 
        /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               tdata->auth_iv.data, tdata->auth_iv.len,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->cipher.offset_bits,
+               tdata->validAuthLenInBits.len,
+               tdata->auth.offset_bits,
+               op_mode, 0, verify);
+
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+                       ut_params->op);
 
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
-                               plaintext_len, buffer);
-       else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
-                               plaintext_len, buffer);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       plaintext = ciphertext +
+                               (tdata->cipher.offset_bits >> 3);
 
-       return 0;
-}
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       ciphertext = plaintext;
 
-/* Shift right a buffer by "offset" bits, "offset" < 8 */
-static void
-buffer_shift_right(uint8_t *buffer, uint32_t length, uint8_t offset)
-{
-       uint8_t curr_byte, prev_byte;
-       uint32_t length_in_bytes = ceil_byte_length(length + offset);
-       uint8_t lower_byte_mask = (1 << offset) - 1;
-       unsigned i;
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                       + (tdata->digest.offset_bytes == 0 ?
+               plaintext_pad_len : tdata->digest.offset_bytes);
+
+               debug_hexdump(stdout, "digest:", ut_params->digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:", tdata->digest.data,
+                               tdata->digest.len);
+       }
 
-       prev_byte = buffer[0];
-       buffer[0] >>= offset;
+       /* Validate obuf */
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "SNOW 3G Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "SNOW 3G Ciphertext data not as expected");
 
-       for (i = 1; i < length_in_bytes; i++) {
-               curr_byte = buffer[i];
-               buffer[i] = ((prev_byte & lower_byte_mask) << (8 - offset)) |
-                               (curr_byte >> offset);
-               prev_byte = curr_byte;
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                       "SNOW 3G Generated auth tag not as expected");
        }
+       return 0;
 }
 
 static int
-test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
+test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *plaintext, *ciphertext;
+
        int retval;
-       uint32_t plaintext_len;
-       uint32_t plaintext_pad_len;
-       uint8_t extra_offset = 4;
-       uint8_t *expected_ciphertext_shifted;
+
+       const uint8_t *plaintext = NULL;
+       const uint8_t *ciphertext = NULL;
+       const uint8_t *digest = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
+       uint8_t buffer[10000];
+       uint8_t digest_buffer[10000];
+
+       struct rte_cryptodev_info dev_info;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
 
        /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
        if (retval < 0)
                return retval;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 15, 0);
        TEST_ASSERT_NOT_NULL(ut_params->ibuf,
                        "Failed to allocate input buffer in mempool");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer in mempool");
-
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       plaintext_len = ceil_byte_length(tdata->plaintext.len + extra_offset);
-       /*
-        * Append data which is padded to a
-        * multiple of the algorithms block size
-        */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-
-       plaintext = (uint8_t *) rte_pktmbuf_append(ut_params->ibuf,
-                                               plaintext_pad_len);
 
-       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+       if (op_mode == OUT_OF_PLACE) {
+               ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                               plaintext_pad_len, 15, 0);
+               TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                               "Failed to allocate output buffer in mempool");
+       }
 
-       memcpy(plaintext, tdata->plaintext.data, (tdata->plaintext.len >> 3));
-       buffer_shift_right(plaintext, tdata->plaintext.len, extra_offset);
+       if (verify) {
+               pktmbuf_write(ut_params->ibuf, 0, ciphertext_len,
+                       tdata->ciphertext.data);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
+                       tdata->plaintext.data);
+               plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+       memset(buffer, 0, sizeof(buffer));
 
-#ifdef RTE_APP_TEST_DEBUG
-       rte_hexdump(stdout, "plaintext:", plaintext, tdata->plaintext.len);
-#endif
        /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       extra_offset);
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               tdata->auth_iv.data, tdata->auth_iv.len,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->cipher.offset_bits,
+               tdata->validAuthLenInBits.len,
+               tdata->auth.offset_bits,
+               op_mode, 1, verify);
+
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       ut_params->op);
+
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               ciphertext = plaintext;
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
-#ifdef RTE_APP_TEST_DEBUG
-       rte_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-#endif
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       plaintext_len, buffer);
+               else
+                       plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
 
-       expected_ciphertext_shifted = rte_malloc(NULL, plaintext_len, 8);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       ciphertext_len, buffer);
+               else
+                       ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
 
-       TEST_ASSERT_NOT_NULL(expected_ciphertext_shifted,
-                       "failed to reserve memory for ciphertext shifted\n");
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               if (ut_params->obuf)
+                       digest = rte_pktmbuf_read(ut_params->obuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+               else
+                       digest = rte_pktmbuf_read(ut_params->ibuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+
+               debug_hexdump(stdout, "digest:", digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
 
-       memcpy(expected_ciphertext_shifted, tdata->ciphertext.data,
-                       ceil_byte_length(tdata->ciphertext.len));
-       buffer_shift_right(expected_ciphertext_shifted, tdata->ciphertext.len,
-                       extra_offset);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
-               ciphertext,
-               expected_ciphertext_shifted,
-               tdata->validDataLenInBits.len,
-               extra_offset,
-               "SNOW 3G Ciphertext data not as expected");
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "SNOW 3G Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "SNOW 3G Ciphertext data not as expected");
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                       "SNOW 3G Generated auth tag not as expected");
+       }
        return 0;
 }
 
-static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
+static int
+test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
-
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
-
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               ciphertext_pad_len);
-       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
-
-       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
-
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
-       if (retval < 0)
-               return retval;
+       uint8_t *plaintext = NULL, *ciphertext = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               plaintext = ciphertext;
+       struct rte_cryptodev_info dev_info;
 
-       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
-                               tdata->plaintext.data,
-                               tdata->validDataLenInBits.len,
-                               "SNOW 3G Plaintext data not as expected");
-       return 0;
-}
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       int retval;
+       if (op_mode == OUT_OF_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
+       /* Create KASUMI session */
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                       tdata->key.data, tdata->key.len,
+                       0, tdata->digest.len,
+                       tdata->cipher_iv.len);
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer");
+       if (op_mode == OUT_OF_PLACE)
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* Clear mbuf payload */
+       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
-                      rte_pktmbuf_tailroom(ut_params->obuf));
+               rte_pktmbuf_tailroom(ut_params->ibuf));
+       if (op_mode == OUT_OF_PLACE)
+               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->obuf));
 
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
        ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               ciphertext_pad_len);
-       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
-       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       if (verify) {
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       ciphertext_pad_len);
+               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       plaintext_pad_len);
+               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               NULL, 0,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->validCipherOffsetInBits.len,
+               tdata->validAuthLenInBits.len,
+               0,
+               op_mode, 0, verify);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       ut_params->op);
+
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               plaintext = ciphertext;
 
-       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+
+
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       plaintext = ciphertext;
+
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       ciphertext = plaintext;
+
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               ut_params->digest = rte_pktmbuf_mtod(
+                       ut_params->obuf, uint8_t *) +
+                       (tdata->digest.offset_bytes == 0 ?
+                       plaintext_pad_len : tdata->digest.offset_bytes);
+
+               debug_hexdump(stdout, "digest:", ut_params->digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
-                               tdata->plaintext.data,
-                               tdata->validDataLenInBits.len,
-                               "SNOW 3G Plaintext data not as expected");
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "KASUMI Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len >> 3,
+                       "KASUMI Ciphertext data not as expected");
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_KASUMI_F9,
+                       "KASUMI Generated auth tag not as expected");
+       }
        return 0;
 }
 
 static int
-test_zuc_cipher_auth(const struct wireless_test_data *tdata)
+test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
 
-       uint8_t *plaintext, *ciphertext;
+       const uint8_t *plaintext = NULL;
+       const uint8_t *ciphertext = NULL;
+       const uint8_t *digest = NULL;
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
+       uint8_t buffer[10000];
+       uint8_t digest_buffer[10000];
 
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-
-       /* Check if device supports ZUC EEA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
+       struct rte_cryptodev_info dev_info;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
                return -ENOTSUP;
-
-       /* Check if device supports ZUC EIA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
-
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
-       /* Create ZUC session */
-       retval = create_zuc_cipher_auth_encrypt_generate_session(
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_auth_cipher_session(
                        ts_params->valid_devs[0],
-                       tdata);
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                       tdata->key.data, tdata->key.len,
+                       0, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
        if (retval < 0)
                return retval;
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
        plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 15, 0);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-       /* Create ZUC operation */
-       retval = create_zuc_cipher_hash_generate_operation(tdata);
-       if (retval < 0)
-               return retval;
+       if (op_mode == OUT_OF_PLACE) {
+               ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                               plaintext_pad_len, 15, 0);
+               TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                               "Failed to allocate output buffer in mempool");
+       }
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               ciphertext = plaintext;
+       if (verify) {
+               pktmbuf_write(ut_params->ibuf, 0, ciphertext_len,
+                       tdata->ciphertext.data);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
+                       tdata->plaintext.data);
+               plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+       memset(buffer, 0, sizeof(buffer));
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               NULL, 0,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->validCipherOffsetInBits.len,
+               tdata->validAuthLenInBits.len,
+               0,
+               op_mode, 1, verify);
+
+       if (retval < 0)
+               return retval;
+
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       plaintext_len, buffer);
+               else
+                       plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       ciphertext_len, buffer);
+               else
+                       ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               if (ut_params->obuf)
+                       digest = rte_pktmbuf_read(ut_params->obuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+               else
+                       digest = rte_pktmbuf_read(ut_params->ibuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+
+               debug_hexdump(stdout, "digest:", digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "KASUMI Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                        ciphertext,
                        tdata->ciphertext.data,
                        tdata->validDataLenInBits.len,
-                       "ZUC Ciphertext data not as expected");
-
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-           + plaintext_pad_len;
+                       "KASUMI Ciphertext data not as expected");
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ut_params->digest,
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       digest,
                        tdata->digest.data,
-                       4,
-                       "ZUC Generated auth tag not as expected");
+                       DIGEST_BYTE_LENGTH_KASUMI_F9,
+                       "KASUMI Generated auth tag not as expected");
+       }
        return 0;
 }
 
 static int
-test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
+test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -4247,17 +4802,32 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_auth_session(ts_params->valid_devs[0],
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_auth_session(
+                       ts_params->valid_devs[0],
                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
                        RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
-                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       RTE_CRYPTO_CIPHER_KASUMI_F8,
                        tdata->key.data, tdata->key.len,
-                       tdata->auth_iv.len, tdata->digest.len,
+                       0, tdata->digest.len,
                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
+
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
        /* clear mbuf payload */
@@ -4274,410 +4844,159 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create SNOW 3G operation */
+       /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data,
-                       tdata->digest.len, tdata->auth_iv.data,
-                       tdata->auth_iv.len,
-                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata->cipher_iv.data, tdata->cipher_iv.len,
-                       tdata->validCipherLenInBits.len,
-                       0,
-                       tdata->validAuthLenInBits.len,
-                       0
-                       );
+                               tdata->digest.len, NULL, 0,
+                               plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                               tdata->cipher_iv.data, tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len,
+                               tdata->validAuthLenInBits.len,
+                               0
+                               );
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+
+       if (ut_params->op->sym->m_dst)
+               ut_params->obuf = ut_params->op->sym->m_dst;
        else
-               ciphertext = plaintext;
+               ut_params->obuf = ut_params->op->sym->m_src;
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->validDataLenInBits.len,
-                       "SNOW 3G Ciphertext data not as expected");
+       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
+                               tdata->validCipherOffsetInBits.len >> 3);
 
        ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-           + plaintext_pad_len;
+                       + plaintext_pad_len;
+
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ut_params->digest,
-                       tdata->digest.data,
-                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-                       "SNOW 3G Generated auth tag not as expected");
+               ut_params->digest,
+               tdata->digest.data,
+               DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+               "KASUMI Generated auth tag not as expected");
        return 0;
 }
+
 static int
-test_snow3g_auth_cipher(const struct snow3g_test_data *tdata)
+test_zuc_encryption(const struct wireless_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-
        uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_auth_cipher_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
-                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                       tdata->key.data, tdata->key.len,
-                       tdata->auth_iv.len, tdata->digest.len,
-                       tdata->cipher_iv.len);
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+
+       /* Check if device supports ZUC EEA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
+
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create ZUC session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* clear mbuf payload */
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_auth_cipher_operation(
-               tdata->digest.len,
-               tdata->cipher_iv.data, tdata->cipher_iv.len,
-               tdata->auth_iv.data, tdata->auth_iv.len,
-               plaintext_pad_len,
-               tdata->validCipherLenInBits.len,
-               0,
-               tdata->validAuthLenInBits.len,
-               0);
-
+       /* Create ZUC operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->plaintext.len,
+                                       0);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
+
+       ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
                ciphertext = plaintext;
 
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + plaintext_pad_len;
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
                tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-               ut_params->digest,
-               tdata->digest.data,
-               DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-               "SNOW 3G Generated auth tag not as expected");
+               tdata->validCipherLenInBits.len,
+               "ZUC Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_kasumi_auth_cipher(const struct kasumi_test_data *tdata)
+test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-
-       /* Create KASUMI session */
-       retval = create_wireless_algo_auth_cipher_session(
-                       ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_KASUMI_F9,
-                       RTE_CRYPTO_CIPHER_KASUMI_F8,
-                       tdata->key.data, tdata->key.len,
-                       0, tdata->digest.len,
-                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       const uint8_t *ciphertext;
+       uint8_t ciphertext_buffer[2048];
+       struct rte_cryptodev_info dev_info;
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       struct rte_cryptodev_sym_capability_idx cap_idx;
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       /* Check if device supports ZUC EEA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
 
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_auth_cipher_operation(tdata->digest.len,
-                               tdata->cipher_iv.data, tdata->cipher_iv.len,
-                               NULL, 0,
-                               plaintext_pad_len,
-                               tdata->validCipherLenInBits.len,
-                               tdata->validCipherOffsetInBits.len,
-                               tdata->validAuthLenInBits.len,
-                               0
-                               );
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       if (retval < 0)
-               return retval;
-
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       if (ut_params->op->sym->m_dst)
-               ut_params->obuf = ut_params->op->sym->m_dst;
-       else
-               ut_params->obuf = ut_params->op->sym->m_src;
-
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
-                               tdata->validCipherOffsetInBits.len >> 3);
-
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       ciphertext,
-                       reference_ciphertext,
-                       tdata->validCipherLenInBits.len,
-                       "KASUMI Ciphertext data not as expected");
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *)
-           + plaintext_pad_len;
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ut_params->digest,
-                       tdata->digest.data,
-                       DIGEST_BYTE_LENGTH_KASUMI_F9,
-                       "KASUMI Generated auth tag not as expected");
-       return 0;
-}
-
-static int
-test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       int retval;
-
-       uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-
-       /* Create KASUMI session */
-       retval = create_wireless_algo_cipher_auth_session(
-                       ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_KASUMI_F9,
-                       RTE_CRYPTO_CIPHER_KASUMI_F8,
-                       tdata->key.data, tdata->key.len,
-                       0, tdata->digest.len,
-                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
-
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
-
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
-
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data,
-                               tdata->digest.len, NULL, 0,
-                               plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
-                               tdata->cipher_iv.data, tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len,
-                               tdata->validAuthLenInBits.len,
-                               0
-                               );
-       if (retval < 0)
-               return retval;
-
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
-       if (ut_params->op->sym->m_dst)
-               ut_params->obuf = ut_params->op->sym->m_dst;
-       else
-               ut_params->obuf = ut_params->op->sym->m_src;
-
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
-                               tdata->validCipherOffsetInBits.len >> 3);
-
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + plaintext_pad_len;
-
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-               ut_params->digest,
-               tdata->digest.data,
-               DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-               "KASUMI Generated auth tag not as expected");
-       return 0;
-}
-
-static int
-test_zuc_encryption(const struct wireless_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       int retval;
-       uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-
-       /* Check if device supports ZUC EEA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
-
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-
-       /* Create ZUC session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
-
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
-
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
-
-       /* Create ZUC operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->plaintext.len,
-                                       0);
-       if (retval < 0)
-               return retval;
-
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               ciphertext = plaintext;
-
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validCipherLenInBits.len,
-               "ZUC Ciphertext data not as expected");
-       return 0;
-}
-
-static int
-test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       int retval;
-
-       unsigned int plaintext_pad_len;
-       unsigned int plaintext_len;
-       const uint8_t *ciphertext;
-       uint8_t ciphertext_buffer[2048];
-       struct rte_cryptodev_info dev_info;
-
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-
-       /* Check if device supports ZUC EEA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
-
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
-
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-
-       uint64_t feat_flags = dev_info.feature_flags;
+       uint64_t feat_flags = dev_info.feature_flags;
 
        if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
                printf("Device doesn't support in-place scatter-gather. "
                                "Test Skipped.\n");
-               return 0;
+               return -ENOTSUP;
        }
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
@@ -4749,6 +5068,16 @@ test_zuc_authentication(const struct wireless_test_data *tdata)
        uint8_t *plaintext;
 
        struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       (tdata->validAuthLenInBits.len % 8 != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
 
        /* Check if device supports ZUC EIA3 */
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
@@ -4801,38 +5130,413 @@ test_zuc_authentication(const struct wireless_test_data *tdata)
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
        ut_params->digest,
        tdata->digest.data,
-       DIGEST_BYTE_LENGTH_KASUMI_F9,
+       tdata->digest.len,
        "ZUC Generated auth tag not as expected");
 
        return 0;
 }
 
 static int
-test_kasumi_encryption_test_case_1(void)
+test_zuc_auth_cipher(const struct wireless_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
-       return test_kasumi_encryption(&kasumi_test_case_1);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_kasumi_encryption_test_case_1_sgl(void)
-{
-       return test_kasumi_encryption_sgl(&kasumi_test_case_1);
-}
+       int retval;
 
-static int
-test_kasumi_encryption_test_case_1_oop(void)
-{
-       return test_kasumi_encryption_oop(&kasumi_test_case_1);
-}
+       uint8_t *plaintext = NULL, *ciphertext = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
 
-static int
-test_kasumi_encryption_test_case_1_oop_sgl(void)
-{
-       return test_kasumi_encryption_oop_sgl(&kasumi_test_case_1);
-}
+       struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
 
-static int
-test_kasumi_encryption_test_case_2(void)
+       /* Check if device supports ZUC EIA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+               printf("Device doesn't support digest encrypted.\n");
+               return -ENOTSUP;
+       }
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       }
+
+       /* Create ZUC session */
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_ZUC_EIA3,
+                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (op_mode == OUT_OF_PLACE)
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+               rte_pktmbuf_tailroom(ut_params->ibuf));
+       if (op_mode == OUT_OF_PLACE)
+               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->obuf));
+
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+
+       if (verify) {
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       ciphertext_pad_len);
+               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       plaintext_pad_len);
+               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+
+       /* Create ZUC operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               tdata->auth_iv.data, tdata->auth_iv.len,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->validCipherOffsetInBits.len,
+               tdata->validAuthLenInBits.len,
+               0,
+               op_mode, 0, verify);
+
+       if (retval < 0)
+               return retval;
+
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+
+
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       plaintext = ciphertext;
+
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       ciphertext = plaintext;
+
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               ut_params->digest = rte_pktmbuf_mtod(
+                       ut_params->obuf, uint8_t *) +
+                       (tdata->digest.offset_bytes == 0 ?
+                       plaintext_pad_len : tdata->digest.offset_bytes);
+
+               debug_hexdump(stdout, "digest:", ut_params->digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
+
+       /* Validate obuf */
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "ZUC Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len >> 3,
+                       "ZUC Ciphertext data not as expected");
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_KASUMI_F9,
+                       "ZUC Generated auth tag not as expected");
+       }
+       return 0;
+}
+
+static int
+test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       int retval;
+
+       const uint8_t *plaintext = NULL;
+       const uint8_t *ciphertext = NULL;
+       const uint8_t *digest = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
+       uint8_t buffer[10000];
+       uint8_t digest_buffer[10000];
+
+       struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+
+       /* Check if device supports ZUC EIA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
+
+       /* Create ZUC session */
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_ZUC_EIA3,
+                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
+       if (retval < 0)
+               return retval;
+
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 15, 0);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       if (op_mode == OUT_OF_PLACE) {
+               ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                               plaintext_pad_len, 15, 0);
+               TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                               "Failed to allocate output buffer in mempool");
+       }
+
+       if (verify) {
+               pktmbuf_write(ut_params->ibuf, 0, ciphertext_len,
+                       tdata->ciphertext.data);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
+                       tdata->plaintext.data);
+               plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+       memset(buffer, 0, sizeof(buffer));
+
+       /* Create ZUC operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               NULL, 0,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->validCipherOffsetInBits.len,
+               tdata->validAuthLenInBits.len,
+               0,
+               op_mode, 1, verify);
+
+       if (retval < 0)
+               return retval;
+
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       plaintext_len, buffer);
+               else
+                       plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       ciphertext_len, buffer);
+               else
+                       ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               if (ut_params->obuf)
+                       digest = rte_pktmbuf_read(ut_params->obuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+               else
+                       digest = rte_pktmbuf_read(ut_params->ibuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+
+               debug_hexdump(stdout, "digest:", digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
+
+       /* Validate obuf */
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "ZUC Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "ZUC Ciphertext data not as expected");
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_KASUMI_F9,
+                       "ZUC Generated auth tag not as expected");
+       }
+       return 0;
+}
+
+static int
+test_kasumi_encryption_test_case_1(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_encryption_test_case_1_sgl(void)
+{
+       return test_kasumi_encryption_sgl(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_encryption_test_case_1_oop(void)
+{
+       return test_kasumi_encryption_oop(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_encryption_test_case_1_oop_sgl(void)
+{
+       return test_kasumi_encryption_oop_sgl(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_encryption_test_case_2(void)
 {
        return test_kasumi_encryption(&kasumi_test_case_2);
 }
@@ -4974,6 +5678,61 @@ test_snow3g_decryption_test_case_5(void)
 {
        return test_snow3g_decryption(&snow3g_test_case_5);
 }
+
+/*
+ * Function prepares snow3g_hash_test_data from snow3g_test_data.
+ * Pattern digest from snow3g_test_data must be allocated as
+ * 4 last bytes in plaintext.
+ */
+static void
+snow3g_hash_test_vector_setup(const struct snow3g_test_data *pattern,
+               struct snow3g_hash_test_data *output)
+{
+       if ((pattern != NULL) && (output != NULL)) {
+               output->key.len = pattern->key.len;
+
+               memcpy(output->key.data,
+               pattern->key.data, pattern->key.len);
+
+               output->auth_iv.len = pattern->auth_iv.len;
+
+               memcpy(output->auth_iv.data,
+               pattern->auth_iv.data, pattern->auth_iv.len);
+
+               output->plaintext.len = pattern->plaintext.len;
+
+               memcpy(output->plaintext.data,
+               pattern->plaintext.data, pattern->plaintext.len >> 3);
+
+               output->digest.len = pattern->digest.len;
+
+               memcpy(output->digest.data,
+               &pattern->plaintext.data[pattern->digest.offset_bytes],
+               pattern->digest.len);
+
+               output->validAuthLenInBits.len =
+               pattern->validAuthLenInBits.len;
+       }
+}
+
+/*
+ * Test case verify computed cipher and digest from snow3g_test_case_7 data.
+ */
+static int
+test_snow3g_decryption_with_digest_test_case_1(void)
+{
+       struct snow3g_hash_test_data snow3g_hash_data;
+
+       /*
+        * Function prepare data for hash veryfication test case.
+        * Digest is allocated in 4 last bytes in plaintext, pattern.
+        */
+       snow3g_hash_test_vector_setup(&snow3g_test_case_7, &snow3g_hash_data);
+
+       return test_snow3g_decryption(&snow3g_test_case_7) &
+                       test_snow3g_authentication_verify(&snow3g_hash_data);
+}
+
 static int
 test_snow3g_cipher_auth_test_case_1(void)
 {
@@ -4983,17 +5742,216 @@ test_snow3g_cipher_auth_test_case_1(void)
 static int
 test_snow3g_auth_cipher_test_case_1(void)
 {
-       return test_snow3g_auth_cipher(&snow3g_test_case_6);
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_1, IN_PLACE, 0);
 }
 
 static int
-test_kasumi_auth_cipher_test_case_1(void)
+test_snow3g_auth_cipher_test_case_2(void)
 {
-       return test_kasumi_auth_cipher(&kasumi_test_case_3);
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, IN_PLACE, 0);
 }
 
 static int
-test_kasumi_cipher_auth_test_case_1(void)
+test_snow3g_auth_cipher_test_case_2_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
+}
+
+static int
+test_snow3g_auth_cipher_part_digest_enc(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 0);
+}
+
+static int
+test_snow3g_auth_cipher_part_digest_enc_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 0);
+}
+
+static int
+test_snow3g_auth_cipher_test_case_3_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, IN_PLACE, 0);
+}
+
+static int
+test_snow3g_auth_cipher_test_case_3_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, OUT_OF_PLACE, 0);
+}
+
+static int
+test_snow3g_auth_cipher_part_digest_enc_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 0);
+}
+
+static int
+test_snow3g_auth_cipher_part_digest_enc_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 0);
+}
+
+static int
+test_snow3g_auth_cipher_verify_test_case_1(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_1, IN_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_test_case_2(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, IN_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_test_case_2_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_test_case_3_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, IN_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_test_case_3_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, OUT_OF_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 1);
+}
+
+static int
+test_snow3g_auth_cipher_with_digest_test_case_1(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_test_case_7, IN_PLACE, 0);
+}
+
+static int
+test_kasumi_auth_cipher_test_case_1(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_test_case_3, IN_PLACE, 0);
+}
+
+static int
+test_kasumi_auth_cipher_test_case_2(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 0);
+}
+
+static int
+test_kasumi_auth_cipher_test_case_2_oop(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
+}
+
+static int
+test_kasumi_auth_cipher_test_case_2_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 0);
+}
+
+static int
+test_kasumi_auth_cipher_test_case_2_oop_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
+}
+
+static int
+test_kasumi_auth_cipher_verify_test_case_1(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_test_case_3, IN_PLACE, 1);
+}
+
+static int
+test_kasumi_auth_cipher_verify_test_case_2(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 1);
+}
+
+static int
+test_kasumi_auth_cipher_verify_test_case_2_oop(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
+}
+
+static int
+test_kasumi_auth_cipher_verify_test_case_2_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 1);
+}
+
+static int
+test_kasumi_auth_cipher_verify_test_case_2_oop_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
+}
+
+static int
+test_kasumi_cipher_auth_test_case_1(void)
 {
        return test_kasumi_cipher_auth(&kasumi_test_case_6);
 }
@@ -5095,434 +6053,802 @@ test_zuc_cipher_auth_test_case_2(void)
 }
 
 static int
-test_3DES_chain_qat_all(void)
+test_zuc_auth_cipher_test_case_1(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
 }
 
 static int
-test_DES_cipheronly_qat_all(void)
+test_zuc_auth_cipher_test_case_1_oop(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_DES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_DES_cipheronly_openssl_all(void)
+test_zuc_auth_cipher_test_case_1_sgl(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_DES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
 }
 
 static int
-test_DES_docsis_openssl_all(void)
+test_zuc_auth_cipher_test_case_1_oop_sgl(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_DES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_DES_cipheronly_mb_all(void)
+test_zuc_auth_cipher_verify_test_case_1(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_DES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 1);
 }
+
 static int
-test_3DES_cipheronly_mb_all(void)
+test_zuc_auth_cipher_verify_test_case_1_oop(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_DES_docsis_mb_all(void)
+test_zuc_auth_cipher_verify_test_case_1_sgl(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_DES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 1);
 }
 
 static int
-test_3DES_chain_caam_jr_all(void)
+test_zuc_auth_cipher_verify_test_case_1_oop_sgl(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_3DES_cipheronly_caam_jr_all(void)
+test_mixed_check_if_unsupported(const struct mixed_cipher_auth_test_data *tdata)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       uint8_t dev_id = testsuite_params.valid_devs[0];
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       struct rte_cryptodev_sym_capability_idx cap_idx;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Check if device supports particular cipher algorithm */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = tdata->cipher_algo;
+       if (rte_cryptodev_sym_capability_get(dev_id, &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       return TEST_SUCCESS;
+       /* Check if device supports particular hash algorithm */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = tdata->auth_algo;
+       if (rte_cryptodev_sym_capability_get(dev_id, &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       return 0;
 }
 
 static int
-test_3DES_chain_dpaa_sec_all(void)
+test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       int retval;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       uint8_t *plaintext = NULL, *ciphertext = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
 
-       return TEST_SUCCESS;
-}
+       struct rte_cryptodev_info dev_info;
+       struct rte_crypto_op *op;
 
-static int
-test_3DES_cipheronly_dpaa_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Check if device supports particular algorithms separately */
+       if (test_mixed_check_if_unsupported(tdata))
+               return -ENOTSUP;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       return TEST_SUCCESS;
-}
+       if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+               printf("Device doesn't support digest encrypted.\n");
+               return -ENOTSUP;
+       }
 
-static int
-test_3DES_chain_dpaa2_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Create the session */
+       if (verify)
+               retval = create_wireless_algo_cipher_auth_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
+       else
+               retval = create_wireless_algo_auth_cipher_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                               RTE_CRYPTO_AUTH_OP_GENERATE,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (op_mode == OUT_OF_PLACE)
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+               rte_pktmbuf_tailroom(ut_params->ibuf));
+       if (op_mode == OUT_OF_PLACE)
+               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(ut_params->obuf));
 
-       return TEST_SUCCESS;
-}
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len_bits);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len_bits);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-static int
-test_3DES_cipheronly_dpaa2_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       if (verify) {
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                               ciphertext_len);
+       } else {
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+               debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       }
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       /* Create the operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+                       tdata->digest_enc.data, tdata->digest_enc.len,
+                       tdata->cipher_iv.data, tdata->cipher_iv.len,
+                       tdata->auth_iv.data, tdata->auth_iv.len,
+                       (tdata->digest_enc.offset == 0 ?
+                               plaintext_pad_len
+                               : tdata->digest_enc.offset),
+                       tdata->validCipherLen.len_bits,
+                       tdata->cipher.offset_bits,
+                       tdata->validAuthLen.len_bits,
+                       tdata->auth.offset_bits,
+                       op_mode, 0, verify);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       if (retval < 0)
+               return retval;
 
-       return TEST_SUCCESS;
-}
+       op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
 
-static int
-test_3DES_chain_ccp_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Check if the op failed because the device doesn't */
+       /* support this particular combination of algorithms */
+       if (op == NULL && ut_params->op->status ==
+                       RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
+               printf("Device doesn't support this mixed combination. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
+       ut_params->op = op;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       ut_params->obuf = (op_mode == IN_PLACE ?
+                       ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
-       return TEST_SUCCESS;
-}
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       plaintext = ciphertext +
+                                       (tdata->cipher.offset_bits >> 3);
 
-static int
-test_3DES_cipheronly_ccp_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                               tdata->plaintext.len_bits >> 3);
+               debug_hexdump(stdout, "plaintext expected:",
+                               tdata->plaintext.data,
+                               tdata->plaintext.len_bits >> 3);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
+                                       uint8_t *);
+               else
+                       ciphertext = plaintext;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                               ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                               tdata->ciphertext.data,
+                               tdata->ciphertext.len_bits >> 3);
+
+               ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                               + (tdata->digest_enc.offset == 0 ?
+               plaintext_pad_len : tdata->digest_enc.offset);
+
+               debug_hexdump(stdout, "digest:", ut_params->digest,
+                               tdata->digest_enc.len);
+               debug_hexdump(stdout, "digest expected:",
+                               tdata->digest_enc.data,
+                               tdata->digest_enc.len);
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Validate obuf */
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                               plaintext,
+                               tdata->plaintext.data,
+                               tdata->plaintext.len_bits >> 3,
+                               "Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                               ciphertext,
+                               tdata->ciphertext.data,
+                               tdata->validDataLen.len_bits,
+                               "Ciphertext data not as expected");
 
-       return TEST_SUCCESS;
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                               ut_params->digest,
+                               tdata->digest_enc.data,
+                               DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                               "Generated auth tag not as expected");
+       }
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
+
+       return 0;
 }
 
 static int
-test_3DES_cipheronly_qat_all(void)
+test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       int retval;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       const uint8_t *plaintext = NULL;
+       const uint8_t *ciphertext = NULL;
+       const uint8_t *digest = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
+       uint8_t buffer[10000];
+       uint8_t digest_buffer[10000];
 
-       return TEST_SUCCESS;
-}
+       struct rte_cryptodev_info dev_info;
+       struct rte_crypto_op *op;
 
-static int
-test_3DES_chain_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Check if device supports particular algorithms */
+       if (test_mixed_check_if_unsupported(tdata))
+               return -ENOTSUP;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       return TEST_SUCCESS;
-}
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
 
-static int
-test_3DES_cipheronly_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Create the session */
+       if (verify)
+               retval = create_wireless_algo_cipher_auth_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
+       else
+               retval = create_wireless_algo_auth_cipher_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                               RTE_CRYPTO_AUTH_OP_GENERATE,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len_bits);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len_bits);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       ciphertext_pad_len, 15, 0);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-       return TEST_SUCCESS;
-}
+       if (op_mode == OUT_OF_PLACE) {
+               ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                               plaintext_pad_len, 15, 0);
+               TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                               "Failed to allocate output buffer in mempool");
+       }
 
-/* ***** AEAD algorithm Tests ***** */
+       if (verify) {
+               pktmbuf_write(ut_params->ibuf, 0, ciphertext_len,
+                       tdata->ciphertext.data);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
+                       tdata->plaintext.data);
+               plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+       memset(buffer, 0, sizeof(buffer));
 
-static int
-create_aead_session(uint8_t dev_id, enum rte_crypto_aead_algorithm algo,
-               enum rte_crypto_aead_operation op,
-               const uint8_t *key, const uint8_t key_len,
-               const uint16_t aad_len, const uint8_t auth_len,
-               uint8_t iv_len)
-{
-       uint8_t aead_key[key_len];
+       /* Create the operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+                       tdata->digest_enc.data, tdata->digest_enc.len,
+                       tdata->cipher_iv.data, tdata->cipher_iv.len,
+                       tdata->auth_iv.data, tdata->auth_iv.len,
+                       (tdata->digest_enc.offset == 0 ?
+                               plaintext_pad_len
+                               : tdata->digest_enc.offset),
+                       tdata->validCipherLen.len_bits,
+                       tdata->cipher.offset_bits,
+                       tdata->validAuthLen.len_bits,
+                       tdata->auth.offset_bits,
+                       op_mode, 1, verify);
 
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       if (retval < 0)
+               return retval;
 
-       memcpy(aead_key, key, key_len);
+       op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
 
-       /* Setup AEAD Parameters */
-       ut_params->aead_xform.type = RTE_CRYPTO_SYM_XFORM_AEAD;
-       ut_params->aead_xform.next = NULL;
-       ut_params->aead_xform.aead.algo = algo;
-       ut_params->aead_xform.aead.op = op;
-       ut_params->aead_xform.aead.key.data = aead_key;
-       ut_params->aead_xform.aead.key.length = key_len;
-       ut_params->aead_xform.aead.iv.offset = IV_OFFSET;
-       ut_params->aead_xform.aead.iv.length = iv_len;
-       ut_params->aead_xform.aead.digest_length = auth_len;
-       ut_params->aead_xform.aead.aad_length = aad_len;
+       /* Check if the op failed because the device doesn't */
+       /* support this particular combination of algorithms */
+       if (op == NULL && ut_params->op->status ==
+                       RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
+               printf("Device doesn't support this mixed combination. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       ut_params->op = op;
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->aead_xform,
-                       ts_params->session_priv_mpool);
+       ut_params->obuf = (op_mode == IN_PLACE ?
+                       ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       plaintext_len, buffer);
+               else
+                       plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                               (tdata->plaintext.len_bits >> 3) -
+                               tdata->digest_enc.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                               tdata->plaintext.data,
+                               (tdata->plaintext.len_bits >> 3) -
+                               tdata->digest_enc.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       ciphertext_len, buffer);
+               else
+                       ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len_bits >> 3);
+
+               if (ut_params->obuf)
+                       digest = rte_pktmbuf_read(ut_params->obuf,
+                                       (tdata->digest_enc.offset == 0 ?
+                                               plaintext_pad_len :
+                                               tdata->digest_enc.offset),
+                                       tdata->digest_enc.len, digest_buffer);
+               else
+                       digest = rte_pktmbuf_read(ut_params->ibuf,
+                                       (tdata->digest_enc.offset == 0 ?
+                                               plaintext_pad_len :
+                                               tdata->digest_enc.offset),
+                                       tdata->digest_enc.len, digest_buffer);
+
+               debug_hexdump(stdout, "digest:", digest,
+                               tdata->digest_enc.len);
+               debug_hexdump(stdout, "digest expected:",
+                               tdata->digest_enc.data, tdata->digest_enc.len);
+       }
+
+       /* Validate obuf */
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                               plaintext,
+                               tdata->plaintext.data,
+                               tdata->plaintext.len_bits >> 3,
+                               "Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                               ciphertext,
+                               tdata->ciphertext.data,
+                               tdata->validDataLen.len_bits,
+                               "Ciphertext data not as expected");
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                               digest,
+                               tdata->digest_enc.data,
+                               tdata->digest_enc.len,
+                               "Generated auth tag not as expected");
+       }
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
        return 0;
 }
 
+/** AUTH AES CMAC + CIPHER AES CTR */
+
 static int
-create_aead_xform(struct rte_crypto_op *op,
-               enum rte_crypto_aead_algorithm algo,
-               enum rte_crypto_aead_operation aead_op,
-               uint8_t *key, const uint8_t key_len,
-               const uint8_t aad_len, const uint8_t auth_len,
-               uint8_t iv_len)
+test_aes_cmac_aes_ctr_digest_enc_test_case_1(void)
 {
-       TEST_ASSERT_NOT_NULL(rte_crypto_op_sym_xforms_alloc(op, 1),
-                       "failed to allocate space for crypto transform");
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 0);
+}
 
-       struct rte_crypto_sym_op *sym_op = op->sym;
+static int
+test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
+}
 
-       /* Setup AEAD Parameters */
-       sym_op->xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
-       sym_op->xform->next = NULL;
-       sym_op->xform->aead.algo = algo;
-       sym_op->xform->aead.op = aead_op;
-       sym_op->xform->aead.key.data = key;
-       sym_op->xform->aead.key.length = key_len;
-       sym_op->xform->aead.iv.offset = IV_OFFSET;
-       sym_op->xform->aead.iv.length = iv_len;
-       sym_op->xform->aead.digest_length = auth_len;
-       sym_op->xform->aead.aad_length = aad_len;
+static int
+test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl(void)
+{
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 0);
+}
 
-       debug_hexdump(stdout, "key:", key, key_len);
+static int
+test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl(void)
+{
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
+}
 
-       return 0;
+static int
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 1);
 }
 
 static int
-create_aead_operation(enum rte_crypto_aead_operation op,
-               const struct aead_test_data *tdata)
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
+}
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned int aad_pad_len, plaintext_pad_len;
+static int
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl(void)
+{
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 1);
+}
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+static int
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl(void)
+{
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
+}
+
+/** MIXED AUTH + CIPHER */
+
+static int
+test_auth_zuc_cipher_snow_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_snow_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_zuc_cipher_snow_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_snow_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_aes_cmac_cipher_snow_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_snow_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_aes_cmac_cipher_snow_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_snow_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_zuc_cipher_aes_ctr_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_zuc_cipher_aes_ctr_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_snow_cipher_aes_ctr_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_snow_cipher_aes_ctr_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_snow_cipher_zuc_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_zuc_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_snow_cipher_zuc_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_zuc_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_aes_cmac_cipher_zuc_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_zuc_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_aes_cmac_cipher_zuc_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_zuc_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_null_cipher_snow_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_snow_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_null_cipher_snow_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_snow_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_null_cipher_zuc_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_zuc_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_null_cipher_zuc_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_zuc_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_snow_cipher_null_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_null_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_snow_cipher_null_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_null_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_zuc_cipher_null_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_null_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_zuc_cipher_null_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_null_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_null_cipher_aes_ctr_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_null_cipher_aes_ctr_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_auth_aes_cmac_cipher_null_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_null_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_verify_auth_aes_cmac_cipher_null_test_case_1(void)
+{
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_null_test_case_1, OUT_OF_PLACE, 1);
+}
+
+/* ***** AEAD algorithm Tests ***** */
+
+static int
+create_aead_session(uint8_t dev_id, enum rte_crypto_aead_algorithm algo,
+               enum rte_crypto_aead_operation op,
+               const uint8_t *key, const uint8_t key_len,
+               const uint16_t aad_len, const uint8_t auth_len,
+               uint8_t iv_len)
+{
+       uint8_t aead_key[key_len];
+
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       memcpy(aead_key, key, key_len);
+
+       /* Setup AEAD Parameters */
+       ut_params->aead_xform.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       ut_params->aead_xform.next = NULL;
+       ut_params->aead_xform.aead.algo = algo;
+       ut_params->aead_xform.aead.op = op;
+       ut_params->aead_xform.aead.key.data = aead_key;
+       ut_params->aead_xform.aead.key.length = key_len;
+       ut_params->aead_xform.aead.iv.offset = IV_OFFSET;
+       ut_params->aead_xform.aead.iv.length = iv_len;
+       ut_params->aead_xform.aead.digest_length = auth_len;
+       ut_params->aead_xform.aead.aad_length = aad_len;
+
+       debug_hexdump(stdout, "key:", key, key_len);
+
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->aead_xform,
+                       ts_params->session_priv_mpool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+
+       return 0;
+}
+
+static int
+create_aead_xform(struct rte_crypto_op *op,
+               enum rte_crypto_aead_algorithm algo,
+               enum rte_crypto_aead_operation aead_op,
+               uint8_t *key, const uint8_t key_len,
+               const uint8_t aad_len, const uint8_t auth_len,
+               uint8_t iv_len)
+{
+       TEST_ASSERT_NOT_NULL(rte_crypto_op_sym_xforms_alloc(op, 1),
+                       "failed to allocate space for crypto transform");
+
+       struct rte_crypto_sym_op *sym_op = op->sym;
+
+       /* Setup AEAD Parameters */
+       sym_op->xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       sym_op->xform->next = NULL;
+       sym_op->xform->aead.algo = algo;
+       sym_op->xform->aead.op = aead_op;
+       sym_op->xform->aead.key.data = key;
+       sym_op->xform->aead.key.length = key_len;
+       sym_op->xform->aead.iv.offset = IV_OFFSET;
+       sym_op->xform->aead.iv.length = iv_len;
+       sym_op->xform->aead.digest_length = auth_len;
+       sym_op->xform->aead.aad_length = aad_len;
+
+       debug_hexdump(stdout, "key:", key, key_len);
+
+       return 0;
+}
+
+static int
+create_aead_operation(enum rte_crypto_aead_operation op,
+               const struct aead_test_data *tdata)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       uint8_t *plaintext, *ciphertext;
+       unsigned int aad_pad_len, plaintext_pad_len;
+
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate symmetric crypto operation struct");
 
        struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
@@ -5566,9 +6892,15 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
                                uint8_t *, IV_OFFSET);
 
-               rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
-               debug_hexdump(stdout, "iv:", iv_ptr,
-                       tdata->iv.len);
+               if (tdata->iv.len == 0) {
+                       rte_memcpy(iv_ptr, tdata->iv.data, AES_GCM_J0_LENGTH);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               AES_GCM_J0_LENGTH);
+               } else {
+                       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               tdata->iv.len);
+               }
        }
 
        /* Append plaintext/ciphertext */
@@ -5663,6 +6995,20 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
        uint16_t plaintext_pad_len;
        uint32_t i;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       const struct rte_cryptodev_symmetric_capability *capability;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       capability = rte_cryptodev_sym_capability_get(
+                       ts_params->valid_devs[0], &cap_idx);
+       if (capability == NULL)
+               return -ENOTSUP;
+       if (rte_cryptodev_sym_capability_check_aead(
+                       capability, tdata->key.len, tdata->auth_tag.len,
+                       tdata->aad.len, tdata->iv.len))
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -5695,7 +7041,11 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -5735,1794 +7085,2398 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
 
 }
 
+#ifdef RTE_LIBRTE_SECURITY
 static int
-test_AES_GCM_authenticated_encryption_test_case_1(void)
+security_proto_supported(enum rte_security_session_action_type action,
+       enum rte_security_session_protocol proto)
 {
-       return test_authenticated_encryption(&gcm_test_case_1);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_2);
-}
+       const struct rte_security_capability *capabilities;
+       const struct rte_security_capability *capability;
+       uint16_t i = 0;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_3);
-}
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_4(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_4);
-}
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_5(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_5);
-}
+       capabilities = rte_security_capabilities_get(ctx);
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_6(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_6);
-}
+       if (capabilities == NULL)
+               return -ENOTSUP;
 
-static int
-test_AES_GCM_authenticated_encryption_test_case_7(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_7);
-}
+       while ((capability = &capabilities[i++])->action !=
+                       RTE_SECURITY_ACTION_TYPE_NONE) {
+               if (capability->action == action &&
+                               capability->protocol == proto)
+                       return 0;
+       }
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_1);
+       return -ENOTSUP;
 }
 
+/* Basic algorithm run function for async inplace mode.
+ * Creates a session from input parameters and runs one operation
+ * on input_vec. Checks the output of the crypto operation against
+ * output_vec.
+ */
 static int
-test_AES_GCM_auth_encryption_test_case_192_2(void)
+test_pdcp_proto(int i, int oop,
+       enum rte_crypto_cipher_operation opc,
+       enum rte_crypto_auth_operation opa,
+       uint8_t *input_vec,
+       unsigned int input_vec_len,
+       uint8_t *output_vec,
+       unsigned int output_vec_len)
 {
-       return test_authenticated_encryption(&gcm_test_case_192_2);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext;
+       int ret = TEST_SUCCESS;
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_3);
-}
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
 
-static int
-test_AES_GCM_auth_encryption_test_case_192_4(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_4);
-}
-
-static int
-test_AES_GCM_auth_encryption_test_case_192_5(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_5);
-}
-
-static int
-test_AES_GCM_auth_encryption_test_case_192_6(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_6);
-}
-
-static int
-test_AES_GCM_auth_encryption_test_case_192_7(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_192_7);
-}
-
-static int
-test_AES_GCM_auth_encryption_test_case_256_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_1);
-}
-
-static int
-test_AES_GCM_auth_encryption_test_case_256_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_2);
-}
-
-static int
-test_AES_GCM_auth_encryption_test_case_256_3(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_3);
-}
-
-static int
-test_AES_GCM_auth_encryption_test_case_256_4(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_4);
-}
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
+       sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
+       if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-test_AES_GCM_auth_encryption_test_case_256_5(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_5);
-}
+       /* Generate test mbuf data */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-static int
-test_AES_GCM_auth_encryption_test_case_256_6(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_6);
-}
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-test_AES_GCM_auth_encryption_test_case_256_7(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_256_7);
-}
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                                 input_vec_len);
+       memcpy(plaintext, input_vec, input_vec_len);
 
-static int
-test_AES_GCM_auth_encryption_test_case_aad_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_aad_1);
-}
+       /* Out of place support */
+       if (oop) {
+               /*
+                * For out-op-place we need to alloc another mbuf
+                */
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               rte_pktmbuf_append(ut_params->obuf, output_vec_len);
+       }
 
-static int
-test_AES_GCM_auth_encryption_test_case_aad_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_aad_2);
-}
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
+       ut_params->cipher_xform.cipher.op = opc;
+       ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
+       ut_params->cipher_xform.cipher.key.length =
+                                       pdcp_test_params[i].cipher_key_len;
+       ut_params->cipher_xform.cipher.iv.length =
+                               pdcp_test_packet_direction[i] ? 4 : 0;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
 
-static int
-test_authenticated_decryption(const struct aead_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       /* Setup HMAC Parameters if ICV header is required */
+       if (pdcp_test_params[i].auth_alg != 0) {
+               ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+               ut_params->auth_xform.next = NULL;
+               ut_params->auth_xform.auth.algo = pdcp_test_params[i].auth_alg;
+               ut_params->auth_xform.auth.op = opa;
+               ut_params->auth_xform.auth.key.data = pdcp_test_auth_key[i];
+               ut_params->auth_xform.auth.key.length =
+                                       pdcp_test_params[i].auth_key_len;
+
+               ut_params->cipher_xform.next = &ut_params->auth_xform;
+       } else {
+               ut_params->cipher_xform.next = NULL;
+       }
 
-       int retval;
-       uint8_t *plaintext;
-       uint32_t i;
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_PDCP,
+               {.pdcp = {
+                       .bearer = pdcp_test_bearer[i],
+                       .domain = pdcp_test_params[i].domain,
+                       .pkt_dir = pdcp_test_packet_direction[i],
+                       .sn_size = pdcp_test_data_sn_size[i],
+                       .hfn = pdcp_test_packet_direction[i] ?
+                               0 : pdcp_test_hfn[i],
+                               /**
+                                * hfn can be set as pdcp_test_hfn[i]
+                                * if hfn_ovrd is not set. Here, PDCP
+                                * packet direction is just used to
+                                * run half of the cases with session
+                                * HFN and other half with per packet
+                                * HFN.
+                                */
+                       .hfn_threshold = pdcp_test_hfn_threshold[i],
+                       .hfn_ovrd = pdcp_test_packet_direction[i] ? 1 : 0,
+               } },
+               .crypto_xform = &ut_params->cipher_xform
+       };
 
-       /* Create AEAD session */
-       retval = create_aead_session(ts_params->valid_devs[0],
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_DECRYPT,
-                       tdata->key.data, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx,
+                               &sess_conf, ts_params->session_priv_mpool);
 
-       /* alloc mbuf and set payload */
-       if (tdata->aad.len > MBUF_SIZE) {
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
-               /* Populate full size of add data */
-               for (i = 32; i < MAX_AAD_LENGTH; i += 32)
-                       memcpy(&tdata->aad.data[i], &tdata->aad.data[0], 32);
-       } else
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (!ut_params->sec_session) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "Failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "Failed to allocate symmetric crypto operation struct");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       /* Create AEAD operation */
-       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
-       if (retval < 0)
-               return retval;
+       uint32_t *per_pkt_hfn = rte_crypto_op_ctod_offset(ut_params->op,
+                                       uint32_t *, IV_OFFSET);
+       *per_pkt_hfn = pdcp_test_packet_direction[i] ? pdcp_test_hfn[i] : 0;
 
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
 
+       /* set crypto operation source mbuf */
        ut_params->op->sym->m_src = ut_params->ibuf;
+       if (oop)
+               ut_params->op->sym->m_dst = ut_params->obuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op)
+               == NULL) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "failed to process sym crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       if (ut_params->op->sym->m_dst)
-               plaintext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
+       /* Validate obuf */
+       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
+                       uint8_t *);
+       if (oop) {
+               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
                                uint8_t *);
-       else
-               plaintext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
-                               uint8_t *,
-                               ut_params->op->sym->cipher.data.offset);
+       }
 
-       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       if (memcmp(ciphertext, output_vec, output_vec_len)) {
+               printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
+               rte_hexdump(stdout, "encrypted", ciphertext, output_vec_len);
+               rte_hexdump(stdout, "reference", output_vec, output_vec_len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       plaintext,
-                       tdata->plaintext.data,
-                       tdata->plaintext.len,
-                       "Plaintext data not as expected");
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
 
-       TEST_ASSERT_EQUAL(ut_params->op->status,
-                       RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "Authentication failed");
-       return 0;
-}
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
 
-static int
-test_AES_GCM_authenticated_decryption_test_case_1(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_1);
-}
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+       if (oop) {
+               rte_pktmbuf_free(ut_params->obuf);
+               ut_params->obuf = NULL;
+       }
 
-static int
-test_AES_GCM_authenticated_decryption_test_case_2(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_2);
+       return ret;
 }
 
 static int
-test_AES_GCM_authenticated_decryption_test_case_3(void)
+test_pdcp_proto_SGL(int i, int oop,
+       enum rte_crypto_cipher_operation opc,
+       enum rte_crypto_auth_operation opa,
+       uint8_t *input_vec,
+       unsigned int input_vec_len,
+       uint8_t *output_vec,
+       unsigned int output_vec_len,
+       uint32_t fragsz,
+       uint32_t fragsz_oop)
 {
-       return test_authenticated_decryption(&gcm_test_case_3);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext;
+       struct rte_mbuf *buf, *buf_oop = NULL;
+       int ret = TEST_SUCCESS;
+       int to_trn = 0;
+       int to_trn_tbl[16];
+       int segs = 1;
+       unsigned int trn_data = 0;
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
 
-static int
-test_AES_GCM_authenticated_decryption_test_case_4(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_4);
-}
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
 
-static int
-test_AES_GCM_authenticated_decryption_test_case_5(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_5);
-}
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
+       sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
+       if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-test_AES_GCM_authenticated_decryption_test_case_6(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_6);
-}
+       if (fragsz > input_vec_len)
+               fragsz = input_vec_len;
 
-static int
-test_AES_GCM_authenticated_decryption_test_case_7(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_7);
-}
+       uint16_t plaintext_len = fragsz;
+       uint16_t frag_size_oop = fragsz_oop ? fragsz_oop : fragsz;
 
-static int
-test_AES_GCM_auth_decryption_test_case_192_1(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_192_1);
-}
+       if (fragsz_oop > output_vec_len)
+               frag_size_oop = output_vec_len;
 
-static int
-test_AES_GCM_auth_decryption_test_case_192_2(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_192_2);
-}
+       int ecx = 0;
+       if (input_vec_len % fragsz != 0) {
+               if (input_vec_len / fragsz + 1 > 16)
+                       return 1;
+       } else if (input_vec_len / fragsz > 16)
+               return 1;
 
-static int
-test_AES_GCM_auth_decryption_test_case_192_3(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_192_3);
-}
+       /* Out of place support */
+       if (oop) {
+               /*
+                * For out-op-place we need to alloc another mbuf
+                */
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               rte_pktmbuf_append(ut_params->obuf, frag_size_oop);
+               buf_oop = ut_params->obuf;
+       }
 
-static int
-test_AES_GCM_auth_decryption_test_case_192_4(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_192_4);
-}
+       /* Generate test mbuf data */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-static int
-test_AES_GCM_auth_decryption_test_case_192_5(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_192_5);
-}
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-test_AES_GCM_auth_decryption_test_case_192_6(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_192_6);
-}
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                                 plaintext_len);
+       memcpy(plaintext, input_vec, plaintext_len);
+       trn_data += plaintext_len;
 
-static int
-test_AES_GCM_auth_decryption_test_case_192_7(void)
-{
-       return test_authenticated_decryption(&gcm_test_case_192_7);
-}
+       buf = ut_params->ibuf;
 
-static int
-test_AES_GCM_auth_decryption_test_case_256_1(void)
+       /*
+        * Loop until no more fragments
+        */
+
+       while (trn_data < input_vec_len) {
+               ++segs;
+               to_trn = (input_vec_len - trn_data < fragsz) ?
+                               (input_vec_len - trn_data) : fragsz;
+
+               to_trn_tbl[ecx++] = to_trn;
+
+               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               buf = buf->next;
+
+               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(buf));
+
+               /* OOP */
+               if (oop && !fragsz_oop) {
+                       buf_oop->next =
+                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
+               }
+
+               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
+                               to_trn);
+
+               memcpy(plaintext, input_vec + trn_data, to_trn);
+               trn_data += to_trn;
+       }
+
+       ut_params->ibuf->nb_segs = segs;
+
+       segs = 1;
+       if (fragsz_oop && oop) {
+               to_trn = 0;
+               ecx = 0;
+
+               trn_data = frag_size_oop;
+               while (trn_data < output_vec_len) {
+                       ++segs;
+                       to_trn =
+                               (output_vec_len - trn_data <
+                                               frag_size_oop) ?
+                               (output_vec_len - trn_data) :
+                                               frag_size_oop;
+
+                       to_trn_tbl[ecx++] = to_trn;
+
+                       buf_oop->next =
+                               rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
+
+                       trn_data += to_trn;
+               }
+               ut_params->obuf->nb_segs = segs;
+       }
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
+       ut_params->cipher_xform.cipher.op = opc;
+       ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
+       ut_params->cipher_xform.cipher.key.length =
+                                       pdcp_test_params[i].cipher_key_len;
+       ut_params->cipher_xform.cipher.iv.length = 0;
+
+       /* Setup HMAC Parameters if ICV header is required */
+       if (pdcp_test_params[i].auth_alg != 0) {
+               ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+               ut_params->auth_xform.next = NULL;
+               ut_params->auth_xform.auth.algo = pdcp_test_params[i].auth_alg;
+               ut_params->auth_xform.auth.op = opa;
+               ut_params->auth_xform.auth.key.data = pdcp_test_auth_key[i];
+               ut_params->auth_xform.auth.key.length =
+                                       pdcp_test_params[i].auth_key_len;
+
+               ut_params->cipher_xform.next = &ut_params->auth_xform;
+       } else {
+               ut_params->cipher_xform.next = NULL;
+       }
+
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_PDCP,
+               {.pdcp = {
+                       .bearer = pdcp_test_bearer[i],
+                       .domain = pdcp_test_params[i].domain,
+                       .pkt_dir = pdcp_test_packet_direction[i],
+                       .sn_size = pdcp_test_data_sn_size[i],
+                       .hfn = pdcp_test_hfn[i],
+                       .hfn_threshold = pdcp_test_hfn_threshold[i],
+                       .hfn_ovrd = 0,
+               } },
+               .crypto_xform = &ut_params->cipher_xform
+       };
+
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx,
+                               &sess_conf, ts_params->session_priv_mpool);
+
+       if (!ut_params->sec_session) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "Failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "Failed to allocate symmetric crypto operation struct");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
+
+       /* set crypto operation source mbuf */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       if (oop)
+               ut_params->op->sym->m_dst = ut_params->obuf;
+
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op)
+               == NULL) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "failed to process sym crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       /* Validate obuf */
+       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
+                       uint8_t *);
+       if (oop) {
+               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
+                               uint8_t *);
+       }
+       if (fragsz_oop)
+               fragsz = frag_size_oop;
+       if (memcmp(ciphertext, output_vec, fragsz)) {
+               printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
+               rte_hexdump(stdout, "encrypted", ciphertext, fragsz);
+               rte_hexdump(stdout, "reference", output_vec, fragsz);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
+
+       buf = ut_params->op->sym->m_src->next;
+       if (oop)
+               buf = ut_params->op->sym->m_dst->next;
+
+       unsigned int off = fragsz;
+
+       ecx = 0;
+       while (buf) {
+               ciphertext = rte_pktmbuf_mtod(buf,
+                               uint8_t *);
+               if (memcmp(ciphertext, output_vec + off, to_trn_tbl[ecx])) {
+                       printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
+                       rte_hexdump(stdout, "encrypted", ciphertext, to_trn_tbl[ecx]);
+                       rte_hexdump(stdout, "reference", output_vec + off,
+                                       to_trn_tbl[ecx]);
+                       ret = TEST_FAILED;
+                       goto on_err;
+               }
+               off += to_trn_tbl[ecx++];
+               buf = buf->next;
+       }
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
+
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
+
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+       if (oop) {
+               rte_pktmbuf_free(ut_params->obuf);
+               ut_params->obuf = NULL;
+       }
+
+       return ret;
+}
+
+int
+test_pdcp_proto_cplane_encap(int i)
 {
-       return test_authenticated_decryption(&gcm_test_case_256_1);
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i]+4);
 }
 
-static int
-test_AES_GCM_auth_decryption_test_case_256_2(void)
+int
+test_pdcp_proto_uplane_encap(int i)
 {
-       return test_authenticated_decryption(&gcm_test_case_256_2);
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i]);
+
 }
 
-static int
-test_AES_GCM_auth_decryption_test_case_256_3(void)
+int
+test_pdcp_proto_uplane_encap_with_int(int i)
 {
-       return test_authenticated_decryption(&gcm_test_case_256_3);
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i] + 4);
 }
 
-static int
-test_AES_GCM_auth_decryption_test_case_256_4(void)
+int
+test_pdcp_proto_cplane_decap(int i)
 {
-       return test_authenticated_decryption(&gcm_test_case_256_4);
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+               RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i] + 4,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i]);
 }
 
-static int
-test_AES_GCM_auth_decryption_test_case_256_5(void)
+int
+test_pdcp_proto_uplane_decap(int i)
 {
-       return test_authenticated_decryption(&gcm_test_case_256_5);
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+               RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i]);
 }
 
-static int
-test_AES_GCM_auth_decryption_test_case_256_6(void)
+int
+test_pdcp_proto_uplane_decap_with_int(int i)
 {
-       return test_authenticated_decryption(&gcm_test_case_256_6);
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+               RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i] + 4,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i]);
 }
 
 static int
-test_AES_GCM_auth_decryption_test_case_256_7(void)
+test_PDCP_PROTO_SGL_in_place_32B(void)
 {
-       return test_authenticated_decryption(&gcm_test_case_256_7);
+       /* i can be used for running any PDCP case
+        * In this case it is uplane 12-bit AES-SNOW DL encap
+        */
+       int i = PDCP_UPLANE_12BIT_OFFSET + AES_ENC + SNOW_AUTH + DOWNLINK;
+       return test_pdcp_proto_SGL(i, IN_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i]+4,
+                       32, 0);
 }
-
 static int
-test_AES_GCM_auth_decryption_test_case_aad_1(void)
+test_PDCP_PROTO_SGL_oop_32B_128B(void)
 {
-       return test_authenticated_decryption(&gcm_test_case_aad_1);
+       /* i can be used for running any PDCP case
+        * In this case it is uplane 18-bit NULL-NULL DL encap
+        */
+       int i = PDCP_UPLANE_18BIT_OFFSET + NULL_ENC + NULL_AUTH + DOWNLINK;
+       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i]+4,
+                       32, 128);
+}
+static int
+test_PDCP_PROTO_SGL_oop_32B_40B(void)
+{
+       /* i can be used for running any PDCP case
+        * In this case it is uplane 18-bit AES DL encap
+        */
+       int i = PDCP_UPLANE_OFFSET + AES_ENC + EIGHTEEN_BIT_SEQ_NUM_OFFSET
+                       + DOWNLINK;
+       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i],
+                       32, 40);
+}
+static int
+test_PDCP_PROTO_SGL_oop_128B_32B(void)
+{
+       /* i can be used for running any PDCP case
+        * In this case it is cplane 12-bit AES-ZUC DL encap
+        */
+       int i = PDCP_CPLANE_LONG_SN_OFFSET + AES_ENC + ZUC_AUTH + DOWNLINK;
+       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i]+4,
+                       128, 32);
 }
 
 static int
-test_AES_GCM_auth_decryption_test_case_aad_2(void)
+test_PDCP_PROTO_all(void)
 {
-       return test_authenticated_decryption(&gcm_test_case_aad_2);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return -ENOTSUP;
+
+       /* Set action type */
+       ut_params->type = gbl_action_type == RTE_SECURITY_ACTION_TYPE_NONE ?
+               RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL :
+               gbl_action_type;
+
+       if (security_proto_supported(ut_params->type,
+                       RTE_SECURITY_PROTOCOL_PDCP) < 0)
+               return -ENOTSUP;
+
+       status = test_PDCP_PROTO_cplane_encap_all();
+       status += test_PDCP_PROTO_cplane_decap_all();
+       status += test_PDCP_PROTO_uplane_encap_all();
+       status += test_PDCP_PROTO_uplane_decap_all();
+       status += test_PDCP_PROTO_SGL_in_place_32B();
+       status += test_PDCP_PROTO_SGL_oop_32B_128B();
+       status += test_PDCP_PROTO_SGL_oop_32B_40B();
+       status += test_PDCP_PROTO_SGL_oop_128B_32B();
+
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
 
 static int
-test_authenticated_encryption_oop(const struct aead_test_data *tdata)
+test_docsis_proto_uplink(int i, struct docsis_test_data *d_td)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
+       uint32_t crc_data_len;
+       int ret = TEST_SUCCESS;
+
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
+
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
+
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_UPLINK;
+
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return -ENOTSUP;
 
-       int retval;
-       uint8_t *ciphertext, *auth_tag;
-       uint16_t plaintext_pad_len;
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
+       }
 
-       /* Create AEAD session */
-       retval = create_aead_session(ts_params->valid_devs[0],
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
-                       tdata->key.data, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return -ENOTSUP;
 
+       /* Setup source mbuf payload */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
-       memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->obuf));
 
-       /* Create AEAD operation */
-       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
-       if (retval < 0)
-               return retval;
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       d_td->ciphertext.len);
 
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       memcpy(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len);
 
-       ut_params->op->sym->m_src = ut_params->ibuf;
-       ut_params->op->sym->m_dst = ut_params->obuf;
+       /* Setup cipher session parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
 
-       /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_UPLINK;
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
+       };
 
-       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_priv_mpool);
 
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
-                       ut_params->op->sym->cipher.data.offset);
-       auth_tag = ciphertext + plaintext_pad_len;
+       if (!ut_params->sec_session) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to allocate symmetric crypto operation");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->ciphertext.len,
-                       "Ciphertext data not as expected");
+       /* Setup CRC operation parameters */
+       crc_len = d_td->ciphertext.no_crc == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       crc_data_len = crc_len == 0 ? 0 : RTE_ETHER_CRC_LEN;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->ciphertext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->ciphertext.no_cipher == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->ciphertext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
+
+       /* Set crypto operation mbufs */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       ut_params->op->sym->m_dst = NULL;
 
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       auth_tag,
-                       tdata->auth_tag.data,
-                       tdata->auth_tag.len,
-                       "Generated auth tag not as expected");
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to process security crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       return 0;
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-}
+       /* Validate plaintext */
+       plaintext = ciphertext;
+
+       if (memcmp(plaintext, d_td->plaintext.data,
+                       d_td->plaintext.len - crc_data_len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "plaintext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->plaintext.data,
+                               d_td->plaintext.len);
+               rte_hexdump(stdout, "actual", plaintext, d_td->plaintext.len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-static int
-test_AES_GCM_authenticated_encryption_oop_test_case_1(void)
-{
-       return test_authenticated_encryption_oop(&gcm_test_case_5);
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
+
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
+
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+
+       return ret;
 }
 
 static int
-test_authenticated_decryption_oop(const struct aead_test_data *tdata)
+test_docsis_proto_downlink(int i, struct docsis_test_data *d_td)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
+       int ret = TEST_SUCCESS;
+
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
+
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
+
+       sec_cap_idx.action = ut_params->type;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
+
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return -ENOTSUP;
 
-       int retval;
-       uint8_t *plaintext;
-
-       /* Create AEAD session */
-       retval = create_aead_session(ts_params->valid_devs[0],
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_DECRYPT,
-                       tdata->key.data, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
+       }
 
-       /* alloc mbuf and set payload */
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return -ENOTSUP;
 
+       /* Setup source mbuf payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
-       memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->obuf));
-
-       /* Create AEAD operation */
-       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
-       if (retval < 0)
-               return retval;
-
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       ut_params->op->sym->m_src = ut_params->ibuf;
-       ut_params->op->sym->m_dst = ut_params->obuf;
-
-       /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
-
-       plaintext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
-                       ut_params->op->sym->cipher.data.offset);
-
-       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       plaintext,
-                       tdata->plaintext.data,
-                       tdata->plaintext.len,
-                       "Plaintext data not as expected");
 
-       TEST_ASSERT_EQUAL(ut_params->op->status,
-                       RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "Authentication failed");
-       return 0;
-}
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       d_td->plaintext.len);
 
-static int
-test_AES_GCM_authenticated_decryption_oop_test_case_1(void)
-{
-       return test_authenticated_decryption_oop(&gcm_test_case_5);
-}
+       memcpy(plaintext, d_td->plaintext.data, d_td->plaintext.len);
 
-static int
-test_authenticated_encryption_sessionless(
-               const struct aead_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       /* Setup cipher session parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
 
-       int retval;
-       uint8_t *ciphertext, *auth_tag;
-       uint16_t plaintext_pad_len;
-       uint8_t key[tdata->key.len + 1];
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       struct rte_security_session_conf sess_conf = {
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
+       };
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_priv_mpool);
 
-       /* Create AEAD operation */
-       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
-       if (retval < 0)
-               return retval;
+       if (!ut_params->sec_session) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       /* Create GCM xform */
-       memcpy(key, tdata->key.data, tdata->key.len);
-       retval = create_aead_xform(ut_params->op,
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
-                       key, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to allocate security crypto operation");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
+       /* Setup CRC operation parameters */
+       crc_len = d_td->plaintext.no_crc == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->plaintext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->plaintext.no_cipher == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->plaintext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
+
+       /* Set crypto operation mbufs */
        ut_params->op->sym->m_src = ut_params->ibuf;
-
-       TEST_ASSERT_EQUAL(ut_params->op->sess_type,
-                       RTE_CRYPTO_OP_SESSIONLESS,
-                       "crypto op session type not sessionless");
+       ut_params->op->sym->m_dst = NULL;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
-
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op status not success");
-
-       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
-
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                       ut_params->op->sym->cipher.data.offset);
-       auth_tag = ciphertext + plaintext_pad_len;
-
-       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->ciphertext.len,
-                       "Ciphertext data not as expected");
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__,
+                       "failed to process security crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       auth_tag,
-                       tdata->auth_tag.data,
-                       tdata->auth_tag.len,
-                       "Generated auth tag not as expected");
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       return 0;
+       /* Validate ciphertext */
+       ciphertext = plaintext;
+
+       if (memcmp(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "ciphertext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->ciphertext.data,
+                               d_td->ciphertext.len);
+               rte_hexdump(stdout, "actual", ciphertext, d_td->ciphertext.len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-}
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
+
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
+
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+
+       return ret;
+}
+
+#define TEST_DOCSIS_COUNT(func) do {                   \
+       int ret = func;                                 \
+       if (ret == TEST_SUCCESS)  {                     \
+               printf("\t%2d)", n++);                  \
+               printf("+++++ PASSED:" #func"\n");      \
+               p++;                                    \
+       } else if (ret == -ENOTSUP) {                   \
+               printf("\t%2d)", n++);                  \
+               printf("~~~~~ UNSUPP:" #func"\n");      \
+               u++;                                    \
+       } else {                                        \
+               printf("\t%2d)", n++);                  \
+               printf("----- FAILED:" #func"\n");      \
+               f++;                                    \
+       }                                               \
+} while (0)
+
+static int
+test_DOCSIS_PROTO_uplink_all(void)
+{
+       int p = 0, u = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d unsupported)\n",
+                       __func__, p, n, u);
+
+       return f;
+};
 
 static int
-test_AES_GCM_authenticated_encryption_sessionless_test_case_1(void)
-{
-       return test_authenticated_encryption_sessionless(
-                       &gcm_test_case_5);
-}
+test_DOCSIS_PROTO_downlink_all(void)
+{
+       int p = 0, u = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d unsupported)\n",
+                       __func__, p, n, u);
+
+       return f;
+};
 
 static int
-test_authenticated_decryption_sessionless(
-               const struct aead_test_data *tdata)
+test_DOCSIS_PROTO_all(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
 
-       int retval;
-       uint8_t *plaintext;
-       uint8_t key[tdata->key.len + 1];
-
-       /* alloc mbuf and set payload */
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       /* Create AEAD operation */
-       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
-       if (retval < 0)
-               return retval;
-
-       /* Create AEAD xform */
-       memcpy(key, tdata->key.data, tdata->key.len);
-       retval = create_aead_xform(ut_params->op,
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_DECRYPT,
-                       key, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
-
-       ut_params->op->sym->m_src = ut_params->ibuf;
-
-       TEST_ASSERT_EQUAL(ut_params->op->sess_type,
-                       RTE_CRYPTO_OP_SESSIONLESS,
-                       "crypto op session type not sessionless");
-
-       /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
-
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op status not success");
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return -ENOTSUP;
 
-       plaintext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                       ut_params->op->sym->cipher.data.offset);
+       /* Set action type */
+       ut_params->type = gbl_action_type == RTE_SECURITY_ACTION_TYPE_NONE ?
+               RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL :
+               gbl_action_type;
 
-       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       if (security_proto_supported(ut_params->type,
+                       RTE_SECURITY_PROTOCOL_DOCSIS) < 0)
+               return -ENOTSUP;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       plaintext,
-                       tdata->plaintext.data,
-                       tdata->plaintext.len,
-                       "Plaintext data not as expected");
+       status = test_DOCSIS_PROTO_uplink_all();
+       status += test_DOCSIS_PROTO_downlink_all();
 
-       TEST_ASSERT_EQUAL(ut_params->op->status,
-                       RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "Authentication failed");
-       return 0;
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
+#endif
 
 static int
-test_AES_GCM_authenticated_decryption_sessionless_test_case_1(void)
+test_AES_GCM_authenticated_encryption_test_case_1(void)
 {
-       return test_authenticated_decryption_sessionless(
-                       &gcm_test_case_5);
+       return test_authenticated_encryption(&gcm_test_case_1);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_128_1(void)
+test_AES_GCM_authenticated_encryption_test_case_2(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_128_1);
+       return test_authenticated_encryption(&gcm_test_case_2);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_128_2(void)
+test_AES_GCM_authenticated_encryption_test_case_3(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_128_2);
+       return test_authenticated_encryption(&gcm_test_case_3);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_128_3(void)
+test_AES_GCM_authenticated_encryption_test_case_4(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_128_3);
+       return test_authenticated_encryption(&gcm_test_case_4);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_128_1(void)
+test_AES_GCM_authenticated_encryption_test_case_5(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_128_1);
+       return test_authenticated_encryption(&gcm_test_case_5);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_128_2(void)
+test_AES_GCM_authenticated_encryption_test_case_6(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_128_2);
+       return test_authenticated_encryption(&gcm_test_case_6);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_128_3(void)
+test_AES_GCM_authenticated_encryption_test_case_7(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_128_3);
+       return test_authenticated_encryption(&gcm_test_case_7);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_192_1(void)
+test_AES_GCM_authenticated_encryption_test_case_8(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_192_1);
+       return test_authenticated_encryption(&gcm_test_case_8);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_192_2(void)
+test_AES_GCM_J0_authenticated_encryption_test_case_1(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_192_2);
+       return test_authenticated_encryption(&gcm_J0_test_case_1);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_192_3(void)
+test_AES_GCM_auth_encryption_test_case_192_1(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_192_3);
+       return test_authenticated_encryption(&gcm_test_case_192_1);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_192_1(void)
+test_AES_GCM_auth_encryption_test_case_192_2(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_192_1);
+       return test_authenticated_encryption(&gcm_test_case_192_2);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_192_2(void)
+test_AES_GCM_auth_encryption_test_case_192_3(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_192_2);
+       return test_authenticated_encryption(&gcm_test_case_192_3);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_192_3(void)
+test_AES_GCM_auth_encryption_test_case_192_4(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_192_3);
+       return test_authenticated_encryption(&gcm_test_case_192_4);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_256_1(void)
+test_AES_GCM_auth_encryption_test_case_192_5(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_256_1);
+       return test_authenticated_encryption(&gcm_test_case_192_5);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_256_2(void)
+test_AES_GCM_auth_encryption_test_case_192_6(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_256_2);
+       return test_authenticated_encryption(&gcm_test_case_192_6);
 }
 
 static int
-test_AES_CCM_authenticated_encryption_test_case_256_3(void)
+test_AES_GCM_auth_encryption_test_case_192_7(void)
 {
-       return test_authenticated_encryption(&ccm_test_case_256_3);
+       return test_authenticated_encryption(&gcm_test_case_192_7);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_256_1(void)
+test_AES_GCM_auth_encryption_test_case_256_1(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_256_1);
+       return test_authenticated_encryption(&gcm_test_case_256_1);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_256_2(void)
+test_AES_GCM_auth_encryption_test_case_256_2(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_256_2);
+       return test_authenticated_encryption(&gcm_test_case_256_2);
 }
 
 static int
-test_AES_CCM_authenticated_decryption_test_case_256_3(void)
+test_AES_GCM_auth_encryption_test_case_256_3(void)
 {
-       return test_authenticated_decryption(&ccm_test_case_256_3);
+       return test_authenticated_encryption(&gcm_test_case_256_3);
 }
 
 static int
-test_stats(void)
+test_AES_GCM_auth_encryption_test_case_256_4(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct rte_cryptodev_stats stats;
-       struct rte_cryptodev *dev;
-       cryptodev_stats_get_t temp_pfn;
-
-       rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
-       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0] + 600,
-                       &stats) == -ENODEV),
-               "rte_cryptodev_stats_get invalid dev failed");
-       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], 0) != 0),
-               "rte_cryptodev_stats_get invalid Param failed");
-       dev = &rte_cryptodevs[ts_params->valid_devs[0]];
-       temp_pfn = dev->dev_ops->stats_get;
-       dev->dev_ops->stats_get = (cryptodev_stats_get_t)0;
-       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
-                       == -ENOTSUP),
-               "rte_cryptodev_stats_get invalid Param failed");
-       dev->dev_ops->stats_get = temp_pfn;
-
-       /* Test expected values */
-       ut_setup();
-       test_AES_CBC_HMAC_SHA1_encrypt_digest();
-       ut_teardown();
-       TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
-                       &stats),
-               "rte_cryptodev_stats_get failed");
-       TEST_ASSERT((stats.enqueued_count == 1),
-               "rte_cryptodev_stats_get returned unexpected enqueued stat");
-       TEST_ASSERT((stats.dequeued_count == 1),
-               "rte_cryptodev_stats_get returned unexpected enqueued stat");
-       TEST_ASSERT((stats.enqueue_err_count == 0),
-               "rte_cryptodev_stats_get returned unexpected enqueued stat");
-       TEST_ASSERT((stats.dequeue_err_count == 0),
-               "rte_cryptodev_stats_get returned unexpected enqueued stat");
-
-       /* invalid device but should ignore and not reset device stats*/
-       rte_cryptodev_stats_reset(ts_params->valid_devs[0] + 300);
-       TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
-                       &stats),
-               "rte_cryptodev_stats_get failed");
-       TEST_ASSERT((stats.enqueued_count == 1),
-               "rte_cryptodev_stats_get returned unexpected enqueued stat");
-
-       /* check that a valid reset clears stats */
-       rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
-       TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
-                       &stats),
-                                         "rte_cryptodev_stats_get failed");
-       TEST_ASSERT((stats.enqueued_count == 0),
-               "rte_cryptodev_stats_get returned unexpected enqueued stat");
-       TEST_ASSERT((stats.dequeued_count == 0),
-               "rte_cryptodev_stats_get returned unexpected enqueued stat");
-
-       return TEST_SUCCESS;
+       return test_authenticated_encryption(&gcm_test_case_256_4);
 }
 
-static int MD5_HMAC_create_session(struct crypto_testsuite_params *ts_params,
-                                  struct crypto_unittest_params *ut_params,
-                                  enum rte_crypto_auth_operation op,
-                                  const struct HMAC_MD5_vector *test_case)
+static int
+test_AES_GCM_auth_encryption_test_case_256_5(void)
 {
-       uint8_t key[64];
-
-       memcpy(key, test_case->key.data, test_case->key.len);
-
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-       ut_params->auth_xform.auth.op = op;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_MD5_HMAC;
-
-       ut_params->auth_xform.auth.digest_length = MD5_DIGEST_LEN;
-       ut_params->auth_xform.auth.key.length = test_case->key.len;
-       ut_params->auth_xform.auth.key.data = key;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-
-       if (ut_params->sess == NULL)
-               return TEST_FAILED;
-
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       return 0;
+       return test_authenticated_encryption(&gcm_test_case_256_5);
 }
 
-static int MD5_HMAC_create_op(struct crypto_unittest_params *ut_params,
-                             const struct HMAC_MD5_vector *test_case,
-                             uint8_t **plaintext)
+static int
+test_AES_GCM_auth_encryption_test_case_256_6(void)
 {
-       uint16_t plaintext_pad_len;
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       plaintext_pad_len = RTE_ALIGN_CEIL(test_case->plaintext.len,
-                               16);
-
-       *plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       plaintext_pad_len);
-       memcpy(*plaintext, test_case->plaintext.data,
-                       test_case->plaintext.len);
-
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, MD5_DIGEST_LEN);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append digest");
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, plaintext_pad_len);
-
-       if (ut_params->auth_xform.auth.op == RTE_CRYPTO_AUTH_OP_VERIFY) {
-               rte_memcpy(sym_op->auth.digest.data, test_case->auth_tag.data,
-                          test_case->auth_tag.len);
-       }
-
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = test_case->plaintext.len;
-
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-       ut_params->op->sym->m_src = ut_params->ibuf;
-
-       return 0;
+       return test_authenticated_encryption(&gcm_test_case_256_6);
 }
 
 static int
-test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
+test_AES_GCM_auth_encryption_test_case_256_7(void)
 {
-       uint16_t plaintext_pad_len;
-       uint8_t *plaintext, *auth_tag;
-
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       if (MD5_HMAC_create_session(ts_params, ut_params,
-                       RTE_CRYPTO_AUTH_OP_GENERATE, test_case))
-               return TEST_FAILED;
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       plaintext_pad_len = RTE_ALIGN_CEIL(test_case->plaintext.len,
-                               16);
-
-       if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
-               return TEST_FAILED;
-
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       return test_authenticated_encryption(&gcm_test_case_256_7);
+}
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+static int
+test_AES_GCM_auth_encryption_test_case_aad_1(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_aad_1);
+}
 
-       if (ut_params->op->sym->m_dst) {
-               auth_tag = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
-                               uint8_t *, plaintext_pad_len);
-       } else {
-               auth_tag = plaintext + plaintext_pad_len;
-       }
+static int
+test_AES_GCM_auth_encryption_test_case_aad_2(void)
+{
+       return test_authenticated_encryption(&gcm_test_case_aad_2);
+}
 
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       auth_tag,
-                       test_case->auth_tag.data,
-                       test_case->auth_tag.len,
-                       "HMAC_MD5 generated tag not as expected");
+static int
+test_AES_GCM_auth_encryption_fail_iv_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
 
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.iv.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
        return TEST_SUCCESS;
 }
 
 static int
-test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
+test_AES_GCM_auth_encryption_fail_in_data_corrupt(void)
 {
-       uint8_t *plaintext;
-
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       if (MD5_HMAC_create_session(ts_params, ut_params,
-                       RTE_CRYPTO_AUTH_OP_VERIFY, test_case)) {
-               return TEST_FAILED;
-       }
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
-               return TEST_FAILED;
-
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "HMAC_MD5 crypto op processing failed");
+       struct aead_test_data tdata;
+       int res;
 
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.plaintext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
        return TEST_SUCCESS;
 }
 
 static int
-test_MD5_HMAC_generate_case_1(void)
+test_AES_GCM_auth_encryption_fail_out_data_corrupt(void)
 {
-       return test_MD5_HMAC_generate(&HMAC_MD5_test_case_1);
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.ciphertext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
 }
 
 static int
-test_MD5_HMAC_verify_case_1(void)
+test_AES_GCM_auth_encryption_fail_aad_len_corrupt(void)
 {
-       return test_MD5_HMAC_verify(&HMAC_MD5_test_case_1);
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.aad.len += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
 }
 
 static int
-test_MD5_HMAC_generate_case_2(void)
+test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
 {
-       return test_MD5_HMAC_generate(&HMAC_MD5_test_case_2);
+       struct aead_test_data tdata;
+       uint8_t aad[gcm_test_case_7.aad.len];
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       memcpy(aad, gcm_test_case_7.aad.data, gcm_test_case_7.aad.len);
+       aad[0] += 1;
+       tdata.aad.data = aad;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
 }
 
 static int
-test_MD5_HMAC_verify_case_2(void)
+test_AES_GCM_auth_encryption_fail_tag_corrupt(void)
 {
-       return test_MD5_HMAC_verify(&HMAC_MD5_test_case_2);
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.auth_tag.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
 }
 
 static int
-test_multi_session(void)
+test_authenticated_decryption(const struct aead_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       struct rte_cryptodev_info dev_info;
-       struct rte_cryptodev_sym_session **sessions;
-
-       uint16_t i;
+       int retval;
+       uint8_t *plaintext;
+       uint32_t i;
 
-       test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(ut_params,
-                       aes_cbc_key, hmac_sha512_key);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       const struct rte_cryptodev_symmetric_capability *capability;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       capability = rte_cryptodev_sym_capability_get(
+                       ts_params->valid_devs[0], &cap_idx);
+       if (capability == NULL)
+               return -ENOTSUP;
+       if (rte_cryptodev_sym_capability_check_aead(
+                       capability, tdata->key.len, tdata->auth_tag.len,
+                       tdata->aad.len, tdata->iv.len))
+               return -ENOTSUP;
 
+       /* Create AEAD session */
+       retval = create_aead_session(ts_params->valid_devs[0],
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
+                       tdata->key.data, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
+       if (retval < 0)
+               return retval;
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       /* alloc mbuf and set payload */
+       if (tdata->aad.len > MBUF_SIZE) {
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
+               /* Populate full size of add data */
+               for (i = 32; i < MAX_AAD_LENGTH; i += 32)
+                       memcpy(&tdata->aad.data[i], &tdata->aad.data[0], 32);
+       } else
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       sessions = rte_malloc(NULL,
-                       (sizeof(struct rte_cryptodev_sym_session *) *
-                       MAX_NB_SESSIONS) + 1, 0);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Create multiple crypto sessions*/
-       for (i = 0; i < MAX_NB_SESSIONS; i++) {
+       /* Create AEAD operation */
+       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
+       if (retval < 0)
+               return retval;
 
-               sessions[i] = rte_cryptodev_sym_session_create(
-                               ts_params->session_mpool);
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-               rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                               sessions[i], &ut_params->auth_xform,
-                               ts_params->session_priv_mpool);
-               TEST_ASSERT_NOT_NULL(sessions[i],
-                               "Session creation failed at session number %u",
-                               i);
+       ut_params->op->sym->m_src = ut_params->ibuf;
 
-               /* Attempt to send a request on each session */
-               TEST_ASSERT_SUCCESS( test_AES_CBC_HMAC_SHA512_decrypt_perform(
-                       sessions[i],
-                       ut_params,
-                       ts_params,
-                       catch_22_quote_2_512_bytes_AES_CBC_ciphertext,
-                       catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA512_digest,
-                       aes_cbc_iv),
-                       "Failed to perform decrypt on request number %u.", i);
-               /* free crypto operation structure */
-               if (ut_params->op)
-                       rte_crypto_op_free(ut_params->op);
+       /* Process crypto operation */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
-               /*
-                * free mbuf - both obuf and ibuf are usually the same,
-                * so check if they point at the same address is necessary,
-                * to avoid freeing the mbuf twice.
-                */
-               if (ut_params->obuf) {
-                       rte_pktmbuf_free(ut_params->obuf);
-                       if (ut_params->ibuf == ut_params->obuf)
-                               ut_params->ibuf = 0;
-                       ut_params->obuf = 0;
-               }
-               if (ut_params->ibuf) {
-                       rte_pktmbuf_free(ut_params->ibuf);
-                       ut_params->ibuf = 0;
-               }
-       }
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
-       /* Next session create should fail */
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       sessions[i], &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NULL(sessions[i],
-                       "Session creation succeeded unexpectedly!");
+       if (ut_params->op->sym->m_dst)
+               plaintext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
+                               uint8_t *);
+       else
+               plaintext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
+                               uint8_t *,
+                               ut_params->op->sym->cipher.data.offset);
 
-       for (i = 0; i < MAX_NB_SESSIONS; i++) {
-               rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
-                               sessions[i]);
-               rte_cryptodev_sym_session_free(sessions[i]);
-       }
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
-       rte_free(sessions);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len,
+                       "Plaintext data not as expected");
 
-       return TEST_SUCCESS;
+       TEST_ASSERT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "Authentication failed");
+
+       return 0;
 }
 
-struct multi_session_params {
-       struct crypto_unittest_params ut_params;
-       uint8_t *cipher_key;
-       uint8_t *hmac_key;
-       const uint8_t *cipher;
-       const uint8_t *digest;
-       uint8_t *iv;
-};
+static int
+test_AES_GCM_authenticated_decryption_test_case_1(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_1);
+}
 
-#define MB_SESSION_NUMBER 3
+static int
+test_AES_GCM_authenticated_decryption_test_case_2(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_2);
+}
 
 static int
-test_multi_session_random_usage(void)
+test_AES_GCM_authenticated_decryption_test_case_3(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct rte_cryptodev_info dev_info;
-       struct rte_cryptodev_sym_session **sessions;
-       uint32_t i, j;
-       struct multi_session_params ut_paramz[] = {
+       return test_authenticated_decryption(&gcm_test_case_3);
+}
 
-               {
-                       .cipher_key = ms_aes_cbc_key0,
-                       .hmac_key = ms_hmac_key0,
-                       .cipher = ms_aes_cbc_cipher0,
-                       .digest = ms_hmac_digest0,
-                       .iv = ms_aes_cbc_iv0
-               },
-               {
-                       .cipher_key = ms_aes_cbc_key1,
-                       .hmac_key = ms_hmac_key1,
-                       .cipher = ms_aes_cbc_cipher1,
-                       .digest = ms_hmac_digest1,
-                       .iv = ms_aes_cbc_iv1
-               },
-               {
-                       .cipher_key = ms_aes_cbc_key2,
-                       .hmac_key = ms_hmac_key2,
-                       .cipher = ms_aes_cbc_cipher2,
-                       .digest = ms_hmac_digest2,
-                       .iv = ms_aes_cbc_iv2
-               },
+static int
+test_AES_GCM_authenticated_decryption_test_case_4(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_4);
+}
 
-       };
+static int
+test_AES_GCM_authenticated_decryption_test_case_5(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_5);
+}
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+static int
+test_AES_GCM_authenticated_decryption_test_case_6(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_6);
+}
 
-       sessions = rte_malloc(NULL,
-                       (sizeof(struct rte_cryptodev_sym_session *)
-                                       * MAX_NB_SESSIONS) + 1, 0);
+static int
+test_AES_GCM_authenticated_decryption_test_case_7(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_7);
+}
 
-       for (i = 0; i < MB_SESSION_NUMBER; i++) {
-               sessions[i] = rte_cryptodev_sym_session_create(
-                               ts_params->session_mpool);
+static int
+test_AES_GCM_authenticated_decryption_test_case_8(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_8);
+}
 
-               rte_memcpy(&ut_paramz[i].ut_params, &unittest_params,
-                               sizeof(struct crypto_unittest_params));
+static int
+test_AES_GCM_J0_authenticated_decryption_test_case_1(void)
+{
+       return test_authenticated_decryption(&gcm_J0_test_case_1);
+}
 
-               test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
-                               &ut_paramz[i].ut_params,
-                               ut_paramz[i].cipher_key, ut_paramz[i].hmac_key);
+static int
+test_AES_GCM_auth_decryption_test_case_192_1(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_192_1);
+}
 
-               /* Create multiple crypto sessions*/
-               rte_cryptodev_sym_session_init(
-                               ts_params->valid_devs[0],
-                               sessions[i],
-                               &ut_paramz[i].ut_params.auth_xform,
-                               ts_params->session_priv_mpool);
+static int
+test_AES_GCM_auth_decryption_test_case_192_2(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_192_2);
+}
 
-               TEST_ASSERT_NOT_NULL(sessions[i],
-                               "Session creation failed at session number %u",
-                               i);
+static int
+test_AES_GCM_auth_decryption_test_case_192_3(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_192_3);
+}
 
-       }
+static int
+test_AES_GCM_auth_decryption_test_case_192_4(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_192_4);
+}
 
-       srand(time(NULL));
-       for (i = 0; i < 40000; i++) {
+static int
+test_AES_GCM_auth_decryption_test_case_192_5(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_192_5);
+}
 
-               j = rand() % MB_SESSION_NUMBER;
+static int
+test_AES_GCM_auth_decryption_test_case_192_6(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_192_6);
+}
 
-               TEST_ASSERT_SUCCESS(
-                       test_AES_CBC_HMAC_SHA512_decrypt_perform(
-                                       sessions[j],
-                                       &ut_paramz[j].ut_params,
-                                       ts_params, ut_paramz[j].cipher,
-                                       ut_paramz[j].digest,
-                                       ut_paramz[j].iv),
-                       "Failed to perform decrypt on request number %u.", i);
+static int
+test_AES_GCM_auth_decryption_test_case_192_7(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_192_7);
+}
 
-               if (ut_paramz[j].ut_params.op)
-                       rte_crypto_op_free(ut_paramz[j].ut_params.op);
+static int
+test_AES_GCM_auth_decryption_test_case_256_1(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_256_1);
+}
 
-               /*
-                * free mbuf - both obuf and ibuf are usually the same,
-                * so check if they point at the same address is necessary,
-                * to avoid freeing the mbuf twice.
-                */
-               if (ut_paramz[j].ut_params.obuf) {
-                       rte_pktmbuf_free(ut_paramz[j].ut_params.obuf);
-                       if (ut_paramz[j].ut_params.ibuf
-                                       == ut_paramz[j].ut_params.obuf)
-                               ut_paramz[j].ut_params.ibuf = 0;
-                       ut_paramz[j].ut_params.obuf = 0;
-               }
-               if (ut_paramz[j].ut_params.ibuf) {
-                       rte_pktmbuf_free(ut_paramz[j].ut_params.ibuf);
-                       ut_paramz[j].ut_params.ibuf = 0;
-               }
-       }
+static int
+test_AES_GCM_auth_decryption_test_case_256_2(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_256_2);
+}
 
-       for (i = 0; i < MB_SESSION_NUMBER; i++) {
-               rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
-                               sessions[i]);
-               rte_cryptodev_sym_session_free(sessions[i]);
-       }
+static int
+test_AES_GCM_auth_decryption_test_case_256_3(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_256_3);
+}
 
-       rte_free(sessions);
+static int
+test_AES_GCM_auth_decryption_test_case_256_4(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_256_4);
+}
 
-       return TEST_SUCCESS;
+static int
+test_AES_GCM_auth_decryption_test_case_256_5(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_256_5);
 }
 
 static int
-test_null_cipher_only_operation(void)
+test_AES_GCM_auth_decryption_test_case_256_6(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_authenticated_decryption(&gcm_test_case_256_6);
+}
 
-       /* Generate test mbuf data and space for digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+static int
+test_AES_GCM_auth_decryption_test_case_256_7(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_256_7);
+}
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+static int
+test_AES_GCM_auth_decryption_test_case_aad_1(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_aad_1);
+}
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+static int
+test_AES_GCM_auth_decryption_test_case_aad_2(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_aad_2);
+}
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+static int
+test_AES_GCM_auth_decryption_fail_iv_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                               ut_params->sess,
-                               &ut_params->cipher_xform,
-                               ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.iv.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+static int
+test_AES_GCM_auth_decryption_fail_in_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.plaintext.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+static int
+test_AES_GCM_auth_decryption_fail_out_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.ciphertext.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+static int
+test_AES_GCM_auth_decryption_fail_aad_len_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
 
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.aad.len += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
+static int
+test_AES_GCM_auth_decryption_fail_aad_corrupt(void)
+{
+       struct aead_test_data tdata;
+       uint8_t aad[gcm_test_case_7.aad.len];
+       int res;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       memcpy(aad, gcm_test_case_7.aad.data, gcm_test_case_7.aad.len);
+       aad[0] += 1;
+       tdata.aad.data = aad;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_decryption_fail_tag_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
 
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.auth_tag.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "authentication not failed");
        return TEST_SUCCESS;
 }
-uint8_t orig_data[] = {0xab, 0xab, 0xab, 0xab,
-                       0xab, 0xab, 0xab, 0xab,
-                       0xab, 0xab, 0xab, 0xab,
-                       0xab, 0xab, 0xab, 0xab};
+
 static int
-test_null_auth_only_operation(void)
+test_authenticated_encryption_oop(const struct aead_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
 
-       /* Generate test mbuf data and space for digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       int retval;
+       uint8_t *ciphertext, *auth_tag;
+       uint16_t plaintext_pad_len;
 
-       /* create a pointer for digest, but don't expect anything to be written
-        * here in a NULL auth algo so no mbuf append done.
-        */
-       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                       QUOTE_512_BYTES);
-       /* prefill the memory pointed to by digest */
-       memcpy(digest, orig_data, sizeof(orig_data));
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       /* Create AEAD session */
+       retval = create_aead_session(ts_params->valid_devs[0],
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
+                       tdata->key.data, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
+       if (retval < 0)
+               return retval;
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->obuf));
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       /* Create AEAD operation */
+       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
+       if (retval < 0)
+               return retval;
 
-       /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                       QUOTE_512_BYTES);
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       ut_params->op->sym->m_dst = ut_params->obuf;
 
        /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
+                       "crypto op processing failed");
+
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+
+       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
+                       ut_params->op->sym->cipher.data.offset);
+       auth_tag = ciphertext + plaintext_pad_len;
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
+
+       /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len,
+                       "Ciphertext data not as expected");
+
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       tdata->auth_tag.data,
+                       tdata->auth_tag.len,
+                       "Generated auth tag not as expected");
+
+       return 0;
 
-       return TEST_SUCCESS;
 }
 
+static int
+test_AES_GCM_authenticated_encryption_oop_test_case_1(void)
+{
+       return test_authenticated_encryption_oop(&gcm_test_case_5);
+}
 
 static int
-test_null_cipher_auth_operation(void)
+test_authenticated_decryption_oop(const struct aead_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
 
-       /* Generate test mbuf data and space for digest */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       int retval;
+       uint8_t *plaintext;
 
-       /* create a pointer for digest, but don't expect anything to be written
-        * here in a NULL auth algo so no mbuf append done.
-        */
-       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                       QUOTE_512_BYTES);
-       /* prefill the memory pointed to by digest */
-       memcpy(digest, orig_data, sizeof(orig_data));
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       /* Create AEAD session */
+       retval = create_aead_session(ts_params->valid_devs[0],
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
+                       tdata->key.data, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
+       if (retval < 0)
+               return retval;
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->obuf));
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       /* Create AEAD operation */
+       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
+       if (retval < 0)
+               return retval;
 
-       /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
-
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                       QUOTE_512_BYTES);
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       ut_params->op->sym->m_dst = ut_params->obuf;
 
        /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
+                       "crypto op processing failed");
+
+       plaintext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
+                       ut_params->op->sym->cipher.data.offset);
+
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len,
+                       "Plaintext data not as expected");
 
-       return TEST_SUCCESS;
+       TEST_ASSERT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "Authentication failed");
+       return 0;
+}
+
+static int
+test_AES_GCM_authenticated_decryption_oop_test_case_1(void)
+{
+       return test_authenticated_decryption_oop(&gcm_test_case_5);
 }
 
 static int
-test_null_auth_cipher_operation(void)
+test_authenticated_encryption_sessionless(
+               const struct aead_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *digest;
 
-       /* Generate test mbuf data */
-       ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
-                       catch_22_quote, QUOTE_512_BYTES, 0);
+       int retval;
+       uint8_t *ciphertext, *auth_tag;
+       uint16_t plaintext_pad_len;
+       uint8_t key[tdata->key.len + 1];
+       struct rte_cryptodev_info dev_info;
 
-       /* create a pointer for digest, but don't expect anything to be written
-        * here in a NULL auth algo so no mbuf append done.
-        */
-       digest = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
-                               QUOTE_512_BYTES);
-       /* prefill the memory pointed to by digest */
-       memcpy(digest, orig_data, sizeof(orig_data));
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       /* Create AEAD operation */
+       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
+       if (retval < 0)
+               return retval;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       /* Create GCM xform */
+       memcpy(key, tdata->key.data, tdata->key.len);
+       retval = create_aead_xform(ut_params->op,
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
+                       key, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
+       if (retval < 0)
+               return retval;
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       ut_params->op->sym->m_src = ut_params->ibuf;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       TEST_ASSERT_EQUAL(ut_params->op->sess_type,
+                       RTE_CRYPTO_OP_SESSIONLESS,
+                       "crypto op session type not sessionless");
 
-       sym_op->m_src = ut_params->ibuf;
+       /* Process crypto operation */
+       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
 
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                                       QUOTE_512_BYTES);
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op status not success");
 
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
+       ciphertext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                       ut_params->op->sym->cipher.data.offset);
+       auth_tag = ciphertext + plaintext_pad_len;
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len,
                        "Ciphertext data not as expected");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
+
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
+                       auth_tag,
+                       tdata->auth_tag.data,
+                       tdata->auth_tag.len,
+                       "Generated auth tag not as expected");
+
+       return 0;
 
-       return TEST_SUCCESS;
 }
 
+static int
+test_AES_GCM_authenticated_encryption_sessionless_test_case_1(void)
+{
+       return test_authenticated_encryption_sessionless(
+                       &gcm_test_case_5);
+}
 
 static int
-test_null_invalid_operation(void)
+test_authenticated_decryption_sessionless(
+               const struct aead_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       int ret;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       int retval;
+       uint8_t *plaintext;
+       uint8_t key[tdata->key.len + 1];
+       struct rte_cryptodev_info dev_info;
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
 
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Create AEAD operation */
+       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
+       if (retval < 0)
+               return retval;
 
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
+       /* Create AEAD xform */
+       memcpy(key, tdata->key.data, tdata->key.len);
+       retval = create_aead_xform(ut_params->op,
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
+                       key, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
+       if (retval < 0)
+               return retval;
 
-       return TEST_SUCCESS;
-}
+       ut_params->op->sym->m_src = ut_params->ibuf;
 
+       TEST_ASSERT_EQUAL(ut_params->op->sess_type,
+                       RTE_CRYPTO_OP_SESSIONLESS,
+                       "crypto op session type not sessionless");
 
-#define NULL_BURST_LENGTH (32)
+       /* Process crypto operation */
+       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
-static int
-test_null_burst_operation(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
 
-       unsigned i, burst_len = NULL_BURST_LENGTH;
-
-       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
-       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
-
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
-
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
-                       burst_len, "failed to generate burst of crypto ops");
-
-       /* Generate an operation for each mbuf in burst */
-       for (i = 0; i < burst_len; i++) {
-               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
-
-               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
-                               sizeof(unsigned));
-               *data = i;
-
-               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
-
-               burst[i]->sym->m_src = m;
-       }
-
-       /* Process crypto operation */
-       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
-                       0, burst, burst_len),
-                       burst_len,
-                       "Error enqueuing burst");
-
-       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
-                       0, burst_dequeued, burst_len),
-                       burst_len,
-                       "Error dequeuing burst");
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op status not success");
 
+       plaintext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                       ut_params->op->sym->cipher.data.offset);
 
-       for (i = 0; i < burst_len; i++) {
-               TEST_ASSERT_EQUAL(
-                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
-                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
-                                       uint32_t *),
-                       "data not as expected");
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
-               rte_pktmbuf_free(burst[i]->sym->m_src);
-               rte_crypto_op_free(burst[i]);
-       }
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len,
+                       "Plaintext data not as expected");
 
-       return TEST_SUCCESS;
+       TEST_ASSERT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "Authentication failed");
+       return 0;
 }
 
-static void
-generate_gmac_large_plaintext(uint8_t *data)
+static int
+test_AES_GCM_authenticated_decryption_sessionless_test_case_1(void)
 {
-       uint16_t i;
-
-       for (i = 32; i < GMAC_LARGE_PLAINTEXT_LENGTH; i += 32)
-               memcpy(&data[i], &data[0], 32);
+       return test_authenticated_decryption_sessionless(
+                       &gcm_test_case_5);
 }
 
 static int
-create_gmac_operation(enum rte_crypto_auth_operation op,
-               const struct gmac_test_data *tdata)
+test_AES_CCM_authenticated_encryption_test_case_128_1(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       struct rte_crypto_sym_op *sym_op;
-
-       uint32_t plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       sym_op = ut_params->op->sym;
-
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, tdata->gmac_tag.len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append digest");
-
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, plaintext_pad_len);
+       return test_authenticated_encryption(&ccm_test_case_128_1);
+}
 
-       if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
-               rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
-                               tdata->gmac_tag.len);
-               debug_hexdump(stdout, "digest:",
-                               sym_op->auth.digest.data,
-                               tdata->gmac_tag.len);
-       }
+static int
+test_AES_CCM_authenticated_encryption_test_case_128_2(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_128_2);
+}
 
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
-                       uint8_t *, IV_OFFSET);
+static int
+test_AES_CCM_authenticated_encryption_test_case_128_3(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_128_3);
+}
 
-       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
+static int
+test_AES_CCM_authenticated_decryption_test_case_128_1(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_128_1);
+}
 
-       debug_hexdump(stdout, "iv:", iv_ptr, tdata->iv.len);
+static int
+test_AES_CCM_authenticated_decryption_test_case_128_2(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_128_2);
+}
 
-       sym_op->cipher.data.length = 0;
-       sym_op->cipher.data.offset = 0;
+static int
+test_AES_CCM_authenticated_decryption_test_case_128_3(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_128_3);
+}
 
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = tdata->plaintext.len;
+static int
+test_AES_CCM_authenticated_encryption_test_case_192_1(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_192_1);
+}
 
-       return 0;
+static int
+test_AES_CCM_authenticated_encryption_test_case_192_2(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_192_2);
 }
 
-static int create_gmac_session(uint8_t dev_id,
-               const struct gmac_test_data *tdata,
-               enum rte_crypto_auth_operation auth_op)
+static int
+test_AES_CCM_authenticated_encryption_test_case_192_3(void)
 {
-       uint8_t auth_key[tdata->key.len];
+       return test_authenticated_encryption(&ccm_test_case_192_3);
+}
 
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+static int
+test_AES_CCM_authenticated_decryption_test_case_192_1(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_192_1);
+}
 
-       memcpy(auth_key, tdata->key.data, tdata->key.len);
+static int
+test_AES_CCM_authenticated_decryption_test_case_192_2(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_192_2);
+}
 
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+static int
+test_AES_CCM_authenticated_decryption_test_case_192_3(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_192_3);
+}
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GMAC;
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.digest_length = tdata->gmac_tag.len;
-       ut_params->auth_xform.auth.key.length = tdata->key.len;
-       ut_params->auth_xform.auth.key.data = auth_key;
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
-       ut_params->auth_xform.auth.iv.length = tdata->iv.len;
+static int
+test_AES_CCM_authenticated_encryption_test_case_256_1(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_256_1);
+}
 
+static int
+test_AES_CCM_authenticated_encryption_test_case_256_2(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_256_2);
+}
 
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+static int
+test_AES_CCM_authenticated_encryption_test_case_256_3(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_256_3);
+}
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
+static int
+test_AES_CCM_authenticated_decryption_test_case_256_1(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_256_1);
+}
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+static int
+test_AES_CCM_authenticated_decryption_test_case_256_2(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_256_2);
+}
 
-       return 0;
+static int
+test_AES_CCM_authenticated_decryption_test_case_256_3(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_256_3);
 }
 
 static int
-test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
+test_stats(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_cryptodev_stats stats;
 
-       int retval;
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
-       uint8_t *auth_tag, *plaintext;
-       uint16_t plaintext_pad_len;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
-                             "No GMAC length in the source data");
+       if (rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
+                       == -ENOTSUP)
+               return -ENOTSUP;
 
-       retval = create_gmac_session(ts_params->valid_devs[0],
-                       tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
+       rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
+       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0] + 600,
+                       &stats) == -ENODEV),
+               "rte_cryptodev_stats_get invalid dev failed");
+       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], 0) != 0),
+               "rte_cryptodev_stats_get invalid Param failed");
 
-       if (retval < 0)
-               return retval;
+       /* Test expected values */
+       ut_setup();
+       test_AES_CBC_HMAC_SHA1_encrypt_digest();
+       ut_teardown();
+       TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
+                       &stats),
+               "rte_cryptodev_stats_get failed");
+       TEST_ASSERT((stats.enqueued_count == 1),
+               "rte_cryptodev_stats_get returned unexpected enqueued stat");
+       TEST_ASSERT((stats.dequeued_count == 1),
+               "rte_cryptodev_stats_get returned unexpected enqueued stat");
+       TEST_ASSERT((stats.enqueue_err_count == 0),
+               "rte_cryptodev_stats_get returned unexpected enqueued stat");
+       TEST_ASSERT((stats.dequeue_err_count == 0),
+               "rte_cryptodev_stats_get returned unexpected enqueued stat");
 
-       if (tdata->plaintext.len > MBUF_SIZE)
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
-       else
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
+       /* invalid device but should ignore and not reset device stats*/
+       rte_cryptodev_stats_reset(ts_params->valid_devs[0] + 300);
+       TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
+                       &stats),
+               "rte_cryptodev_stats_get failed");
+       TEST_ASSERT((stats.enqueued_count == 1),
+               "rte_cryptodev_stats_get returned unexpected enqueued stat");
+
+       /* check that a valid reset clears stats */
+       rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
+       TEST_ASSERT_SUCCESS(rte_cryptodev_stats_get(ts_params->valid_devs[0],
+                       &stats),
+                                         "rte_cryptodev_stats_get failed");
+       TEST_ASSERT((stats.enqueued_count == 0),
+               "rte_cryptodev_stats_get returned unexpected enqueued stat");
+       TEST_ASSERT((stats.dequeued_count == 0),
+               "rte_cryptodev_stats_get returned unexpected enqueued stat");
+
+       return TEST_SUCCESS;
+}
+
+static int MD5_HMAC_create_session(struct crypto_testsuite_params *ts_params,
+                                  struct crypto_unittest_params *ut_params,
+                                  enum rte_crypto_auth_operation op,
+                                  const struct HMAC_MD5_vector *test_case)
+{
+       uint8_t key[64];
+
+       memcpy(key, test_case->key.data, test_case->key.len);
+
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
+       ut_params->auth_xform.auth.op = op;
+
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_MD5_HMAC;
+
+       ut_params->auth_xform.auth.digest_length = MD5_DIGEST_LEN;
+       ut_params->auth_xform.auth.key.length = test_case->key.len;
+       ut_params->auth_xform.auth.key.data = key;
+
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+
+       if (ut_params->sess == NULL)
+               return TEST_FAILED;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
-       /*
-        * Runtime generate the large plain text instead of use hard code
-        * plain text vector. It is done to avoid create huge source file
-        * with the test vector.
-        */
-       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
-               generate_gmac_large_plaintext(tdata->plaintext.data);
+       return 0;
+}
 
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+static int MD5_HMAC_create_op(struct crypto_unittest_params *ut_params,
+                             const struct HMAC_MD5_vector *test_case,
+                             uint8_t **plaintext)
+{
+       uint16_t plaintext_pad_len;
 
-       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-       debug_hexdump(stdout, "plaintext:", plaintext,
-                       tdata->plaintext.len);
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata);
+       plaintext_pad_len = RTE_ALIGN_CEIL(test_case->plaintext.len,
+                               16);
 
-       if (retval < 0)
-               return retval;
+       *plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       plaintext_pad_len);
+       memcpy(*plaintext, test_case->plaintext.data,
+                       test_case->plaintext.len);
 
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, MD5_DIGEST_LEN);
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append digest");
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, plaintext_pad_len);
+
+       if (ut_params->auth_xform.auth.op == RTE_CRYPTO_AUTH_OP_VERIFY) {
+               rte_memcpy(sym_op->auth.digest.data, test_case->auth_tag.data,
+                          test_case->auth_tag.len);
+       }
+
+       sym_op->auth.data.offset = 0;
+       sym_op->auth.data.length = test_case->plaintext.len;
 
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
        ut_params->op->sym->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       return 0;
+}
+
+static int
+test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
+{
+       uint16_t plaintext_pad_len;
+       uint8_t *plaintext, *auth_tag;
+
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_MD5_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       if (MD5_HMAC_create_session(ts_params, ut_params,
+                       RTE_CRYPTO_AUTH_OP_GENERATE, test_case))
+               return TEST_FAILED;
+
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate symmetric crypto operation struct");
+
+       plaintext_pad_len = RTE_ALIGN_CEIL(test_case->plaintext.len,
+                               16);
+
+       if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
+               return TEST_FAILED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -7534,2586 +9488,2538 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
                auth_tag = plaintext + plaintext_pad_len;
        }
 
-       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
-
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
                        auth_tag,
-                       tdata->gmac_tag.data,
-                       tdata->gmac_tag.len,
-                       "GMAC Generated auth tag not as expected");
+                       test_case->auth_tag.data,
+                       test_case->auth_tag.len,
+                       "HMAC_MD5 generated tag not as expected");
 
-       return 0;
+       return TEST_SUCCESS;
 }
 
 static int
-test_AES_GMAC_authentication_test_case_1(void)
+test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_1);
+       uint8_t *plaintext;
+
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_MD5_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       if (MD5_HMAC_create_session(ts_params, ut_params,
+                       RTE_CRYPTO_AUTH_OP_VERIFY, test_case)) {
+               return TEST_FAILED;
+       }
+
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate symmetric crypto operation struct");
+
+       if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
+               return TEST_FAILED;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "HMAC_MD5 crypto op processing failed");
+
+       return TEST_SUCCESS;
 }
 
 static int
-test_AES_GMAC_authentication_test_case_2(void)
+test_MD5_HMAC_generate_case_1(void)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_2);
+       return test_MD5_HMAC_generate(&HMAC_MD5_test_case_1);
 }
 
 static int
-test_AES_GMAC_authentication_test_case_3(void)
+test_MD5_HMAC_verify_case_1(void)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_3);
+       return test_MD5_HMAC_verify(&HMAC_MD5_test_case_1);
 }
 
 static int
-test_AES_GMAC_authentication_test_case_4(void)
+test_MD5_HMAC_generate_case_2(void)
 {
-       return test_AES_GMAC_authentication(&gmac_test_case_4);
+       return test_MD5_HMAC_generate(&HMAC_MD5_test_case_2);
 }
 
 static int
-test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
+test_MD5_HMAC_verify_case_2(void)
+{
+       return test_MD5_HMAC_verify(&HMAC_MD5_test_case_2);
+}
+
+static int
+test_multi_session(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       int retval;
-       uint32_t plaintext_pad_len;
-       uint8_t *plaintext;
 
-       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
-                             "No GMAC length in the source data");
+       struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_session **sessions;
 
-       retval = create_gmac_session(ts_params->valid_devs[0],
-                       tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
+       uint16_t i;
 
-       if (retval < 0)
-               return retval;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA512_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       if (tdata->plaintext.len > MBUF_SIZE)
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
-       else
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
-
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(ut_params,
+                       aes_cbc_key, hmac_sha512_key);
 
-       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
 
-       /*
-        * Runtime generate the large plain text instead of use hard code
-        * plain text vector. It is done to avoid create huge source file
-        * with the test vector.
-        */
-       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
-               generate_gmac_large_plaintext(tdata->plaintext.data);
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       sessions = rte_malloc(NULL,
+                       (sizeof(struct rte_cryptodev_sym_session *) *
+                       MAX_NB_SESSIONS) + 1, 0);
 
-       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-       debug_hexdump(stdout, "plaintext:", plaintext,
-                       tdata->plaintext.len);
+       /* Create multiple crypto sessions*/
+       for (i = 0; i < MAX_NB_SESSIONS; i++) {
 
-       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_VERIFY,
-                       tdata);
+               sessions[i] = rte_cryptodev_sym_session_create(
+                               ts_params->session_mpool);
 
-       if (retval < 0)
-               return retval;
+               rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                               sessions[i], &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
+               TEST_ASSERT_NOT_NULL(sessions[i],
+                               "Session creation failed at session number %u",
+                               i);
 
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+               /* Attempt to send a request on each session */
+               TEST_ASSERT_SUCCESS( test_AES_CBC_HMAC_SHA512_decrypt_perform(
+                       sessions[i],
+                       ut_params,
+                       ts_params,
+                       catch_22_quote_2_512_bytes_AES_CBC_ciphertext,
+                       catch_22_quote_2_512_bytes_AES_CBC_HMAC_SHA512_digest,
+                       aes_cbc_iv),
+                       "Failed to perform decrypt on request number %u.", i);
+               /* free crypto operation structure */
+               if (ut_params->op)
+                       rte_crypto_op_free(ut_params->op);
 
-       ut_params->op->sym->m_src = ut_params->ibuf;
+               /*
+                * free mbuf - both obuf and ibuf are usually the same,
+                * so check if they point at the same address is necessary,
+                * to avoid freeing the mbuf twice.
+                */
+               if (ut_params->obuf) {
+                       rte_pktmbuf_free(ut_params->obuf);
+                       if (ut_params->ibuf == ut_params->obuf)
+                               ut_params->ibuf = 0;
+                       ut_params->obuf = 0;
+               }
+               if (ut_params->ibuf) {
+                       rte_pktmbuf_free(ut_params->ibuf);
+                       ut_params->ibuf = 0;
+               }
+       }
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       /* Next session create should fail */
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       sessions[i], &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT_NULL(sessions[i],
+                       "Session creation succeeded unexpectedly!");
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       for (i = 0; i < MAX_NB_SESSIONS; i++) {
+               rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
+                               sessions[i]);
+               rte_cryptodev_sym_session_free(sessions[i]);
+       }
 
-       return 0;
+       rte_free(sessions);
 
+       return TEST_SUCCESS;
 }
 
-static int
-test_AES_GMAC_authentication_verify_test_case_1(void)
-{
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_1);
-}
+struct multi_session_params {
+       struct crypto_unittest_params ut_params;
+       uint8_t *cipher_key;
+       uint8_t *hmac_key;
+       const uint8_t *cipher;
+       const uint8_t *digest;
+       uint8_t *iv;
+};
 
-static int
-test_AES_GMAC_authentication_verify_test_case_2(void)
-{
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_2);
-}
+#define MB_SESSION_NUMBER 3
 
 static int
-test_AES_GMAC_authentication_verify_test_case_3(void)
+test_multi_session_random_usage(void)
 {
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_3);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_session **sessions;
+       uint32_t i, j;
+       struct multi_session_params ut_paramz[] = {
 
-static int
-test_AES_GMAC_authentication_verify_test_case_4(void)
-{
-       return test_AES_GMAC_authentication_verify(&gmac_test_case_4);
-}
+               {
+                       .cipher_key = ms_aes_cbc_key0,
+                       .hmac_key = ms_hmac_key0,
+                       .cipher = ms_aes_cbc_cipher0,
+                       .digest = ms_hmac_digest0,
+                       .iv = ms_aes_cbc_iv0
+               },
+               {
+                       .cipher_key = ms_aes_cbc_key1,
+                       .hmac_key = ms_hmac_key1,
+                       .cipher = ms_aes_cbc_cipher1,
+                       .digest = ms_hmac_digest1,
+                       .iv = ms_aes_cbc_iv1
+               },
+               {
+                       .cipher_key = ms_aes_cbc_key2,
+                       .hmac_key = ms_hmac_key2,
+                       .cipher = ms_aes_cbc_cipher2,
+                       .digest = ms_hmac_digest2,
+                       .iv = ms_aes_cbc_iv2
+               },
 
-struct test_crypto_vector {
-       enum rte_crypto_cipher_algorithm crypto_algo;
+       };
 
-       struct {
-               uint8_t data[64];
-               unsigned int len;
-       } cipher_key;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA512_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       struct {
-               uint8_t data[64];
-               unsigned int len;
-       } iv;
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       struct {
-               const uint8_t *data;
-               unsigned int len;
-       } plaintext;
+       sessions = rte_malloc(NULL,
+                       (sizeof(struct rte_cryptodev_sym_session *)
+                                       * MAX_NB_SESSIONS) + 1, 0);
 
-       struct {
-               const uint8_t *data;
-               unsigned int len;
-       } ciphertext;
+       for (i = 0; i < MB_SESSION_NUMBER; i++) {
+               sessions[i] = rte_cryptodev_sym_session_create(
+                               ts_params->session_mpool);
 
-       enum rte_crypto_auth_algorithm auth_algo;
+               rte_memcpy(&ut_paramz[i].ut_params, &unittest_params,
+                               sizeof(struct crypto_unittest_params));
 
-       struct {
-               uint8_t data[128];
-               unsigned int len;
-       } auth_key;
+               test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
+                               &ut_paramz[i].ut_params,
+                               ut_paramz[i].cipher_key, ut_paramz[i].hmac_key);
 
-       struct {
-               const uint8_t *data;
-               unsigned int len;
-       } aad;
+               /* Create multiple crypto sessions*/
+               rte_cryptodev_sym_session_init(
+                               ts_params->valid_devs[0],
+                               sessions[i],
+                               &ut_paramz[i].ut_params.auth_xform,
+                               ts_params->session_priv_mpool);
 
-       struct {
-               uint8_t data[128];
-               unsigned int len;
-       } digest;
-};
+               TEST_ASSERT_NOT_NULL(sessions[i],
+                               "Session creation failed at session number %u",
+                               i);
 
-static const struct test_crypto_vector
-hmac_sha1_test_crypto_vector = {
-       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
-       .plaintext = {
-               .data = plaintext_hash,
-               .len = 512
-       },
-       .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 = {
-                       0xC4, 0xB7, 0x0E, 0x6B, 0xDE, 0xD1, 0xE7, 0x77,
-                       0x7E, 0x2E, 0x8F, 0xFC, 0x48, 0x39, 0x46, 0x17,
-                       0x3F, 0x91, 0x64, 0x59
-               },
-               .len = 20
        }
-};
 
-static const struct test_crypto_vector
-aes128_gmac_test_vector = {
-       .auth_algo = RTE_CRYPTO_AUTH_AES_GMAC,
-       .plaintext = {
-               .data = plaintext_hash,
-               .len = 512
-       },
-       .iv = {
-               .data = {
-                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-                       0x08, 0x09, 0x0A, 0x0B
-               },
-               .len = 12
-       },
-       .auth_key = {
-               .data = {
-                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
-                       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA
-               },
-               .len = 16
-       },
-       .digest = {
-               .data = {
-                       0xCA, 0x00, 0x99, 0x8B, 0x30, 0x7E, 0x74, 0x56,
-                       0x32, 0xA7, 0x87, 0xB5, 0xE9, 0xB2, 0x34, 0x5A
-               },
-               .len = 16
-       }
-};
+       srand(time(NULL));
+       for (i = 0; i < 40000; i++) {
 
-static const struct test_crypto_vector
-aes128cbc_hmac_sha1_test_vector = {
-       .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_hash,
-               .len = 512
-       },
-       .ciphertext = {
-               .data = ciphertext512_aes128cbc,
-               .len = 512
-       },
-       .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 = {
-                       0x9A, 0x4F, 0x88, 0x1B, 0xB6, 0x8F, 0xD8, 0x60,
-                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
-                       0x18, 0x8C, 0x1D, 0x32
-               },
-               .len = 20
+               j = rand() % MB_SESSION_NUMBER;
+
+               TEST_ASSERT_SUCCESS(
+                       test_AES_CBC_HMAC_SHA512_decrypt_perform(
+                                       sessions[j],
+                                       &ut_paramz[j].ut_params,
+                                       ts_params, ut_paramz[j].cipher,
+                                       ut_paramz[j].digest,
+                                       ut_paramz[j].iv),
+                       "Failed to perform decrypt on request number %u.", i);
+
+               if (ut_paramz[j].ut_params.op)
+                       rte_crypto_op_free(ut_paramz[j].ut_params.op);
+
+               /*
+                * free mbuf - both obuf and ibuf are usually the same,
+                * so check if they point at the same address is necessary,
+                * to avoid freeing the mbuf twice.
+                */
+               if (ut_paramz[j].ut_params.obuf) {
+                       rte_pktmbuf_free(ut_paramz[j].ut_params.obuf);
+                       if (ut_paramz[j].ut_params.ibuf
+                                       == ut_paramz[j].ut_params.obuf)
+                               ut_paramz[j].ut_params.ibuf = 0;
+                       ut_paramz[j].ut_params.obuf = 0;
+               }
+               if (ut_paramz[j].ut_params.ibuf) {
+                       rte_pktmbuf_free(ut_paramz[j].ut_params.ibuf);
+                       ut_paramz[j].ut_params.ibuf = 0;
+               }
        }
-};
 
-static void
-data_corruption(uint8_t *data)
-{
-       data[0] += 1;
-}
+       for (i = 0; i < MB_SESSION_NUMBER; i++) {
+               rte_cryptodev_sym_session_clear(ts_params->valid_devs[0],
+                               sessions[i]);
+               rte_cryptodev_sym_session_free(sessions[i]);
+       }
 
-static void
-tag_corruption(uint8_t *data, unsigned int tag_offset)
-{
-       data[tag_offset] += 1;
+       rte_free(sessions);
+
+       return TEST_SUCCESS;
 }
 
+uint8_t orig_data[] = {0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab,
+                       0xab, 0xab, 0xab, 0xab};
+
 static int
-create_auth_session(struct crypto_unittest_params *ut_params,
-               uint8_t dev_id,
-               const struct test_crypto_vector *reference,
-               enum rte_crypto_auth_operation auth_op)
+test_null_invalid_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t auth_key[reference->auth_key.len + 1];
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       int ret;
 
-       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+               return -ENOTSUP;
 
-       /* Setup Authentication Parameters */
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
+
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       /* Create Crypto session*/
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
+
+
+       /* Setup HMAC Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = auth_op;
        ut_params->auth_xform.next = NULL;
-       ut_params->auth_xform.auth.algo = reference->auth_algo;
-       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
-       ut_params->auth_xform.auth.key.data = auth_key;
-       ut_params->auth_xform.auth.digest_length = reference->digest.len;
 
-       /* Create Crypto session*/
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                               &ut_params->auth_xform,
-                               ts_params->session_priv_mpool);
-
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       /* Create Crypto session*/
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
 
-       return 0;
+       return TEST_SUCCESS;
 }
 
+
+#define NULL_BURST_LENGTH (32)
+
 static int
-create_auth_cipher_session(struct crypto_unittest_params *ut_params,
-               uint8_t dev_id,
-               const struct test_crypto_vector *reference,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_cipher_operation cipher_op)
+test_null_burst_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t cipher_key[reference->cipher_key.len + 1];
-       uint8_t auth_key[reference->auth_key.len + 1];
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(cipher_key, reference->cipher_key.data,
-                       reference->cipher_key.len);
-       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
+       unsigned i, burst_len = NULL_BURST_LENGTH;
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.algo = reference->auth_algo;
-       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
-       ut_params->auth_xform.auth.key.data = auth_key;
-       ut_params->auth_xform.auth.digest_length = reference->digest.len;
+       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
+       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
 
-       if (reference->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) {
-               ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
-               ut_params->auth_xform.auth.iv.length = reference->iv.len;
-       } else {
-               ut_params->auth_xform.next = &ut_params->cipher_xform;
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+               return -ENOTSUP;
 
-               /* Setup Cipher Parameters */
-               ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-               ut_params->cipher_xform.next = NULL;
-               ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
-               ut_params->cipher_xform.cipher.op = cipher_op;
-               ut_params->cipher_xform.cipher.key.data = cipher_key;
-               ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
-               ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-               ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
-       }
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
+
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+
+       /* Setup HMAC Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
+
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
 
-       /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                               &ut_params->auth_xform,
-                               ts_params->session_priv_mpool);
-
+       /* Create Crypto session*/
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       return 0;
-}
-
-static int
-create_auth_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int auth_generate)
-{
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
+       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
+                       burst_len, "failed to generate burst of crypto ops");
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Generate an operation for each mbuf in burst */
+       for (i = 0; i < burst_len; i++) {
+               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
+                               sizeof(unsigned));
+               *data = i;
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, reference->digest.len);
+               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+               burst[i]->sym->m_src = m;
+       }
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, reference->plaintext.len);
+       /* Process crypto operation */
+       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
+                       0, burst, burst_len),
+                       burst_len,
+                       "Error enqueuing burst");
 
-       if (auth_generate)
-               memset(sym_op->auth.digest.data, 0, reference->digest.len);
-       else
-               memcpy(sym_op->auth.digest.data,
-                               reference->digest.data,
-                               reference->digest.len);
+       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
+                       0, burst_dequeued, burst_len),
+                       burst_len,
+                       "Error dequeuing burst");
 
-       debug_hexdump(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       reference->digest.len);
 
-       sym_op->auth.data.length = reference->plaintext.len;
-       sym_op->auth.data.offset = 0;
+       for (i = 0; i < burst_len; i++) {
+               TEST_ASSERT_EQUAL(
+                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
+                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
+                                       uint32_t *),
+                       "data not as expected");
 
-       return 0;
+               rte_pktmbuf_free(burst[i]->sym->m_src);
+               rte_crypto_op_free(burst[i]);
+       }
+
+       return TEST_SUCCESS;
+}
+
+static void
+generate_gmac_large_plaintext(uint8_t *data)
+{
+       uint16_t i;
+
+       for (i = 32; i < GMAC_LARGE_PLAINTEXT_LENGTH; i += 32)
+               memcpy(&data[i], &data[0], 32);
 }
 
 static int
-create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int auth_generate)
+create_gmac_operation(enum rte_crypto_auth_operation op,
+               const struct gmac_test_data *tdata)
 {
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_crypto_sym_op *sym_op;
+
+       uint32_t plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
                        RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+                       "Failed to allocate symmetric crypto operation struct");
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       sym_op = ut_params->op->sym;
 
-       /* digest */
        sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, reference->digest.len);
-
+                       ut_params->ibuf, tdata->gmac_tag.len);
        TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+                       "no room to append digest");
 
        sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, reference->ciphertext.len);
+                       ut_params->ibuf, plaintext_pad_len);
 
-       if (auth_generate)
-               memset(sym_op->auth.digest.data, 0, reference->digest.len);
-       else
-               memcpy(sym_op->auth.digest.data,
-                               reference->digest.data,
-                               reference->digest.len);
+       if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
+               rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
+                               tdata->gmac_tag.len);
+               debug_hexdump(stdout, "digest:",
+                               sym_op->auth.digest.data,
+                               tdata->gmac_tag.len);
+       }
 
-       debug_hexdump(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       reference->digest.len);
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
+                       uint8_t *, IV_OFFSET);
 
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       reference->iv.data, reference->iv.len);
+       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
+
+       debug_hexdump(stdout, "iv:", iv_ptr, tdata->iv.len);
 
        sym_op->cipher.data.length = 0;
        sym_op->cipher.data.offset = 0;
 
-       sym_op->auth.data.length = reference->plaintext.len;
        sym_op->auth.data.offset = 0;
+       sym_op->auth.data.length = tdata->plaintext.len;
 
        return 0;
 }
 
-static int
-create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int auth_generate)
+static int create_gmac_session(uint8_t dev_id,
+               const struct gmac_test_data *tdata,
+               enum rte_crypto_auth_operation auth_op)
 {
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       uint8_t auth_key[tdata->key.len];
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, reference->digest.len);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+       memcpy(auth_key, tdata->key.data, tdata->key.len);
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, reference->ciphertext.len);
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       if (auth_generate)
-               memset(sym_op->auth.digest.data, 0, reference->digest.len);
-       else
-               memcpy(sym_op->auth.digest.data,
-                               reference->digest.data,
-                               reference->digest.len);
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GMAC;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.digest_length = tdata->gmac_tag.len;
+       ut_params->auth_xform.auth.key.length = tdata->key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+       ut_params->auth_xform.auth.iv.length = tdata->iv.len;
 
-       debug_hexdump(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       reference->digest.len);
 
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       reference->iv.data, reference->iv.len);
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       sym_op->cipher.data.length = reference->ciphertext.len;
-       sym_op->cipher.data.offset = 0;
+       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
 
-       sym_op->auth.data.length = reference->ciphertext.len;
-       sym_op->auth.data.offset = 0;
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
        return 0;
 }
 
 static int
-create_auth_verify_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
+test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
 {
-       return create_auth_operation(ts_params, ut_params, reference, 0);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-create_auth_verify_GMAC_operation(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return create_auth_GMAC_operation(ts_params, ut_params, reference, 0);
-}
+       int retval;
 
-static int
-create_cipher_auth_verify_operation(struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return create_cipher_auth_operation(ts_params, ut_params, reference, 0);
-}
+       uint8_t *auth_tag, *plaintext;
+       uint16_t plaintext_pad_len;
 
-static int
-test_authentication_verify_fail_when_data_corruption(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int data_corrupted)
-{
-       int retval;
+       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
+                             "No GMAC length in the source data");
 
-       uint8_t *plaintext;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       retval = create_gmac_session(ts_params->valid_devs[0],
+                       tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
 
-       /* Create session */
-       retval = create_auth_session(ut_params,
-                       ts_params->valid_devs[0],
-                       reference,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
        if (retval < 0)
                return retval;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (tdata->plaintext.len > MBUF_SIZE)
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
+       else
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
        TEST_ASSERT_NOT_NULL(ut_params->ibuf,
                        "Failed to allocate input buffer in mempool");
 
-       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+       /*
+        * Runtime generate the large plain text instead of use hard code
+        * plain text vector. It is done to avoid create huge source file
+        * with the test vector.
+        */
+       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
+               generate_gmac_large_plaintext(tdata->plaintext.data);
+
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->plaintext.len);
+                               plaintext_pad_len);
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
-       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
+       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
        debug_hexdump(stdout, "plaintext:", plaintext,
-               reference->plaintext.len);
+                       tdata->plaintext.len);
 
-       /* Create operation */
-       retval = create_auth_verify_operation(ts_params, ut_params, reference);
+       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_GENERATE,
+                       tdata);
 
        if (retval < 0)
                return retval;
 
-       if (data_corrupted)
-               data_corruption(plaintext);
-       else
-               tag_corruption(plaintext, reference->plaintext.len);
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       ut_params->op->sym->m_src = ut_params->ibuf;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-       TEST_ASSERT_EQUAL(ut_params->op->status,
-                       RTE_CRYPTO_OP_STATUS_AUTH_FAILED,
-                       "authentication not failed");
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
-       ut_params->obuf = ut_params->op->sym->m_src;
-       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
-       return 0;
-}
+       if (ut_params->op->sym->m_dst) {
+               auth_tag = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
+                               uint8_t *, plaintext_pad_len);
+       } else {
+               auth_tag = plaintext + plaintext_pad_len;
+       }
 
-static int
-test_authentication_verify_GMAC_fail_when_corruption(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int data_corrupted)
-{
-       int retval;
-       uint8_t *plaintext;
-
-       /* Create session */
-       retval = create_auth_cipher_session(ut_params,
-                       ts_params->valid_devs[0],
-                       reference,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
-       if (retval < 0)
-               return retval;
-
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
-
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->plaintext.len);
-       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
-       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
-
-       debug_hexdump(stdout, "plaintext:", plaintext,
-               reference->plaintext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
 
-       /* Create operation */
-       retval = create_auth_verify_GMAC_operation(ts_params,
-                       ut_params,
-                       reference);
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       tdata->gmac_tag.data,
+                       tdata->gmac_tag.len,
+                       "GMAC Generated auth tag not as expected");
 
-       if (retval < 0)
-               return retval;
+       return 0;
+}
 
-       if (data_corrupted)
-               data_corruption(plaintext);
-       else
-               tag_corruption(plaintext, reference->aad.len);
+static int
+test_AES_GMAC_authentication_test_case_1(void)
+{
+       return test_AES_GMAC_authentication(&gmac_test_case_1);
+}
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-       TEST_ASSERT_EQUAL(ut_params->op->status,
-                       RTE_CRYPTO_OP_STATUS_AUTH_FAILED,
-                       "authentication not failed");
+static int
+test_AES_GMAC_authentication_test_case_2(void)
+{
+       return test_AES_GMAC_authentication(&gmac_test_case_2);
+}
 
-       ut_params->obuf = ut_params->op->sym->m_src;
-       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
+static int
+test_AES_GMAC_authentication_test_case_3(void)
+{
+       return test_AES_GMAC_authentication(&gmac_test_case_3);
+}
 
-       return 0;
+static int
+test_AES_GMAC_authentication_test_case_4(void)
+{
+       return test_AES_GMAC_authentication(&gmac_test_case_4);
 }
 
 static int
-test_authenticated_decryption_fail_when_corruption(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference,
-               unsigned int data_corrupted)
+test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
 {
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
        int retval;
+       uint32_t plaintext_pad_len;
+       uint8_t *plaintext;
 
-       uint8_t *ciphertext;
+       TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
+                             "No GMAC length in the source data");
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       retval = create_gmac_session(ts_params->valid_devs[0],
+                       tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
 
-       /* Create session */
-       retval = create_auth_cipher_session(ut_params,
-                       ts_params->valid_devs[0],
-                       reference,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
        if (retval < 0)
                return retval;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (tdata->plaintext.len > MBUF_SIZE)
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
+       else
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
        TEST_ASSERT_NOT_NULL(ut_params->ibuf,
                        "Failed to allocate input buffer in mempool");
 
-       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->ciphertext.len);
-       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
-       memcpy(ciphertext, reference->ciphertext.data,
-                       reference->ciphertext.len);
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
 
-       /* Create operation */
-       retval = create_cipher_auth_verify_operation(ts_params,
-                       ut_params,
-                       reference);
+       /*
+        * Runtime generate the large plain text instead of use hard code
+        * plain text vector. It is done to avoid create huge source file
+        * with the test vector.
+        */
+       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
+               generate_gmac_large_plaintext(tdata->plaintext.data);
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+
+       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext,
+                       tdata->plaintext.len);
+
+       retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_VERIFY,
+                       tdata);
 
        if (retval < 0)
                return retval;
 
-       if (data_corrupted)
-               data_corruption(ciphertext);
-       else
-               tag_corruption(ciphertext, reference->ciphertext.len);
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+       ut_params->op->sym->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-       TEST_ASSERT_EQUAL(ut_params->op->status,
-                       RTE_CRYPTO_OP_STATUS_AUTH_FAILED,
-                       "authentication not failed");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
-       ut_params->obuf = ut_params->op->sym->m_src;
-       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
        return 0;
+
 }
 
 static int
-create_aead_operation_SGL(enum rte_crypto_aead_operation op,
-               const struct aead_test_data *tdata,
-               void *digest_mem, uint64_t digest_phys)
+test_AES_GMAC_authentication_verify_test_case_1(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       const unsigned int auth_tag_len = tdata->auth_tag.len;
-       const unsigned int iv_len = tdata->iv.len;
-       unsigned int aad_len = tdata->aad.len;
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-               "Failed to allocate symmetric crypto operation struct");
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_1);
+}
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+static int
+test_AES_GMAC_authentication_verify_test_case_2(void)
+{
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_2);
+}
 
-       sym_op->aead.digest.data = digest_mem;
+static int
+test_AES_GMAC_authentication_verify_test_case_3(void)
+{
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_3);
+}
 
-       TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
-                       "no room to append digest");
+static int
+test_AES_GMAC_authentication_verify_test_case_4(void)
+{
+       return test_AES_GMAC_authentication_verify(&gmac_test_case_4);
+}
 
-       sym_op->aead.digest.phys_addr = digest_phys;
+struct test_crypto_vector {
+       enum rte_crypto_cipher_algorithm crypto_algo;
+       unsigned int cipher_offset;
+       unsigned int cipher_len;
 
-       if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
-               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
-                               auth_tag_len);
-               debug_hexdump(stdout, "digest:",
-                               sym_op->aead.digest.data,
-                               auth_tag_len);
-       }
+       struct {
+               uint8_t data[64];
+               unsigned int len;
+       } cipher_key;
 
-       /* Append aad data */
-       if (tdata->algo == RTE_CRYPTO_AEAD_AES_CCM) {
-               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
-                               uint8_t *, IV_OFFSET);
+       struct {
+               uint8_t data[64];
+               unsigned int len;
+       } iv;
 
-               /* Copy IV 1 byte after the IV pointer, according to the API */
-               rte_memcpy(iv_ptr + 1, tdata->iv.data, iv_len);
+       struct {
+               const uint8_t *data;
+               unsigned int len;
+       } plaintext;
 
-               aad_len = RTE_ALIGN_CEIL(aad_len + 18, 16);
+       struct {
+               const uint8_t *data;
+               unsigned int len;
+       } ciphertext;
 
-               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
-                               ut_params->ibuf, aad_len);
-               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
-                               "no room to prepend aad");
-               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
-                               ut_params->ibuf);
+       enum rte_crypto_auth_algorithm auth_algo;
+       unsigned int auth_offset;
 
-               memset(sym_op->aead.aad.data, 0, aad_len);
-               /* Copy AAD 18 bytes after the AAD pointer, according to the API */
-               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
+       struct {
+               uint8_t data[128];
+               unsigned int len;
+       } auth_key;
 
-               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
-               debug_hexdump(stdout, "aad:",
-                               sym_op->aead.aad.data, aad_len);
-       } else {
-               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
-                               uint8_t *, IV_OFFSET);
+       struct {
+               const uint8_t *data;
+               unsigned int len;
+       } aad;
 
-               rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
+       struct {
+               uint8_t data[128];
+               unsigned int len;
+       } digest;
+};
 
-               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
-                               ut_params->ibuf, aad_len);
-               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
-                               "no room to prepend aad");
-               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
-                               ut_params->ibuf);
+static const struct test_crypto_vector
+hmac_sha1_test_crypto_vector = {
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .plaintext = {
+               .data = plaintext_hash,
+               .len = 512
+       },
+       .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 = {
+                       0xC4, 0xB7, 0x0E, 0x6B, 0xDE, 0xD1, 0xE7, 0x77,
+                       0x7E, 0x2E, 0x8F, 0xFC, 0x48, 0x39, 0x46, 0x17,
+                       0x3F, 0x91, 0x64, 0x59
+               },
+               .len = 20
+       }
+};
 
-               memset(sym_op->aead.aad.data, 0, aad_len);
-               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
+static const struct test_crypto_vector
+aes128_gmac_test_vector = {
+       .auth_algo = RTE_CRYPTO_AUTH_AES_GMAC,
+       .plaintext = {
+               .data = plaintext_hash,
+               .len = 512
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B
+               },
+               .len = 12
+       },
+       .auth_key = {
+               .data = {
+                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+                       0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA
+               },
+               .len = 16
+       },
+       .digest = {
+               .data = {
+                       0xCA, 0x00, 0x99, 0x8B, 0x30, 0x7E, 0x74, 0x56,
+                       0x32, 0xA7, 0x87, 0xB5, 0xE9, 0xB2, 0x34, 0x5A
+               },
+               .len = 16
+       }
+};
 
-               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
-               debug_hexdump(stdout, "aad:",
-                               sym_op->aead.aad.data, aad_len);
+static const struct test_crypto_vector
+aes128cbc_hmac_sha1_test_vector = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_offset = 0,
+       .cipher_len = 512,
+       .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_hash,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc,
+               .len = 512
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_offset = 0,
+       .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 = {
+                       0x9A, 0x4F, 0x88, 0x1B, 0xB6, 0x8F, 0xD8, 0x60,
+                       0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
+                       0x18, 0x8C, 0x1D, 0x32
+               },
+               .len = 20
        }
+};
 
-       sym_op->aead.data.length = tdata->plaintext.len;
-       sym_op->aead.data.offset = aad_len;
+static const struct test_crypto_vector
+aes128cbc_hmac_sha1_aad_test_vector = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_offset = 8,
+       .cipher_len = 496,
+       .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_hash,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc_aad,
+               .len = 512
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_offset = 0,
+       .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 = {
+                       0x6D, 0xF3, 0x50, 0x79, 0x7A, 0x2A, 0xAC, 0x7F,
+                       0xA6, 0xF0, 0xC6, 0x38, 0x1F, 0xA4, 0xDD, 0x9B,
+                       0x62, 0x0F, 0xFB, 0x10
+               },
+               .len = 20
+       }
+};
 
-       return 0;
+static void
+data_corruption(uint8_t *data)
+{
+       data[0] += 1;
 }
 
-#define SGL_MAX_NO     16
+static void
+tag_corruption(uint8_t *data, unsigned int tag_offset)
+{
+       data[tag_offset] += 1;
+}
 
 static int
-test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
-               const int oop, uint32_t fragsz, uint32_t fragsz_oop)
+create_auth_session(struct crypto_unittest_params *ut_params,
+               uint8_t dev_id,
+               const struct test_crypto_vector *reference,
+               enum rte_crypto_auth_operation auth_op)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       struct rte_mbuf *buf, *buf_oop = NULL, *buf_last_oop = NULL;
-       int retval;
-       int to_trn = 0;
-       int to_trn_tbl[SGL_MAX_NO];
-       int segs = 1;
-       unsigned int trn_data = 0;
-       uint8_t *plaintext, *ciphertext, *auth_tag;
-
-       if (fragsz > tdata->plaintext.len)
-               fragsz = tdata->plaintext.len;
-
-       uint16_t plaintext_len = fragsz;
-       uint16_t frag_size_oop = fragsz_oop ? fragsz_oop : fragsz;
+       uint8_t auth_key[reference->auth_key.len + 1];
 
-       if (fragsz_oop > tdata->plaintext.len)
-               frag_size_oop = tdata->plaintext.len;
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
-       int ecx = 0;
-       void *digest_mem = NULL;
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.next = NULL;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
 
-       uint32_t prepend_len = tdata->aad.len;
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       if (tdata->plaintext.len % fragsz != 0) {
-               if (tdata->plaintext.len / fragsz + 1 > SGL_MAX_NO)
-                       return 1;
-       }       else {
-               if (tdata->plaintext.len / fragsz > SGL_MAX_NO)
-                       return 1;
-       }
+       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
 
-       /*
-        * For out-op-place we need to alloc another mbuf
-        */
-       if (oop) {
-               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-               rte_pktmbuf_append(ut_params->obuf,
-                               frag_size_oop + prepend_len);
-               buf_oop = ut_params->obuf;
-       }
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       /* Create AEAD session */
-       retval = create_aead_session(ts_params->valid_devs[0],
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
-                       tdata->key.data, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
+       return 0;
+}
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+static int
+create_auth_cipher_session(struct crypto_unittest_params *ut_params,
+               uint8_t dev_id,
+               const struct test_crypto_vector *reference,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_cipher_operation cipher_op)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t cipher_key[reference->cipher_key.len + 1];
+       uint8_t auth_key[reference->auth_key.len + 1];
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       memcpy(cipher_key, reference->cipher_key.data,
+                       reference->cipher_key.len);
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       plaintext_len);
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
 
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       if (reference->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) {
+               ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+               ut_params->auth_xform.auth.iv.length = reference->iv.len;
+       } else {
+               ut_params->auth_xform.next = &ut_params->cipher_xform;
 
-       trn_data += plaintext_len;
+               /* Setup Cipher Parameters */
+               ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+               ut_params->cipher_xform.next = NULL;
+               ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+               ut_params->cipher_xform.cipher.op = cipher_op;
+               ut_params->cipher_xform.cipher.key.data = cipher_key;
+               ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+               ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+               ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+       }
 
-       buf = ut_params->ibuf;
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       /*
-        * Loop until no more fragments
-        */
+       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
 
-       while (trn_data < tdata->plaintext.len) {
-               ++segs;
-               to_trn = (tdata->plaintext.len - trn_data < fragsz) ?
-                               (tdata->plaintext.len - trn_data) : fragsz;
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-               to_trn_tbl[ecx++] = to_trn;
+       return 0;
+}
 
-               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-               buf = buf->next;
+static int
+create_auth_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int auth_generate)
+{
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
 
-               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
-                               rte_pktmbuf_tailroom(buf));
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-               /* OOP */
-               if (oop && !fragsz_oop) {
-                       buf_last_oop = buf_oop->next =
-                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
-                       buf_oop = buf_oop->next;
-                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
-                                       0, rte_pktmbuf_tailroom(buf_oop));
-                       rte_pktmbuf_append(buf_oop, to_trn);
-               }
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
-                               to_trn);
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-               memcpy(plaintext, tdata->plaintext.data + trn_data,
-                               to_trn);
-               trn_data += to_trn;
-               if (trn_data  == tdata->plaintext.len) {
-                       if (oop) {
-                               if (!fragsz_oop)
-                                       digest_mem = rte_pktmbuf_append(buf_oop,
-                                               tdata->auth_tag.len);
-                       } else
-                               digest_mem = (uint8_t *)rte_pktmbuf_append(buf,
-                                       tdata->auth_tag.len);
-               }
-       }
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, reference->digest.len);
 
-       uint64_t digest_phys = 0;
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
 
-       ut_params->ibuf->nb_segs = segs;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, reference->plaintext.len);
 
-       segs = 1;
-       if (fragsz_oop && oop) {
-               to_trn = 0;
-               ecx = 0;
+       if (auth_generate)
+               memset(sym_op->auth.digest.data, 0, reference->digest.len);
+       else
+               memcpy(sym_op->auth.digest.data,
+                               reference->digest.data,
+                               reference->digest.len);
 
-               if (frag_size_oop == tdata->plaintext.len) {
-                       digest_mem = rte_pktmbuf_append(ut_params->obuf,
-                               tdata->auth_tag.len);
+       debug_hexdump(stdout, "digest:",
+                       sym_op->auth.digest.data,
+                       reference->digest.len);
 
-                       digest_phys = rte_pktmbuf_iova_offset(
-                                       ut_params->obuf,
-                                       tdata->plaintext.len + prepend_len);
-               }
+       sym_op->auth.data.length = reference->plaintext.len;
+       sym_op->auth.data.offset = 0;
 
-               trn_data = frag_size_oop;
-               while (trn_data < tdata->plaintext.len) {
-                       ++segs;
-                       to_trn =
-                               (tdata->plaintext.len - trn_data <
-                                               frag_size_oop) ?
-                               (tdata->plaintext.len - trn_data) :
-                                               frag_size_oop;
+       return 0;
+}
 
-                       to_trn_tbl[ecx++] = to_trn;
+static int
+create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int auth_generate)
+{
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
 
-                       buf_last_oop = buf_oop->next =
-                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
-                       buf_oop = buf_oop->next;
-                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
-                                       0, rte_pktmbuf_tailroom(buf_oop));
-                       rte_pktmbuf_append(buf_oop, to_trn);
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-                       trn_data += to_trn;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-                       if (trn_data  == tdata->plaintext.len) {
-                               digest_mem = rte_pktmbuf_append(buf_oop,
-                                       tdata->auth_tag.len);
-                       }
-               }
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-               ut_params->obuf->nb_segs = segs;
-       }
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, reference->digest.len);
 
-       /*
-        * Place digest at the end of the last buffer
-        */
-       if (!digest_phys)
-               digest_phys = rte_pktmbuf_iova(buf) + to_trn;
-       if (oop && buf_last_oop)
-               digest_phys = rte_pktmbuf_iova(buf_last_oop) + to_trn;
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
 
-       if (!digest_mem && !oop) {
-               digest_mem = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               + tdata->auth_tag.len);
-               digest_phys = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                               tdata->plaintext.len);
-       }
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, reference->ciphertext.len);
 
-       /* Create AEAD operation */
-       retval = create_aead_operation_SGL(RTE_CRYPTO_AEAD_OP_ENCRYPT,
-                       tdata, digest_mem, digest_phys);
+       if (auth_generate)
+               memset(sym_op->auth.digest.data, 0, reference->digest.len);
+       else
+               memcpy(sym_op->auth.digest.data,
+                               reference->digest.data,
+                               reference->digest.len);
 
-       if (retval < 0)
-               return retval;
+       debug_hexdump(stdout, "digest:",
+                       sym_op->auth.digest.data,
+                       reference->digest.len);
 
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       reference->iv.data, reference->iv.len);
 
-       ut_params->op->sym->m_src = ut_params->ibuf;
-       if (oop)
-               ut_params->op->sym->m_dst = ut_params->obuf;
+       sym_op->cipher.data.length = 0;
+       sym_op->cipher.data.offset = 0;
 
-       /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       sym_op->auth.data.length = reference->plaintext.len;
+       sym_op->auth.data.offset = 0;
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
+       return 0;
+}
 
+static int
+create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int auth_generate)
+{
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
 
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
-                       uint8_t *, prepend_len);
-       if (oop) {
-               ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
-                               uint8_t *, prepend_len);
-       }
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       if (fragsz_oop)
-               fragsz = fragsz_oop;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       fragsz,
-                       "Ciphertext data not as expected");
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       buf = ut_params->op->sym->m_src->next;
-       if (oop)
-               buf = ut_params->op->sym->m_dst->next;
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, reference->digest.len);
 
-       unsigned int off = fragsz;
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
 
-       ecx = 0;
-       while (buf) {
-               ciphertext = rte_pktmbuf_mtod(buf,
-                               uint8_t *);
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, reference->ciphertext.len);
 
-               TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                               ciphertext,
-                               tdata->ciphertext.data + off,
-                               to_trn_tbl[ecx],
-                               "Ciphertext data not as expected");
+       if (auth_generate)
+               memset(sym_op->auth.digest.data, 0, reference->digest.len);
+       else
+               memcpy(sym_op->auth.digest.data,
+                               reference->digest.data,
+                               reference->digest.len);
 
-               off += to_trn_tbl[ecx++];
-               buf = buf->next;
-       }
+       debug_hexdump(stdout, "digest:",
+                       sym_op->auth.digest.data,
+                       reference->digest.len);
 
-       auth_tag = digest_mem;
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       auth_tag,
-                       tdata->auth_tag.data,
-                       tdata->auth_tag.len,
-                       "Generated auth tag not as expected");
-
-       return 0;
-}
-
-#define IN_PLACE       0
-#define OUT_OF_PLACE   1
-
-static int
-test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B(void)
-{
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 400, 400);
-}
-
-static int
-test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B(void)
-{
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 1500, 2000);
-}
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       reference->iv.data, reference->iv.len);
 
-static int
-test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg(void)
-{
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_8, OUT_OF_PLACE, 400,
-                       gcm_test_case_8.plaintext.len);
-}
+       sym_op->cipher.data.length = reference->cipher_len;
+       sym_op->cipher.data.offset = reference->cipher_offset;
 
-static int
-test_AES_GCM_auth_encrypt_SGL_in_place_1500B(void)
-{
+       sym_op->auth.data.length = reference->plaintext.len;
+       sym_op->auth.data.offset = reference->auth_offset;
 
-       return test_authenticated_encryption_SGL(
-                       &gcm_test_case_SGL_1, IN_PLACE, 1500, 0);
+       return 0;
 }
 
 static int
-test_authentication_verify_fail_when_data_corrupted(
-               struct crypto_testsuite_params *ts_params,
+create_auth_verify_operation(struct crypto_testsuite_params *ts_params,
                struct crypto_unittest_params *ut_params,
                const struct test_crypto_vector *reference)
 {
-       return test_authentication_verify_fail_when_data_corruption(
-                       ts_params, ut_params, reference, 1);
+       return create_auth_operation(ts_params, ut_params, reference, 0);
 }
 
 static int
-test_authentication_verify_fail_when_tag_corrupted(
+create_auth_verify_GMAC_operation(
                struct crypto_testsuite_params *ts_params,
                struct crypto_unittest_params *ut_params,
                const struct test_crypto_vector *reference)
 {
-       return test_authentication_verify_fail_when_data_corruption(
-                       ts_params, ut_params, reference, 0);
+       return create_auth_GMAC_operation(ts_params, ut_params, reference, 0);
 }
 
 static int
-test_authentication_verify_GMAC_fail_when_data_corrupted(
-               struct crypto_testsuite_params *ts_params,
+create_cipher_auth_verify_operation(struct crypto_testsuite_params *ts_params,
                struct crypto_unittest_params *ut_params,
                const struct test_crypto_vector *reference)
 {
-       return test_authentication_verify_GMAC_fail_when_corruption(
-                       ts_params, ut_params, reference, 1);
+       return create_cipher_auth_operation(ts_params, ut_params, reference, 0);
 }
 
 static int
-test_authentication_verify_GMAC_fail_when_tag_corrupted(
+test_authentication_verify_fail_when_data_corruption(
                struct crypto_testsuite_params *ts_params,
                struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
+               const struct test_crypto_vector *reference,
+               unsigned int data_corrupted)
 {
-       return test_authentication_verify_GMAC_fail_when_corruption(
-                       ts_params, ut_params, reference, 0);
-}
+       int retval;
 
-static int
-test_authenticated_decryption_fail_when_data_corrupted(
-               struct crypto_testsuite_params *ts_params,
-               struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authenticated_decryption_fail_when_corruption(
-                       ts_params, ut_params, reference, 1);
+       uint8_t *plaintext;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create session */
+       retval = create_auth_session(ut_params,
+                       ts_params->valid_devs[0],
+                       reference,
+                       RTE_CRYPTO_AUTH_OP_VERIFY);
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->plaintext.len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
+
+       debug_hexdump(stdout, "plaintext:", plaintext,
+               reference->plaintext.len);
+
+       /* Create operation */
+       retval = create_auth_verify_operation(ts_params, ut_params, reference);
+
+       if (retval < 0)
+               return retval;
+
+       if (data_corrupted)
+               data_corruption(plaintext);
+       else
+               tag_corruption(plaintext, reference->plaintext.len);
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
+
+       return 0;
 }
 
 static int
-test_authenticated_decryption_fail_when_tag_corrupted(
+test_authentication_verify_GMAC_fail_when_corruption(
                struct crypto_testsuite_params *ts_params,
                struct crypto_unittest_params *ut_params,
-               const struct test_crypto_vector *reference)
-{
-       return test_authenticated_decryption_fail_when_corruption(
-                       ts_params, ut_params, reference, 0);
-}
-
-static int
-authentication_verify_HMAC_SHA1_fail_data_corrupt(void)
+               const struct test_crypto_vector *reference,
+               unsigned int data_corrupted)
 {
-       return test_authentication_verify_fail_when_data_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &hmac_sha1_test_crypto_vector);
-}
+       int retval;
+       uint8_t *plaintext;
 
-static int
-authentication_verify_HMAC_SHA1_fail_tag_corrupt(void)
-{
-       return test_authentication_verify_fail_when_tag_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &hmac_sha1_test_crypto_vector);
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-authentication_verify_AES128_GMAC_fail_data_corrupt(void)
-{
-       return test_authentication_verify_GMAC_fail_when_data_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &aes128_gmac_test_vector);
-}
+       /* Create session */
+       retval = create_auth_cipher_session(ut_params,
+                       ts_params->valid_devs[0],
+                       reference,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
+       if (retval < 0)
+               return retval;
 
-static int
-authentication_verify_AES128_GMAC_fail_tag_corrupt(void)
-{
-       return test_authentication_verify_GMAC_fail_when_tag_corrupted(
-                       &testsuite_params, &unittest_params,
-                       &aes128_gmac_test_vector);
-}
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-static int
-auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt(void)
-{
-       return test_authenticated_decryption_fail_when_data_corrupted(
-                       &testsuite_params,
-                       &unittest_params,
-                       &aes128cbc_hmac_sha1_test_vector);
-}
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt(void)
-{
-       return test_authenticated_decryption_fail_when_tag_corrupted(
-                       &testsuite_params,
-                       &unittest_params,
-                       &aes128cbc_hmac_sha1_test_vector);
-}
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->plaintext.len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+       debug_hexdump(stdout, "plaintext:", plaintext,
+               reference->plaintext.len);
 
-/* global AESNI slave IDs for the scheduler test */
-uint8_t aesni_ids[2];
+       /* Create operation */
+       retval = create_auth_verify_GMAC_operation(ts_params,
+                       ut_params,
+                       reference);
 
-static int
-test_scheduler_attach_slave_op(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       uint32_t nb_devs, i, nb_devs_attached = 0;
-       int ret;
-       char vdev_name[32];
+       if (retval < 0)
+               return retval;
 
-       /* create 2 AESNI_MB if necessary */
-       nb_devs = rte_cryptodev_device_count_by_driver(
-                       rte_cryptodev_driver_id_get(
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
-       if (nb_devs < 2) {
-               for (i = nb_devs; i < 2; i++) {
-                       snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
-                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD),
-                                       i);
-                       ret = rte_vdev_init(vdev_name, NULL);
+       if (data_corrupted)
+               data_corruption(plaintext);
+       else
+               tag_corruption(plaintext, reference->aad.len);
 
-                       TEST_ASSERT(ret == 0,
-                               "Failed to create instance %u of"
-                               " pmd : %s",
-                               i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-               }
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
        }
 
-       /* attach 2 AESNI_MB cdevs */
-       for (i = 0; i < rte_cryptodev_count() && nb_devs_attached < 2;
-                       i++) {
-               struct rte_cryptodev_info info;
-               unsigned int session_size;
+       return 0;
+}
 
-               rte_cryptodev_info_get(i, &info);
-               if (info.driver_id != rte_cryptodev_driver_id_get(
-                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)))
-                       continue;
+static int
+test_authenticated_decryption_fail_when_corruption(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference,
+               unsigned int data_corrupted)
+{
+       int retval;
 
-               session_size = rte_cryptodev_sym_get_private_session_size(i);
-               /*
-                * Create the session mempool again, since now there are new devices
-                * to use the mempool.
-                */
-               if (ts_params->session_mpool) {
-                       rte_mempool_free(ts_params->session_mpool);
-                       ts_params->session_mpool = NULL;
-               }
-               if (ts_params->session_priv_mpool) {
-                       rte_mempool_free(ts_params->session_priv_mpool);
-                       ts_params->session_priv_mpool = NULL;
-               }
+       uint8_t *ciphertext;
 
-               if (info.sym.max_nb_sessions != 0 &&
-                               info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
-                       RTE_LOG(ERR, USER1,
-                                       "Device does not support "
-                                       "at least %u sessions\n",
-                                       MAX_NB_SESSIONS);
-                       return TEST_FAILED;
-               }
-               /*
-                * Create mempool with maximum number of sessions,
-                * to include the session headers
-                */
-               if (ts_params->session_mpool == NULL) {
-                       ts_params->session_mpool =
-                               rte_cryptodev_sym_session_pool_create(
-                                               "test_sess_mp",
-                                               MAX_NB_SESSIONS, 0, 0, 0,
-                                               SOCKET_ID_ANY);
-                       TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
-                                       "session mempool allocation failed");
-               }
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-               /*
-                * Create mempool with maximum number of sessions,
-                * to include device specific session private data
-                */
-               if (ts_params->session_priv_mpool == NULL) {
-                       ts_params->session_priv_mpool = rte_mempool_create(
-                                       "test_sess_mp_priv",
-                                       MAX_NB_SESSIONS,
-                                       session_size,
-                                       0, 0, NULL, NULL, NULL,
-                                       NULL, SOCKET_ID_ANY,
-                                       0);
+       /* Create session */
+       retval = create_auth_cipher_session(ut_params,
+                       ts_params->valid_devs[0],
+                       reference,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       RTE_CRYPTO_CIPHER_OP_DECRYPT);
+       if (retval < 0)
+               return retval;
 
-                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
-                                       "session mempool allocation failed");
-               }
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-               ts_params->qp_conf.mp_session = ts_params->session_mpool;
-               ts_params->qp_conf.mp_session_private =
-                               ts_params->session_priv_mpool;
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-               ret = rte_cryptodev_scheduler_slave_attach(sched_id,
-                               (uint8_t)i);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->ciphertext.len);
+       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
+       memcpy(ciphertext, reference->ciphertext.data,
+                       reference->ciphertext.len);
 
-               TEST_ASSERT(ret == 0,
-                       "Failed to attach device %u of pmd : %s", i,
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+       /* Create operation */
+       retval = create_cipher_auth_verify_operation(ts_params,
+                       ut_params,
+                       reference);
 
-               aesni_ids[nb_devs_attached] = (uint8_t)i;
+       if (retval < 0)
+               return retval;
 
-               nb_devs_attached++;
+       if (data_corrupted)
+               data_corruption(ciphertext);
+       else
+               tag_corruption(ciphertext, reference->ciphertext.len);
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
        }
 
        return 0;
 }
 
 static int
-test_scheduler_detach_slave_op(void)
+test_authenticated_encryt_with_esn(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       uint32_t i;
-       int ret;
+       int retval;
 
-       for (i = 0; i < 2; i++) {
-               ret = rte_cryptodev_scheduler_slave_detach(sched_id,
-                               aesni_ids[i]);
-               TEST_ASSERT(ret == 0,
-                       "Failed to detach device %u", aesni_ids[i]);
-       }
+       uint8_t *authciphertext, *plaintext, *auth_tag;
+       uint16_t plaintext_pad_len;
+       uint8_t cipher_key[reference->cipher_key.len + 1];
+       uint8_t auth_key[reference->auth_key.len + 1];
 
-       return 0;
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-test_scheduler_mode_op(enum rte_cryptodev_scheduler_mode scheduler_mode)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       /* set mode */
-       return rte_cryptodev_scheduler_mode_set(sched_id,
-               scheduler_mode);
-}
+       /* Create session */
+       memcpy(cipher_key, reference->cipher_key.data,
+                       reference->cipher_key.len);
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
-static int
-test_scheduler_mode_roundrobin_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_ROUNDROBIN) ==
-                       0, "Failed to set roundrobin mode");
-       return 0;
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
 
-}
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
 
-static int
-test_scheduler_mode_multicore_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_MULTICORE) ==
-                       0, "Failed to set multicore mode");
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
+       ut_params->auth_xform.next = NULL;
 
-       return 0;
-}
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-static int
-test_scheduler_mode_failover_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_FAILOVER) ==
-                       0, "Failed to set failover mode");
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                               ut_params->sess,
+                               &ut_params->cipher_xform,
+                               ts_params->session_priv_mpool);
 
-       return 0;
-}
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-static int
-test_scheduler_mode_pkt_size_distr_op(void)
-{
-       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_PKT_SIZE_DISTR) ==
-                       0, "Failed to set pktsize mode");
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-       return 0;
-}
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static struct unit_test_suite cryptodev_scheduler_testsuite  = {
-       .suite_name = "Crypto Device Scheduler Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /* Multi Core */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_multicore_op),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_AES_chain_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_AES_cipheronly_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_authonly_scheduler_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->plaintext.len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-               /* Round Robin */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_roundrobin_op),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_chain_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_scheduler_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+       /* Create operation */
+       retval = create_cipher_auth_operation(ts_params,
+                       ut_params,
+                       reference, 0);
 
-               /* Fail over */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_failover_op),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_AES_chain_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_AES_cipheronly_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_authonly_scheduler_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+       if (retval < 0)
+               return retval;
 
-               /* PKT SIZE */
-               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_pkt_size_distr_op),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_AES_chain_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_AES_cipheronly_scheduler_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                       test_authonly_scheduler_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(
+                       ts_params->valid_devs[0], ut_params->op);
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
 
-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
-static struct unit_test_suite cryptodev_qat_testsuite  = {
-       .suite_name = "Crypto QAT Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_queue_pair_ids),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_queue_pair_descriptor_setup),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session),
+       plaintext_pad_len = RTE_ALIGN_CEIL(reference->plaintext.len, 16);
 
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_AES_cipheronly_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_3DES_cipheronly_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_DES_cipheronly_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_AES_docsis_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_DES_docsis_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_qat_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_stats),
+       authciphertext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                       ut_params->op->sym->auth.data.offset);
+       auth_tag = authciphertext + plaintext_pad_len;
+       debug_hexdump(stdout, "ciphertext:", authciphertext,
+                       reference->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, reference->digest.len);
 
-               /** AES CCM Authenticated Encryption 128 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_3),
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       authciphertext,
+                       reference->ciphertext.data,
+                       reference->ciphertext.len,
+                       "Ciphertext data not as expected");
 
-               /** AES CCM Authenticated Decryption 128 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_3),
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       reference->digest.data,
+                       reference->digest.len,
+                       "Generated digest not as expected");
 
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+       return TEST_SUCCESS;
 
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
+}
 
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
+static int
+test_authenticated_decrypt_with_esn(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       int retval;
 
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
+       uint8_t *ciphertext;
+       uint8_t cipher_key[reference->cipher_key.len + 1];
+       uint8_t auth_key[reference->auth_key.len + 1];
 
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
+       /* Create session */
+       memcpy(cipher_key, reference->cipher_key.data,
+                       reference->cipher_key.len);
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
 
-               /** SNOW 3G encrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
+       ut_params->auth_xform.next = &ut_params->cipher_xform;
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
+       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
 
-               /** SNOW 3G decrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_cipher_auth_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                               ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
 
-               /** ZUC authenticate (EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_7),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_8),
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-               /** ZUC alg-chain (EEA3/EIA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_cipher_auth_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_cipher_auth_test_case_2),
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
 
-               /** HMAC_MD5 Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_generate_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_MD5_HMAC_verify_case_2),
-
-               /** NULL tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_only_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_only_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_auth_operation),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_cipher_operation),
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-               /** KASUMI tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->ciphertext.len);
+       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
+       memcpy(ciphertext, reference->ciphertext.data,
+                       reference->ciphertext.len);
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
+       /* Create operation */
+       retval = create_cipher_auth_verify_operation(ts_params,
+                       ut_params,
+                       reference);
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_cipher_auth_test_case_1),
+       if (retval < 0)
+               return retval;
 
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
+       TEST_ASSERT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing passed");
 
-static struct unit_test_suite cryptodev_virtio_testsuite = {
-       .suite_name = "Crypto VIRTIO Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_virtio_all),
+       ut_params->obuf = ut_params->op->sym->m_src;
+       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+       return 0;
+}
 
-static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
-       .suite_name = "Crypto Device AESNI MB Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-#if IMB_VERSION_NUM >= IMB_VERSION(0, 51, 0)
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+static int
+create_aead_operation_SGL(enum rte_crypto_aead_operation op,
+               const struct aead_test_data *tdata,
+               void *digest_mem, uint64_t digest_phys)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
+       const unsigned int auth_tag_len = tdata->auth_tag.len;
+       const unsigned int iv_len = tdata->iv.len;
+       unsigned int aad_len = tdata->aad.len;
+       unsigned int aad_len_pad = 0;
 
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+               "Failed to allocate symmetric crypto operation struct");
 
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
+       sym_op->aead.digest.data = digest_mem;
 
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
+       TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
+                       "no room to append digest");
 
-               /** AES GCM Authenticated Encryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_2),
+       sym_op->aead.digest.phys_addr = digest_phys;
 
-               /** AES GCM Authenticated Decryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_2),
+       if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
+               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
+                               auth_tag_len);
+               debug_hexdump(stdout, "digest:",
+                               sym_op->aead.digest.data,
+                               auth_tag_len);
+       }
 
-               /** Session-less tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
+       /* Append aad data */
+       if (tdata->algo == RTE_CRYPTO_AEAD_AES_CCM) {
+               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
+                               uint8_t *, IV_OFFSET);
 
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-#endif /* IMB_VERSION_NUM >= IMB_VERSION(0, 51, 0) */
+               /* Copy IV 1 byte after the IV pointer, according to the API */
+               rte_memcpy(iv_ptr + 1, tdata->iv.data, iv_len);
 
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_mb_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_mb_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_docsis_mb_all),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_mb_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_DES_cipheronly_mb_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_DES_docsis_mb_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_3DES_cipheronly_mb_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_3),
+               aad_len = RTE_ALIGN_CEIL(aad_len + 18, 16);
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
+                               ut_params->ibuf, aad_len);
+               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
+                               "no room to prepend aad");
+               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
+                               ut_params->ibuf);
 
-static struct unit_test_suite cryptodev_openssl_testsuite  = {
-       .suite_name = "Crypto Device OPENSSL Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_chain_openssl_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_openssl_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_chain_openssl_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_cipheronly_openssl_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_DES_cipheronly_openssl_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_DES_docsis_openssl_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_openssl_all),
+               memset(sym_op->aead.aad.data, 0, aad_len);
+               /* Copy AAD 18 bytes after the AAD pointer, according to the API */
+               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
 
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
+               debug_hexdump(stdout, "aad:",
+                               sym_op->aead.aad.data, aad_len);
+       } else {
+               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
+                               uint8_t *, IV_OFFSET);
 
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
+               rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
 
+               aad_len_pad = RTE_ALIGN_CEIL(aad_len, 16);
 
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
+               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
+                               ut_params->ibuf, aad_len_pad);
+               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
+                               "no room to prepend aad");
+               sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
+                               ut_params->ibuf);
 
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
+               memset(sym_op->aead.aad.data, 0, aad_len);
+               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
 
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
+               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
+               debug_hexdump(stdout, "aad:",
+                               sym_op->aead.aad.data, aad_len);
+       }
 
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
+       sym_op->aead.data.length = tdata->plaintext.len;
+       sym_op->aead.data.offset = aad_len_pad;
 
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_4),
+       return 0;
+}
 
-               /** AES CCM Authenticated Encryption 128 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_128_3),
+#define SGL_MAX_NO     16
 
-               /** AES CCM Authenticated Decryption 128 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_128_3),
+static int
+test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
+               const int oop, uint32_t fragsz, uint32_t fragsz_oop)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       struct rte_mbuf *buf, *buf_oop = NULL, *buf_last_oop = NULL;
+       int retval;
+       int to_trn = 0;
+       int to_trn_tbl[SGL_MAX_NO];
+       int segs = 1;
+       unsigned int trn_data = 0;
+       uint8_t *plaintext, *ciphertext, *auth_tag;
+       struct rte_cryptodev_info dev_info;
 
-               /** AES CCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_3),
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-               /** AES CCM Authenticated Decryption 192 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_3),
+       /* OOP not supported with CPU crypto */
+       if (oop && gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
 
-               /** AES CCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_3),
+       /* Detailed check for the particular SGL support flag */
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       if (!oop) {
+               unsigned int sgl_in = fragsz < tdata->plaintext.len;
+               if (sgl_in && (!(dev_info.feature_flags &
+                               RTE_CRYPTODEV_FF_IN_PLACE_SGL)))
+                       return -ENOTSUP;
+       } else {
+               unsigned int sgl_in = fragsz < tdata->plaintext.len;
+               unsigned int sgl_out = (fragsz_oop ? fragsz_oop : fragsz) <
+                               tdata->plaintext.len;
+               if (sgl_in && !sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT))
+                               return -ENOTSUP;
+               } else if (!sgl_in && sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT))
+                               return -ENOTSUP;
+               } else if (sgl_in && sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT))
+                               return -ENOTSUP;
+               }
+       }
 
-               /** AES CCM Authenticated Decryption 256 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_3),
+       if (fragsz > tdata->plaintext.len)
+               fragsz = tdata->plaintext.len;
 
-               /** Scatter-Gather */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+       uint16_t plaintext_len = fragsz;
+       uint16_t frag_size_oop = fragsz_oop ? fragsz_oop : fragsz;
 
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+       if (fragsz_oop > tdata->plaintext.len)
+               frag_size_oop = tdata->plaintext.len;
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
+       int ecx = 0;
+       void *digest_mem = NULL;
+
+       uint32_t prepend_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
+
+       if (tdata->plaintext.len % fragsz != 0) {
+               if (tdata->plaintext.len / fragsz + 1 > SGL_MAX_NO)
+                       return 1;
+       }       else {
+               if (tdata->plaintext.len / fragsz > SGL_MAX_NO)
+                       return 1;
        }
-};
 
-static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
-       .suite_name = "Crypto Device AESNI GCM Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+       /*
+        * For out-op-place we need to alloc another mbuf
+        */
+       if (oop) {
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               rte_pktmbuf_append(ut_params->obuf,
+                               frag_size_oop + prepend_len);
+               buf_oop = ut_params->obuf;
+       }
 
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
+       /* Create AEAD session */
+       retval = create_aead_session(ts_params->valid_devs[0],
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
+                       tdata->key.data, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
+       if (retval < 0)
+               return retval;
 
-               /** AES GCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-               /** AES GCM Authenticated Decryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       plaintext_len);
 
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-               /** AES GCM Authenticated Encryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_aad_2),
+       trn_data += plaintext_len;
 
-               /** AES GCM Authenticated Decryption big aad size */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_aad_2),
+       buf = ut_params->ibuf;
 
-               /** AES GMAC Authentication */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_4),
+       /*
+        * Loop until no more fragments
+        */
 
-               /** Negative tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+       while (trn_data < tdata->plaintext.len) {
+               ++segs;
+               to_trn = (tdata->plaintext.len - trn_data < fragsz) ?
+                               (tdata->plaintext.len - trn_data) : fragsz;
 
-               /** Out of place tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
+               to_trn_tbl[ecx++] = to_trn;
 
-               /** Session-less tests */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
+               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               buf = buf->next;
 
-               /** Scatter-Gather */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(buf));
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
+               /* OOP */
+               if (oop && !fragsz_oop) {
+                       buf_last_oop = buf_oop->next =
+                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
+               }
+
+               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
+                               to_trn);
+
+               memcpy(plaintext, tdata->plaintext.data + trn_data,
+                               to_trn);
+               trn_data += to_trn;
+               if (trn_data  == tdata->plaintext.len) {
+                       if (oop) {
+                               if (!fragsz_oop)
+                                       digest_mem = rte_pktmbuf_append(buf_oop,
+                                               tdata->auth_tag.len);
+                       } else
+                               digest_mem = (uint8_t *)rte_pktmbuf_append(buf,
+                                       tdata->auth_tag.len);
+               }
        }
-};
 
-static struct unit_test_suite cryptodev_sw_kasumi_testsuite  = {
-       .suite_name = "Crypto Device SW KASUMI Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** KASUMI encrypt only (UEA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
-               /** KASUMI decrypt only (UEA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
+       uint64_t digest_phys = 0;
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
+       ut_params->ibuf->nb_segs = segs;
 
+       segs = 1;
+       if (fragsz_oop && oop) {
+               to_trn = 0;
+               ecx = 0;
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
+               if (frag_size_oop == tdata->plaintext.len) {
+                       digest_mem = rte_pktmbuf_append(ut_params->obuf,
+                               tdata->auth_tag.len);
 
-               /** KASUMI hash only (UIA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_cipher_auth_test_case_1),
-               TEST_CASES_END() /**< NULL terminate unit test array */
+                       digest_phys = rte_pktmbuf_iova_offset(
+                                       ut_params->obuf,
+                                       tdata->plaintext.len + prepend_len);
+               }
+
+               trn_data = frag_size_oop;
+               while (trn_data < tdata->plaintext.len) {
+                       ++segs;
+                       to_trn =
+                               (tdata->plaintext.len - trn_data <
+                                               frag_size_oop) ?
+                               (tdata->plaintext.len - trn_data) :
+                                               frag_size_oop;
+
+                       to_trn_tbl[ecx++] = to_trn;
+
+                       buf_last_oop = buf_oop->next =
+                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
+
+                       trn_data += to_trn;
+
+                       if (trn_data  == tdata->plaintext.len) {
+                               digest_mem = rte_pktmbuf_append(buf_oop,
+                                       tdata->auth_tag.len);
+                       }
+               }
+
+               ut_params->obuf->nb_segs = segs;
        }
-};
-static struct unit_test_suite cryptodev_sw_snow3g_testsuite  = {
-       .suite_name = "Crypto Device SW SNOW 3G Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** SNOW 3G encrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_snow3g_encryption_test_case_1_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+       /*
+        * Place digest at the end of the last buffer
+        */
+       if (!digest_phys)
+               digest_phys = rte_pktmbuf_iova(buf) + to_trn;
+       if (oop && buf_last_oop)
+               digest_phys = rte_pktmbuf_iova(buf_last_oop) + to_trn;
+
+       if (!digest_mem && !oop) {
+               digest_mem = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               + tdata->auth_tag.len);
+               digest_phys = rte_pktmbuf_iova_offset(ut_params->ibuf,
+                               tdata->plaintext.len);
+       }
+
+       /* Create AEAD operation */
+       retval = create_aead_operation_SGL(RTE_CRYPTO_AEAD_OP_ENCRYPT,
+                       tdata, digest_mem, digest_phys);
+
+       if (retval < 0)
+               return retval;
+
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       if (oop)
+               ut_params->op->sym->m_dst = ut_params->obuf;
+
+       /* Process crypto operation */
+       if (oop == IN_PLACE &&
+                       gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
+
+
+       ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
+                       uint8_t *, prepend_len);
+       if (oop) {
+               ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
+                               uint8_t *, prepend_len);
+       }
+
+       if (fragsz_oop)
+               fragsz = fragsz_oop;
+
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       fragsz,
+                       "Ciphertext data not as expected");
+
+       buf = ut_params->op->sym->m_src->next;
+       if (oop)
+               buf = ut_params->op->sym->m_dst->next;
+
+       unsigned int off = fragsz;
+
+       ecx = 0;
+       while (buf) {
+               ciphertext = rte_pktmbuf_mtod(buf,
+                               uint8_t *);
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                               ciphertext,
+                               tdata->ciphertext.data + off,
+                               to_trn_tbl[ecx],
+                               "Ciphertext data not as expected");
+
+               off += to_trn_tbl[ecx++];
+               buf = buf->next;
+       }
+
+       auth_tag = digest_mem;
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       tdata->auth_tag.data,
+                       tdata->auth_tag.len,
+                       "Generated auth tag not as expected");
+
+       return 0;
+}
+
+static int
+test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B(void)
+{
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 400, 400);
+}
+
+static int
+test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B(void)
+{
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_SGL_1, OUT_OF_PLACE, 1500, 2000);
+}
+
+static int
+test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg(void)
+{
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_8, OUT_OF_PLACE, 400,
+                       gcm_test_case_8.plaintext.len);
+}
+
+static int
+test_AES_GCM_auth_encrypt_SGL_in_place_1500B(void)
+{
+       /* This test is not for OPENSSL PMD */
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)))
+               return -ENOTSUP;
+
+       return test_authenticated_encryption_SGL(
+                       &gcm_test_case_SGL_1, IN_PLACE, 1500, 0);
+}
+
+static int
+test_authentication_verify_fail_when_data_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_fail_when_data_corruption(
+                       ts_params, ut_params, reference, 1);
+}
+
+static int
+test_authentication_verify_fail_when_tag_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_fail_when_data_corruption(
+                       ts_params, ut_params, reference, 0);
+}
+
+static int
+test_authentication_verify_GMAC_fail_when_data_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_GMAC_fail_when_corruption(
+                       ts_params, ut_params, reference, 1);
+}
+
+static int
+test_authentication_verify_GMAC_fail_when_tag_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authentication_verify_GMAC_fail_when_corruption(
+                       ts_params, ut_params, reference, 0);
+}
+
+static int
+test_authenticated_decryption_fail_when_data_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authenticated_decryption_fail_when_corruption(
+                       ts_params, ut_params, reference, 1);
+}
+
+static int
+test_authenticated_decryption_fail_when_tag_corrupted(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       return test_authenticated_decryption_fail_when_corruption(
+                       ts_params, ut_params, reference, 0);
+}
+
+static int
+authentication_verify_HMAC_SHA1_fail_data_corrupt(void)
+{
+       return test_authentication_verify_fail_when_data_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &hmac_sha1_test_crypto_vector);
+}
+
+static int
+authentication_verify_HMAC_SHA1_fail_tag_corrupt(void)
+{
+       return test_authentication_verify_fail_when_tag_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &hmac_sha1_test_crypto_vector);
+}
+
+static int
+authentication_verify_AES128_GMAC_fail_data_corrupt(void)
+{
+       return test_authentication_verify_GMAC_fail_when_data_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &aes128_gmac_test_vector);
+}
+
+static int
+authentication_verify_AES128_GMAC_fail_tag_corrupt(void)
+{
+       return test_authentication_verify_GMAC_fail_when_tag_corrupted(
+                       &testsuite_params, &unittest_params,
+                       &aes128_gmac_test_vector);
+}
+
+static int
+auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt(void)
+{
+       return test_authenticated_decryption_fail_when_data_corrupted(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_test_vector);
+}
+
+static int
+auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt(void)
+{
+       return test_authenticated_decryption_fail_when_tag_corrupted(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_test_vector);
+}
+
+static int
+auth_encrypt_AES128CBC_HMAC_SHA1_esn_check(void)
+{
+       return test_authenticated_encryt_with_esn(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_aad_test_vector);
+}
+
+static int
+auth_decrypt_AES128CBC_HMAC_SHA1_esn_check(void)
+{
+       return test_authenticated_decrypt_with_esn(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_aad_test_vector);
+}
+
+static int
+test_chacha20_poly1305_encrypt_test_case_rfc8439(void)
+{
+       return test_authenticated_encryption(&chacha20_poly1305_case_rfc8439);
+}
+
+static int
+test_chacha20_poly1305_decrypt_test_case_rfc8439(void)
+{
+       return test_authenticated_decryption(&chacha20_poly1305_case_rfc8439);
+}
+
+#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+
+/* global AESNI slave IDs for the scheduler test */
+uint8_t aesni_ids[2];
+
+static int
+test_scheduler_attach_slave_op(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       uint32_t nb_devs, i, nb_devs_attached = 0;
+       int ret;
+       char vdev_name[32];
+
+       /* create 2 AESNI_MB if necessary */
+       nb_devs = rte_cryptodev_device_count_by_driver(
+                       rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)));
+       if (nb_devs < 2) {
+               for (i = nb_devs; i < 2; i++) {
+                       snprintf(vdev_name, sizeof(vdev_name), "%s_%u",
+                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD),
+                                       i);
+                       ret = rte_vdev_init(vdev_name, NULL);
+
+                       TEST_ASSERT(ret == 0,
+                               "Failed to create instance %u of"
+                               " pmd : %s",
+                               i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+               }
+       }
+
+       /* attach 2 AESNI_MB cdevs */
+       for (i = 0; i < rte_cryptodev_count() && nb_devs_attached < 2;
+                       i++) {
+               struct rte_cryptodev_info info;
+               unsigned int session_size;
+
+               rte_cryptodev_info_get(i, &info);
+               if (info.driver_id != rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)))
+                       continue;
+
+               session_size = rte_cryptodev_sym_get_private_session_size(i);
+               /*
+                * Create the session mempool again, since now there are new devices
+                * to use the mempool.
+                */
+               if (ts_params->session_mpool) {
+                       rte_mempool_free(ts_params->session_mpool);
+                       ts_params->session_mpool = NULL;
+               }
+               if (ts_params->session_priv_mpool) {
+                       rte_mempool_free(ts_params->session_priv_mpool);
+                       ts_params->session_priv_mpool = NULL;
+               }
+
+               if (info.sym.max_nb_sessions != 0 &&
+                               info.sym.max_nb_sessions < MAX_NB_SESSIONS) {
+                       RTE_LOG(ERR, USER1,
+                                       "Device does not support "
+                                       "at least %u sessions\n",
+                                       MAX_NB_SESSIONS);
+                       return TEST_FAILED;
+               }
+               /*
+                * Create mempool with maximum number of sessions,
+                * to include the session headers
+                */
+               if (ts_params->session_mpool == NULL) {
+                       ts_params->session_mpool =
+                               rte_cryptodev_sym_session_pool_create(
+                                               "test_sess_mp",
+                                               MAX_NB_SESSIONS, 0, 0, 0,
+                                               SOCKET_ID_ANY);
+                       TEST_ASSERT_NOT_NULL(ts_params->session_mpool,
+                                       "session mempool allocation failed");
+               }
+
+               /*
+                * Create mempool with maximum number of sessions,
+                * to include device specific session private data
+                */
+               if (ts_params->session_priv_mpool == NULL) {
+                       ts_params->session_priv_mpool = rte_mempool_create(
+                                       "test_sess_mp_priv",
+                                       MAX_NB_SESSIONS,
+                                       session_size,
+                                       0, 0, NULL, NULL, NULL,
+                                       NULL, SOCKET_ID_ANY,
+                                       0);
+
+                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
+                                       "session mempool allocation failed");
+               }
+
+               ts_params->qp_conf.mp_session = ts_params->session_mpool;
+               ts_params->qp_conf.mp_session_private =
+                               ts_params->session_priv_mpool;
+
+               ret = rte_cryptodev_scheduler_slave_attach(sched_id,
+                               (uint8_t)i);
+
+               TEST_ASSERT(ret == 0,
+                       "Failed to attach device %u of pmd : %s", i,
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+
+               aesni_ids[nb_devs_attached] = (uint8_t)i;
+
+               nb_devs_attached++;
+       }
+
+       return 0;
+}
+
+static int
+test_scheduler_detach_slave_op(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       uint32_t i;
+       int ret;
+
+       for (i = 0; i < 2; i++) {
+               ret = rte_cryptodev_scheduler_slave_detach(sched_id,
+                               aesni_ids[i]);
+               TEST_ASSERT(ret == 0,
+                       "Failed to detach device %u", aesni_ids[i]);
+       }
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_offset_oop),
+       return 0;
+}
 
-               /** SNOW 3G decrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_cipher_auth_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
+static int
+test_scheduler_mode_op(enum rte_cryptodev_scheduler_mode scheduler_mode)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       /* set mode */
+       return rte_cryptodev_scheduler_mode_set(sched_id,
+               scheduler_mode);
+}
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+static int
+test_scheduler_mode_roundrobin_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_ROUNDROBIN) ==
+                       0, "Failed to set roundrobin mode");
+       return 0;
 
-static struct unit_test_suite cryptodev_sw_zuc_testsuite  = {
-       .suite_name = "Crypto Device SW ZUC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+}
 
-static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
-       .suite_name = "Crypto CAAM JR Unit Test Suite",
+static int
+test_scheduler_mode_multicore_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_MULTICORE) ==
+                       0, "Failed to set multicore mode");
+
+       return 0;
+}
+
+static int
+test_scheduler_mode_failover_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_FAILOVER) ==
+                       0, "Failed to set failover mode");
+
+       return 0;
+}
+
+static int
+test_scheduler_mode_pkt_size_distr_op(void)
+{
+       TEST_ASSERT(test_scheduler_mode_op(CDEV_SCHED_MODE_PKT_SIZE_DISTR) ==
+                       0, "Failed to set pktsize mode");
+
+       return 0;
+}
+
+static struct unit_test_suite cryptodev_scheduler_testsuite  = {
+       .suite_name = "Crypto Device Scheduler Unit Test Suite",
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
+               /* Multi Core */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_multicore_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_chain_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_chain_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_cipheronly_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_cipheronly_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_authonly_caam_jr_all),
+               /* Round Robin */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_roundrobin_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
+               /* Fail over */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_failover_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
+               /* PKT SIZE */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_pkt_size_distr_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
 
-static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
-       .suite_name = "Crypto DPAA_SEC Unit Test Suite",
+#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
+
+static struct unit_test_suite cryptodev_testsuite  = {
+       .suite_name = "Crypto Unit Test Suite",
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_chain_dpaa_sec_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_chain_dpaa_sec_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_cipheronly_dpaa_sec_all),
+                               test_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_cipheronly_dpaa_sec_all),
+                               test_queue_pair_descriptor_setup),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_authonly_dpaa_sec_all),
+                               test_device_configure_invalid_queue_pair_ids),
 
-               /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                               test_multi_session),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                               test_multi_session_random_usage),
 
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
+                       test_null_invalid_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
+
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_docsis_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_stats),
 
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
+               /** AES CCM Authenticated Encryption 128 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
+                       test_AES_CCM_authenticated_encryption_test_case_128_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
+                       test_AES_CCM_authenticated_encryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
+                       test_AES_CCM_authenticated_encryption_test_case_128_3),
 
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
+               /** AES CCM Authenticated Decryption 128 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** Out of place tests */
+                       test_AES_CCM_authenticated_decryption_test_case_128_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
+                       test_AES_CCM_authenticated_decryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
+                       test_AES_CCM_authenticated_decryption_test_case_128_3),
 
-               /** Scatter-Gather */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+               /** AES CCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+                       test_AES_CCM_authenticated_encryption_test_case_192_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+                       test_AES_CCM_authenticated_encryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+                       test_AES_CCM_authenticated_encryption_test_case_192_3),
 
-static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
-       .suite_name = "Crypto DPAA2_SEC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+               /** AES CCM Authenticated Decryption 192 bits key*/
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_decryption_test_case_192_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_device_configure_invalid_dev_id),
+                       test_AES_CCM_authenticated_decryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_multi_session),
+                       test_AES_CCM_authenticated_decryption_test_case_192_3),
 
+               /** AES CCM Authenticated Encryption 256 bits key */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_CCM_authenticated_encryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_chain_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_encryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_chain_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_encryption_test_case_256_3),
+
+               /** AES CCM Authenticated Decryption 256 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_cipheronly_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_decryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_cipheronly_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_decryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_authonly_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_decryption_test_case_256_3),
 
                /** AES GCM Authenticated Encryption */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -10128,6 +12034,10 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_7),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_encryption_test_case_1),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -10144,6 +12054,10 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_test_case_7),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_decryption_test_case_1),
 
                /** AES GCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -10209,325 +12123,505 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_decryption_test_case_256_7),
 
+               /** AES GCM Authenticated Encryption big aad size */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_aad_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_aad_2),
+
+               /** AES GCM Authenticated Decryption big aad size */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_aad_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_aad_2),
+
                /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
-               /** Scatter-Gather */
+               /** Session-less tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
+
+               /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+                       test_AES_GMAC_authentication_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
+                       test_AES_GMAC_authentication_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_4),
+               /** Chacha20-Poly1305 */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_chacha20_poly1305_encrypt_test_case_rfc8439),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_chacha20_poly1305_decrypt_test_case_rfc8439),
+               /** SNOW 3G encrypt only (UEA2) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_5),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_offset_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_1_oop),
 
-static struct unit_test_suite cryptodev_null_testsuite  = {
-       .suite_name = "Crypto Device NULL Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+               /** SNOW 3G generate auth, then encrypt (UEA2) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_only_operation),
+                       test_snow3g_auth_cipher_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_only_operation),
+                       test_snow3g_auth_cipher_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_auth_operation),
+                       test_snow3g_auth_cipher_part_digest_enc),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_cipher_operation),
+                       test_snow3g_auth_cipher_part_digest_enc_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_invalid_operation),
+                       test_snow3g_auth_cipher_test_case_3_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_burst_operation),
+                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               /** SNOW 3G decrypt (UEA2), then verify auth */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_2_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
 
-static struct unit_test_suite cryptodev_armv8_testsuite  = {
-       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_armv8_all),
+               /** SNOW 3G decrypt only (UEA2) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_with_digest_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_cipher_auth_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_with_digest_test_case_1),
 
-               /** Negative tests */
+               /** ZUC encrypt only (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_zuc_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       test_zuc_encryption_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_6_sgl),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               /** ZUC authenticate (EIA3) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_7),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_8),
 
-static struct unit_test_suite cryptodev_mrvl_testsuite  = {
-       .suite_name = "Crypto Device Marvell Component Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
+               /** ZUC alg-chain (EEA3/EIA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
+                       test_zuc_cipher_auth_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_chain_mrvl_all),
+                       test_zuc_cipher_auth_test_case_2),
+
+               /** ZUC generate auth, then encrypt (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_mrvl_all),
+                       test_zuc_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_mrvl_all),
+                       test_zuc_auth_cipher_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_chain_mrvl_all),
+                       test_zuc_auth_cipher_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_cipheronly_mrvl_all),
+                       test_zuc_auth_cipher_test_case_1_oop_sgl),
 
-               /** Negative tests */
+               /** ZUC decrypt (EEA3), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_zuc_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_zuc_auth_cipher_verify_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_zuc_auth_cipher_verify_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       test_zuc_auth_cipher_verify_test_case_1_oop_sgl),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               /** HMAC_MD5 Authentication */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_generate_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_verify_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_generate_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_verify_case_2),
 
-static struct unit_test_suite cryptodev_ccp_testsuite  = {
-       .suite_name = "Crypto Device CCP Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
+               /** KASUMI hash only (UIA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
+                       test_kasumi_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_chain_ccp_all),
+                       test_kasumi_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_ccp_all),
+                       test_kasumi_hash_generate_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_chain_ccp_all),
+                       test_kasumi_hash_generate_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_cipheronly_ccp_all),
+                       test_kasumi_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_ccp_all),
+                       test_kasumi_hash_generate_test_case_6),
 
-               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_kasumi_hash_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_hash_verify_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+                       test_kasumi_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_verify_test_case_5),
 
-static struct unit_test_suite cryptodev_octeontx_testsuite  = {
-       .suite_name = "Crypto Device OCTEONTX Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+               /** KASUMI encrypt only (UEA1) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_chain_octeontx_all),
+                       test_kasumi_encryption_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_cipheronly_octeontx_all),
+                       test_kasumi_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_chain_octeontx_all),
+                       test_kasumi_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_cipheronly_octeontx_all),
+                       test_kasumi_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_authonly_octeontx_all),
+                       test_kasumi_encryption_test_case_5),
 
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
+               /** KASUMI decrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
+                       test_kasumi_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
+                       test_kasumi_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
+                       test_kasumi_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
+                       test_kasumi_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                       test_kasumi_decryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                       test_kasumi_decryption_test_case_1_oop),
 
-               /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
+                       test_kasumi_cipher_auth_test_case_1),
+
+               /** KASUMI generate auth, then encrypt (F8) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
+                       test_kasumi_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
+                       test_kasumi_auth_cipher_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
+                       test_kasumi_auth_cipher_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
+                       test_kasumi_auth_cipher_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
+                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
+
+               /** KASUMI decrypt (F8), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-               /** AES GMAC Authentication */
+                       test_kasumi_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
+                       test_kasumi_auth_cipher_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
+                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
+
+               /** ESN Testcase */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
+                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
+                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
 
-               /** SNOW 3G encrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
+                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
-
+                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
+                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop_sgl),
-
-               /** SNOW 3G decrypt only (UEA2) */
+                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
+                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
+                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
+                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
+                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-
+                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
+                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
+                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
+                       authentication_verify_AES128_GMAC_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
+                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
 
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
+               /** Mixed CIPHER + HASH algorithms */
+               /** AUTH AES CMAC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
+                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
+                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
+                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
+                  test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
 
-               /** KASUMI encrypt only (UEA1) */
+               /** AUTH ZUC + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
+                       test_auth_zuc_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
+                       test_verify_auth_zuc_cipher_snow_test_case_1),
+               /** AUTH AES CMAC + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
+                       test_auth_aes_cmac_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
+                       test_verify_auth_aes_cmac_cipher_snow_test_case_1),
+               /** AUTH ZUC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
+                       test_auth_zuc_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
+                       test_verify_auth_zuc_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               /** KASUMI decrypt only (UEA1) */
+                       test_auth_snow_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
+                       test_verify_auth_snow_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
+                       test_auth_snow_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
+                       test_verify_auth_snow_cipher_zuc_test_case_1),
+               /** AUTH AES CMAC + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
+                       test_auth_aes_cmac_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
+                       test_verify_auth_aes_cmac_cipher_zuc_test_case_1),
 
+               /** AUTH NULL + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
-
-               /** KASUMI hash only (UIA1) */
+                       test_auth_null_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_1),
+                       test_verify_auth_null_cipher_snow_test_case_1),
+               /** AUTH NULL + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_2),
+                       test_auth_null_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_3),
+                       test_verify_auth_null_cipher_zuc_test_case_1),
+               /** AUTH SNOW3G + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
+                       test_auth_snow_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
+                       test_verify_auth_snow_cipher_null_test_case_1),
+               /** AUTH ZUC + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
+                       test_auth_zuc_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
+                       test_verify_auth_zuc_cipher_null_test_case_1),
+               /** AUTH NULL + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
+                       test_auth_null_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
+                       test_verify_auth_null_cipher_aes_ctr_test_case_1),
+               /** AUTH AES CMAC + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
+                       test_auth_aes_cmac_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
+                       test_verify_auth_aes_cmac_cipher_null_test_case_1),
+
+#ifdef RTE_LIBRTE_SECURITY
+               TEST_CASE_ST(ut_setup_security, ut_teardown,
+                       test_PDCP_PROTO_all),
+               TEST_CASE_ST(ut_setup_security, ut_teardown,
+                       test_DOCSIS_PROTO_all),
+#endif
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_virtio_testsuite = {
+       .suite_name = "Crypto VIRTIO Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
 
-               /** NULL tests */
+static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
+       .suite_name = "Crypto CAAM JR Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_only_operation),
+                            test_multi_session),
+
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_armv8_testsuite  = {
+       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_only_operation),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_auth_operation),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_mrvl_testsuite  = {
+       .suite_name = "Crypto Device Marvell Component Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_cipher_operation),
+                               test_multi_session_random_usage),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
 
                /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -10535,13 +12629,54 @@ static struct unit_test_suite cryptodev_octeontx_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_ccp_testsuite  = {
+       .suite_name = "Crypto Device CCP Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_multi_session_random_usage),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+
+               /** Negative tests */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_nitrox_testsuite  = {
+       .suite_name = "Crypto NITROX Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_device_configure_invalid_dev_id),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_device_configure_invalid_queue_pair_ids),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -10559,7 +12694,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_qat_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10591,7 +12726,30 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_aesni_mb_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
+}
+
+static int
+test_cryptodev_cpu_aesni_mb(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
 }
 
 static int
@@ -10607,7 +12765,7 @@ test_cryptodev_openssl(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_openssl_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10623,7 +12781,30 @@ test_cryptodev_aesni_gcm(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_aesni_gcm_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
+}
+
+static int
+test_cryptodev_cpu_aesni_gcm(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
 }
 
 static int
@@ -10639,7 +12820,7 @@ test_cryptodev_null(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_null_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10655,7 +12836,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_snow3g_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10671,7 +12852,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_kasumi_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10687,7 +12868,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_zuc_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10763,7 +12944,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10779,7 +12960,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10810,7 +12991,22 @@ test_cryptodev_octeontx(void)
                                "testsuite.\n");
                return TEST_FAILED;
        }
-       return unit_test_suite_runner(&cryptodev_octeontx_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
+}
+
+static int
+test_cryptodev_octeontx2(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is "
+                               "enabled in config file to run this "
+                               "testsuite.\n");
+               return TEST_FAILED;
+       }
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -10829,10 +13025,30 @@ test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_caam_jr_testsuite);
 }
 
+static int
+test_cryptodev_nitrox(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NITROX_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_NITROX is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_FAILED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_nitrox_testsuite);
+}
+
 REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_mb_autotest,
+       test_cryptodev_cpu_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl);
 REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,
+       test_cryptodev_cpu_aesni_gcm);
 REGISTER_TEST_COMMAND(cryptodev_null_autotest, test_cryptodev_null);
 REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g);
 REGISTER_TEST_COMMAND(cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi);
@@ -10844,4 +13060,6 @@ REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);
 REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);
 REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);
 REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, test_cryptodev_octeontx);
+REGISTER_TEST_COMMAND(cryptodev_octeontx2_autotest, test_cryptodev_octeontx2);
 REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);
+REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox);