examples/bpf: move from test directory
[dpdk.git] / test / test / test_cryptodev.c
index 83b8ee7..32f1893 100644 (file)
@@ -1,41 +1,16 @@
-/*-
- *   BSD LICENSE
- *
- *   Copyright(c) 2015-2017 Intel Corporation. All rights reserved.
- *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *      * Redistributions of source code must retain the above copyright
- *        notice, this list of conditions and the following disclaimer.
- *      * Redistributions in binary form must reproduce the above copyright
- *        notice, this list of conditions and the following disclaimer in
- *        the documentation and/or other materials provided with the
- *        distribution.
- *      * Neither the name of Intel Corporation nor the names of its
- *        contributors may be used to endorse or promote products derived
- *        from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2015-2017 Intel Corporation
  */
 
+#include <time.h>
+
 #include <rte_common.h>
 #include <rte_hexdump.h>
 #include <rte_mbuf.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_pause.h>
+#include <rte_bus_vdev.h>
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
@@ -46,6 +21,8 @@
 #include <rte_cryptodev_scheduler_operations.h>
 #endif
 
+#include <rte_lcore.h>
+
 #include "test.h"
 #include "test_cryptodev.h"
 
@@ -61,6 +38,9 @@
 #include "test_cryptodev_aead_test_vectors.h"
 #include "test_cryptodev_hmac_test_vectors.h"
 
+#define VDEV_ARGS_SIZE 100
+#define MAX_NB_SESSIONS            4
+
 static int gbl_driver_id;
 
 struct crypto_testsuite_params {
@@ -68,6 +48,7 @@ struct crypto_testsuite_params {
        struct rte_mempool *large_mbuf_pool;
        struct rte_mempool *op_mpool;
        struct rte_mempool *session_mpool;
+       struct rte_mempool *session_priv_mpool;
        struct rte_cryptodev_config conf;
        struct rte_cryptodev_qp_conf qp_conf;
 
@@ -341,18 +322,81 @@ testsuite_setup(void)
                }
        }
 
+       /* Create a MVSAM device if required */
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_MVSAM_PMD))) {
+               nb_devs = rte_cryptodev_device_count_by_driver(
+                               rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)));
+               if (nb_devs < 1) {
+                       ret = rte_vdev_init(
+                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD),
+                               NULL);
+
+                       TEST_ASSERT(ret == 0, "Failed to create "
+                               "instance of pmd : %s",
+                               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD));
+               }
+       }
+
+       /* Create an CCP device if required */
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_CCP_PMD))) {
+               nb_devs = rte_cryptodev_device_count_by_driver(
+                               rte_cryptodev_driver_id_get(
+                               RTE_STR(CRYPTODEV_NAME_CCP_PMD)));
+               if (nb_devs < 1) {
+                       ret = rte_vdev_init(
+                               RTE_STR(CRYPTODEV_NAME_CCP_PMD),
+                               NULL);
+
+                       TEST_ASSERT(ret == 0, "Failed to create "
+                               "instance of pmd : %s",
+                               RTE_STR(CRYPTODEV_NAME_CCP_PMD));
+               }
+       }
+
 #ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+       char vdev_args[VDEV_ARGS_SIZE] = {""};
+       char temp_str[VDEV_ARGS_SIZE] = {"mode=multi-core,"
+               "ordering=enable,name=cryptodev_test_scheduler,corelist="};
+       uint16_t slave_core_count = 0;
+       uint16_t socket_id = 0;
+
        if (gbl_driver_id == rte_cryptodev_driver_id_get(
                        RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD))) {
 
+               /* Identify the Slave Cores
+                * Use 2 slave cores for the device args
+                */
+               RTE_LCORE_FOREACH_SLAVE(i) {
+                       if (slave_core_count > 1)
+                               break;
+                       snprintf(vdev_args, sizeof(vdev_args),
+                                       "%s%d", temp_str, i);
+                       strcpy(temp_str, vdev_args);
+                       strcat(temp_str, ";");
+                       slave_core_count++;
+                       socket_id = lcore_config[i].socket_id;
+               }
+               if (slave_core_count != 2) {
+                       RTE_LOG(ERR, USER1,
+                               "Cryptodev scheduler test require at least "
+                               "two slave cores to run. "
+                               "Please use the correct coremask.\n");
+                       return TEST_FAILED;
+               }
+               strcpy(temp_str, vdev_args);
+               snprintf(vdev_args, sizeof(vdev_args), "%s,socket_id=%d",
+                               temp_str, socket_id);
+               RTE_LOG(DEBUG, USER1, "vdev_args: %s\n", vdev_args);
                nb_devs = rte_cryptodev_device_count_by_driver(
                                rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)));
                if (nb_devs < 1) {
                        ret = rte_vdev_init(
                                RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD),
-                               NULL);
-
+                                       vdev_args);
                        TEST_ASSERT(ret == 0,
                                "Failed to create instance %u of"
                                " pmd : %s",
@@ -386,35 +430,52 @@ testsuite_setup(void)
        ts_params->conf.nb_queue_pairs = info.max_nb_queue_pairs;
        ts_params->conf.socket_id = SOCKET_ID_ANY;
 
-       unsigned int session_size = rte_cryptodev_get_private_session_size(dev_id);
+       unsigned int session_size =
+               rte_cryptodev_sym_get_private_session_size(dev_id);
 
        /*
         * Create mempool with maximum number of sessions * 2,
         * to include the session headers
         */
-       ts_params->session_mpool = rte_mempool_create(
-                               "test_sess_mp",
-                               info.sym.max_nb_sessions * 2,
-                               session_size,
-                               0, 0, NULL, NULL, NULL,
-                               NULL, SOCKET_ID_ANY,
-                               0);
+       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;
+       }
 
+       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");
 
+       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");
+
+
+
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id,
                        &ts_params->conf),
                        "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.mp_session = ts_params->session_mpool;
+       ts_params->qp_conf.mp_session_private = ts_params->session_priv_mpool;
 
        for (qp_id = 0; qp_id < info.max_nb_queue_pairs; qp_id++) {
                TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                        dev_id, qp_id, &ts_params->qp_conf,
-                       rte_cryptodev_socket_id(dev_id),
-                       ts_params->session_mpool),
+                       rte_cryptodev_socket_id(dev_id)),
                        "Failed to setup queue pair %u on cryptodev %u",
                        qp_id, dev_id);
        }
@@ -438,6 +499,11 @@ testsuite_teardown(void)
        }
 
        /* Free session mempools */
+       if (ts_params->session_priv_mpool != NULL) {
+               rte_mempool_free(ts_params->session_priv_mpool);
+               ts_params->session_priv_mpool = NULL;
+       }
+
        if (ts_params->session_mpool != NULL) {
                rte_mempool_free(ts_params->session_mpool);
                ts_params->session_mpool = NULL;
@@ -457,6 +523,9 @@ ut_setup(void)
 
        /* Reconfigure device to default parameters */
        ts_params->conf.socket_id = SOCKET_ID_ANY;
+       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;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -467,8 +536,7 @@ ut_setup(void)
                TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                        ts_params->valid_devs[0], qp_id,
                        &ts_params->qp_conf,
-                       rte_cryptodev_socket_id(ts_params->valid_devs[0]),
-                       ts_params->session_mpool),
+                       rte_cryptodev_socket_id(ts_params->valid_devs[0])),
                        "Failed to setup queue pair %u on cryptodev %u",
                        qp_id, ts_params->valid_devs[0]);
        }
@@ -542,7 +610,7 @@ test_device_configure_invalid_dev_id(void)
        dev_id = ts_params->valid_devs[ts_params->valid_dev_count - 1];
 
        /* Stop the device in case it's started so it can be configured */
-       rte_cryptodev_stop(ts_params->valid_devs[dev_id]);
+       rte_cryptodev_stop(dev_id);
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(dev_id, &ts_params->conf),
                        "Failed test for rte_cryptodev_configure: "
@@ -583,7 +651,7 @@ test_device_configure_invalid_queue_pair_ids(void)
 
 
        /* valid - max value queue pairs */
-       ts_params->conf.nb_queue_pairs = MAX_NUM_QPS_PER_QAT_DEVICE;
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -615,7 +683,7 @@ test_device_configure_invalid_queue_pair_ids(void)
 
 
        /* invalid - max value + 1 queue pairs */
-       ts_params->conf.nb_queue_pairs = MAX_NUM_QPS_PER_QAT_DEVICE + 1;
+       ts_params->conf.nb_queue_pairs = orig_nb_qps + 1;
 
        TEST_ASSERT_FAIL(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -657,13 +725,14 @@ test_queue_pair_descriptor_setup(void)
         * freed so are re-used if ring is released and re-created.
         */
        qp_conf.nb_descriptors = MIN_NUM_OPS_INFLIGHT; /* min size*/
+       qp_conf.mp_session = ts_params->session_mpool;
+       qp_conf.mp_session_private = ts_params->session_priv_mpool;
 
        for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
                TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                                ts_params->valid_devs[0], qp_id, &qp_conf,
                                rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0]),
-                               ts_params->session_mpool),
+                                               ts_params->valid_devs[0])),
                                "Failed test for "
                                "rte_cryptodev_queue_pair_setup: num_inflights "
                                "%u on qp %u on cryptodev %u",
@@ -677,8 +746,7 @@ test_queue_pair_descriptor_setup(void)
                TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                                ts_params->valid_devs[0], qp_id, &qp_conf,
                                rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0]),
-                               ts_params->session_mpool),
+                                               ts_params->valid_devs[0])),
                                "Failed test for"
                                " rte_cryptodev_queue_pair_setup: num_inflights"
                                " %u on qp %u on cryptodev %u",
@@ -692,8 +760,7 @@ test_queue_pair_descriptor_setup(void)
                TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                                ts_params->valid_devs[0], qp_id, &qp_conf,
                                rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0]),
-                               ts_params->session_mpool),
+                                               ts_params->valid_devs[0])),
                                "Failed test for "
                                "rte_cryptodev_queue_pair_setup: num_inflights"
                                " %u on qp %u on cryptodev %u",
@@ -708,8 +775,7 @@ test_queue_pair_descriptor_setup(void)
                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]),
-                               ts_params->session_mpool),
+                                               ts_params->valid_devs[0])),
                                "Unexpectedly passed test for "
                                "rte_cryptodev_queue_pair_setup:"
                                "num_inflights %u on qp %u on cryptodev %u",
@@ -724,8 +790,7 @@ test_queue_pair_descriptor_setup(void)
                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]),
-                               ts_params->session_mpool),
+                                               ts_params->valid_devs[0])),
                                "Unexpectedly passed test for "
                                "rte_cryptodev_queue_pair_setup:"
                                "num_inflights %u on qp %u on cryptodev %u",
@@ -739,8 +804,7 @@ test_queue_pair_descriptor_setup(void)
                TEST_ASSERT_SUCCESS(rte_cryptodev_queue_pair_setup(
                                ts_params->valid_devs[0], qp_id, &qp_conf,
                                rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0]),
-                               ts_params->session_mpool),
+                                               ts_params->valid_devs[0])),
                                "Failed test for"
                                " rte_cryptodev_queue_pair_setup:"
                                "num_inflights %u on qp %u on cryptodev %u",
@@ -755,8 +819,7 @@ test_queue_pair_descriptor_setup(void)
                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]),
-                               ts_params->session_mpool),
+                                               ts_params->valid_devs[0])),
                                "Unexpectedly passed test for "
                                "rte_cryptodev_queue_pair_setup:"
                                "num_inflights %u on qp %u on cryptodev %u",
@@ -767,13 +830,12 @@ test_queue_pair_descriptor_setup(void)
        /* test invalid queue pair id */
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
 
-       qp_id = DEFAULT_NUM_QPS_PER_QAT_DEVICE;         /*invalid */
+       qp_id = ts_params->conf.nb_queue_pairs;         /*invalid */
 
        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]),
-                       ts_params->session_mpool),
+                       rte_cryptodev_socket_id(ts_params->valid_devs[0])),
                        "Failed test for rte_cryptodev_queue_pair_setup:"
                        "invalid qp %u on cryptodev %u",
                        qp_id, ts_params->valid_devs[0]);
@@ -783,8 +845,7 @@ test_queue_pair_descriptor_setup(void)
        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]),
-                       ts_params->session_mpool),
+                       rte_cryptodev_socket_id(ts_params->valid_devs[0])),
                        "Failed test for rte_cryptodev_queue_pair_setup:"
                        "invalid qp %u on cryptodev %u",
                        qp_id, ts_params->valid_devs[0]);
@@ -1292,7 +1353,7 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        /* Create crypto session*/
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
        /* Generate crypto op data structure */
@@ -1310,7 +1371,7 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
 
        /* Set crypto operation authentication parameters */
        sym_op->auth.digest.data = ut_params->digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
                        ut_params->ibuf, QUOTE_512_BYTES);
 
        sym_op->auth.data.offset = 0;
@@ -1462,7 +1523,7 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
        sym_op->m_src = ut_params->ibuf;
 
        sym_op->auth.digest.data = ut_params->digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
                        ut_params->ibuf, QUOTE_512_BYTES);
 
        sym_op->auth.data.offset = 0;
@@ -1506,7 +1567,7 @@ test_AES_cipheronly_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1525,7 +1586,7 @@ test_AES_docsis_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1544,7 +1605,7 @@ test_AES_docsis_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1563,7 +1624,7 @@ test_DES_docsis_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1582,7 +1643,7 @@ test_authonly_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1601,7 +1662,7 @@ test_authonly_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1619,7 +1680,7 @@ test_AES_chain_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1640,7 +1701,7 @@ test_AES_cipheronly_scheduler_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1659,7 +1720,7 @@ test_AES_chain_scheduler_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1678,7 +1739,7 @@ test_authonly_scheduler_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1699,7 +1760,7 @@ test_AES_chain_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1718,7 +1779,7 @@ test_AES_cipheronly_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -1730,17 +1791,17 @@ test_AES_cipheronly_openssl_all(void)
 }
 
 static int
-test_AES_chain_qat_all(void)
+test_AES_chain_ccp_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_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
+               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1749,17 +1810,17 @@ test_AES_chain_qat_all(void)
 }
 
 static int
-test_AES_cipheronly_qat_all(void)
+test_AES_cipheronly_ccp_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_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
+               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1768,17 +1829,17 @@ test_AES_cipheronly_qat_all(void)
 }
 
 static int
-test_AES_chain_dpaa2_sec_all(void)
+test_AES_chain_qat_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_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1787,17 +1848,17 @@ test_AES_chain_dpaa2_sec_all(void)
 }
 
 static int
-test_AES_cipheronly_dpaa2_sec_all(void)
+test_AES_cipheronly_qat_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_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
+               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
                BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -1806,18 +1867,18 @@ test_AES_cipheronly_dpaa2_sec_all(void)
 }
 
 static int
-test_authonly_dpaa2_sec_all(void)
+test_AES_cipheronly_virtio_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_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);
+               RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)),
+               BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
@@ -1825,18 +1886,18 @@ test_authonly_dpaa2_sec_all(void)
 }
 
 static int
-test_authonly_openssl_all(void)
+test_AES_chain_caam_jr_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_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);
+               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
+               BLKCIPHER_AES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
@@ -1844,538 +1905,494 @@ test_authonly_openssl_all(void)
 }
 
 static int
-test_AES_chain_armv8_all(void)
+test_AES_cipheronly_caam_jr_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_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);
+               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
+               BLKCIPHER_AES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
        return TEST_SUCCESS;
 }
 
-/* ***** 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_authonly_caam_jr_all(void)
 {
-       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);
-
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       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 = 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);
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform, ts_params->session_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
+       return TEST_SUCCESS;
 }
 
+
 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)
+test_AES_chain_dpaa_sec_all(void)
 {
-       uint8_t cipher_key[key_len];
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       int status;
 
-       memcpy(cipher_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);
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       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;
+       return TEST_SUCCESS;
+}
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+static int
+test_AES_cipheronly_dpaa_sec_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       /* Create Crypto session */
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_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_DPAA_SEC_PMD)),
+               BLKCIPHER_AES_CIPHERONLY_TYPE);
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform, ts_params->session_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
 }
 
 static int
-create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
-                       unsigned int cipher_len,
-                       unsigned int cipher_offset)
+test_authonly_dpaa_sec_all(void)
 {
        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 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_DPAA_SEC_PMD)),
+               BLKCIPHER_AUTHONLY_TYPE);
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       /* 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;
+       return TEST_SUCCESS;
 }
 
 static int
-create_wireless_algo_cipher_operation_oop(const uint8_t *iv, uint8_t iv_len,
-                       unsigned int cipher_len,
-                       unsigned int cipher_offset)
+test_AES_chain_dpaa2_sec_all(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       int status;
 
-       /* 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");
+       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);
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       return TEST_SUCCESS;
+}
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-       sym_op->m_dst = ut_params->obuf;
+static int
+test_AES_cipheronly_dpaa2_sec_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       /* 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;
+       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);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
 }
 
 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_authonly_dpaa2_sec_all(void)
 {
-       uint8_t cipher_auth_key[key_len];
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       int status;
 
-       memcpy(cipher_auth_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_DPAA2_SEC_PMD)),
+               BLKCIPHER_AUTHONLY_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 = 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;
-
-       /* 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 = 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;
+       return TEST_SUCCESS;
+}
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+static int
+test_authonly_openssl_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_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_OPENSSL_PMD)),
+               BLKCIPHER_AUTHONLY_TYPE);
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform, ts_params->session_mpool);
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
+       return TEST_SUCCESS;
 }
 
 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_authonly_ccp_all(void)
 {
-       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);
-
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-
-       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;
+       int status;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       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);
 
-       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;
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
+       return TEST_SUCCESS;
+}
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+static int
+test_AES_chain_armv8_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_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_ARMV8_PMD)),
+               BLKCIPHER_AES_CHAIN_TYPE);
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform, ts_params->session_mpool);
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
+       return TEST_SUCCESS;
 }
 
 static int
-create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
-               const struct wireless_test_data *tdata)
+test_AES_chain_mrvl_all(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);
+       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_AES_CHAIN_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
 }
 
 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_AES_cipheronly_mrvl_all(void)
 {
-       uint8_t auth_cipher_key[key_len];
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       memcpy(auth_cipher_key, key, key_len);
+       int status;
 
-       /* 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;
+       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);
 
-       /* 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;
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       return TEST_SUCCESS;
+}
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+static int
+test_authonly_mrvl_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform, ts_params->session_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_MVSAM_PMD)),
+               BLKCIPHER_AUTHONLY_TYPE);
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       return 0;
+       return TEST_SUCCESS;
 }
 
 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_3DES_chain_mrvl_all(void)
 {
        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);
 
-       /* 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;
+static int
+test_3DES_cipheronly_mrvl_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       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);
 
-       /* 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);
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       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_mtophys_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);
+       return TEST_SUCCESS;
+}
 
-       TEST_HEXDUMP(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+static int
+test_AES_chain_octeontx_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = auth_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_AES_CHAIN_TYPE);
 
-       return 0;
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
 }
 
 static int
-create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
-       enum rte_crypto_auth_operation op)
+test_AES_cipheronly_octeontx_all(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       int status;
 
-       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);
+       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);
 
-       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;
+       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");
-       /* 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;
+static int
+test_3DES_chain_octeontx_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       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);
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       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_mtophys_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);
+       return TEST_SUCCESS;
+}
 
-       TEST_HEXDUMP(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+static int
+test_3DES_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_3DES_CIPHERONLY_TYPE);
 
-       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;
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       return 0;
+       return TEST_SUCCESS;
 }
 
 static int
-create_zuc_cipher_hash_generate_operation(
-               const struct wireless_test_data *tdata)
+test_authonly_octeontx_all(void)
 {
-       return create_wireless_cipher_hash_operation(tdata,
-               RTE_CRYPTO_AUTH_OP_GENERATE);
+       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_OCTEONTX_SYM_PMD)),
+               BLKCIPHER_AUTHONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
 }
 
+/* ***** SNOW 3G Tests ***** */
 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)
+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)
 {
+       uint8_t hash_key[key_len];
+
        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);
+       memcpy(hash_key, key, key_len);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       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);
 
-       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_mtophys_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);
+       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;
+}
 
-       TEST_HEXDUMP(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+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];
 
-       /* 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 crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       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;
+       memcpy(cipher_key, key, key_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 = 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;
+
+       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->cipher_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 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)
+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;
        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);
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
+                               "Failed to allocate pktmbuf offload");
 
        /* Set crypto operation data parameters */
        rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
@@ -2385,725 +2402,861 @@ create_wireless_algo_auth_cipher_operation(unsigned int auth_tag_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);
+       /* 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;
+}
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append auth tag");
+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;
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
-                       ut_params->ibuf, data_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 pktmbuf offload");
 
-       memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       TEST_HEXDUMP(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       auth_tag_len);
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       /* 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);
+       /* 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;
-
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = auth_offset;
-
        return 0;
 }
 
 static int
-test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
+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)
+
 {
+       uint8_t cipher_auth_key[key_len];
+
        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;
+       memcpy(cipher_auth_key, 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;
+       /* Setup Authentication 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.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;
 
-       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 = &ut_params->auth_xform;
 
-       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 = 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;
 
-       /* 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
-test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
+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)
 {
+       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;
 
-       int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       memcpy(cipher_auth_key, 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_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);
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+       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;
 
-       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);
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
 
-       /* 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;
+       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;
 
-       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;
+       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->cipher_xform,
+                       ts_params->session_priv_mpool);
 
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 static int
-test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
+create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
+               const struct wireless_test_data *tdata)
+{
+       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
+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)
 {
+       uint8_t auth_cipher_key[key_len];
+
        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;
-
-       /* 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;
+       memcpy(auth_cipher_key, key, key_len);
 
-       /* alloc mbuf and set payload */
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       /* 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;
 
-       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;
+       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;
 
-       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, "key:", key, key_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);
-       if (retval < 0)
-               return retval;
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       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;
+       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
 
-       /* 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
-test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
+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;
+
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
-
-       /* 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);
+       /* 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, 8);
-       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 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;
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       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;
+       /* 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);
 
-       /* Validate obuf */
-       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
-               return 0;
+       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
-               return -1;
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
+
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
+
+       sym_op->auth.data.length = auth_len;
+       sym_op->auth.data.offset = auth_offset;
 
        return 0;
 }
 
 static int
-test_snow3g_hash_generate_test_case_1(void)
+create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
+       enum rte_crypto_auth_operation op)
 {
-       return test_snow3g_authentication(&snow3g_hash_test_case_1);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_snow3g_hash_generate_test_case_2(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_2);
-}
+       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);
 
-static int
-test_snow3g_hash_generate_test_case_3(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_3);
-}
+       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;
 
-static int
-test_snow3g_hash_generate_test_case_4(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_4);
-}
+       /* 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_snow3g_hash_generate_test_case_5(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_5);
-}
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-static int
-test_snow3g_hash_generate_test_case_6(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_6);
-}
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-static int
-test_snow3g_hash_verify_test_case_1(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_1);
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, auth_tag_len);
 
-}
+       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_snow3g_hash_verify_test_case_2(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_2);
-}
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
 
-static int
-test_snow3g_hash_verify_test_case_3(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_3);
-}
+       /* 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);
 
-static int
-test_snow3g_hash_verify_test_case_4(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_4);
-}
+       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;
 
-static int
-test_snow3g_hash_verify_test_case_5(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_5);
+       return 0;
 }
 
 static int
-test_snow3g_hash_verify_test_case_6(void)
+create_zuc_cipher_hash_generate_operation(
+               const struct wireless_test_data *tdata)
 {
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_6);
+       return create_wireless_cipher_hash_operation(tdata,
+               RTE_CRYPTO_AUTH_OP_GENERATE);
 }
 
 static int
-test_kasumi_hash_generate_test_case_1(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)
 {
-       return test_kasumi_authentication(&kasumi_hash_test_case_1);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_kasumi_hash_generate_test_case_2(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_2);
-}
+       /* 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_kasumi_hash_generate_test_case_3(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_3);
-}
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-static int
-test_kasumi_hash_generate_test_case_4(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_4);
-}
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-static int
-test_kasumi_hash_generate_test_case_5(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_5);
-}
+       /* 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_6(void)
-{
-       return test_kasumi_authentication(&kasumi_hash_test_case_6);
-}
+       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_verify_test_case_1(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_1);
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_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);
+
+       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;
+
+       return 0;
 }
 
 static int
-test_kasumi_hash_verify_test_case_2(void)
+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)
 {
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_2);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_kasumi_hash_verify_test_case_3(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_3);
-}
+       /* 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_verify_test_case_4(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_4);
-}
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-static int
-test_kasumi_hash_verify_test_case_5(void)
-{
-       return test_kasumi_authentication_verify(&kasumi_hash_test_case_5);
+       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);
+
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, data_pad_len);
+
+       memset(sym_op->auth.digest.data, 0, auth_tag_len);
+
+       debug_hexdump(stdout, "digest:",
+                       sym_op->auth.digest.data,
+                       auth_tag_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);
+
+       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;
+
+       return 0;
 }
 
 static int
-test_kasumi_encryption(const struct kasumi_test_data *tdata)
+test_snow3g_authentication(const struct snow3g_hash_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 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);
+       /* 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;
 
+       /* 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);
-       /* 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);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_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_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;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                               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;
 
-       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);
-
-       TEST_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");
+       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_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
+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;
 
        int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
 
-       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);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
-                               "Test Skipped.\n");
-               return 0;
-       }
-
-       /* 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);
+       /* 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);
 
-       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 = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 10, 0);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+       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);
 
-       /* 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_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;
 
        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_read(ut_params->obuf, 0,
-                               plaintext_len, buffer);
-       else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
-                               tdata->validCipherOffsetInBits.len >> 3,
-                               plaintext_len, buffer);
+       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 */
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
+               return 0;
+       else
+               return -1;
 
-       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_encryption_oop(const struct kasumi_test_data *tdata)
+test_kasumi_authentication(const struct kasumi_hash_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 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);
+       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;
 
+       /* 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 */
+       /* 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);
 
-       TEST_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);
+       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;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                               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;
 
-       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);
-
-       TEST_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");
+       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_encryption_oop_sgl(const struct kasumi_test_data *tdata)
+test_kasumi_authentication_verify(const struct kasumi_hash_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);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
-                               "Test Skipped.\n");
-               return 0;
-       }
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
 
        /* 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);
+       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);
+
+       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);
-
-       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);
+       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_cipher_operation_oop(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+       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;
 
        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;
 
-       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);
+       /* Validate obuf */
+       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
+               return 0;
        else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
-                               tdata->validCipherOffsetInBits.len >> 3,
-                               plaintext_pad_len, buffer);
+               return -1;
 
-       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_hash_generate_test_case_1(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_1);
+}
 
 static int
-test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
+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);
+
+}
+
+static int
+test_snow3g_hash_verify_test_case_2(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_2);
+}
+
+static int
+test_snow3g_hash_verify_test_case_3(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_3);
+}
+
+static int
+test_snow3g_hash_verify_test_case_4(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_4);
+}
+
+static int
+test_snow3g_hash_verify_test_case_5(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_5);
+}
+
+static int
+test_snow3g_hash_verify_test_case_6(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_6);
+}
+
+static int
+test_kasumi_hash_generate_test_case_1(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_1);
+}
+
+static int
+test_kasumi_hash_generate_test_case_2(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_2);
+}
+
+static int
+test_kasumi_hash_generate_test_case_3(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_3);
+}
+
+static int
+test_kasumi_hash_generate_test_case_4(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_4);
+}
+
+static int
+test_kasumi_hash_generate_test_case_5(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_5);
+}
+
+static int
+test_kasumi_hash_generate_test_case_6(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_6);
+}
+
+static int
+test_kasumi_hash_verify_test_case_1(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_1);
+}
+
+static int
+test_kasumi_hash_verify_test_case_2(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_2);
+}
+
+static int
+test_kasumi_hash_verify_test_case_3(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_3);
+}
+
+static int
+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;
 
        int retval;
-       uint8_t *ciphertext, *plaintext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
        /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
                                        RTE_CRYPTO_CIPHER_KASUMI_F8,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
@@ -3111,25 +3264,23 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
                return retval;
 
        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));
 
-       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, 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);
+       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);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
                                tdata->cipher_iv.len,
                                RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
                                tdata->validCipherOffsetInBits.len);
@@ -3142,64 +3293,75 @@ test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
 
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
-               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-       const uint8_t *reference_plaintext = tdata->plaintext.data +
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
                                (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               plaintext,
-               reference_plaintext,
+               ciphertext,
+               reference_ciphertext,
                tdata->validCipherLenInBits.len,
-               "KASUMI Plaintext data not as expected");
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_kasumi_decryption(const struct kasumi_test_data *tdata)
+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;
 
        int retval;
-       uint8_t *ciphertext, *plaintext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
+
+       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);
+
+       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;
+       }
 
        /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       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;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
 
-       /* 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);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 10, 0);
+
+       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,
-                                       tdata->ciphertext.len,
-                                       tdata->validCipherOffsetInBits.len);
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
@@ -3208,26 +3370,31 @@ test_kasumi_decryption(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)
-               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                               plaintext_len, buffer);
        else
-               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
+                               tdata->validCipherOffsetInBits.len >> 3,
+                               plaintext_len, buffer);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       /* Validate obuf */
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-       const uint8_t *reference_plaintext = tdata->plaintext.data +
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
                                (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               plaintext,
-               reference_plaintext,
+               ciphertext,
+               reference_ciphertext,
                tdata->validCipherLenInBits.len,
-               "KASUMI Plaintext data not as expected");
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_snow3g_encryption(const struct snow3g_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;
@@ -3237,36 +3404,38 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
-       /* Create SNOW 3G session */
+       /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       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);
+       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));
 
        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);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       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 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;
 
@@ -3278,68 +3447,74 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = plaintext;
+               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       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,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
-
 static int
-test_snow3g_encryption_oop(const struct snow3g_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;
-       uint8_t *plaintext, *ciphertext;
 
        int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
 
-       /* Create SNOW 3G session */
+       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);
+
+       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;
+       }
+
+       /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       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);
-       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, 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);
+       /* 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 = 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_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       /* 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 SNOW 3G operation */
+       /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
@@ -3349,73 +3524,68 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
 
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                               plaintext_pad_len, buffer);
        else
-               ciphertext = plaintext;
-
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+               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,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
+
 static int
-test_snow3g_encryption_oop_sgl(const struct snow3g_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 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);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
-                               "Test Skipped.\n");
-               return 0;
-       }
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
 
-       /* Create SNOW 3G session */
+       /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       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;
 
-       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);
+       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));
 
-       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);
+       /* 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);
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
-       /* Create SNOW 3G operation */
+       /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
@@ -3425,100 +3595,64 @@ test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
 
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
-                               plaintext_len, buffer);
+               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
-                               plaintext_len, buffer);
+               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       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(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
-
+               plaintext,
+               reference_plaintext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext 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_snow3g_encryption_offset_oop(const struct snow3g_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;
-       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;
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
 
-       /* Create SNOW 3G session */
+       /* Create KASUMI session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       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);
-       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 + 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);
+       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);
 
-       memcpy(plaintext, tdata->plaintext.data, (tdata->plaintext.len >> 3));
-       buffer_shift_right(plaintext, tdata->plaintext.len, extra_offset);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
-#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,
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
                                        tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       extra_offset);
+                                       tdata->ciphertext.len,
+                                       tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
@@ -3528,47 +3662,37 @@ test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
 
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = plaintext;
-
-#ifdef RTE_APP_TEST_DEBUG
-       rte_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-#endif
-
-       expected_ciphertext_shifted = rte_malloc(NULL, plaintext_len, 8);
+               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
 
-       TEST_ASSERT_NOT_NULL(expected_ciphertext_shifted,
-                       "failed to reserve memory for ciphertext shifted\n");
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_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);
+       const uint8_t *reference_plaintext = tdata->plaintext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
        /* 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");
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               plaintext,
+               reference_plaintext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext data not as expected");
        return 0;
 }
 
-static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
+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;
 
        int retval;
-
        uint8_t *plaintext, *ciphertext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
                                        RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
@@ -3581,15 +3705,15 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
        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);
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               ciphertext_pad_len);
-       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+       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);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
@@ -3602,36 +3726,39 @@ static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
        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 *);
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               plaintext = ciphertext;
+               ciphertext = plaintext;
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
-                               tdata->plaintext.data,
-                               tdata->validDataLenInBits.len,
-                               "SNOW 3G Plaintext data not as expected");
+       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_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
+
+static int
+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 ciphertext_pad_len;
-       unsigned ciphertext_len;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
        /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
                                        RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
@@ -3642,27 +3769,24 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
        ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
        TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer");
+                       "Failed to allocate input buffer in mempool");
        TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer");
+                       "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));
 
-       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);
        /* 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);
-       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+       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);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
@@ -3675,191 +3799,220 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
        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 *);
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               plaintext = ciphertext;
+               ciphertext = plaintext;
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
-                               tdata->plaintext.data,
-                               tdata->validDataLenInBits.len,
-                               "SNOW 3G Plaintext data not as expected");
+       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_zuc_cipher_auth(const struct wireless_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;
-
-       uint8_t *plaintext, *ciphertext;
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
+       uint8_t buffer[10000];
+       const uint8_t *ciphertext;
 
-       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;
 
-       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);
 
-       /* Check if device supports ZUC EIA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       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;
+       }
 
-       /* Create ZUC session */
-       retval = create_zuc_cipher_auth_encrypt_generate_session(
-                       ts_params->valid_devs[0],
-                       tdata);
+       /* 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;
-       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);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       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);
 
-       /* Create ZUC operation */
-       retval = create_zuc_cipher_hash_generate_operation(tdata);
+       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 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_src;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+
+       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 = plaintext;
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                               plaintext_len, buffer);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
        /* Validate obuf */
        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;
+               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,
-                       4,
-                       "ZUC Generated auth tag 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_snow3g_cipher_auth(const struct snow3g_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;
 
        /* Create SNOW 3G 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,
-                       tdata->key.data, tdata->key.len,
-                       tdata->auth_iv.len, tdata->digest.len,
-                       tdata->cipher_iv.len);
+       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;
+
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* clear mbuf payload */
+       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));
+              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_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);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       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, (tdata->plaintext.len >> 3));
+       buffer_shift_right(plaintext, tdata->plaintext.len, extra_offset);
 
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+#endif
        /* Create SNOW 3G 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
-                       );
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       extra_offset);
        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;
 
-       TEST_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");
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+#endif
 
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-           + plaintext_pad_len;
+       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(
-                       ut_params->digest,
-                       tdata->digest.data,
-                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-                       "SNOW 3G Generated auth tag not as expected");
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
+               ciphertext,
+               expected_ciphertext_shifted,
+               tdata->validDataLenInBits.len,
+               extra_offset,
+               "SNOW 3G Ciphertext data not as expected");
        return 0;
 }
-static int
-test_snow3g_auth_cipher(const struct snow3g_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;
@@ -3867,82 +4020,62 @@ test_snow3g_auth_cipher(const struct snow3g_test_data *tdata)
        int retval;
 
        uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_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);
+       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 */
+       /* 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, 16);
-       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, 16);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_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);
-
+       retval = create_wireless_algo_cipher_operation(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_src;
+       ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+               plaintext = 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;
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+               plaintext = ciphertext;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_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");
+       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_auth_cipher(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;
@@ -3950,26 +4083,112 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata)
        int retval;
 
        uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_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);
+       /* 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);
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+       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, 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);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_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;
+
+       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;
+
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
+
+       /* Validate obuf */
+       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_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 *plaintext, *ciphertext;
+       unsigned int plaintext_pad_len;
+       unsigned int 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;
+
+       /* 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;
+
+       /* 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 */
+       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 */
@@ -3979,55 +4198,44 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
-
-       /* 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
-                               );
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
+       /* 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);
        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;
+       ut_params->obuf = ut_params->op->sym->m_src;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ut_params->obuf = ut_params->op->sym->m_src;
-
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
-                               tdata->validCipherOffsetInBits.len >> 3);
+               ciphertext = plaintext;
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
        /* 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 *)
+                       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,
-                       DIGEST_BYTE_LENGTH_KASUMI_F9,
-                       "KASUMI Generated auth tag not as expected");
+                       4,
+                       "ZUC Generated auth tag not as expected");
        return 0;
 }
 
 static int
-test_kasumi_cipher_auth(const struct kasumi_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;
@@ -4038,19 +4246,17 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
-       /* Create KASUMI session */
-       retval = create_wireless_algo_cipher_auth_session(
-                       ts_params->valid_devs[0],
+       /* Create SNOW 3G 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,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                        tdata->key.data, tdata->key.len,
-                       0, tdata->digest.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);
 
        /* clear mbuf payload */
@@ -4065,295 +4271,549 @@ test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
                                plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create KASUMI operation */
+       /* Create SNOW 3G 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
-                               );
+                       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);
        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;
+       ut_params->obuf = ut_params->op->sym->m_src;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        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;
+               ciphertext = plaintext;
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "SNOW 3G 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,
-               DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-               "KASUMI Generated auth tag not as expected");
+                       ut_params->digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                       "SNOW 3G Generated auth tag not as expected");
        return 0;
 }
-
 static int
-test_zuc_encryption(const struct wireless_test_data *tdata)
+test_snow3g_auth_cipher(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;
 
-       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);
+       /* 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);
        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, 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);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, 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_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;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
-
+       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->validCipherLenInBits.len,
-               "ZUC Ciphertext data not as expected");
+               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");
        return 0;
 }
 
 static int
-test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
+test_kasumi_auth_cipher(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 int plaintext_pad_len;
-       unsigned int plaintext_len;
-       const uint8_t *ciphertext;
-       uint8_t ciphertext_buffer[2048];
-       struct rte_cryptodev_info dev_info;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
-       struct rte_cryptodev_sym_capability_idx cap_idx;
+       /* 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);
 
-       /* Check if device supports ZUC EEA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       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);
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-       if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {
-               printf("Device doesn't support scatter-gather. "
-                               "Test Skipped.\n");
-               return -ENOTSUP;
-       }
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* 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
+                               );
 
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       if (retval < 0)
+               return retval;
 
-       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 10, 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");
+       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;
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
-                       tdata->plaintext.data);
+       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
+                               tdata->validCipherOffsetInBits.len >> 3);
 
-       /* Create ZUC session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+       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_CIPHER_ZUC_EEA3,
+                       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;
 
-       /* Clear mbuf payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Create ZUC operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                       tdata->cipher_iv.len, tdata->plaintext.len,
-                       0);
+       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);
+                       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_len, ciphertext_buffer);
+       if (ut_params->op->sym->m_dst)
+               ut_params->obuf = ut_params->op->sym->m_dst;
        else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
-                       0, plaintext_len, ciphertext_buffer);
+               ut_params->obuf = ut_params->op->sym->m_src;
 
-       /* Validate obuf */
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+       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,
-               tdata->ciphertext.data,
+               reference_ciphertext,
                tdata->validCipherLenInBits.len,
-               "ZUC Ciphertext data not as expected");
+               "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_authentication(const struct wireless_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;
-       uint8_t *plaintext;
 
        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;
+       /* 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_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_ZUC_EIA3);
+       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;
 
-       /* 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);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
+       /* 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_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);
+       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->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,
-       "ZUC 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;
+
+       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_kasumi_encryption_test_case_1(void)
+test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
 {
-       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)
+       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;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+               printf("Device doesn't support in-place scatter-gather. "
+                               "Test Skipped.\n");
+               return 0;
+       }
+
+       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 = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 10, 0);
+
+       pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
+                       tdata->plaintext.data);
+
+       /* 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;
+
+       /* Clear mbuf payload */
+
+       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+
+       /* 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_read(ut_params->obuf,
+                       0, plaintext_len, ciphertext_buffer);
+       else
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
+                       0, plaintext_len, ciphertext_buffer);
+
+       /* Validate obuf */
+       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_authentication(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 plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+
+       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;
+
+       /* Create ZUC 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_ZUC_EIA3);
+       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, 8);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+
+       /* Create ZUC 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;
+
+       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,
+       "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);
 }
@@ -4641,7 +5101,7 @@ test_3DES_chain_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -4660,7 +5120,7 @@ test_DES_cipheronly_qat_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -4679,7 +5139,7 @@ test_DES_cipheronly_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -4698,7 +5158,7 @@ test_DES_docsis_openssl_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -4717,7 +5177,7 @@ test_DES_cipheronly_mb_all(void)
 
        status = test_blockcipher_all_tests(ts_params->mbuf_pool,
                ts_params->op_mpool,
-               ts_params->session_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)),
@@ -4727,20 +5187,19 @@ test_DES_cipheronly_mb_all(void)
 
        return TEST_SUCCESS;
 }
-
 static int
-test_DES_docsis_mb_all(void)
+test_3DES_cipheronly_mb_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_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);
+               BLKCIPHER_3DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
@@ -4748,18 +5207,18 @@ test_DES_docsis_mb_all(void)
 }
 
 static int
-test_3DES_chain_dpaa2_sec_all(void)
+test_DES_docsis_mb_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_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);
+               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
+               BLKCIPHER_DES_DOCSIS_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
@@ -4767,18 +5226,18 @@ test_3DES_chain_dpaa2_sec_all(void)
 }
 
 static int
-test_3DES_cipheronly_dpaa2_sec_all(void)
+test_3DES_chain_caam_jr_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_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);
+               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
+               BLKCIPHER_3DES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
@@ -4786,17 +5245,17 @@ test_3DES_cipheronly_dpaa2_sec_all(void)
 }
 
 static int
-test_3DES_cipheronly_qat_all(void)
+test_3DES_cipheronly_caam_jr_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_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
+               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
                BLKCIPHER_3DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4805,17 +5264,17 @@ test_3DES_cipheronly_qat_all(void)
 }
 
 static int
-test_3DES_chain_openssl_all(void)
+test_3DES_chain_dpaa_sec_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_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
+               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
                BLKCIPHER_3DES_CHAIN_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4824,17 +5283,17 @@ test_3DES_chain_openssl_all(void)
 }
 
 static int
-test_3DES_cipheronly_openssl_all(void)
+test_3DES_cipheronly_dpaa_sec_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_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
                rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
+               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
                BLKCIPHER_3DES_CIPHERONLY_TYPE);
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
@@ -4842,81 +5301,215 @@ test_3DES_cipheronly_openssl_all(void)
        return TEST_SUCCESS;
 }
 
-/* ***** 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)
+test_3DES_chain_dpaa2_sec_all(void)
 {
-       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;
-
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
-
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       int status;
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->aead_xform, ts_params->session_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_3DES_CHAIN_TYPE);
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       return 0;
+       return TEST_SUCCESS;
 }
 
 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_3DES_cipheronly_dpaa2_sec_all(void)
 {
-       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;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
 
-       /* 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;
+       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);
 
-       TEST_HEXDUMP(stdout, "key:", key, key_len);
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
-       return 0;
+       return TEST_SUCCESS;
 }
 
 static int
-create_aead_operation(enum rte_crypto_aead_operation op,
-               const struct aead_test_data *tdata)
+test_3DES_chain_ccp_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_CCP_PMD)),
+               BLKCIPHER_3DES_CHAIN_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_3DES_cipheronly_ccp_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_CCP_PMD)),
+               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_3DES_cipheronly_qat_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_3DES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_3DES_chain_openssl_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_OPENSSL_PMD)),
+               BLKCIPHER_3DES_CHAIN_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+static int
+test_3DES_cipheronly_openssl_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_OPENSSL_PMD)),
+               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
+/* ***** 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;
@@ -4933,25 +5526,49 @@ create_aead_operation(enum rte_crypto_aead_operation op,
        struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
        /* Append aad data */
-       aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
-       sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       aad_pad_len);
-       TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
-                       "no room to append aad");
-
-       sym_op->aead.aad.phys_addr =
-                       rte_pktmbuf_mtophys(ut_params->ibuf);
-       memcpy(sym_op->aead.aad.data, tdata->aad.data, tdata->aad.len);
-       TEST_HEXDUMP(stdout, "aad:", sym_op->aead.aad.data,
-               tdata->aad.len);
-
-       /* Append IV 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, tdata->iv.data, tdata->iv.len);
-       TEST_HEXDUMP(stdout, "iv:", iv_ptr,
-               tdata->iv.len);
+       if (tdata->algo == RTE_CRYPTO_AEAD_AES_CCM) {
+               aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len + 18, 16);
+               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               aad_pad_len);
+               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
+                               "no room to append aad");
+
+               sym_op->aead.aad.phys_addr =
+                               rte_pktmbuf_iova(ut_params->ibuf);
+               /* Copy AAD 18 bytes after the AAD pointer, according to the API */
+               memcpy(sym_op->aead.aad.data + 18, tdata->aad.data, tdata->aad.len);
+               debug_hexdump(stdout, "aad:", sym_op->aead.aad.data,
+                       tdata->aad.len);
+
+               /* Append IV at the end of the crypto operation*/
+               uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
+                               uint8_t *, IV_OFFSET);
+
+               /* Copy IV 1 byte after the IV pointer, according to the API */
+               rte_memcpy(iv_ptr + 1, tdata->iv.data, tdata->iv.len);
+               debug_hexdump(stdout, "iv:", iv_ptr,
+                       tdata->iv.len);
+       } else {
+               aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
+               sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               aad_pad_len);
+               TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
+                               "no room to append aad");
+
+               sym_op->aead.aad.phys_addr =
+                               rte_pktmbuf_iova(ut_params->ibuf);
+               memcpy(sym_op->aead.aad.data, tdata->aad.data, tdata->aad.len);
+               debug_hexdump(stdout, "aad:", sym_op->aead.aad.data,
+                       tdata->aad.len);
+
+               /* Append IV 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, tdata->iv.data, tdata->iv.len);
+               debug_hexdump(stdout, "iv:", iv_ptr,
+                       tdata->iv.len);
+       }
 
        /* Append plaintext/ciphertext */
        if (op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
@@ -4961,7 +5578,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
                memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-               TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+               debug_hexdump(stdout, "plaintext:", plaintext,
                                tdata->plaintext.len);
 
                if (ut_params->obuf) {
@@ -4983,7 +5600,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
 
                memcpy(ciphertext, tdata->ciphertext.data,
                                tdata->ciphertext.len);
-               TEST_HEXDUMP(stdout, "ciphertext:", ciphertext,
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
                                tdata->ciphertext.len);
 
                if (ut_params->obuf) {
@@ -5007,7 +5624,7 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                                "no room to append digest");
                memset(sym_op->aead.digest.data, 0, tdata->auth_tag.len);
-               sym_op->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+               sym_op->aead.digest.phys_addr = rte_pktmbuf_iova_offset(
                                ut_params->obuf ? ut_params->obuf :
                                                ut_params->ibuf,
                                                plaintext_pad_len +
@@ -5017,13 +5634,13 @@ create_aead_operation(enum rte_crypto_aead_operation op,
                                ut_params->ibuf, tdata->auth_tag.len);
                TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                                "no room to append digest");
-               sym_op->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+               sym_op->aead.digest.phys_addr = rte_pktmbuf_iova_offset(
                                ut_params->ibuf,
                                plaintext_pad_len + aad_pad_len);
 
                rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                        tdata->auth_tag.len);
-               TEST_HEXDUMP(stdout, "digest:",
+               debug_hexdump(stdout, "digest:",
                        sym_op->aead.digest.data,
                        tdata->auth_tag.len);
        }
@@ -5097,8 +5714,8 @@ test_authenticated_encryption(const struct aead_test_data *tdata)
                auth_tag = ciphertext + plaintext_pad_len;
        }
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->auth_tag.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(
@@ -5311,7 +5928,7 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
                                uint8_t *,
                                ut_params->op->sym->cipher.data.offset);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5516,8 +6133,8 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata)
                        ut_params->op->sym->cipher.data.offset);
        auth_tag = ciphertext + plaintext_pad_len;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->auth_tag.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(
@@ -5590,7 +6207,7 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata)
        plaintext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
                        ut_params->op->sym->cipher.data.offset);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5666,8 +6283,8 @@ test_authenticated_encryption_sessionless(
                        ut_params->op->sym->cipher.data.offset);
        auth_tag = ciphertext + plaintext_pad_len;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->auth_tag.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(
@@ -5744,7 +6361,7 @@ test_authenticated_decryption_sessionless(
        plaintext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
                        ut_params->op->sym->cipher.data.offset);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext, tdata->ciphertext.len);
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
@@ -5766,6 +6383,114 @@ test_AES_GCM_authenticated_decryption_sessionless_test_case_1(void)
                        &gcm_test_case_5);
 }
 
+static int
+test_AES_CCM_authenticated_encryption_test_case_128_1(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_128_1);
+}
+
+static int
+test_AES_CCM_authenticated_encryption_test_case_128_2(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_128_2);
+}
+
+static int
+test_AES_CCM_authenticated_encryption_test_case_128_3(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_128_3);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_128_1(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_128_1);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_128_2(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_128_2);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_128_3(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_128_3);
+}
+
+static int
+test_AES_CCM_authenticated_encryption_test_case_192_1(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_192_1);
+}
+
+static int
+test_AES_CCM_authenticated_encryption_test_case_192_2(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_192_2);
+}
+
+static int
+test_AES_CCM_authenticated_encryption_test_case_192_3(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_192_3);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_192_1(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_192_1);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_192_2(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_192_2);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_192_3(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_192_3);
+}
+
+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);
+}
+
+static int
+test_AES_CCM_authenticated_encryption_test_case_256_3(void)
+{
+       return test_authenticated_encryption(&ccm_test_case_256_3);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_256_1(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_256_1);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_256_2(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_256_2);
+}
+
+static int
+test_AES_CCM_authenticated_decryption_test_case_256_3(void)
+{
+       return test_authenticated_decryption(&ccm_test_case_256_3);
+}
+
 static int
 test_stats(void)
 {
@@ -5849,7 +6574,7 @@ static int MD5_HMAC_create_session(struct crypto_testsuite_params *ts_params,
 
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
 
        if (ut_params->sess == NULL)
                return TEST_FAILED;
@@ -5882,7 +6607,7 @@ static int MD5_HMAC_create_op(struct crypto_unittest_params *ut_params,
                        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_mtophys_offset(
+       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) {
@@ -6020,17 +6745,17 @@ test_multi_session(void)
 
        sessions = rte_malloc(NULL,
                        (sizeof(struct rte_cryptodev_sym_session *) *
-                       dev_info.sym.max_nb_sessions) + 1, 0);
+                       MAX_NB_SESSIONS) + 1, 0);
 
        /* Create multiple crypto sessions*/
-       for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
+       for (i = 0; i < MAX_NB_SESSIONS; i++) {
 
                sessions[i] = rte_cryptodev_sym_session_create(
                                ts_params->session_mpool);
 
                rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                                sessions[i], &ut_params->auth_xform,
-                               ts_params->session_mpool);
+                               ts_params->session_priv_mpool);
                TEST_ASSERT_NOT_NULL(sessions[i],
                                "Session creation failed at session number %u",
                                i);
@@ -6068,11 +6793,11 @@ test_multi_session(void)
        /* Next session create should fail */
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        sessions[i], &ut_params->auth_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
        TEST_ASSERT_NULL(sessions[i],
                        "Session creation succeeded unexpectedly!");
 
-       for (i = 0; i < dev_info.sym.max_nb_sessions; i++) {
+       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]);
@@ -6131,13 +6856,13 @@ test_multi_session_random_usage(void)
 
        sessions = rte_malloc(NULL,
                        (sizeof(struct rte_cryptodev_sym_session *)
-                                       * dev_info.sym.max_nb_sessions) + 1, 0);
+                                       * MAX_NB_SESSIONS) + 1, 0);
 
        for (i = 0; i < MB_SESSION_NUMBER; i++) {
                sessions[i] = rte_cryptodev_sym_session_create(
                                ts_params->session_mpool);
 
-               rte_memcpy(&ut_paramz[i].ut_params, &testsuite_params,
+               rte_memcpy(&ut_paramz[i].ut_params, &unittest_params,
                                sizeof(struct crypto_unittest_params));
 
                test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(
@@ -6149,7 +6874,7 @@ test_multi_session_random_usage(void)
                                ts_params->valid_devs[0],
                                sessions[i],
                                &ut_paramz[i].ut_params.auth_xform,
-                               ts_params->session_mpool);
+                               ts_params->session_priv_mpool);
 
                TEST_ASSERT_NOT_NULL(sessions[i],
                                "Session creation failed at session number %u",
@@ -6227,7 +6952,7 @@ test_null_cipher_only_operation(void)
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                                ut_params->sess,
                                &ut_params->cipher_xform,
-                               ts_params->session_mpool);
+                               ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
        /* Generate Crypto op data structure */
@@ -6264,17 +6989,29 @@ test_null_cipher_only_operation(void)
 
        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)
 {
        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);
 
+       /* 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));
+
        /* Setup HMAC Parameters */
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
        ut_params->auth_xform.next = NULL;
@@ -6288,7 +7025,7 @@ test_null_auth_only_operation(void)
        /* Create Crypto session*/
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
        /* Generate Crypto op data structure */
@@ -6306,6 +7043,9 @@ test_null_auth_only_operation(void)
 
        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);
 
        /* Process crypto operation */
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
@@ -6314,20 +7054,36 @@ test_null_auth_only_operation(void)
 
        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 */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       orig_data,
+                       digest,
+                       sizeof(orig_data),
+                       "Memory at digest ptr overwritten unexpectedly");
 
        return TEST_SUCCESS;
 }
 
+
 static int
 test_null_cipher_auth_operation(void)
 {
        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);
 
+       /* 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));
+
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = &ut_params->auth_xform;
@@ -6348,7 +7104,7 @@ test_null_cipher_auth_operation(void)
        /* Create Crypto session*/
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
        /* Generate Crypto op data structure */
@@ -6369,6 +7125,9 @@ test_null_cipher_auth_operation(void)
 
        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);
 
        /* Process crypto operation */
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
@@ -6384,6 +7143,12 @@ test_null_cipher_auth_operation(void)
                        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");
 
        return TEST_SUCCESS;
 }
@@ -6393,11 +7158,20 @@ test_null_auth_cipher_operation(void)
 {
        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 */
+       /* Generate test mbuf data */
        ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
                        catch_22_quote, QUOTE_512_BYTES, 0);
 
+       /* 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));
+
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = NULL;
@@ -6418,7 +7192,7 @@ test_null_auth_cipher_operation(void)
        /* Create Crypto session*/
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
        /* Generate Crypto op data structure */
@@ -6439,6 +7213,9 @@ test_null_auth_cipher_operation(void)
 
        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);
 
        /* Process crypto operation */
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
@@ -6454,6 +7231,12 @@ test_null_auth_cipher_operation(void)
                        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");
 
        return TEST_SUCCESS;
 }
@@ -6479,7 +7262,7 @@ test_null_invalid_operation(void)
        /* Create Crypto session*/
        ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
        TEST_ASSERT(ret < 0,
                        "Session creation succeeded unexpectedly");
 
@@ -6497,7 +7280,7 @@ test_null_invalid_operation(void)
        /* Create Crypto session*/
        ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
        TEST_ASSERT(ret < 0,
                        "Session creation succeeded unexpectedly");
 
@@ -6538,7 +7321,7 @@ test_null_burst_operation(void)
        /* Create Crypto session*/
        rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_mpool);
+                       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,
@@ -6618,13 +7401,13 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
        TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
                        "no room to append digest");
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
                        ut_params->ibuf, plaintext_pad_len);
 
        if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
                rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
                                tdata->gmac_tag.len);
-               TEST_HEXDUMP(stdout, "digest:",
+               debug_hexdump(stdout, "digest:",
                                sym_op->auth.digest.data,
                                tdata->gmac_tag.len);
        }
@@ -6634,7 +7417,7 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
 
        rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
 
-       TEST_HEXDUMP(stdout, "iv:", iv_ptr, tdata->iv.len);
+       debug_hexdump(stdout, "iv:", iv_ptr, tdata->iv.len);
 
        sym_op->cipher.data.length = 0;
        sym_op->cipher.data.offset = 0;
@@ -6673,7 +7456,7 @@ static int create_gmac_session(uint8_t dev_id,
 
        rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
                        &ut_params->auth_xform,
-                       ts_params->session_mpool);
+                       ts_params->session_priv_mpool);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
@@ -6724,7 +7507,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
        memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+       debug_hexdump(stdout, "plaintext:", plaintext,
                        tdata->plaintext.len);
 
        retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_GENERATE,
@@ -6750,7 +7533,7 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
                auth_tag = plaintext + plaintext_pad_len;
        }
 
-       TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
 
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
                        auth_tag,
@@ -6828,7 +7611,7 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
        memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+       debug_hexdump(stdout, "plaintext:", plaintext,
                        tdata->plaintext.len);
 
        retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_VERIFY,
@@ -7053,7 +7836,7 @@ create_auth_session(struct crypto_unittest_params *ut_params,
 
        rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
                                &ut_params->auth_xform,
-                               ts_params->session_mpool);
+                               ts_params->session_priv_mpool);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
@@ -7106,7 +7889,7 @@ create_auth_cipher_session(struct crypto_unittest_params *ut_params,
 
        rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
                                &ut_params->auth_xform,
-                               ts_params->session_mpool);
+                               ts_params->session_priv_mpool);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
@@ -7140,7 +7923,7 @@ create_auth_operation(struct crypto_testsuite_params *ts_params,
        TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
                        "no room to append auth tag");
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
                        ut_params->ibuf, reference->plaintext.len);
 
        if (auth_generate)
@@ -7150,7 +7933,7 @@ create_auth_operation(struct crypto_testsuite_params *ts_params,
                                reference->digest.data,
                                reference->digest.len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                        sym_op->auth.digest.data,
                        reference->digest.len);
 
@@ -7187,7 +7970,7 @@ create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
        TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
                        "no room to append auth tag");
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
                        ut_params->ibuf, reference->ciphertext.len);
 
        if (auth_generate)
@@ -7197,7 +7980,7 @@ create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
                                reference->digest.data,
                                reference->digest.len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                        sym_op->auth.digest.data,
                        reference->digest.len);
 
@@ -7240,7 +8023,7 @@ create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
        TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
                        "no room to append auth tag");
 
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
                        ut_params->ibuf, reference->ciphertext.len);
 
        if (auth_generate)
@@ -7250,7 +8033,7 @@ create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
                                reference->digest.data,
                                reference->digest.len);
 
-       TEST_HEXDUMP(stdout, "digest:",
+       debug_hexdump(stdout, "digest:",
                        sym_op->auth.digest.data,
                        reference->digest.len);
 
@@ -7323,7 +8106,8 @@ test_authentication_verify_fail_when_data_corruption(
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
        memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, reference->plaintext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext,
+               reference->plaintext.len);
 
        /* Create operation */
        retval = create_auth_verify_operation(ts_params, ut_params, reference);
@@ -7381,7 +8165,8 @@ test_authentication_verify_GMAC_fail_when_corruption(
        TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
        memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, reference->plaintext.len);
+       debug_hexdump(stdout, "plaintext:", plaintext,
+               reference->plaintext.len);
 
        /* Create operation */
        retval = create_auth_verify_GMAC_operation(ts_params,
@@ -7480,7 +8265,7 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,
 
        const unsigned int auth_tag_len = tdata->auth_tag.len;
        const unsigned int iv_len = tdata->iv.len;
-       const unsigned int aad_len = tdata->aad.len;
+       unsigned int aad_len = tdata->aad.len;
 
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
@@ -7500,29 +8285,55 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,
        if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
                rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                                auth_tag_len);
-               TEST_HEXDUMP(stdout, "digest:",
+               debug_hexdump(stdout, "digest:",
                                sym_op->aead.digest.data,
                                auth_tag_len);
        }
 
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
-                       uint8_t *, IV_OFFSET);
+       /* 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);
 
-       rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
+               /* Copy IV 1 byte after the IV pointer, according to the API */
+               rte_memcpy(iv_ptr + 1, tdata->iv.data, iv_len);
 
-       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_mtophys(
-                       ut_params->ibuf);
+               aad_len = RTE_ALIGN_CEIL(aad_len + 18, 16);
 
-       memset(sym_op->aead.aad.data, 0, aad_len);
-       rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
+               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);
 
-       TEST_HEXDUMP(stdout, "iv:", iv_ptr, iv_len);
-       TEST_HEXDUMP(stdout, "aad:",
-                       sym_op->aead.aad.data, aad_len);
+               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);
+
+               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);
+
+               rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
+
+               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);
+
+               memset(sym_op->aead.aad.data, 0, aad_len);
+               rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
+
+               debug_hexdump(stdout, "iv:", iv_ptr, iv_len);
+               debug_hexdump(stdout, "aad:",
+                               sym_op->aead.aad.data, aad_len);
+       }
 
        sym_op->aead.data.length = tdata->plaintext.len;
        sym_op->aead.data.offset = aad_len;
@@ -7660,7 +8471,7 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
                        digest_mem = rte_pktmbuf_append(ut_params->obuf,
                                tdata->auth_tag.len);
 
-                       digest_phys = rte_pktmbuf_mtophys_offset(
+                       digest_phys = rte_pktmbuf_iova_offset(
                                        ut_params->obuf,
                                        tdata->plaintext.len + prepend_len);
                }
@@ -7698,14 +8509,14 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
         * Place digest at the end of the last buffer
         */
        if (!digest_phys)
-               digest_phys = rte_pktmbuf_mtophys(buf) + to_trn;
+               digest_phys = rte_pktmbuf_iova(buf) + to_trn;
        if (oop && buf_last_oop)
-               digest_phys = rte_pktmbuf_mtophys(buf_last_oop) + to_trn;
+               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_mtophys_offset(ut_params->ibuf,
+               digest_phys = rte_pktmbuf_iova_offset(ut_params->ibuf,
                                tdata->plaintext.len);
        }
 
@@ -7956,12 +8767,14 @@ test_scheduler_attach_slave_op(void)
        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.
@@ -7970,25 +8783,54 @@ test_scheduler_attach_slave_op(void)
                        rte_mempool_free(ts_params->session_mpool);
                        ts_params->session_mpool = NULL;
                }
-               unsigned int session_size = rte_cryptodev_get_private_session_size(i);
+               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 * 2,
+                * Create mempool with maximum number of sessions,
                 * to include the session headers
                 */
                if (ts_params->session_mpool == NULL) {
-                       ts_params->session_mpool = rte_mempool_create(
-                                       "test_sess_mp",
-                                       info.sym.max_nb_sessions * 2,
+                       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_mpool,
+                       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);
 
@@ -8019,97 +8861,785 @@ test_scheduler_detach_slave_op(void)
                        "Failed to detach device %u", aesni_ids[i]);
        }
 
-       return 0;
-}
+       return 0;
+}
+
+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);
+}
+
+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 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 = {
+               /* 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),
+
+               /* 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),
+
+               /* 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),
+
+               /* 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),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
+
+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),
+
+               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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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_decryption_test_case_1_oop),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               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_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),
+
+               /** 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),
+
+               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_virtio_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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) */
+
+               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),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
 
-static int
-test_scheduler_mode_op(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       struct rte_cryptodev_scheduler_ops op = {0};
-       struct rte_cryptodev_scheduler dummy_scheduler = {
-               .description = "dummy scheduler to test mode",
-               .name = "dummy scheduler",
-               .mode = CDEV_SCHED_MODE_USERDEFINED,
-               .ops = &op
-       };
-       int ret;
+               /** 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),
 
-       /* set user defined mode */
-       ret = rte_cryptodev_scheduler_load_user_scheduler(sched_id,
-                       &dummy_scheduler);
-       TEST_ASSERT(ret == 0,
-               "Failed to set cdev %u to user defined mode", sched_id);
-
-       /* set round robin mode */
-       ret = rte_cryptodev_scheduler_mode_set(sched_id,
-                       CDEV_SCHED_MODE_ROUNDROBIN);
-       TEST_ASSERT(ret == 0,
-               "Failed to set cdev %u to round-robin mode", sched_id);
-       TEST_ASSERT(rte_cryptodev_scheduler_mode_get(sched_id) ==
-                       CDEV_SCHED_MODE_ROUNDROBIN, "Scheduling Mode "
-                                       "not match");
+               /** 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),
 
-       return 0;
-}
+               /** 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),
 
-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(NULL, NULL, test_scheduler_attach_slave_op),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_op),
+               /** AES CCM Authenticated Encryption 128 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_chain_scheduler_all),
+                       test_AES_CCM_authenticated_encryption_test_case_128_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_scheduler_all),
+                       test_AES_CCM_authenticated_encryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_scheduler_all),
-               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+                       test_AES_CCM_authenticated_encryption_test_case_128_3),
 
-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
+               /** 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 struct unit_test_suite cryptodev_qat_testsuite  = {
-       .suite_name = "Crypto QAT Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+               /** AES CCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_dev_id),
+                       test_AES_CCM_authenticated_encryption_test_case_192_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_device_configure_invalid_queue_pair_ids),
+                       test_AES_CCM_authenticated_encryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_queue_pair_descriptor_setup),
+                       test_AES_CCM_authenticated_encryption_test_case_192_3),
+
+               /** AES CCM Authenticated Decryption 192 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session),
+                       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),
 
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_qat_all),
+               /** AES CCM Authenticated Encryption 256 bits key */
                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_AES_CCM_authenticated_encryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_3DES_cipheronly_qat_all),
+                       test_AES_CCM_authenticated_encryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_DES_cipheronly_qat_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_docsis_qat_all),
+                       test_AES_CCM_authenticated_decryption_test_case_256_1),
                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),
+                       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),
 
-               /** AES GCM Authenticated Encryption */
+               /** Scatter-Gather */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
+                       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),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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,
@@ -8139,70 +9669,198 @@ static struct unit_test_suite cryptodev_qat_testsuite  = {
                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_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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** 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),
+
+               /** Scatter-Gather */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
 
-               /** AES GCM Authenticated Encryption 192 bits key */
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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_AES_GCM_auth_encryption_test_case_192_1),
+                       test_kasumi_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
+                       test_kasumi_encryption_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
+                       test_kasumi_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
+                       test_kasumi_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
+                       test_kasumi_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
+                       test_kasumi_encryption_test_case_5),
+               /** KASUMI decrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
-
-               /** AES GCM Authenticated Decryption 192 bits key */
+                       test_kasumi_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
+                       test_kasumi_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
+                       test_kasumi_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
+                       test_kasumi_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
+                       test_kasumi_decryption_test_case_5),
+
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
+                       test_kasumi_encryption_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
+                       test_kasumi_encryption_test_case_1_oop_sgl),
+
+
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
+                       test_kasumi_decryption_test_case_1_oop),
 
-               /** AES GCM Authenticated Encryption 256 bits key */
+               /** KASUMI hash only (UIA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
+                       test_kasumi_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
+                       test_kasumi_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
+                       test_kasumi_hash_generate_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
+                       test_kasumi_hash_generate_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
+                       test_kasumi_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
+                       test_kasumi_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
-
-               /** AES GMAC Authentication */
+                       test_kasumi_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
+                       test_kasumi_hash_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
+                       test_kasumi_hash_verify_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
+                       test_kasumi_hash_verify_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
+                       test_kasumi_hash_verify_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
+                       test_kasumi_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-
+                       test_kasumi_cipher_auth_test_case_1),
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+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),
@@ -8217,9 +9875,14 @@ static struct unit_test_suite cryptodev_qat_testsuite  = {
 
                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),
 
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_offset_oop),
+
                /** SNOW 3G decrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_decryption_test_case_1),
@@ -8237,17 +9900,40 @@ static struct unit_test_suite cryptodev_qat_testsuite  = {
                        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),
 
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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),
@@ -8259,133 +9945,67 @@ static struct unit_test_suite cryptodev_qat_testsuite  = {
                        test_zuc_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_encryption_test_case_5),
-
-               /** 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),
-
-               /** 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),
-
-               /** 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),
-
-               /** 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),
-
+                       test_zuc_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
+                       test_zuc_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
+                       test_zuc_hash_generate_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
+                       test_zuc_hash_generate_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
+                       test_zuc_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
+                       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",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
                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_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_cipher_auth_test_case_1),
+                            test_multi_session),
 
-               /** 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_AES_chain_caam_jr_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_data_corrupt),
+                            test_3DES_chain_caam_jr_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+                            test_AES_cipheronly_caam_jr_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                            test_3DES_cipheronly_caam_jr_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                            test_authonly_caam_jr_all),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
 
-static struct unit_test_suite cryptodev_aesni_mb_testsuite  = {
-       .suite_name = "Crypto Device AESNI MB Unit Test Suite",
+static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
+       .suite_name = "Crypto DPAA_SEC Unit Test Suite",
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               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_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                                               test_DES_docsis_mb_all),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+                            test_multi_session),
 
-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_AES_chain_dpaa_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_cipheronly_openssl_all),
+                            test_3DES_chain_dpaa_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_DES_cipheronly_openssl_all),
+                            test_AES_cipheronly_dpaa_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_DES_docsis_openssl_all),
+                            test_3DES_cipheronly_dpaa_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_openssl_all),
+                            test_authonly_dpaa_sec_all),
 
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8415,42 +10035,9 @@ static struct unit_test_suite cryptodev_openssl_testsuite  = {
                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),
-
-               /** 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_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
+                       test_AES_GCM_authenticated_decryption_test_case_7),
 
                /** AES GCM Authenticated Encryption 256 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8484,51 +10071,47 @@ static struct unit_test_suite cryptodev_openssl_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_decryption_test_case_256_7),
 
-               /** 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),
+               /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_4),
+                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_4),
+                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
                /** Scatter-Gather */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
-
-               /** 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_AES_GCM_auth_encrypt_SGL_in_place_1500B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
 
-static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
-       .suite_name = "Crypto Device AESNI GCM Unit Test Suite",
+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 = {
+               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_dpaa2_sec_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_3DES_chain_dpaa2_sec_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_cipheronly_dpaa2_sec_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_3DES_cipheronly_dpaa2_sec_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_authonly_dpaa2_sec_all),
+
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_1),
@@ -8625,252 +10208,146 @@ static struct unit_test_suite cryptodev_aesni_gcm_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),
-
-               /** 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),
-
-               /** 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),
-
                /** 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),
 
-               /** Session-less tests */
+               /** Scatter-Gather */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
+                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
-
-               /** Scatter-Gather */
+                       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_400B_1seg),
+               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 */
        }
 };
 
-static struct unit_test_suite cryptodev_sw_kasumi_testsuite  = {
-       .suite_name = "Crypto Device SW KASUMI Unit Test Suite",
+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 = {
-               /** 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_null_auth_only_operation),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
+                       test_null_cipher_only_operation),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
-
+                       test_null_cipher_auth_operation),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
+                       test_null_auth_cipher_operation),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-
-
+                       test_null_invalid_operation),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
+                       test_null_burst_operation),
 
-               /** 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 */
        }
 };
-static struct unit_test_suite cryptodev_sw_snow3g_testsuite  = {
-       .suite_name = "Crypto Device SW SNOW 3G Unit Test Suite",
+
+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 = {
-               /** 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_AES_chain_armv8_all),
 
+               /** Negative tests */
                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),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_offset_oop),
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
 
-               /** 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),
+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_snow3g_hash_generate_test_case_5),
+                               test_multi_session_random_usage),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_6),
+                               test_AES_chain_mrvl_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
+                               test_AES_cipheronly_mrvl_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
+                               test_authonly_mrvl_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-               /* Tests with buffers which length is not byte-aligned */
+                               test_3DES_chain_mrvl_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_4),
+                               test_3DES_cipheronly_mrvl_all),
+
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_5),
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_6),
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_cipher_auth_test_case_1),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
 
-static struct unit_test_suite cryptodev_sw_zuc_testsuite  = {
-       .suite_name = "Crypto Device SW ZUC Unit Test Suite",
+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 = {
-               /** 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_multi_session),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
+                               test_multi_session_random_usage),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
+                               test_AES_chain_ccp_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
+                               test_AES_cipheronly_ccp_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
+                               test_3DES_chain_ccp_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
+                               test_3DES_cipheronly_ccp_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
+                               test_authonly_ccp_all),
+
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
 
-static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
-       .suite_name = "Crypto DPAA2_SEC Unit Test Suite",
+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 = {
                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_dpaa2_sec_all),
+                       test_AES_chain_octeontx_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_chain_dpaa2_sec_all),
+                       test_AES_cipheronly_octeontx_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_cipheronly_dpaa2_sec_all),
+                       test_3DES_chain_octeontx_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_cipheronly_dpaa2_sec_all),
+                       test_3DES_cipheronly_octeontx_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_authonly_dpaa2_sec_all),
+                       test_authonly_octeontx_all),
 
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8903,110 +10380,167 @@ 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),
+               /** 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),
 
-               /** AES GCM Authenticated Encryption 192 bits key */
+               /** SNOW 3G encrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_1),
+                       test_snow3g_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_2),
+                       test_snow3g_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_3),
+                       test_snow3g_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_4),
+                       test_snow3g_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_5),
+                       test_snow3g_encryption_test_case_5),
+
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_6),
+                       test_snow3g_encryption_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_192_7),
+                       test_snow3g_decryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_oop_sgl),
 
-               /** AES GCM Authenticated Decryption 192 bits key */
+               /** SNOW 3G decrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_1),
+                       test_snow3g_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_2),
+                       test_snow3g_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_3),
+                       test_snow3g_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_4),
+                       test_snow3g_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_5),
+                       test_snow3g_decryption_test_case_5),
+
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_6),
+                       test_snow3g_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_192_7),
+                       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),
 
-               /** AES GCM Authenticated Encryption 256 bits key */
+               /** ZUC encrypt only (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
+                       test_zuc_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
+                       test_zuc_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
+                       test_zuc_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
+                       test_zuc_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
+                       test_zuc_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
+                       test_zuc_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
+                       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),
 
-               /** AES GCM Authenticated Decryption 256 bits key */
+               /** KASUMI encrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
+                       test_kasumi_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
+                       test_kasumi_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
+                       test_kasumi_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
+                       test_kasumi_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
+                       test_kasumi_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
+                       test_kasumi_encryption_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
+                       test_kasumi_encryption_test_case_1_oop_sgl),
+               /** 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),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               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),
 
-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 = {
+               /** KASUMI hash only (UIA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_only_operation),
+                       test_kasumi_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_only_operation),
+                       test_kasumi_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_cipher_auth_operation),
+                       test_kasumi_hash_generate_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_cipher_operation),
+                       test_kasumi_hash_generate_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_invalid_operation),
+                       test_kasumi_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_burst_operation),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+                       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),
 
-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),
+               /** NULL tests */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_cipher_only_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_null_auth_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),
 
                /** 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),
-
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -9018,13 +10552,29 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
                        RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
 
        if (gbl_driver_id == -1) {
-               RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check if "
-                               "CONFIG_RTE_LIBRTE_PMD_QAT is enabled "
+               RTE_LOG(ERR, USER1, "QAT PMD must be loaded. Check that both "
+               "CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM "
+               "are enabled in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_qat_testsuite);
+}
+
+static int
+test_cryptodev_virtio(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "VIRTIO PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_VIRTIO_CRYPTO is enabled "
                                "in config file to run this testsuite.\n");
                return TEST_FAILED;
        }
 
-       return unit_test_suite_runner(&cryptodev_qat_testsuite);
+       return unit_test_suite_runner(&cryptodev_virtio_testsuite);
 }
 
 static int
@@ -9037,7 +10587,7 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
                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_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_aesni_mb_testsuite);
@@ -9053,7 +10603,7 @@ test_cryptodev_openssl(void)
                RTE_LOG(ERR, USER1, "OPENSSL PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_OPENSSL is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_openssl_testsuite);
@@ -9069,7 +10619,7 @@ test_cryptodev_aesni_gcm(void)
                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_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_aesni_gcm_testsuite);
@@ -9085,7 +10635,7 @@ test_cryptodev_null(void)
                RTE_LOG(ERR, USER1, "NULL PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_NULL is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_null_testsuite);
@@ -9101,7 +10651,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "SNOW3G PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_SNOW3G is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_sw_snow3g_testsuite);
@@ -9117,7 +10667,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_KASUMI is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_sw_kasumi_testsuite);
@@ -9133,7 +10683,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "ZUC PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_ZUC is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_sw_zuc_testsuite);
@@ -9149,12 +10699,28 @@ test_cryptodev_armv8(void)
                RTE_LOG(ERR, USER1, "ARMV8 PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_ARMV8 is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_armv8_testsuite);
 }
 
+static int
+test_cryptodev_mrvl(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_MVSAM_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "MVSAM PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_MVSAM_CRYPTO is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_mrvl_testsuite);
+}
+
 #ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
 
 static int
@@ -9167,14 +10733,14 @@ test_cryptodev_scheduler(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "SCHEDULER PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_SCHEDULER is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        if (rte_cryptodev_driver_id_get(
                                RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)) == -1) {
                RTE_LOG(ERR, USER1, "CONFIG_RTE_LIBRTE_PMD_AESNI_MB must be"
                        " enabled in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
 }
        return unit_test_suite_runner(&cryptodev_scheduler_testsuite);
 }
@@ -9193,12 +10759,75 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                RTE_LOG(ERR, USER1, "DPAA2 SEC PMD must be loaded. Check if "
                                "CONFIG_RTE_LIBRTE_PMD_DPAA2_SEC is enabled "
                                "in config file to run this testsuite.\n");
-               return TEST_FAILED;
+               return TEST_SKIPPED;
        }
 
        return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
 }
 
+static int
+test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "DPAA SEC PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_DPAA_SEC is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_dpaa_sec_testsuite);
+}
+
+static int
+test_cryptodev_ccp(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_CCP_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "CCP PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_CCP is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_FAILED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_ccp_testsuite);
+}
+
+static int
+test_cryptodev_octeontx(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD));
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "OCTEONTX PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_OCTEONTX_CRYPTO is "
+                               "enabled in config file to run this "
+                               "testsuite.\n");
+               return TEST_FAILED;
+       }
+       return unit_test_suite_runner(&cryptodev_octeontx_testsuite);
+}
+
+static int
+test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "CAAM_JR PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_CAAM_JR is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_FAILED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_caam_jr_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_openssl_autotest, test_cryptodev_openssl);
@@ -9208,4 +10837,10 @@ REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g);
 REGISTER_TEST_COMMAND(cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi);
 REGISTER_TEST_COMMAND(cryptodev_sw_zuc_autotest, test_cryptodev_sw_zuc);
 REGISTER_TEST_COMMAND(cryptodev_sw_armv8_autotest, test_cryptodev_armv8);
+REGISTER_TEST_COMMAND(cryptodev_sw_mvsam_autotest, test_cryptodev_mrvl);
 REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_autotest, test_cryptodev_dpaa2_sec);
+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_caam_jr_autotest, test_cryptodev_caam_jr);