test/crypto: use generic test suite for OCTEON TX/TX2
[dpdk.git] / app / test / test_cryptodev.c
index c83d962..f1c11bc 100644 (file)
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2019 Intel Corporation
+ * Copyright(c) 2015-2020 Intel Corporation
  */
 
 #include <time.h>
@@ -11,6 +11,7 @@
 #include <rte_memcpy.h>
 #include <rte_pause.h>
 #include <rte_bus_vdev.h>
+#include <rte_ether.h>
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
 #include "test_cryptodev_zuc_test_vectors.h"
 #include "test_cryptodev_aead_test_vectors.h"
 #include "test_cryptodev_hmac_test_vectors.h"
+#include "test_cryptodev_mixed_test_vectors.h"
 #ifdef RTE_LIBRTE_SECURITY
 #include "test_cryptodev_security_pdcp_test_vectors.h"
 #include "test_cryptodev_security_pdcp_test_func.h"
+#include "test_cryptodev_security_docsis_test_vectors.h"
 #endif
 
 #define VDEV_ARGS_SIZE 100
@@ -51,6 +54,9 @@
 
 static int gbl_driver_id;
 
+static enum rte_security_session_action_type gbl_action_type =
+       RTE_SECURITY_ACTION_TYPE_NONE;
+
 struct crypto_testsuite_params {
        struct rte_mempool *mbuf_pool;
        struct rte_mempool *large_mbuf_pool;
@@ -68,12 +74,19 @@ struct crypto_unittest_params {
        struct rte_crypto_sym_xform cipher_xform;
        struct rte_crypto_sym_xform auth_xform;
        struct rte_crypto_sym_xform aead_xform;
+#ifdef RTE_LIBRTE_SECURITY
+       struct rte_security_docsis_xform docsis_xform;
+#endif
 
        union {
                struct rte_cryptodev_sym_session *sess;
+#ifdef RTE_LIBRTE_SECURITY
                struct rte_security_session *sec_session;
+#endif
        };
+#ifdef RTE_LIBRTE_SECURITY
        enum rte_security_session_action_type type;
+#endif
        struct rte_crypto_op *op;
 
        struct rte_mbuf *obuf, *ibuf;
@@ -134,11 +147,101 @@ ceil_byte_length(uint32_t num_bits)
                return (num_bits >> 3);
 }
 
+static void
+process_cpu_aead_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->aead.data.offset,
+               sop->aead.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->aead.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
+static void
+process_cpu_crypt_auth_op(uint8_t dev_id, struct rte_crypto_op *op)
+{
+       int32_t n, st;
+       void *iv;
+       struct rte_crypto_sym_op *sop;
+       union rte_crypto_sym_ofs ofs;
+       struct rte_crypto_sgl sgl;
+       struct rte_crypto_sym_vec symvec;
+       struct rte_crypto_vec vec[UINT8_MAX];
+
+       sop = op->sym;
+
+       n = rte_crypto_mbuf_to_vec(sop->m_src, sop->auth.data.offset,
+               sop->auth.data.length, vec, RTE_DIM(vec));
+
+       if (n < 0 || n != sop->m_src->nb_segs) {
+               op->status = RTE_CRYPTO_OP_STATUS_ERROR;
+               return;
+       }
+
+       sgl.vec = vec;
+       sgl.num = n;
+       symvec.sgl = &sgl;
+       iv = rte_crypto_op_ctod_offset(op, void *, IV_OFFSET);
+       symvec.iv = &iv;
+       symvec.aad = (void **)&sop->aead.aad.data;
+       symvec.digest = (void **)&sop->auth.digest.data;
+       symvec.status = &st;
+       symvec.num = 1;
+
+       ofs.raw = 0;
+       ofs.ofs.cipher.head = sop->cipher.data.offset - sop->auth.data.offset;
+       ofs.ofs.cipher.tail = (sop->auth.data.offset + sop->auth.data.length) -
+               (sop->cipher.data.offset + sop->cipher.data.length);
+
+       n = rte_cryptodev_sym_cpu_crypto_process(dev_id, sop->session, ofs,
+               &symvec);
+
+       if (n != 1)
+               op->status = RTE_CRYPTO_OP_STATUS_AUTH_FAILED;
+       else
+               op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+}
+
 static struct rte_crypto_op *
 process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
 {
+
+       RTE_VERIFY(gbl_action_type != RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO);
+
        if (rte_cryptodev_enqueue_burst(dev_id, 0, &op, 1) != 1) {
-               printf("Error sending packet for encryption");
+               RTE_LOG(ERR, USER1, "Error sending packet for encryption\n");
                return NULL;
        }
 
@@ -147,6 +250,11 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
        while (rte_cryptodev_dequeue_burst(dev_id, 0, &op, 1) == 0)
                rte_pause();
 
+       if (op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               RTE_LOG(DEBUG, USER1, "Operation status %d\n", op->status);
+               return NULL;
+       }
+
        return op;
 }
 
@@ -573,6 +681,7 @@ ut_teardown(void)
        struct rte_cryptodev_stats stats;
 
        /* free crypto session structure */
+#ifdef RTE_LIBRTE_SECURITY
        if (ut_params->type == RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL) {
                if (ut_params->sec_session) {
                        rte_security_session_destroy(rte_cryptodev_get_sec_ctx
@@ -580,7 +689,9 @@ ut_teardown(void)
                                                ut_params->sec_session);
                        ut_params->sec_session = NULL;
                }
-       } else {
+       } else
+#endif
+       {
                if (ut_params->sess) {
                        rte_cryptodev_sym_session_clear(
                                        ts_params->valid_devs[0],
@@ -664,17 +775,16 @@ test_device_configure_invalid_queue_pair_ids(void)
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-       /* valid - one queue pairs */
-       ts_params->conf.nb_queue_pairs = 1;
+       /* valid - max value queue pairs */
+       ts_params->conf.nb_queue_pairs = orig_nb_qps;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev: dev_id %u, qp_id %u",
                        ts_params->valid_devs[0], ts_params->conf.nb_queue_pairs);
 
-
-       /* valid - max value queue pairs */
-       ts_params->conf.nb_queue_pairs = orig_nb_qps;
+       /* valid - one queue pairs */
+       ts_params->conf.nb_queue_pairs = 1;
 
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
@@ -725,19 +835,14 @@ static int
 test_queue_pair_descriptor_setup(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct rte_cryptodev_info dev_info;
        struct rte_cryptodev_qp_conf qp_conf = {
                .nb_descriptors = MAX_NUM_OPS_INFLIGHT
        };
-
        uint16_t qp_id;
 
        /* Stop the device in case it's started so it can be configured */
        rte_cryptodev_stop(ts_params->valid_devs[0]);
 
-
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
-
        TEST_ASSERT_SUCCESS(rte_cryptodev_configure(ts_params->valid_devs[0],
                        &ts_params->conf),
                        "Failed to configure cryptodev %u",
@@ -791,36 +896,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 2 */
-       qp_conf.nb_descriptors = MAX_NUM_OPS_INFLIGHT + 2;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
-       /* invalid number of descriptors - max value of parameter */
-       qp_conf.nb_descriptors = UINT32_MAX-1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;
 
        for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
@@ -835,21 +910,6 @@ test_queue_pair_descriptor_setup(void)
                                ts_params->valid_devs[0]);
        }
 
-       /* invalid number of descriptors - max supported + 1 */
-       qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT + 1;
-
-       for (qp_id = 0; qp_id < ts_params->conf.nb_queue_pairs; qp_id++) {
-               TEST_ASSERT_FAIL(rte_cryptodev_queue_pair_setup(
-                               ts_params->valid_devs[0], qp_id, &qp_conf,
-                               rte_cryptodev_socket_id(
-                                               ts_params->valid_devs[0])),
-                               "Unexpectedly passed test for "
-                               "rte_cryptodev_queue_pair_setup:"
-                               "num_inflights %u on qp %u on cryptodev %u",
-                               qp_conf.nb_descriptors, qp_id,
-                               ts_params->valid_devs[0]);
-       }
-
        /* test invalid queue pair id */
        qp_conf.nb_descriptors = DEFAULT_NUM_OPS_INFLIGHT;      /*valid */
 
@@ -1340,6 +1400,19 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        /* Generate test mbuf data and space for digest */
        ut_params->ibuf = setup_test_string(ts_params->mbuf_pool,
                        catch_22_quote, QUOTE_512_BYTES, 0);
@@ -1409,8 +1482,14 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1560,8 +1639,14 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
        sym_op->cipher.data.length = QUOTE_512_BYTES;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                               process_crypto_request(ts_params->valid_devs[0],
+                                       ut_params->op),
+                                       "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
@@ -1583,7 +1668,7 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
 }
 
 static int
-test_AES_cipheronly_mb_all(void)
+test_blockcipher(enum blockcipher_test_type test_type)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        int status;
@@ -1592,9 +1677,10 @@ test_AES_cipheronly_mb_all(void)
                ts_params->op_mpool,
                ts_params->session_mpool, ts_params->session_priv_mpool,
                ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+               test_type);
+
+       if (status == -ENOTSUP)
+               return status;
 
        TEST_ASSERT_EQUAL(status, 0, "Test failed");
 
@@ -1602,1795 +1688,1763 @@ test_AES_cipheronly_mb_all(void)
 }
 
 static int
-test_AES_docsis_mb_all(void)
+test_AES_cipheronly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AES_CIPHERONLY_TYPE);
 }
 
 static int
-test_AES_docsis_qat_all(void)
+test_AES_docsis_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AES_DOCSIS_TYPE);
 }
 
 static int
-test_DES_docsis_qat_all(void)
+test_DES_docsis_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_DES_DOCSIS_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_DES_DOCSIS_TYPE);
 }
 
 static int
-test_authonly_mb_all(void)
+test_DES_cipheronly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_DES_CIPHERONLY_TYPE);
 }
 
 static int
-test_authonly_qat_all(void)
+test_authonly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AUTHONLY_TYPE);
 }
 
 static int
-test_AES_chain_null_all(void)
+test_AES_chain_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_NULL_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_AES_CHAIN_TYPE);
 }
 
 static int
-test_AES_cipheronly_null_all(void)
+test_3DES_chain_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_NULL_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_3DES_CHAIN_TYPE);
 }
 
 static int
-test_authonly_null_all(void)
+test_3DES_cipheronly_all(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_NULL_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return test_blockcipher(BLKCIPHER_3DES_CIPHERONLY_TYPE);
 }
 
+/* ***** SNOW 3G Tests ***** */
 static int
-test_AES_chain_mb_all(void)
+create_wireless_algo_hash_session(uint8_t dev_id,
+       const uint8_t *key, const uint8_t key_len,
+       const uint8_t iv_len, const uint8_t auth_len,
+       enum rte_crypto_auth_operation op,
+       enum rte_crypto_auth_algorithm algo)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t hash_key[key_len];
        int status;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-#ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
+       memcpy(hash_key, key, key_len);
 
-static int
-test_AES_cipheronly_scheduler_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       ut_params->auth_xform.auth.op = op;
+       ut_params->auth_xform.auth.algo = algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       ut_params->auth_xform.auth.key.data = hash_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+       ut_params->auth_xform.auth.iv.length = iv_len;
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       return TEST_SUCCESS;
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->auth_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
 }
 
 static int
-test_AES_chain_scheduler_all(void)
+create_wireless_algo_cipher_session(uint8_t dev_id,
+                       enum rte_crypto_cipher_operation op,
+                       enum rte_crypto_cipher_algorithm algo,
+                       const uint8_t *key, const uint8_t key_len,
+                       uint8_t iv_len)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t cipher_key[key_len];
        int status;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       memcpy(cipher_key, key, key_len);
 
-       return TEST_SUCCESS;
-}
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
 
-static int
-test_authonly_scheduler_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       ut_params->cipher_xform.cipher.algo = algo;
+       ut_params->cipher_xform.cipher.op = op;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = iv_len;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_SCHEDULER_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Create Crypto session */
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       return TEST_SUCCESS;
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
 }
 
-#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
-
 static int
-test_AES_chain_openssl_all(void)
+create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
+                       unsigned int cipher_len,
+                       unsigned int cipher_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       return TEST_SUCCESS;
-}
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                               "Failed to allocate pktmbuf offload");
 
-static int
-test_AES_cipheronly_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       return TEST_SUCCESS;
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = cipher_offset;
+       return 0;
 }
 
 static int
-test_AES_chain_ccp_all(void)
+create_wireless_algo_cipher_operation_oop(const uint8_t *iv, uint8_t iv_len,
+                       unsigned int cipher_len,
+                       unsigned int cipher_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                               "Failed to allocate pktmbuf offload");
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       return TEST_SUCCESS;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
+       sym_op->m_dst = ut_params->obuf;
+
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = cipher_offset;
+       return 0;
 }
 
 static int
-test_AES_cipheronly_ccp_all(void)
+create_wireless_algo_cipher_auth_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const uint8_t *key, uint8_t key_len,
+               uint8_t auth_iv_len, uint8_t auth_len,
+               uint8_t cipher_iv_len)
+
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t cipher_auth_key[key_len];
        int status;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       return TEST_SUCCESS;
-}
+       memcpy(cipher_auth_key, key, key_len);
 
-static int
-test_AES_chain_qat_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       /* Hash key = cipher key */
+       ut_params->auth_xform.auth.key.data = cipher_auth_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
 
-       return TEST_SUCCESS;
-}
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-static int
-test_AES_cipheronly_qat_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return status;
 
-       return TEST_SUCCESS;
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       return 0;
 }
 
 static int
-test_AES_cipheronly_virtio_all(void)
+create_wireless_cipher_auth_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const struct wireless_test_data *tdata)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       const uint8_t key_len = tdata->key.len;
+       uint8_t cipher_auth_key[key_len];
        int status;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_VIRTIO_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       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;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       memcpy(cipher_auth_key, key, key_len);
 
-       return TEST_SUCCESS;
-}
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.next = NULL;
 
-static int
-test_AES_chain_caam_jr_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       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;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       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;
-}
 
-static int
-test_AES_cipheronly_caam_jr_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                       &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       if (status == -ENOTSUP)
+               return status;
 
-       return TEST_SUCCESS;
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       return 0;
 }
 
 static int
-test_authonly_caam_jr_all(void)
+create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
+               const struct wireless_test_data *tdata)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
-}
-
+       return create_wireless_cipher_auth_session(dev_id,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_ZUC_EIA3,
+               RTE_CRYPTO_CIPHER_ZUC_EEA3, tdata);
+}
 
 static int
-test_AES_chain_dpaa_sec_all(void)
+create_wireless_algo_auth_cipher_session(uint8_t dev_id,
+               enum rte_crypto_cipher_operation cipher_op,
+               enum rte_crypto_auth_operation auth_op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
+               const uint8_t *key, const uint8_t key_len,
+               uint8_t auth_iv_len, uint8_t auth_len,
+               uint8_t cipher_iv_len)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t auth_cipher_key[key_len];
        int status;
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       memcpy(auth_cipher_key, key, key_len);
 
-       return TEST_SUCCESS;
-}
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = auth_op;
+       ut_params->auth_xform.next = &ut_params->cipher_xform;
+       ut_params->auth_xform.auth.algo = auth_algo;
+       ut_params->auth_xform.auth.key.length = key_len;
+       ut_params->auth_xform.auth.key.data = auth_cipher_key;
+       ut_params->auth_xform.auth.digest_length = auth_len;
+       /* Auth IV will be after cipher IV */
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
+       ut_params->auth_xform.auth.iv.length = auth_iv_len;
 
-static int
-test_AES_cipheronly_dpaa_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
+       ut_params->cipher_xform.cipher.algo = cipher_algo;
+       ut_params->cipher_xform.cipher.op = cipher_op;
+       ut_params->cipher_xform.cipher.key.data = auth_cipher_key;
+       ut_params->cipher_xform.cipher.key.length = key_len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       debug_hexdump(stdout, "key:", key, key_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       return TEST_SUCCESS;
-}
+       if (cipher_op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {
+               ut_params->auth_xform.next = NULL;
+               ut_params->cipher_xform.next = &ut_params->auth_xform;
+               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->cipher_xform,
+                               ts_params->session_priv_mpool);
 
-static int
-test_authonly_dpaa_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       } else
+               status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       if (status == -ENOTSUP)
+               return status;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       TEST_ASSERT_EQUAL(status, 0, "session init failed");
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
 static int
-test_AES_chain_dpaa2_sec_all(void)
+create_wireless_algo_hash_operation(const uint8_t *auth_tag,
+               unsigned int auth_tag_len,
+               const uint8_t *iv, unsigned int iv_len,
+               unsigned int data_pad_len,
+               enum rte_crypto_auth_operation op,
+               unsigned int auth_len, unsigned int auth_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       return TEST_SUCCESS;
-}
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+               "Failed to allocate pktmbuf offload");
 
-static int
-test_AES_cipheronly_dpaa2_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       return TEST_SUCCESS;
-}
+       /* iv */
+       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
+                       iv, iv_len);
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                                       ut_params->ibuf, auth_tag_len);
 
-static int
-test_authonly_dpaa2_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                               "no room to append auth tag");
+       ut_params->digest = sym_op->auth.digest.data;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, data_pad_len);
+       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       else
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA2_SEC_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       sym_op->auth.data.length = auth_len;
+       sym_op->auth.data.offset = auth_offset;
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
 static int
-test_authonly_openssl_all(void)
+create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
+       enum rte_crypto_auth_operation op)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       const uint8_t *auth_tag = tdata->digest.data;
+       const unsigned int auth_tag_len = tdata->digest.len;
+       unsigned int plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       unsigned int data_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       const uint8_t *cipher_iv = tdata->cipher_iv.data;
+       const uint8_t cipher_iv_len = tdata->cipher_iv.len;
+       const uint8_t *auth_iv = tdata->auth_iv.data;
+       const uint8_t auth_iv_len = tdata->auth_iv.len;
+       const unsigned int cipher_len = tdata->validCipherLenInBits.len;
+       const unsigned int auth_len = tdata->validAuthLenInBits.len;
 
-       return TEST_SUCCESS;
-}
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-static int
-test_authonly_ccp_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_AUTHONLY_TYPE);
+       /* set crypto operation source mbuf */
+       sym_op->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* digest */
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, auth_tag_len);
 
-       return TEST_SUCCESS;
-}
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append auth tag");
+       ut_params->digest = sym_op->auth.digest.data;
+       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       ut_params->ibuf, data_pad_len);
+       if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       else
+               rte_memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-static int
-test_AES_chain_armv8_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_ARMV8_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* Copy cipher and auth IVs at the end of the crypto operation */
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
+                                               IV_OFFSET);
+       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
+       iv_ptr += cipher_iv_len;
+       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       sym_op->cipher.data.length = cipher_len;
+       sym_op->cipher.data.offset = 0;
+       sym_op->auth.data.length = auth_len;
+       sym_op->auth.data.offset = 0;
 
-       return TEST_SUCCESS;
+       return 0;
 }
 
 static int
-test_AES_chain_mrvl_all(void)
+create_zuc_cipher_hash_generate_operation(
+               const struct wireless_test_data *tdata)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
-
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
-
-       return TEST_SUCCESS;
+       return create_wireless_cipher_hash_operation(tdata,
+               RTE_CRYPTO_AUTH_OP_GENERATE);
 }
 
 static int
-test_AES_cipheronly_mrvl_all(void)
+create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
+               const unsigned auth_tag_len,
+               const uint8_t *auth_iv, uint8_t auth_iv_len,
+               unsigned data_pad_len,
+               enum rte_crypto_auth_operation op,
+               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
+               const unsigned cipher_len, const unsigned cipher_offset,
+               const unsigned auth_len, const unsigned auth_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_AES_CIPHERONLY_TYPE);
+       enum rte_crypto_cipher_algorithm cipher_algo =
+                       ut_params->cipher_xform.cipher.algo;
+       enum rte_crypto_auth_algorithm auth_algo =
+                       ut_params->auth_xform.auth.algo;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
+       /* 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_authonly_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_AUTHONLY_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;
 
-       return TEST_SUCCESS;
-}
+       if (rte_pktmbuf_is_contiguous(ut_params->ibuf)) {
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                               ut_params->ibuf, data_pad_len);
+       } else {
+               struct rte_mbuf *m = ut_params->ibuf;
+               unsigned int offset = data_pad_len;
 
-static int
-test_3DES_chain_mrvl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+               while (offset > m->data_len && m->next != NULL) {
+                       offset -= m->data_len;
+                       m = m->next;
+               }
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       m, offset);
+       }
 
-       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);
+       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);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       debug_hexdump(stdout, "digest:",
+               sym_op->auth.digest.data,
+               auth_tag_len);
 
-       return TEST_SUCCESS;
+       /* 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);
+
+       if (cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3) {
+               sym_op->cipher.data.length = cipher_len;
+               sym_op->cipher.data.offset = cipher_offset;
+       } else {
+               sym_op->cipher.data.length = cipher_len >> 3;
+               sym_op->cipher.data.offset = cipher_offset >> 3;
+       }
+
+       if (auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+               auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+               auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3) {
+               sym_op->auth.data.length = auth_len;
+               sym_op->auth.data.offset = auth_offset;
+       } else {
+               sym_op->auth.data.length = auth_len >> 3;
+               sym_op->auth.data.offset = auth_offset >> 3;
+       }
+
+       return 0;
 }
 
 static int
-test_3DES_cipheronly_mrvl_all(void)
+create_wireless_algo_auth_cipher_operation(
+               const uint8_t *auth_tag, unsigned int auth_tag_len,
+               const uint8_t *cipher_iv, uint8_t cipher_iv_len,
+               const uint8_t *auth_iv, uint8_t auth_iv_len,
+               unsigned int data_pad_len,
+               unsigned int cipher_len, unsigned int cipher_offset,
+               unsigned int auth_len, unsigned int auth_offset,
+               uint8_t op_mode, uint8_t do_sgl, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_MVSAM_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       enum rte_crypto_cipher_algorithm cipher_algo =
+                       ut_params->cipher_xform.cipher.algo;
+       enum rte_crypto_auth_algorithm auth_algo =
+                       ut_params->auth_xform.auth.algo;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate pktmbuf offload");
 
-       return TEST_SUCCESS;
-}
+       /* Set crypto operation data parameters */
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-static int
-test_AES_chain_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool, ts_params->session_mpool,
-               ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)),
-               BLKCIPHER_AES_CHAIN_TYPE);
+       /* set crypto operation mbufs */
+       sym_op->m_src = ut_params->ibuf;
+       if (op_mode == OUT_OF_PLACE)
+               sym_op->m_dst = ut_params->obuf;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* digest */
+       if (!do_sgl) {
+               sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(
+                       (op_mode == IN_PLACE ?
+                               ut_params->ibuf : ut_params->obuf),
+                       uint8_t *, data_pad_len);
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
+                       (op_mode == IN_PLACE ?
+                               ut_params->ibuf : ut_params->obuf),
+                       data_pad_len);
+               memset(sym_op->auth.digest.data, 0, auth_tag_len);
+       } else {
+               uint16_t remaining_off = (auth_offset >> 3) + (auth_len >> 3);
+               struct rte_mbuf *sgl_buf = (op_mode == IN_PLACE ?
+                               sym_op->m_src : sym_op->m_dst);
+               while (remaining_off >= rte_pktmbuf_data_len(sgl_buf)) {
+                       remaining_off -= rte_pktmbuf_data_len(sgl_buf);
+                       sgl_buf = sgl_buf->next;
+               }
+               sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(sgl_buf,
+                               uint8_t *, remaining_off);
+               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(sgl_buf,
+                               remaining_off);
+               memset(sym_op->auth.digest.data, 0, remaining_off);
+               while (sgl_buf->next != NULL) {
+                       memset(rte_pktmbuf_mtod(sgl_buf, uint8_t *),
+                               0, rte_pktmbuf_data_len(sgl_buf));
+                       sgl_buf = sgl_buf->next;
+               }
+       }
 
-       return TEST_SUCCESS;
-}
+       /* Copy digest for the verification */
+       if (verify)
+               memcpy(sym_op->auth.digest.data, auth_tag, auth_tag_len);
 
-static int
-test_AES_cipheronly_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Copy cipher and auth IVs at the end of the crypto operation */
+       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(
+                       ut_params->op, uint8_t *, IV_OFFSET);
 
-       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);
+       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
+       iv_ptr += cipher_iv_len;
+       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       if (cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 ||
+               cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3) {
+               sym_op->cipher.data.length = cipher_len;
+               sym_op->cipher.data.offset = cipher_offset;
+       } else {
+               sym_op->cipher.data.length = cipher_len >> 3;
+               sym_op->cipher.data.offset = cipher_offset >> 3;
+       }
 
-       return TEST_SUCCESS;
+       if (auth_algo == RTE_CRYPTO_AUTH_SNOW3G_UIA2 ||
+               auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9 ||
+               auth_algo == RTE_CRYPTO_AUTH_ZUC_EIA3) {
+               sym_op->auth.data.length = auth_len;
+               sym_op->auth.data.offset = auth_offset;
+       } else {
+               sym_op->auth.data.length = auth_len >> 3;
+               sym_op->auth.data.offset = auth_offset >> 3;
+       }
+
+       return 0;
 }
 
 static int
-test_3DES_chain_octeontx_all(void)
+test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool, ts_params->session_mpool,
-               ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OCTEONTX_SYM_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       return TEST_SUCCESS;
-}
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
 
-static int
-test_3DES_cipheronly_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       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);
+       /* 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;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       return TEST_SUCCESS;
-}
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-test_authonly_octeontx_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       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);
 
-       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);
+       /* 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;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       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;
 
-       return TEST_SUCCESS;
+       /* 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;
 }
 
-/* ***** SNOW 3G Tests ***** */
 static int
-create_wireless_algo_hash_session(uint8_t dev_id,
-       const uint8_t *key, const uint8_t key_len,
-       const uint8_t iv_len, const uint8_t auth_len,
-       enum rte_crypto_auth_operation op,
-       enum rte_crypto_auth_algorithm algo)
+test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
 {
-       uint8_t hash_key[key_len];
-       int status;
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(hash_key, key, key_len);
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+       struct rte_cryptodev_info dev_info;
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* 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 = op;
-       ut_params->auth_xform.auth.algo = algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       ut_params->auth_xform.auth.key.data = hash_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
-       ut_params->auth_xform.auth.iv.length = iv_len;
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-create_wireless_algo_cipher_session(uint8_t dev_id,
-                       enum rte_crypto_cipher_operation op,
-                       enum rte_crypto_cipher_algorithm algo,
-                       const uint8_t *key, const uint8_t key_len,
-                       uint8_t iv_len)
-{
-       uint8_t cipher_key[key_len];
-       int status;
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       /* Create SNOW 3G session */
+       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
+                               tdata->key.data, tdata->key.len,
+                               tdata->auth_iv.len, tdata->digest.len,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               RTE_CRYPTO_AUTH_SNOW3G_UIA2);
+       if (retval < 0)
+               return retval;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       memcpy(cipher_key, key, key_len);
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       ut_params->cipher_xform.cipher.algo = algo;
-       ut_params->cipher_xform.cipher.op = op;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = iv_len;
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_hash_operation(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;
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+       ut_params->obuf = ut_params->op->sym->m_src;
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                               + plaintext_pad_len;
 
-       /* Create Crypto session */
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Validate obuf */
+       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
+               return 0;
+       else
+               return -1;
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 static int
-create_wireless_algo_cipher_operation(const uint8_t *iv, uint8_t iv_len,
-                       unsigned int cipher_len,
-                       unsigned int cipher_offset)
+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;
 
-       /* 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");
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       /* 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;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* 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;
-}
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-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;
+       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);
 
-       /* 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");
+       /* 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;
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       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;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-       sym_op->m_dst = ut_params->obuf;
+       /* 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");
 
-       /* iv */
-       rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
-                       iv, iv_len);
-       sym_op->cipher.data.length = cipher_len;
-       sym_op->cipher.data.offset = cipher_offset;
        return 0;
 }
 
 static int
-create_wireless_algo_cipher_auth_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const uint8_t *key, uint8_t key_len,
-               uint8_t auth_iv_len, uint8_t auth_len,
-               uint8_t cipher_iv_len)
-
+test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
 {
-       uint8_t cipher_auth_key[key_len];
-       int status;
-
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       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;
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
 
-       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;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+       /* 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);
 
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_hash_operation(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;
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
+       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;
 
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
 
 static int
-create_wireless_cipher_auth_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const struct wireless_test_data *tdata)
+test_snow3g_hash_generate_test_case_1(void)
 {
-       const uint8_t key_len = tdata->key.len;
-       uint8_t cipher_auth_key[key_len];
-       int status;
-
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       const uint8_t *key = tdata->key.data;
-       const uint8_t auth_len = tdata->digest.len;
-       uint8_t cipher_iv_len = tdata->cipher_iv.len;
-       uint8_t auth_iv_len = tdata->auth_iv.len;
+       return test_snow3g_authentication(&snow3g_hash_test_case_1);
+}
 
-       memcpy(cipher_auth_key, key, key_len);
+static int
+test_snow3g_hash_generate_test_case_2(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_2);
+}
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
+static int
+test_snow3g_hash_generate_test_case_3(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_3);
+}
 
-       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;
+static int
+test_snow3g_hash_generate_test_case_4(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_4);
+}
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
+static int
+test_snow3g_hash_generate_test_case_5(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_5);
+}
 
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = cipher_auth_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+static int
+test_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);
 
-       debug_hexdump(stdout, "key:", key, key_len);
+}
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+static int
+test_snow3g_hash_verify_test_case_2(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_2);
+}
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
+static int
+test_snow3g_hash_verify_test_case_3(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_3);
+}
 
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-       return 0;
+static int
+test_snow3g_hash_verify_test_case_4(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_4);
 }
 
 static int
-create_zuc_cipher_auth_encrypt_generate_session(uint8_t dev_id,
-               const struct wireless_test_data *tdata)
+test_snow3g_hash_verify_test_case_5(void)
 {
-       return create_wireless_cipher_auth_session(dev_id,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE, RTE_CRYPTO_AUTH_ZUC_EIA3,
-               RTE_CRYPTO_CIPHER_ZUC_EEA3, tdata);
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_5);
 }
 
 static int
-create_wireless_algo_auth_cipher_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation cipher_op,
-               enum rte_crypto_auth_operation auth_op,
-               enum rte_crypto_auth_algorithm auth_algo,
-               enum rte_crypto_cipher_algorithm cipher_algo,
-               const uint8_t *key, const uint8_t key_len,
-               uint8_t auth_iv_len, uint8_t auth_len,
-               uint8_t cipher_iv_len)
+test_snow3g_hash_verify_test_case_6(void)
 {
-       uint8_t auth_cipher_key[key_len];
-       int status;
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_6);
+}
 
-       memcpy(auth_cipher_key, key, key_len);
+static int
+test_kasumi_hash_generate_test_case_1(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_1);
+}
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
-       ut_params->auth_xform.auth.algo = auth_algo;
-       ut_params->auth_xform.auth.key.length = key_len;
-       ut_params->auth_xform.auth.key.data = auth_cipher_key;
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       /* Auth IV will be after cipher IV */
-       ut_params->auth_xform.auth.iv.offset = IV_OFFSET + cipher_iv_len;
-       ut_params->auth_xform.auth.iv.length = auth_iv_len;
+static int
+test_kasumi_hash_generate_test_case_2(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_2);
+}
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
-       ut_params->cipher_xform.cipher.algo = cipher_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = auth_cipher_key;
-       ut_params->cipher_xform.cipher.key.length = key_len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = cipher_iv_len;
+static int
+test_kasumi_hash_generate_test_case_3(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_3);
+}
 
-       debug_hexdump(stdout, "key:", key, key_len);
+static int
+test_kasumi_hash_generate_test_case_4(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_4);
+}
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+static int
+test_kasumi_hash_generate_test_case_5(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_5);
+}
 
-       status = rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_EQUAL(status, 0, "session init failed");
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+static int
+test_kasumi_hash_generate_test_case_6(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_6);
+}
 
-       return 0;
+static int
+test_kasumi_hash_verify_test_case_1(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_1);
 }
 
 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_kasumi_hash_verify_test_case_2(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_2);
+}
 
-       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;
+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;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       int retval;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_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);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       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);
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-       debug_hexdump(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       sym_op->auth.data.length = auth_len;
-       sym_op->auth.data.offset = auth_offset;
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
+       if (retval < 0)
+               return retval;
+
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
 static int
-create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
-       enum rte_crypto_auth_operation op)
+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;
 
-       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);
+       int retval;
 
-       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;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate pktmbuf offload");
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       uint8_t buffer[10000];
+       const uint8_t *ciphertext;
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       struct rte_cryptodev_info dev_info;
 
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       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);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       debug_hexdump(stdout, "digest:",
-               sym_op->auth.digest.data,
-               auth_tag_len);
+       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+               printf("Device doesn't support in-place scatter-gather. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
 
-       /* Copy cipher and auth IVs at the end of the crypto operation */
-       uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op, uint8_t *,
-                                               IV_OFFSET);
-       rte_memcpy(iv_ptr, cipher_iv, cipher_iv_len);
-       iv_ptr += cipher_iv_len;
-       rte_memcpy(iv_ptr, auth_iv, auth_iv_len);
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-       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;
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
 
-       return 0;
-}
 
-static int
-create_zuc_cipher_hash_generate_operation(
-               const struct wireless_test_data *tdata)
-{
-       return create_wireless_cipher_hash_operation(tdata,
-               RTE_CRYPTO_AUTH_OP_GENERATE);
-}
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
 
-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)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 10, 0);
 
-       /* 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);
+       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
+       if (retval < 0)
+               return retval;
 
-       /* 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");
 
-       /* digest */
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, auth_tag_len);
+       ut_params->obuf = ut_params->op->sym->m_dst;
 
-       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);
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                               plaintext_len, buffer);
        else
-               rte_memcpy(sym_op->auth.digest.data, auth_tag, 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);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
+                               tdata->validCipherOffsetInBits.len >> 3,
+                               plaintext_len, buffer);
 
-       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;
+       /* Validate obuf */
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
 static int
-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,
-               uint8_t op_mode, uint8_t do_sgl)
+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;
 
-       /* 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");
+       int retval;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       /* set crypto operation mbufs */
-       sym_op->m_src = ut_params->ibuf;
-       if (op_mode == OUT_OF_PLACE)
-               sym_op->m_dst = ut_params->obuf;
-
-       /* digest */
-       if (!do_sgl) {
-               sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(
-                       (op_mode == IN_PLACE ?
-                               ut_params->ibuf : ut_params->obuf),
-                       uint8_t *, data_pad_len);
-               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       (op_mode == IN_PLACE ?
-                               ut_params->ibuf : ut_params->obuf),
-                       data_pad_len);
-               memset(sym_op->auth.digest.data, 0, auth_tag_len);
-       } else {
-               uint16_t remaining_off = (auth_offset >> 3) + (auth_len >> 3);
-               struct rte_mbuf *sgl_buf = (op_mode == IN_PLACE ?
-                               sym_op->m_src : sym_op->m_dst);
-               while (remaining_off >= rte_pktmbuf_data_len(sgl_buf)) {
-                       remaining_off -= rte_pktmbuf_data_len(sgl_buf);
-                       sgl_buf = sgl_buf->next;
-               }
-               sym_op->auth.digest.data = rte_pktmbuf_mtod_offset(sgl_buf,
-                               uint8_t *, remaining_off);
-               sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(sgl_buf,
-                               remaining_off);
-               memset(sym_op->auth.digest.data, 0, remaining_off);
-               while (sgl_buf->next != NULL) {
-                       memset(rte_pktmbuf_mtod(sgl_buf, uint8_t *),
-                               0, rte_pktmbuf_data_len(sgl_buf));
-                       sgl_buf = sgl_buf->next;
-               }
-       }
-
-       /* 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_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;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Create 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);
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
-       /* alloc mbuf and set payload */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len,
-                       tdata->auth_iv.data, tdata->auth_iv.len,
-                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata->validAuthLenInBits.len,
-                       0);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
-       ut_params->obuf = ut_params->op->sym->m_src;
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + plaintext_pad_len;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-       ut_params->digest,
-       tdata->digest.data,
-       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-       "SNOW 3G Generated auth tag not as expected");
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
+test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
-                               tdata->key.data, tdata->key.len,
-                               tdata->auth_iv.len, tdata->digest.len,
-                               RTE_CRYPTO_AUTH_OP_VERIFY,
-                               RTE_CRYPTO_AUTH_SNOW3G_UIA2);
+       const uint8_t *ciphertext;
+       uint8_t buffer[2048];
+
+       struct rte_cryptodev_info dev_info;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+               printf("Device doesn't support out-of-place scatter-gather "
+                               "in both input and output mbufs. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
-       /* alloc mbuf and set payload */
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_hash_operation(tdata->digest.data,
-                       tdata->digest.len,
-                       tdata->auth_iv.data, tdata->auth_iv.len,
-                       plaintext_pad_len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       tdata->validAuthLenInBits.len,
-                       0);
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 10, 0);
+       ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 3, 0);
+
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                               + plaintext_pad_len;
 
-       /* Validate obuf */
-       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
-               return 0;
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                               plaintext_pad_len, buffer);
        else
-               return -1;
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
+                               tdata->validCipherOffsetInBits.len >> 3,
+                               plaintext_pad_len, buffer);
 
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
+
 static int
-test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
+test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        /* Create KASUMI session */
-       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
-                       tdata->key.data, tdata->key.len,
-                       0, tdata->digest.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_KASUMI_F9);
-       if (retval < 0)
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
+       if (retval < 0)
                return retval;
 
-       /* alloc mbuf and set payload */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create KASUMI operation */
-       retval = create_wireless_algo_hash_operation(NULL, tdata->digest.len,
-                       NULL, 0,
-                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata->plaintext.len,
-                       0);
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                               tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
-       ut_params->obuf = ut_params->op->sym->m_src;
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + plaintext_pad_len;
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-       ut_params->digest,
-       tdata->digest.data,
-       DIGEST_BYTE_LENGTH_KASUMI_F9,
-       "KASUMI Generated auth tag not as expected");
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
+       const uint8_t *reference_plaintext = tdata->plaintext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               plaintext,
+               reference_plaintext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext data not as expected");
        return 0;
 }
 
 static int
-test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
+test_kasumi_decryption(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        /* Create KASUMI session */
-       retval = create_wireless_algo_hash_session(ts_params->valid_devs[0],
-                               tdata->key.data, tdata->key.len,
-                               0, tdata->digest.len,
-                               RTE_CRYPTO_AUTH_OP_VERIFY,
-                               RTE_CRYPTO_AUTH_KASUMI_F9);
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
-       /* alloc mbuf and set payload */
+
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
        /* Append data which is padded to a multiple */
        /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+
+       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create KASUMI operation */
-       retval = create_wireless_algo_hash_operation(tdata->digest.data,
-                       tdata->digest.len,
-                       NULL, 0,
-                       plaintext_pad_len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY,
-                       tdata->plaintext.len,
-                       0);
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->ciphertext.len,
+                                       tdata->validCipherOffsetInBits.len);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                               ut_params->op);
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                               + plaintext_pad_len;
 
-       /* Validate obuf */
-       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
-               return 0;
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               return -1;
+               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
 
+       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
+
+       const uint8_t *reference_plaintext = tdata->plaintext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               plaintext,
+               reference_plaintext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext data not as expected");
        return 0;
 }
 
 static int
-test_snow3g_hash_generate_test_case_1(void)
+test_snow3g_encryption(const struct snow3g_test_data *tdata)
 {
-       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);
-}
+       int retval;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
-static int
-test_snow3g_hash_generate_test_case_3(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_3);
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-static int
-test_snow3g_hash_generate_test_case_4(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_4);
-}
+       /* Create SNOW 3G session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
 
-static int
-test_snow3g_hash_generate_test_case_5(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_5);
-}
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-static int
-test_snow3g_hash_generate_test_case_6(void)
-{
-       return test_snow3g_authentication(&snow3g_hash_test_case_6);
-}
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-test_snow3g_hash_verify_test_case_1(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_1);
+       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);
 
-static int
-test_snow3g_hash_verify_test_case_2(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_2);
-}
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       0);
+       if (retval < 0)
+               return retval;
 
-static int
-test_snow3g_hash_verify_test_case_3(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_3);
-}
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                                               ut_params->op);
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-static int
-test_snow3g_hash_verify_test_case_4(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_4);
-}
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+       else
+               ciphertext = plaintext;
 
-static int
-test_snow3g_hash_verify_test_case_5(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_5);
-}
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-static int
-test_snow3g_hash_verify_test_case_6(void)
-{
-       return test_snow3g_authentication_verify(&snow3g_hash_test_case_6);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
+               "SNOW 3G Ciphertext data not as expected");
+       return 0;
 }
 
-static int
-test_kasumi_hash_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)
+test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
 
        int retval;
-       uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
-       /* Create KASUMI session */
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
 
        /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       0);
        if (retval < 0)
                return retval;
 
@@ -3402,73 +3456,83 @@ test_kasumi_encryption(const struct kasumi_test_data *tdata)
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
+               ciphertext = plaintext;
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
+               "SNOW 3G Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
+test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
-
        uint8_t buffer[10000];
        const uint8_t *ciphertext;
 
        struct rte_cryptodev_info dev_info;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
        uint64_t feat_flags = dev_info.feature_flags;
 
-       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
-               printf("Device doesn't support in-place scatter-gather. "
+       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+               printf("Device doesn't support out-of-place scatter-gather "
+                               "in both input and output mbufs. "
                                "Test Skipped.\n");
                return -ENOTSUP;
        }
 
-       /* Create KASUMI session */
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-
-
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
        ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
                        plaintext_pad_len, 10, 0);
+       ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 3, 0);
+
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
 
        pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       0);
        if (retval < 0)
                return retval;
 
@@ -3477,44 +3541,79 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
        ut_params->obuf = ut_params->op->sym->m_dst;
-
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
                                plaintext_len, buffer);
        else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
-                               tdata->validCipherOffsetInBits.len >> 3,
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
                                plaintext_len, buffer);
 
-       /* Validate obuf */
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
+               "SNOW 3G Ciphertext data not as expected");
+
        return 0;
 }
 
+/* Shift right a buffer by "offset" bits, "offset" < 8 */
+static void
+buffer_shift_right(uint8_t *buffer, uint32_t length, uint8_t offset)
+{
+       uint8_t curr_byte, prev_byte;
+       uint32_t length_in_bytes = ceil_byte_length(length + offset);
+       uint8_t lower_byte_mask = (1 << offset) - 1;
+       unsigned i;
+
+       prev_byte = buffer[0];
+       buffer[0] >>= offset;
+
+       for (i = 1; i < length_in_bytes; i++) {
+               curr_byte = buffer[i];
+               buffer[i] = ((prev_byte & lower_byte_mask) << (8 - offset)) |
+                               (curr_byte >> offset);
+               prev_byte = curr_byte;
+       }
+}
+
 static int
-test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
+test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-
-       int retval;
        uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+       int retval;
+       uint32_t plaintext_len;
+       uint32_t plaintext_pad_len;
+       uint8_t extra_offset = 4;
+       uint8_t *expected_ciphertext_shifted;
+       struct rte_cryptodev_info dev_info;
 
-       /* Create KASUMI session */
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validDataLenInBits.len % 8) != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
@@ -3523,26 +3622,38 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
        ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
+
        /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len + extra_offset);
+       /*
+        * Append data which is padded to a
+        * multiple of the algorithms block size
+        */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+
+       plaintext = (uint8_t *) rte_pktmbuf_append(ut_params->ibuf,
+                                               plaintext_pad_len);
+
        rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       memcpy(plaintext, tdata->plaintext.data, (tdata->plaintext.len >> 3));
+       buffer_shift_right(plaintext, tdata->plaintext.len, extra_offset);
 
-       /* Create KASUMI operation */
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+#endif
+       /* Create SNOW 3G operation */
        retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       extra_offset);
        if (retval < 0)
                return retval;
 
@@ -3554,263 +3665,235 @@ test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               ciphertext = plaintext + (tdata->validCipherOffsetInBits.len >> 3);
+               ciphertext = plaintext;
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+#endif
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
-       /* 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_sgl(const struct kasumi_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       int retval;
-       unsigned 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);
-
-       uint64_t feat_flags = dev_info.feature_flags;
-       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
-               printf("Device doesn't support out-of-place scatter-gather "
-                               "in both input and output mbufs. "
-                               "Test Skipped.\n");
-               return -ENOTSUP;
-       }
-
-       /* Create KASUMI session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
-
-       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);
-
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
-       if (retval < 0)
-               return retval;
-
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+       expected_ciphertext_shifted = rte_malloc(NULL, plaintext_len, 8);
 
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
-                               plaintext_pad_len, buffer);
-       else
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf,
-                               tdata->validCipherOffsetInBits.len >> 3,
-                               plaintext_pad_len, buffer);
+       TEST_ASSERT_NOT_NULL(expected_ciphertext_shifted,
+                       "failed to reserve memory for ciphertext shifted\n");
 
-       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
+       memcpy(expected_ciphertext_shifted, tdata->ciphertext.data,
+                       ceil_byte_length(tdata->ciphertext.len));
+       buffer_shift_right(expected_ciphertext_shifted, tdata->ciphertext.len,
+                       extra_offset);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
                ciphertext,
-               reference_ciphertext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Ciphertext data not as expected");
+               expected_ciphertext_shifted,
+               tdata->validDataLenInBits.len,
+               extra_offset,
+               "SNOW 3G Ciphertext data not as expected");
        return 0;
 }
 
-
-static int
-test_kasumi_decryption_oop(const struct kasumi_test_data *tdata)
+static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       uint8_t *ciphertext, *plaintext;
+
+       uint8_t *plaintext, *ciphertext;
        unsigned ciphertext_pad_len;
        unsigned ciphertext_len;
 
-       /* Create KASUMI session */
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_DECRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
                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);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
        ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                ciphertext_pad_len);
-       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
        memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                               tdata->cipher_iv.len,
-                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
-                               tdata->validCipherOffsetInBits.len);
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       tdata->cipher.offset_bits);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
                plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+               plaintext = ciphertext;
 
        debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
-       const uint8_t *reference_plaintext = tdata->plaintext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               plaintext,
-               reference_plaintext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Plaintext data not as expected");
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
+                               tdata->plaintext.data,
+                               tdata->validDataLenInBits.len,
+                               "SNOW 3G Plaintext data not as expected");
        return 0;
 }
 
-static int
-test_kasumi_decryption(const struct kasumi_test_data *tdata)
+static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
-       uint8_t *ciphertext, *plaintext;
+
+       uint8_t *plaintext, *ciphertext;
        unsigned ciphertext_pad_len;
        unsigned ciphertext_len;
 
-       /* Create KASUMI session */
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create SNOW 3G session */
        retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_DECRYPT,
-                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len,
                                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer");
 
        /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
+       memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                      rte_pktmbuf_tailroom(ut_params->obuf));
+
        ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
        ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                ciphertext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
        memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
-       /* Create KASUMI operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+       /* Create SNOW 3G operation */
+       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
                                        tdata->cipher_iv.len,
-                                       tdata->ciphertext.len,
-                                       tdata->validCipherOffsetInBits.len);
+                                       tdata->validCipherLenInBits.len,
+                                       0);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                                                ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
        ut_params->obuf = ut_params->op->sym->m_dst;
        if (ut_params->obuf)
                plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
-               plaintext = ciphertext + (tdata->validCipherOffsetInBits.len >> 3);
+               plaintext = ciphertext;
 
        debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
 
-       const uint8_t *reference_plaintext = tdata->plaintext.data +
-                               (tdata->validCipherOffsetInBits.len >> 3);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               plaintext,
-               reference_plaintext,
-               tdata->validCipherLenInBits.len,
-               "KASUMI Plaintext data not as expected");
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
+                               tdata->plaintext.data,
+                               tdata->validDataLenInBits.len,
+                               "SNOW 3G Plaintext data not as expected");
        return 0;
 }
 
 static int
-test_snow3g_encryption(const struct snow3g_test_data *tdata)
+test_zuc_cipher_auth(const struct wireless_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
+
        uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
 
-       /* 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);
+       struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       ((tdata->validAuthLenInBits.len % 8 != 0) ||
+                       (tdata->validDataLenInBits.len % 8 != 0))) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
+       }
+
+       /* 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 */
+       /* 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 */
@@ -3822,67 +3905,81 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+       /* Create ZUC operation */
+       retval = create_zuc_cipher_hash_generate_operation(tdata);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
-       ut_params->obuf = ut_params->op->sym->m_dst;
+       ut_params->obuf = ut_params->op->sym->m_src;
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
                ciphertext = plaintext;
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "ZUC Ciphertext data not as expected");
+
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+           + plaintext_pad_len;
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       4,
+                       "ZUC Generated auth tag not as expected");
        return 0;
 }
 
-
 static int
-test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
+test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *plaintext, *ciphertext;
 
        int retval;
+
+       uint8_t *plaintext, *ciphertext;
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
+       retval = create_wireless_algo_cipher_auth_session(ts_params->valid_devs[0],
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
-
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer in mempool");
 
-       /* Clear mbuf payload */
+       /* clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
        /* Append data which is padded to a multiple of */
@@ -3890,459 +3987,797 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
        plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                                plaintext_pad_len);
-       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
        memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+       retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data,
+                       tdata->digest.len, tdata->auth_iv.data,
+                       tdata->auth_iv.len,
+                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                       tdata->cipher_iv.data, tdata->cipher_iv.len,
+                       tdata->validCipherLenInBits.len,
+                       0,
+                       tdata->validAuthLenInBits.len,
+                       0
+                       );
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-
-       ut_params->obuf = ut_params->op->sym->m_dst;
+       ut_params->obuf = ut_params->op->sym->m_src;
        if (ut_params->obuf)
                ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
        else
                ciphertext = plaintext;
 
        debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validDataLenInBits.len,
-               "SNOW 3G Ciphertext data not as expected");
+                       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,
+                       "SNOW 3G Generated auth tag not as expected");
        return 0;
 }
 
 static int
-test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)
+test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
+
+       uint8_t *plaintext = NULL, *ciphertext = NULL;
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
-       uint8_t buffer[10000];
-       const uint8_t *ciphertext;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
 
        struct rte_cryptodev_info dev_info;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
        uint64_t feat_flags = dev_info.feature_flags;
 
-       if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
-               printf("Device doesn't support out-of-place scatter-gather "
-                               "in both input and output mbufs. "
-                               "Test Skipped.\n");
-               return -ENOTSUP;
+       if (op_mode == OUT_OF_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
        }
 
        /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
        if (retval < 0)
                return retval;
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (op_mode == OUT_OF_PLACE)
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 10, 0);
-       ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 3, 0);
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+               rte_pktmbuf_tailroom(ut_params->ibuf));
+       if (op_mode == OUT_OF_PLACE)
+               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->obuf));
 
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer in mempool");
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+       if (verify) {
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       ciphertext_pad_len);
+               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       plaintext_pad_len);
+               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+               debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       }
 
        /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       0);
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               tdata->auth_iv.data, tdata->auth_iv.len,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->cipher.offset_bits,
+               tdata->validAuthLenInBits.len,
+               tdata->auth.offset_bits,
+               op_mode, 0, verify);
+
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       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, 0,
-                               plaintext_len, buffer);
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       plaintext = ciphertext +
+                               (tdata->cipher.offset_bits >> 3);
 
-       /* 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,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       ciphertext = plaintext;
 
-       return 0;
-}
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
 
-/* 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;
+               ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                       + (tdata->digest.offset_bytes == 0 ?
+               plaintext_pad_len : tdata->digest.offset_bytes);
 
-       prev_byte = buffer[0];
-       buffer[0] >>= offset;
+               debug_hexdump(stdout, "digest:", ut_params->digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:", tdata->digest.data,
+                               tdata->digest.len);
+       }
 
-       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;
+       /* Validate obuf */
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "SNOW 3G Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "SNOW 3G Ciphertext data not as expected");
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                       "SNOW 3G Generated auth tag not as expected");
        }
+       return 0;
 }
 
 static int
-test_snow3g_encryption_offset_oop(const struct snow3g_test_data *tdata)
+test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *plaintext, *ciphertext;
+
        int retval;
-       uint32_t plaintext_len;
-       uint32_t plaintext_pad_len;
-       uint8_t extra_offset = 4;
-       uint8_t *expected_ciphertext_shifted;
+
+       const uint8_t *plaintext = NULL;
+       const uint8_t *ciphertext = NULL;
+       const uint8_t *digest = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
+       uint8_t buffer[10000];
+       uint8_t digest_buffer[10000];
+
+       struct rte_cryptodev_info dev_info;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_SNOW3G_UEA2;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
 
        /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       tdata->key.data, tdata->key.len,
+                       tdata->auth_iv.len, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
        if (retval < 0)
                return retval;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 15, 0);
        TEST_ASSERT_NOT_NULL(ut_params->ibuf,
                        "Failed to allocate input buffer in mempool");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer in mempool");
-
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       plaintext_len = ceil_byte_length(tdata->plaintext.len + extra_offset);
-       /*
-        * Append data which is padded to a
-        * multiple of the algorithms block size
-        */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-
-       plaintext = (uint8_t *) rte_pktmbuf_append(ut_params->ibuf,
-                                               plaintext_pad_len);
 
-       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+       if (op_mode == OUT_OF_PLACE) {
+               ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                               plaintext_pad_len, 15, 0);
+               TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                               "Failed to allocate output buffer in mempool");
+       }
 
-       memcpy(plaintext, tdata->plaintext.data, (tdata->plaintext.len >> 3));
-       buffer_shift_right(plaintext, tdata->plaintext.len, extra_offset);
+       if (verify) {
+               pktmbuf_write(ut_params->ibuf, 0, ciphertext_len,
+                       tdata->ciphertext.data);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
+                       tdata->plaintext.data);
+               plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+       memset(buffer, 0, sizeof(buffer));
 
-#ifdef RTE_APP_TEST_DEBUG
-       rte_hexdump(stdout, "plaintext:", plaintext, tdata->plaintext.len);
-#endif
        /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation_oop(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       extra_offset);
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               tdata->auth_iv.data, tdata->auth_iv.len,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->cipher.offset_bits,
+               tdata->validAuthLenInBits.len,
+               tdata->auth.offset_bits,
+               op_mode, 1, verify);
+
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
+                       ut_params->op);
+
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               ciphertext = plaintext;
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
-#ifdef RTE_APP_TEST_DEBUG
-       rte_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-#endif
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       plaintext_len, buffer);
+               else
+                       plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
 
-       expected_ciphertext_shifted = rte_malloc(NULL, plaintext_len, 8);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       ciphertext_len, buffer);
+               else
+                       ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
 
-       TEST_ASSERT_NOT_NULL(expected_ciphertext_shifted,
-                       "failed to reserve memory for ciphertext shifted\n");
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               if (ut_params->obuf)
+                       digest = rte_pktmbuf_read(ut_params->obuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+               else
+                       digest = rte_pktmbuf_read(ut_params->ibuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+
+               debug_hexdump(stdout, "digest:", digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
 
-       memcpy(expected_ciphertext_shifted, tdata->ciphertext.data,
-                       ceil_byte_length(tdata->ciphertext.len));
-       buffer_shift_right(expected_ciphertext_shifted, tdata->ciphertext.len,
-                       extra_offset);
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
-               ciphertext,
-               expected_ciphertext_shifted,
-               tdata->validDataLenInBits.len,
-               extra_offset,
-               "SNOW 3G Ciphertext data not as expected");
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "SNOW 3G Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->validDataLenInBits.len,
+                       "SNOW 3G Ciphertext data not as expected");
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                       "SNOW 3G Generated auth tag not as expected");
+       }
        return 0;
 }
 
-static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+static int
+test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
+       uint8_t *plaintext = NULL, *ciphertext = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
-                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
+       struct rte_cryptodev_info dev_info;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
-       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               ciphertext_pad_len);
-       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
+       if (op_mode == OUT_OF_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_auth_cipher_session(
+                       ts_params->valid_devs[0],
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                       tdata->key.data, tdata->key.len,
+                       0, tdata->digest.len,
+                       tdata->cipher_iv.len);
 
-       /* Create SNOW 3G operation */
-       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
-                                       tdata->cipher_iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       tdata->cipher.offset_bits);
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               plaintext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               plaintext = ciphertext;
-
-       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (op_mode == OUT_OF_PLACE)
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
-                               tdata->plaintext.data,
-                               tdata->validDataLenInBits.len,
-                               "SNOW 3G Plaintext data not as expected");
-       return 0;
-}
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+               rte_pktmbuf_tailroom(ut_params->ibuf));
+       if (op_mode == OUT_OF_PLACE)
+               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->obuf));
 
-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;
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       int retval;
+       if (verify) {
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       ciphertext_pad_len);
+               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                       plaintext_pad_len);
+               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned ciphertext_pad_len;
-       unsigned ciphertext_len;
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               NULL, 0,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->validCipherOffsetInBits.len,
+               tdata->validAuthLenInBits.len,
+               0,
+               op_mode, 0, verify);
 
-       /* Create SNOW 3G 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);
+       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
 
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer");
-       TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                       "Failed to allocate output buffer");
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
-       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);
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       plaintext = ciphertext;
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, ciphertext_len);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       ciphertext = plaintext;
 
-       /* 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;
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
 
-       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;
+               ut_params->digest = rte_pktmbuf_mtod(
+                       ut_params->obuf, uint8_t *) +
+                       (tdata->digest.offset_bytes == 0 ?
+                       plaintext_pad_len : tdata->digest.offset_bytes);
 
-       debug_hexdump(stdout, "plaintext:", plaintext, ciphertext_len);
+               debug_hexdump(stdout, "digest:", ut_params->digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
-                               tdata->plaintext.data,
-                               tdata->validDataLenInBits.len,
-                               "SNOW 3G Plaintext data not as expected");
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "KASUMI Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len >> 3,
+                       "KASUMI Ciphertext data not as expected");
+
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ut_params->digest,
+                       tdata->digest.data,
+                       DIGEST_BYTE_LENGTH_KASUMI_F9,
+                       "KASUMI Generated auth tag not as expected");
+       }
        return 0;
 }
 
 static int
-test_zuc_cipher_auth(const struct wireless_test_data *tdata)
+test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
 
-       uint8_t *plaintext, *ciphertext;
+       const uint8_t *plaintext = NULL;
+       const uint8_t *ciphertext = NULL;
+       const uint8_t *digest = NULL;
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
+       uint8_t buffer[10000];
+       uint8_t digest_buffer[10000];
 
-       struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_cryptodev_info dev_info;
 
-       /* Check if device supports ZUC EEA3 */
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
-
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
        if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
                        &cap_idx) == NULL)
                return -ENOTSUP;
 
-       /* Check if device supports ZUC EIA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+       uint64_t feat_flags = dev_info.feature_flags;
 
-       /* Create ZUC session */
-       retval = create_zuc_cipher_auth_encrypt_generate_session(
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+                       printf("Device doesn't support digest encrypted.\n");
+                       return -ENOTSUP;
+               }
+       }
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_auth_cipher_session(
                        ts_params->valid_devs[0],
-                       tdata);
+                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
+                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
+                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
+                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                       tdata->key.data, tdata->key.len,
+                       0, tdata->digest.len,
+                       tdata->cipher_iv.len);
+
        if (retval < 0)
                return retval;
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
        plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                       plaintext_pad_len, 15, 0);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       if (op_mode == OUT_OF_PLACE) {
+               ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
+                               plaintext_pad_len, 15, 0);
+               TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                               "Failed to allocate output buffer in mempool");
+       }
+
+       if (verify) {
+               pktmbuf_write(ut_params->ibuf, 0, ciphertext_len,
+                       tdata->ciphertext.data);
+               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+       } else {
+               pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
+                       tdata->plaintext.data);
+               plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       plaintext_len);
+       }
+       memset(buffer, 0, sizeof(buffer));
+
+       /* Create KASUMI operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+               tdata->digest.data, tdata->digest.len,
+               tdata->cipher_iv.data, tdata->cipher_iv.len,
+               NULL, 0,
+               (tdata->digest.offset_bytes == 0 ?
+               (verify ? ciphertext_pad_len : plaintext_pad_len)
+                       : tdata->digest.offset_bytes),
+               tdata->validCipherLenInBits.len,
+               tdata->validCipherOffsetInBits.len,
+               tdata->validAuthLenInBits.len,
+               0,
+               op_mode, 1, verify);
 
-       /* 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");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               ciphertext = plaintext;
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+       ut_params->obuf = (op_mode == IN_PLACE ?
+               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       plaintext_len, buffer);
+               else
+                       plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       plaintext_len, buffer);
+
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+               debug_hexdump(stdout, "plaintext expected:",
+                       tdata->plaintext.data,
+                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
+                                       ciphertext_len, buffer);
+               else
+                       ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
+                                       ciphertext_len, buffer);
+
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                       ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+
+               if (ut_params->obuf)
+                       digest = rte_pktmbuf_read(ut_params->obuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+               else
+                       digest = rte_pktmbuf_read(ut_params->ibuf,
+                               (tdata->digest.offset_bytes == 0 ?
+                               plaintext_pad_len : tdata->digest.offset_bytes),
+                               tdata->digest.len, digest_buffer);
+
+               debug_hexdump(stdout, "digest:", digest,
+                       tdata->digest.len);
+               debug_hexdump(stdout, "digest expected:",
+                       tdata->digest.data, tdata->digest.len);
+       }
+
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+       if (verify) {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+                       plaintext,
+                       tdata->plaintext.data,
+                       tdata->plaintext.len >> 3,
+                       "KASUMI Plaintext data not as expected");
+       } else {
+               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                        ciphertext,
                        tdata->ciphertext.data,
                        tdata->validDataLenInBits.len,
-                       "ZUC Ciphertext data not as expected");
-
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-           + plaintext_pad_len;
+                       "KASUMI Ciphertext data not as expected");
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ut_params->digest,
+               TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       digest,
                        tdata->digest.data,
-                       4,
-                       "ZUC Generated auth tag not as expected");
+                       DIGEST_BYTE_LENGTH_KASUMI_F9,
+                       "KASUMI Generated auth tag not as expected");
+       }
        return 0;
 }
 
 static int
-test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
+test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -4353,17 +4788,32 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
        unsigned plaintext_pad_len;
        unsigned plaintext_len;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_cipher_auth_session(ts_params->valid_devs[0],
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_KASUMI_F9;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_KASUMI_F8;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create KASUMI session */
+       retval = create_wireless_algo_cipher_auth_session(
+                       ts_params->valid_devs[0],
                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
                        RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
-                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       RTE_CRYPTO_CIPHER_KASUMI_F8,
                        tdata->key.data, tdata->key.len,
-                       tdata->auth_iv.len, tdata->digest.len,
+                       0, tdata->digest.len,
                        tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
+
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
        /* clear mbuf payload */
@@ -4380,395 +4830,300 @@ test_snow3g_cipher_auth(const struct snow3g_test_data *tdata)
 
        debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create SNOW 3G operation */
+       /* Create KASUMI operation */
        retval = create_wireless_algo_cipher_hash_operation(tdata->digest.data,
-                       tdata->digest.len, tdata->auth_iv.data,
-                       tdata->auth_iv.len,
-                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
-                       tdata->cipher_iv.data, tdata->cipher_iv.len,
-                       tdata->validCipherLenInBits.len,
-                       0,
-                       tdata->validAuthLenInBits.len,
-                       0
-                       );
+                               tdata->digest.len, NULL, 0,
+                               plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                               tdata->cipher_iv.data, tdata->cipher_iv.len,
+                               RTE_ALIGN_CEIL(tdata->validCipherLenInBits.len, 8),
+                               tdata->validCipherOffsetInBits.len,
+                               tdata->validAuthLenInBits.len,
+                               0
+                               );
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
-       ut_params->obuf = ut_params->op->sym->m_src;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
+
+       if (ut_params->op->sym->m_dst)
+               ut_params->obuf = ut_params->op->sym->m_dst;
        else
-               ciphertext = plaintext;
+               ut_params->obuf = ut_params->op->sym->m_src;
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->validDataLenInBits.len,
-                       "SNOW 3G Ciphertext data not as expected");
+       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
+                               tdata->validCipherOffsetInBits.len >> 3);
 
        ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-           + plaintext_pad_len;
+                       + plaintext_pad_len;
+
+       const uint8_t *reference_ciphertext = tdata->ciphertext.data +
+                               (tdata->validCipherOffsetInBits.len >> 3);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               reference_ciphertext,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
 
        /* Validate obuf */
        TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ut_params->digest,
-                       tdata->digest.data,
-                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-                       "SNOW 3G Generated auth tag not as expected");
+               ut_params->digest,
+               tdata->digest.data,
+               DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+               "KASUMI Generated auth tag not as expected");
        return 0;
 }
 
 static int
-test_snow3g_auth_cipher(const struct snow3g_test_data *tdata,
-       uint8_t op_mode, uint8_t verify)
+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 = NULL, *ciphertext = NULL;
-       unsigned int plaintext_pad_len;
-       unsigned int plaintext_len;
-       unsigned int ciphertext_pad_len;
-       unsigned int ciphertext_len;
-
-       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;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
 
-       if (op_mode == OUT_OF_PLACE) {
-               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
-                       printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
-               }
-       }
+       /* Check if device supports ZUC EEA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_auth_cipher_session(
-                       ts_params->valid_devs[0],
-                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
-                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
-                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
-                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
-                       RTE_CRYPTO_AUTH_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 (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
+       /* Create ZUC session */
+       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
+                                       tdata->key.data, tdata->key.len,
+                                       tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       if (op_mode == OUT_OF_PLACE)
-               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       /* clear mbuf payload */
+       /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-               rte_pktmbuf_tailroom(ut_params->ibuf));
-       if (op_mode == OUT_OF_PLACE)
-               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->obuf));
+              rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
        plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-
-       if (verify) {
-               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                                       ciphertext_pad_len);
-               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
-               if (op_mode == OUT_OF_PLACE)
-                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
-               debug_hexdump(stdout, "ciphertext:", ciphertext,
-                       ciphertext_len);
-       } else {
-               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                                       plaintext_pad_len);
-               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
-               if (op_mode == OUT_OF_PLACE)
-                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
-               debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
-       }
+       /* 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 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,
-               (tdata->digest.offset_bytes == 0 ?
-               (verify ? ciphertext_pad_len : plaintext_pad_len)
-                       : tdata->digest.offset_bytes),
-               tdata->validCipherLenInBits.len,
-               tdata->cipher.offset_bits,
-               tdata->validAuthLenInBits.len,
-               tdata->auth.offset_bits,
-               op_mode, 0);
+       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
 
+       /* Create ZUC operation */
+       retval = create_wireless_algo_cipher_operation(tdata->cipher_iv.data,
+                                       tdata->cipher_iv.len,
+                                       tdata->plaintext.len,
+                                       0);
        if (retval < 0)
                return retval;
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       ut_params->obuf = (op_mode == IN_PLACE ?
-               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
-
-       if (verify) {
-               if (ut_params->obuf)
-                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
-                                                       uint8_t *);
-               else
-                       plaintext = ciphertext +
-                               (tdata->cipher.offset_bits >> 3);
-
-               debug_hexdump(stdout, "plaintext:", plaintext,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
-               debug_hexdump(stdout, "plaintext expected:",
-                       tdata->plaintext.data,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
-       } else {
-               if (ut_params->obuf)
-                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
-                                                       uint8_t *);
-               else
-                       ciphertext = plaintext;
-
-               debug_hexdump(stdout, "ciphertext:", ciphertext,
-                       ciphertext_len);
-               debug_hexdump(stdout, "ciphertext expected:",
-                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
-
-               ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + (tdata->digest.offset_bytes == 0 ?
-               plaintext_pad_len : tdata->digest.offset_bytes);
+       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, "digest:", ut_params->digest,
-                       tdata->digest.len);
-               debug_hexdump(stdout, "digest expected:", tdata->digest.data,
-                               tdata->digest.len);
-       }
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
-       if (verify) {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       plaintext,
-                       tdata->plaintext.data,
-                       tdata->plaintext.len >> 3,
-                       "SNOW 3G Plaintext data not as expected");
-       } else {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->validDataLenInBits.len,
-                       "SNOW 3G Ciphertext data not as expected");
-
-               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(
+               ciphertext,
+               tdata->ciphertext.data,
+               tdata->validCipherLenInBits.len,
+               "ZUC Ciphertext data not as expected");
        return 0;
 }
 
 static int
-test_snow3g_auth_cipher_sgl(const struct snow3g_test_data *tdata,
-       uint8_t op_mode, uint8_t verify)
+test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
 
-       const uint8_t *plaintext = NULL;
-       const uint8_t *ciphertext = NULL;
-       const uint8_t *digest = NULL;
        unsigned int plaintext_pad_len;
        unsigned int plaintext_len;
-       unsigned int ciphertext_pad_len;
-       unsigned int ciphertext_len;
-       uint8_t buffer[10000];
-       uint8_t digest_buffer[10000];
-
+       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 (op_mode == IN_PLACE) {
-               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
-                       printf("Device doesn't support in-place scatter-gather "
-                                       "in both input and output mbufs.\n");
-                       return -ENOTSUP;
-               }
-       } else {
-               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
-                       printf("Device doesn't support out-of-place scatter-gather "
-                                       "in both input and output mbufs.\n");
-                       return -ENOTSUP;
-               }
-               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
-                       printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
-               }
+       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+               printf("Device doesn't support in-place scatter-gather. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
        }
 
-       /* Create SNOW 3G session */
-       retval = create_wireless_algo_auth_cipher_session(
-                       ts_params->valid_devs[0],
-                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
-                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
-                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
-                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
-                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
-                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+       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->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
-
        if (retval < 0)
                return retval;
 
-       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-
-       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 15, 0);
-       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
-                       "Failed to allocate input buffer in mempool");
+       /* Clear mbuf payload */
 
-       if (op_mode == OUT_OF_PLACE) {
-               ut_params->obuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                               plaintext_pad_len, 15, 0);
-               TEST_ASSERT_NOT_NULL(ut_params->obuf,
-                               "Failed to allocate output buffer in mempool");
-       }
-
-       if (verify) {
-               pktmbuf_write(ut_params->ibuf, 0, ciphertext_len,
-                       tdata->ciphertext.data);
-               ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
-                                       ciphertext_len, buffer);
-               debug_hexdump(stdout, "ciphertext:", ciphertext,
-                       ciphertext_len);
-       } else {
-               pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
-                       tdata->plaintext.data);
-               plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
-                                       plaintext_len, buffer);
-               debug_hexdump(stdout, "plaintext:", plaintext,
-                       plaintext_len);
-       }
-       memset(buffer, 0, sizeof(buffer));
-
-       /* Create 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,
-               (tdata->digest.offset_bytes == 0 ?
-               (verify ? ciphertext_pad_len : plaintext_pad_len)
-                       : tdata->digest.offset_bytes),
-               tdata->validCipherLenInBits.len,
-               tdata->cipher.offset_bits,
-               tdata->validAuthLenInBits.len,
-               tdata->auth.offset_bits,
-               op_mode, 1);
+       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);
-
+                                               ut_params->op);
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
-       ut_params->obuf = (op_mode == IN_PLACE ?
-               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+       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);
 
-       if (verify) {
-               if (ut_params->obuf)
-                       plaintext = rte_pktmbuf_read(ut_params->obuf, 0,
-                                       plaintext_len, buffer);
-               else
-                       plaintext = rte_pktmbuf_read(ut_params->ibuf, 0,
-                                       plaintext_len, buffer);
+       /* Validate obuf */
+       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
 
-               debug_hexdump(stdout, "plaintext:", plaintext,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
-               debug_hexdump(stdout, "plaintext expected:",
-                       tdata->plaintext.data,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
-       } else {
-               if (ut_params->obuf)
-                       ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
-                                       ciphertext_len, buffer);
-               else
-                       ciphertext = rte_pktmbuf_read(ut_params->ibuf, 0,
-                                       ciphertext_len, buffer);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               tdata->ciphertext.data,
+               tdata->validCipherLenInBits.len,
+               "ZUC Ciphertext data not as expected");
 
-               debug_hexdump(stdout, "ciphertext:", ciphertext,
-                       ciphertext_len);
-               debug_hexdump(stdout, "ciphertext expected:",
-                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+       return 0;
+}
 
-               if (ut_params->obuf)
-                       digest = rte_pktmbuf_read(ut_params->obuf,
-                               (tdata->digest.offset_bytes == 0 ?
-                               plaintext_pad_len : tdata->digest.offset_bytes),
-                               tdata->digest.len, digest_buffer);
-               else
-                       digest = rte_pktmbuf_read(ut_params->ibuf,
-                               (tdata->digest.offset_bytes == 0 ?
-                               plaintext_pad_len : tdata->digest.offset_bytes),
-                               tdata->digest.len, digest_buffer);
+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;
 
-               debug_hexdump(stdout, "digest:", digest,
-                       tdata->digest.len);
-               debug_hexdump(stdout, "digest expected:",
-                       tdata->digest.data, tdata->digest.len);
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_cryptodev_info dev_info;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA) &&
+                       (tdata->validAuthLenInBits.len % 8 != 0)) {
+               printf("Device doesn't support NON-Byte Aligned Data.\n");
+               return -ENOTSUP;
        }
 
+       /* Check if device supports ZUC EIA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       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 */
-       if (verify) {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       plaintext,
-                       tdata->plaintext.data,
-                       tdata->plaintext.len >> 3,
-                       "SNOW 3G Plaintext data not as expected");
-       } else {
-               TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->validDataLenInBits.len,
-                       "SNOW 3G Ciphertext data not as expected");
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       ut_params->digest,
+       tdata->digest.data,
+       tdata->digest.len,
+       "ZUC Generated auth tag not as expected");
 
-               TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       digest,
-                       tdata->digest.data,
-                       DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
-                       "SNOW 3G Generated auth tag not as expected");
-       }
        return 0;
 }
 
 static int
-test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
+test_zuc_auth_cipher(const struct wireless_test_data *tdata,
        uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -4783,29 +5138,49 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
        unsigned int ciphertext_len;
 
        struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+
+       /* Check if device supports ZUC EIA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
        uint64_t feat_flags = dev_info.feature_flags;
 
-       if (op_mode == OUT_OF_PLACE) {
-               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
-                       printf("Device doesn't support digest encrypted.\n");
+       if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+               printf("Device doesn't support digest encrypted.\n");
+               return -ENOTSUP;
+       }
+       if (op_mode == IN_PLACE) {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
+                       printf("Device doesn't support in-place scatter-gather "
+                                       "in both input and output mbufs.\n");
+                       return -ENOTSUP;
+               }
+       } else {
+               if (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {
+                       printf("Device doesn't support out-of-place scatter-gather "
+                                       "in both input and output mbufs.\n");
                        return -ENOTSUP;
                }
        }
 
-       /* Create KASUMI session */
+       /* Create ZUC session */
        retval = create_wireless_algo_auth_cipher_session(
                        ts_params->valid_devs[0],
                        (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
                                        : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
                        (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
                                        : RTE_CRYPTO_AUTH_OP_GENERATE),
-                       RTE_CRYPTO_AUTH_KASUMI_F9,
-                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                       RTE_CRYPTO_AUTH_ZUC_EIA3,
+                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
                        tdata->key.data, tdata->key.len,
-                       0, tdata->digest.len,
+                       tdata->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
 
        if (retval < 0)
@@ -4845,11 +5220,11 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
                        plaintext_len);
        }
 
-       /* Create KASUMI operation */
+       /* Create ZUC operation */
        retval = create_wireless_algo_auth_cipher_operation(
-               tdata->digest.len,
+               tdata->digest.data, tdata->digest.len,
                tdata->cipher_iv.data, tdata->cipher_iv.len,
-               NULL, 0,
+               tdata->auth_iv.data, tdata->auth_iv.len,
                (tdata->digest.offset_bytes == 0 ?
                (verify ? ciphertext_pad_len : plaintext_pad_len)
                        : tdata->digest.offset_bytes),
@@ -4857,7 +5232,7 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
                tdata->validCipherOffsetInBits.len,
                tdata->validAuthLenInBits.len,
                0,
-               op_mode, 0);
+               op_mode, 0, verify);
 
        if (retval < 0)
                return retval;
@@ -4912,25 +5287,25 @@ test_kasumi_auth_cipher(const struct kasumi_test_data *tdata,
                        plaintext,
                        tdata->plaintext.data,
                        tdata->plaintext.len >> 3,
-                       "KASUMI Plaintext data not as expected");
+                       "ZUC Plaintext data not as expected");
        } else {
                TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                        ciphertext,
                        tdata->ciphertext.data,
                        tdata->ciphertext.len >> 3,
-                       "KASUMI Ciphertext data not as expected");
+                       "ZUC 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");
+                       "ZUC Generated auth tag not as expected");
        }
        return 0;
 }
 
 static int
-test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
+test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
        uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -4949,6 +5324,15 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
        uint8_t digest_buffer[10000];
 
        struct rte_cryptodev_info dev_info;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+
+       /* Check if device supports ZUC EIA3 */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
@@ -4972,17 +5356,17 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
                }
        }
 
-       /* Create KASUMI session */
+       /* Create ZUC session */
        retval = create_wireless_algo_auth_cipher_session(
                        ts_params->valid_devs[0],
                        (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
                                        : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
                        (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
                                        : RTE_CRYPTO_AUTH_OP_GENERATE),
-                       RTE_CRYPTO_AUTH_KASUMI_F9,
-                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                       RTE_CRYPTO_AUTH_ZUC_EIA3,
+                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
                        tdata->key.data, tdata->key.len,
-                       0, tdata->digest.len,
+                       tdata->auth_iv.len, tdata->digest.len,
                        tdata->cipher_iv.len);
 
        if (retval < 0)
@@ -5022,9 +5406,9 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
        }
        memset(buffer, 0, sizeof(buffer));
 
-       /* Create KASUMI operation */
+       /* Create ZUC operation */
        retval = create_wireless_algo_auth_cipher_operation(
-               tdata->digest.len,
+               tdata->digest.data, tdata->digest.len,
                tdata->cipher_iv.data, tdata->cipher_iv.len,
                NULL, 0,
                (tdata->digest.offset_bytes == 0 ?
@@ -5034,7 +5418,7 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
                tdata->validCipherOffsetInBits.len,
                tdata->validAuthLenInBits.len,
                0,
-               op_mode, 1);
+               op_mode, 1, verify);
 
        if (retval < 0)
                return retval;
@@ -5096,519 +5480,831 @@ test_kasumi_auth_cipher_sgl(const struct kasumi_test_data *tdata,
                        plaintext,
                        tdata->plaintext.data,
                        tdata->plaintext.len >> 3,
-                       "KASUMI Plaintext data not as expected");
+                       "ZUC Plaintext data not as expected");
        } else {
                TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                        ciphertext,
                        tdata->ciphertext.data,
                        tdata->validDataLenInBits.len,
-                       "KASUMI Ciphertext data not as expected");
+                       "ZUC Ciphertext data not as expected");
 
                TEST_ASSERT_BUFFERS_ARE_EQUAL(
                        digest,
                        tdata->digest.data,
                        DIGEST_BYTE_LENGTH_KASUMI_F9,
-                       "KASUMI Generated auth tag not as expected");
+                       "ZUC Generated auth tag not as expected");
        }
        return 0;
 }
 
 static int
-test_kasumi_cipher_auth(const struct kasumi_test_data *tdata)
+test_kasumi_encryption_test_case_1(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       int retval;
+       return test_kasumi_encryption(&kasumi_test_case_1);
+}
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-
-       /* Create KASUMI session */
-       retval = create_wireless_algo_cipher_auth_session(
-                       ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       RTE_CRYPTO_AUTH_KASUMI_F9,
-                       RTE_CRYPTO_CIPHER_KASUMI_F8,
-                       tdata->key.data, tdata->key.len,
-                       0, tdata->digest.len,
-                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
-
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
+static int
+test_kasumi_encryption_test_case_1_sgl(void)
+{
+       return test_kasumi_encryption_sgl(&kasumi_test_case_1);
+}
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       /* Append data which is padded to a multiple of */
-       /* the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+static int
+test_kasumi_encryption_test_case_1_oop(void)
+{
+       return test_kasumi_encryption_oop(&kasumi_test_case_1);
+}
 
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+static int
+test_kasumi_encryption_test_case_1_oop_sgl(void)
+{
+       return test_kasumi_encryption_oop_sgl(&kasumi_test_case_1);
+}
 
-       /* 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;
+static int
+test_kasumi_encryption_test_case_2(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_2);
+}
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+static int
+test_kasumi_encryption_test_case_3(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_3);
+}
 
-       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;
+static int
+test_kasumi_encryption_test_case_4(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_4);
+}
 
-       ciphertext = rte_pktmbuf_mtod_offset(ut_params->obuf, uint8_t *,
-                               tdata->validCipherOffsetInBits.len >> 3);
+static int
+test_kasumi_encryption_test_case_5(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_5);
+}
 
-       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
-                       + plaintext_pad_len;
+static int
+test_kasumi_decryption_test_case_1(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_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");
+static int
+test_kasumi_decryption_test_case_1_oop(void)
+{
+       return test_kasumi_decryption_oop(&kasumi_test_case_1);
+}
 
-       /* 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_kasumi_decryption_test_case_2(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_2);
 }
 
 static int
-test_zuc_encryption(const struct wireless_test_data *tdata)
+test_kasumi_decryption_test_case_3(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_kasumi_decryption(&kasumi_test_case_3);
+}
 
-       int retval;
-       uint8_t *plaintext, *ciphertext;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
+static int
+test_kasumi_decryption_test_case_4(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_4);
+}
 
-       struct rte_cryptodev_sym_capability_idx cap_idx;
+static int
+test_kasumi_decryption_test_case_5(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_5);
+}
+static int
+test_snow3g_encryption_test_case_1(void)
+{
+       return test_snow3g_encryption(&snow3g_test_case_1);
+}
 
-       /* Check if device supports ZUC EEA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
+static int
+test_snow3g_encryption_test_case_1_oop(void)
+{
+       return test_snow3g_encryption_oop(&snow3g_test_case_1);
+}
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+static int
+test_snow3g_encryption_test_case_1_oop_sgl(void)
+{
+       return test_snow3g_encryption_oop_sgl(&snow3g_test_case_1);
+}
 
-       /* Create ZUC session */
-       retval = create_wireless_algo_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
-                                       tdata->key.data, tdata->key.len,
-                                       tdata->cipher_iv.len);
-       if (retval < 0)
-               return retval;
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+static int
+test_snow3g_encryption_test_case_1_offset_oop(void)
+{
+       return test_snow3g_encryption_offset_oop(&snow3g_test_case_1);
+}
 
-       /* Clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-              rte_pktmbuf_tailroom(ut_params->ibuf));
+static int
+test_snow3g_encryption_test_case_2(void)
+{
+       return test_snow3g_encryption(&snow3g_test_case_2);
+}
 
-       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);
+static int
+test_snow3g_encryption_test_case_3(void)
+{
+       return test_snow3g_encryption(&snow3g_test_case_3);
+}
 
-       debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+static int
+test_snow3g_encryption_test_case_4(void)
+{
+       return test_snow3g_encryption(&snow3g_test_case_4);
+}
 
-       /* 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;
+static int
+test_snow3g_encryption_test_case_5(void)
+{
+       return test_snow3g_encryption(&snow3g_test_case_5);
+}
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                                               ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+static int
+test_snow3g_decryption_test_case_1(void)
+{
+       return test_snow3g_decryption(&snow3g_test_case_1);
+}
 
-       ut_params->obuf = ut_params->op->sym->m_dst;
-       if (ut_params->obuf)
-               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *);
-       else
-               ciphertext = plaintext;
+static int
+test_snow3g_decryption_test_case_1_oop(void)
+{
+       return test_snow3g_decryption_oop(&snow3g_test_case_1);
+}
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+static int
+test_snow3g_decryption_test_case_2(void)
+{
+       return test_snow3g_decryption(&snow3g_test_case_2);
+}
 
-       /* 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_snow3g_decryption_test_case_3(void)
+{
+       return test_snow3g_decryption(&snow3g_test_case_3);
 }
 
 static int
-test_zuc_encryption_sgl(const struct wireless_test_data *tdata)
+test_snow3g_decryption_test_case_4(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_snow3g_decryption(&snow3g_test_case_4);
+}
 
-       int retval;
+static int
+test_snow3g_decryption_test_case_5(void)
+{
+       return test_snow3g_decryption(&snow3g_test_case_5);
+}
 
-       unsigned int plaintext_pad_len;
-       unsigned int plaintext_len;
-       const uint8_t *ciphertext;
-       uint8_t ciphertext_buffer[2048];
-       struct rte_cryptodev_info dev_info;
+/*
+ * Function prepares snow3g_hash_test_data from snow3g_test_data.
+ * Pattern digest from snow3g_test_data must be allocated as
+ * 4 last bytes in plaintext.
+ */
+static void
+snow3g_hash_test_vector_setup(const struct snow3g_test_data *pattern,
+               struct snow3g_hash_test_data *output)
+{
+       if ((pattern != NULL) && (output != NULL)) {
+               output->key.len = pattern->key.len;
 
-       struct rte_cryptodev_sym_capability_idx cap_idx;
+               memcpy(output->key.data,
+               pattern->key.data, pattern->key.len);
 
-       /* Check if device supports ZUC EEA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_ZUC_EEA3;
+               output->auth_iv.len = pattern->auth_iv.len;
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+               memcpy(output->auth_iv.data,
+               pattern->auth_iv.data, pattern->auth_iv.len);
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+               output->plaintext.len = pattern->plaintext.len;
 
-       uint64_t feat_flags = dev_info.feature_flags;
+               memcpy(output->plaintext.data,
+               pattern->plaintext.data, pattern->plaintext.len >> 3);
 
-       if (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {
-               printf("Device doesn't support in-place scatter-gather. "
-                               "Test Skipped.\n");
-               return -ENOTSUP;
-       }
+               output->digest.len = pattern->digest.len;
 
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+               memcpy(output->digest.data,
+               &pattern->plaintext.data[pattern->digest.offset_bytes],
+               pattern->digest.len);
 
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+               output->validAuthLenInBits.len =
+               pattern->validAuthLenInBits.len;
+       }
+}
 
-       ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 10, 0);
+/*
+ * Test case verify computed cipher and digest from snow3g_test_case_7 data.
+ */
+static int
+test_snow3g_decryption_with_digest_test_case_1(void)
+{
+       struct snow3g_hash_test_data snow3g_hash_data;
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len,
-                       tdata->plaintext.data);
+       /*
+        * Function prepare data for hash veryfication test case.
+        * Digest is allocated in 4 last bytes in plaintext, pattern.
+        */
+       snow3g_hash_test_vector_setup(&snow3g_test_case_7, &snow3g_hash_data);
 
-       /* 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;
+       return test_snow3g_decryption(&snow3g_test_case_7) &
+                       test_snow3g_authentication_verify(&snow3g_hash_data);
+}
 
-       /* Clear mbuf payload */
+static int
+test_snow3g_cipher_auth_test_case_1(void)
+{
+       return test_snow3g_cipher_auth(&snow3g_test_case_3);
+}
 
-       pktmbuf_write(ut_params->ibuf, 0, plaintext_len, tdata->plaintext.data);
+static int
+test_snow3g_auth_cipher_test_case_1(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_1, IN_PLACE, 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;
+static int
+test_snow3g_auth_cipher_test_case_2(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, IN_PLACE, 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");
+static int
+test_snow3g_auth_cipher_test_case_2_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
+}
 
-       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);
+static int
+test_snow3g_auth_cipher_part_digest_enc(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 0);
+}
 
-       /* Validate obuf */
-       debug_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+static int
+test_snow3g_auth_cipher_part_digest_enc_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 0);
+}
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-               ciphertext,
-               tdata->ciphertext.data,
-               tdata->validCipherLenInBits.len,
-               "ZUC Ciphertext data not as expected");
+static int
+test_snow3g_auth_cipher_test_case_3_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, IN_PLACE, 0);
+}
 
-       return 0;
+static int
+test_snow3g_auth_cipher_test_case_3_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, OUT_OF_PLACE, 0);
 }
 
 static int
-test_zuc_authentication(const struct wireless_test_data *tdata)
+test_snow3g_auth_cipher_part_digest_enc_sgl(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 0);
+}
 
-       int retval;
-       unsigned plaintext_pad_len;
-       unsigned plaintext_len;
-       uint8_t *plaintext;
+static int
+test_snow3g_auth_cipher_part_digest_enc_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 0);
+}
 
-       struct rte_cryptodev_sym_capability_idx cap_idx;
+static int
+test_snow3g_auth_cipher_verify_test_case_1(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_1, IN_PLACE, 1);
+}
 
-       /* Check if device supports ZUC EIA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+static int
+test_snow3g_auth_cipher_verify_test_case_2(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, IN_PLACE, 1);
+}
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+static int
+test_snow3g_auth_cipher_verify_test_case_2_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
+}
 
-       /* 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;
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 1);
+}
 
-       /* alloc mbuf and set payload */
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc_oop(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 1);
+}
 
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-       rte_pktmbuf_tailroom(ut_params->ibuf));
+static int
+test_snow3g_auth_cipher_verify_test_case_3_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, IN_PLACE, 1);
+}
 
-       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);
+static int
+test_snow3g_auth_cipher_verify_test_case_3_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_test_case_3, OUT_OF_PLACE, 1);
+}
 
-       /* 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;
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       IN_PLACE, 1);
+}
 
-       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");
+static int
+test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl(void)
+{
+       return test_snow3g_auth_cipher_sgl(
+               &snow3g_auth_cipher_partial_digest_encryption,
+                       OUT_OF_PLACE, 1);
+}
 
-       return 0;
+static int
+test_snow3g_auth_cipher_with_digest_test_case_1(void)
+{
+       return test_snow3g_auth_cipher(
+               &snow3g_test_case_7, IN_PLACE, 0);
 }
 
 static int
-test_zuc_auth_cipher(const struct wireless_test_data *tdata,
-       uint8_t op_mode, uint8_t verify)
+test_kasumi_auth_cipher_test_case_1(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       return test_kasumi_auth_cipher(
+               &kasumi_test_case_3, IN_PLACE, 0);
+}
 
-       int retval;
+static int
+test_kasumi_auth_cipher_test_case_2(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 0);
+}
 
-       uint8_t *plaintext = NULL, *ciphertext = NULL;
-       unsigned int plaintext_pad_len;
-       unsigned int plaintext_len;
-       unsigned int ciphertext_pad_len;
-       unsigned int ciphertext_len;
+static int
+test_kasumi_auth_cipher_test_case_2_oop(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
+}
 
-       struct rte_cryptodev_info dev_info;
-       struct rte_cryptodev_sym_capability_idx cap_idx;
+static int
+test_kasumi_auth_cipher_test_case_2_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 0);
+}
 
-       /* Check if device supports ZUC EIA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+static int
+test_kasumi_auth_cipher_test_case_2_oop_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
+}
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
-               return -ENOTSUP;
+static int
+test_kasumi_auth_cipher_verify_test_case_1(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_test_case_3, IN_PLACE, 1);
+}
 
-       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+static int
+test_kasumi_auth_cipher_verify_test_case_2(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 1);
+}
 
-       uint64_t feat_flags = dev_info.feature_flags;
+static int
+test_kasumi_auth_cipher_verify_test_case_2_oop(void)
+{
+       return test_kasumi_auth_cipher(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
+}
 
-       if (op_mode == OUT_OF_PLACE) {
-               if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
-                       printf("Device doesn't support digest encrypted.\n");
-                       return -ENOTSUP;
-               }
-       }
+static int
+test_kasumi_auth_cipher_verify_test_case_2_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, IN_PLACE, 1);
+}
 
-       /* Create ZUC session */
-       retval = create_wireless_algo_auth_cipher_session(
-                       ts_params->valid_devs[0],
-                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
-                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
-                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
-                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
-                       RTE_CRYPTO_AUTH_ZUC_EIA3,
-                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
-                       tdata->key.data, tdata->key.len,
-                       tdata->auth_iv.len, tdata->digest.len,
-                       tdata->cipher_iv.len);
+static int
+test_kasumi_auth_cipher_verify_test_case_2_oop_sgl(void)
+{
+       return test_kasumi_auth_cipher_sgl(
+               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
+}
 
-       if (retval < 0)
-               return retval;
+static int
+test_kasumi_cipher_auth_test_case_1(void)
+{
+       return test_kasumi_cipher_auth(&kasumi_test_case_6);
+}
 
-       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-       if (op_mode == OUT_OF_PLACE)
-               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+static int
+test_zuc_encryption_test_case_1(void)
+{
+       return test_zuc_encryption(&zuc_test_case_cipher_193b);
+}
 
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-               rte_pktmbuf_tailroom(ut_params->ibuf));
-       if (op_mode == OUT_OF_PLACE)
-               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->obuf));
+static int
+test_zuc_encryption_test_case_2(void)
+{
+       return test_zuc_encryption(&zuc_test_case_cipher_800b);
+}
 
-       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
-       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
-       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+static int
+test_zuc_encryption_test_case_3(void)
+{
+       return test_zuc_encryption(&zuc_test_case_cipher_1570b);
+}
 
-       if (verify) {
-               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                                       ciphertext_pad_len);
-               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
-               if (op_mode == OUT_OF_PLACE)
-                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
-               debug_hexdump(stdout, "ciphertext:", ciphertext,
-                       ciphertext_len);
-       } else {
-               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                                       plaintext_pad_len);
-               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
-               if (op_mode == OUT_OF_PLACE)
-                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
-               debug_hexdump(stdout, "plaintext:", plaintext,
-                       plaintext_len);
-       }
+static int
+test_zuc_encryption_test_case_4(void)
+{
+       return test_zuc_encryption(&zuc_test_case_cipher_2798b);
+}
 
-       /* Create ZUC 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,
-               (tdata->digest.offset_bytes == 0 ?
-               (verify ? ciphertext_pad_len : plaintext_pad_len)
-                       : tdata->digest.offset_bytes),
-               tdata->validCipherLenInBits.len,
-               tdata->validCipherOffsetInBits.len,
-               tdata->validAuthLenInBits.len,
-               0,
-               op_mode, 0);
+static int
+test_zuc_encryption_test_case_5(void)
+{
+       return test_zuc_encryption(&zuc_test_case_cipher_4019b);
+}
 
-       if (retval < 0)
-               return retval;
+static int
+test_zuc_encryption_test_case_6_sgl(void)
+{
+       return test_zuc_encryption_sgl(&zuc_test_case_cipher_193b);
+}
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
+static int
+test_zuc_hash_generate_test_case_1(void)
+{
+       return test_zuc_authentication(&zuc_test_case_auth_1b);
+}
 
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+static int
+test_zuc_hash_generate_test_case_2(void)
+{
+       return test_zuc_authentication(&zuc_test_case_auth_90b);
+}
 
-       ut_params->obuf = (op_mode == IN_PLACE ?
-               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+static int
+test_zuc_hash_generate_test_case_3(void)
+{
+       return test_zuc_authentication(&zuc_test_case_auth_577b);
+}
 
+static int
+test_zuc_hash_generate_test_case_4(void)
+{
+       return test_zuc_authentication(&zuc_test_case_auth_2079b);
+}
 
-       if (verify) {
-               if (ut_params->obuf)
-                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
-                                                       uint8_t *);
-               else
-                       plaintext = ciphertext;
+static int
+test_zuc_hash_generate_test_case_5(void)
+{
+       return test_zuc_authentication(&zuc_test_auth_5670b);
+}
 
-               debug_hexdump(stdout, "plaintext:", plaintext,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
-               debug_hexdump(stdout, "plaintext expected:",
-                       tdata->plaintext.data,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
-       } else {
-               if (ut_params->obuf)
-                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
-                                                       uint8_t *);
-               else
-                       ciphertext = plaintext;
+static int
+test_zuc_hash_generate_test_case_6(void)
+{
+       return test_zuc_authentication(&zuc_test_case_auth_128b);
+}
 
-               debug_hexdump(stdout, "ciphertext:", ciphertext,
-                       ciphertext_len);
-               debug_hexdump(stdout, "ciphertext expected:",
-                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+static int
+test_zuc_hash_generate_test_case_7(void)
+{
+       return test_zuc_authentication(&zuc_test_case_auth_2080b);
+}
 
-               ut_params->digest = rte_pktmbuf_mtod(
-                       ut_params->obuf, uint8_t *) +
-                       (tdata->digest.offset_bytes == 0 ?
-                       plaintext_pad_len : tdata->digest.offset_bytes);
+static int
+test_zuc_hash_generate_test_case_8(void)
+{
+       return test_zuc_authentication(&zuc_test_case_auth_584b);
+}
+
+static int
+test_zuc_cipher_auth_test_case_1(void)
+{
+       return test_zuc_cipher_auth(&zuc_test_case_cipher_200b_auth_200b);
+}
+
+static int
+test_zuc_cipher_auth_test_case_2(void)
+{
+       return test_zuc_cipher_auth(&zuc_test_case_cipher_800b_auth_120b);
+}
+
+static int
+test_zuc_auth_cipher_test_case_1(void)
+{
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
+}
+
+static int
+test_zuc_auth_cipher_test_case_1_oop(void)
+{
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_zuc_auth_cipher_test_case_1_sgl(void)
+{
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
+}
+
+static int
+test_zuc_auth_cipher_test_case_1_oop_sgl(void)
+{
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 0);
+}
+
+static int
+test_zuc_auth_cipher_verify_test_case_1(void)
+{
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 1);
+}
+
+static int
+test_zuc_auth_cipher_verify_test_case_1_oop(void)
+{
+       return test_zuc_auth_cipher(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_zuc_auth_cipher_verify_test_case_1_sgl(void)
+{
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, IN_PLACE, 1);
+}
+
+static int
+test_zuc_auth_cipher_verify_test_case_1_oop_sgl(void)
+{
+       return test_zuc_auth_cipher_sgl(
+               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 1);
+}
+
+static int
+test_mixed_check_if_unsupported(const struct mixed_cipher_auth_test_data *tdata)
+{
+       uint8_t dev_id = testsuite_params.valid_devs[0];
+
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+
+       /* Check if device supports particular cipher algorithm */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = tdata->cipher_algo;
+       if (rte_cryptodev_sym_capability_get(dev_id, &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Check if device supports particular hash algorithm */
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = tdata->auth_algo;
+       if (rte_cryptodev_sym_capability_get(dev_id, &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       return 0;
+}
+
+static int
+test_mixed_auth_cipher(const struct mixed_cipher_auth_test_data *tdata,
+       uint8_t op_mode, uint8_t verify)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       int retval;
+
+       uint8_t *plaintext = NULL, *ciphertext = NULL;
+       unsigned int plaintext_pad_len;
+       unsigned int plaintext_len;
+       unsigned int ciphertext_pad_len;
+       unsigned int ciphertext_len;
+
+       struct rte_cryptodev_info dev_info;
+       struct rte_crypto_op *op;
+
+       /* Check if device supports particular algorithms separately */
+       if (test_mixed_check_if_unsupported(tdata))
+               return -ENOTSUP;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+
+       uint64_t feat_flags = dev_info.feature_flags;
+
+       if (!(feat_flags & RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED)) {
+               printf("Device doesn't support digest encrypted.\n");
+               return -ENOTSUP;
+       }
+
+       /* Create the session */
+       if (verify)
+               retval = create_wireless_algo_cipher_auth_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
+       else
+               retval = create_wireless_algo_auth_cipher_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                               RTE_CRYPTO_AUTH_OP_GENERATE,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       if (op_mode == OUT_OF_PLACE)
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+               rte_pktmbuf_tailroom(ut_params->ibuf));
+       if (op_mode == OUT_OF_PLACE)
+               memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(ut_params->obuf));
+
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len_bits);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len_bits);
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+
+       if (verify) {
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+               memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, ciphertext_pad_len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                               ciphertext_len);
+       } else {
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+               memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+               if (op_mode == OUT_OF_PLACE)
+                       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+               debug_hexdump(stdout, "plaintext:", plaintext, plaintext_len);
+       }
+
+       /* Create the operation */
+       retval = create_wireless_algo_auth_cipher_operation(
+                       tdata->digest_enc.data, tdata->digest_enc.len,
+                       tdata->cipher_iv.data, tdata->cipher_iv.len,
+                       tdata->auth_iv.data, tdata->auth_iv.len,
+                       (tdata->digest_enc.offset == 0 ?
+                               plaintext_pad_len
+                               : tdata->digest_enc.offset),
+                       tdata->validCipherLen.len_bits,
+                       tdata->cipher.offset_bits,
+                       tdata->validAuthLen.len_bits,
+                       tdata->auth.offset_bits,
+                       op_mode, 0, verify);
+
+       if (retval < 0)
+               return retval;
+
+       op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+
+       /* Check if the op failed because the device doesn't */
+       /* support this particular combination of algorithms */
+       if (op == NULL && ut_params->op->status ==
+                       RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
+               printf("Device doesn't support this mixed combination. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
+       ut_params->op = op;
+
+       TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
+
+       ut_params->obuf = (op_mode == IN_PLACE ?
+                       ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+
+       if (verify) {
+               if (ut_params->obuf)
+                       plaintext = rte_pktmbuf_mtod(ut_params->obuf,
+                                                       uint8_t *);
+               else
+                       plaintext = ciphertext +
+                                       (tdata->cipher.offset_bits >> 3);
+
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                               tdata->plaintext.len_bits >> 3);
+               debug_hexdump(stdout, "plaintext expected:",
+                               tdata->plaintext.data,
+                               tdata->plaintext.len_bits >> 3);
+       } else {
+               if (ut_params->obuf)
+                       ciphertext = rte_pktmbuf_mtod(ut_params->obuf,
+                                       uint8_t *);
+               else
+                       ciphertext = plaintext;
+
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                               ciphertext_len);
+               debug_hexdump(stdout, "ciphertext expected:",
+                               tdata->ciphertext.data,
+                               tdata->ciphertext.len_bits >> 3);
+
+               ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                               + (tdata->digest_enc.offset == 0 ?
+               plaintext_pad_len : tdata->digest_enc.offset);
 
                debug_hexdump(stdout, "digest:", ut_params->digest,
-                       tdata->digest.len);
+                               tdata->digest_enc.len);
                debug_hexdump(stdout, "digest expected:",
-                       tdata->digest.data, tdata->digest.len);
+                               tdata->digest_enc.data,
+                               tdata->digest_enc.len);
        }
 
        /* Validate obuf */
        if (verify) {
                TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       plaintext,
-                       tdata->plaintext.data,
-                       tdata->plaintext.len >> 3,
-                       "ZUC Plaintext data not as expected");
+                               plaintext,
+                               tdata->plaintext.data,
+                               tdata->plaintext.len_bits >> 3,
+                               "Plaintext data not as expected");
        } else {
                TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->ciphertext.len >> 3,
-                       "ZUC Ciphertext data not as expected");
+                               ciphertext,
+                               tdata->ciphertext.data,
+                               tdata->validDataLen.len_bits,
+                               "Ciphertext data not as expected");
 
                TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ut_params->digest,
-                       tdata->digest.data,
-                       DIGEST_BYTE_LENGTH_KASUMI_F9,
-                       "ZUC Generated auth tag not as expected");
+                               ut_params->digest,
+                               tdata->digest_enc.data,
+                               DIGEST_BYTE_LENGTH_SNOW3G_UIA2,
+                               "Generated auth tag not as expected");
        }
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
+
        return 0;
 }
 
 static int
-test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
+test_mixed_auth_cipher_sgl(const struct mixed_cipher_auth_test_data *tdata,
        uint8_t op_mode, uint8_t verify)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -5627,14 +6323,10 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
        uint8_t digest_buffer[10000];
 
        struct rte_cryptodev_info dev_info;
-       struct rte_cryptodev_sym_capability_idx cap_idx;
-
-       /* Check if device supports ZUC EIA3 */
-       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       cap_idx.algo.auth = RTE_CRYPTO_AUTH_ZUC_EIA3;
+       struct rte_crypto_op *op;
 
-       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
-                       &cap_idx) == NULL)
+       /* Check if device supports particular algorithms */
+       if (test_mixed_check_if_unsupported(tdata))
                return -ENOTSUP;
 
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
@@ -5659,29 +6351,37 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
                }
        }
 
-       /* Create ZUC session */
-       retval = create_wireless_algo_auth_cipher_session(
-                       ts_params->valid_devs[0],
-                       (verify ? RTE_CRYPTO_CIPHER_OP_DECRYPT
-                                       : RTE_CRYPTO_CIPHER_OP_ENCRYPT),
-                       (verify ? RTE_CRYPTO_AUTH_OP_VERIFY
-                                       : RTE_CRYPTO_AUTH_OP_GENERATE),
-                       RTE_CRYPTO_AUTH_ZUC_EIA3,
-                       RTE_CRYPTO_CIPHER_ZUC_EEA3,
-                       tdata->key.data, tdata->key.len,
-                       tdata->auth_iv.len, tdata->digest.len,
-                       tdata->cipher_iv.len);
-
+       /* Create the session */
+       if (verify)
+               retval = create_wireless_algo_cipher_auth_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
+       else
+               retval = create_wireless_algo_auth_cipher_session(
+                               ts_params->valid_devs[0],
+                               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                               RTE_CRYPTO_AUTH_OP_GENERATE,
+                               tdata->auth_algo,
+                               tdata->cipher_algo,
+                               tdata->auth_key.data, tdata->auth_key.len,
+                               tdata->auth_iv.len, tdata->digest_enc.len,
+                               tdata->cipher_iv.len);
        if (retval < 0)
                return retval;
 
-       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
-       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len_bits);
+       plaintext_len = ceil_byte_length(tdata->plaintext.len_bits);
        ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
        plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
        ut_params->ibuf = create_segmented_mbuf(ts_params->mbuf_pool,
-                       plaintext_pad_len, 15, 0);
+                       ciphertext_pad_len, 15, 0);
        TEST_ASSERT_NOT_NULL(ut_params->ibuf,
                        "Failed to allocate input buffer in mempool");
 
@@ -5709,30 +6409,41 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
        }
        memset(buffer, 0, sizeof(buffer));
 
-       /* Create ZUC operation */
+       /* Create the operation */
        retval = create_wireless_algo_auth_cipher_operation(
-               tdata->digest.len,
-               tdata->cipher_iv.data, tdata->cipher_iv.len,
-               NULL, 0,
-               (tdata->digest.offset_bytes == 0 ?
-               (verify ? ciphertext_pad_len : plaintext_pad_len)
-                       : tdata->digest.offset_bytes),
-               tdata->validCipherLenInBits.len,
-               tdata->validCipherOffsetInBits.len,
-               tdata->validAuthLenInBits.len,
-               0,
-               op_mode, 1);
+                       tdata->digest_enc.data, tdata->digest_enc.len,
+                       tdata->cipher_iv.data, tdata->cipher_iv.len,
+                       tdata->auth_iv.data, tdata->auth_iv.len,
+                       (tdata->digest_enc.offset == 0 ?
+                               plaintext_pad_len
+                               : tdata->digest_enc.offset),
+                       tdata->validCipherLen.len_bits,
+                       tdata->cipher.offset_bits,
+                       tdata->validAuthLen.len_bits,
+                       tdata->auth.offset_bits,
+                       op_mode, 1, verify);
 
        if (retval < 0)
                return retval;
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
+       /* Check if the op failed because the device doesn't */
+       /* support this particular combination of algorithms */
+       if (op == NULL && ut_params->op->status ==
+                       RTE_CRYPTO_OP_STATUS_INVALID_SESSION) {
+               printf("Device doesn't support this mixed combination. "
+                               "Test Skipped.\n");
+               return -ENOTSUP;
+       }
+
+       ut_params->op = op;
+
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed to retrieve obuf");
 
        ut_params->obuf = (op_mode == IN_PLACE ?
-               ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
+                       ut_params->op->sym->m_src : ut_params->op->sym->m_dst);
 
        if (verify) {
                if (ut_params->obuf)
@@ -5743,10 +6454,12 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
                                        plaintext_len, buffer);
 
                debug_hexdump(stdout, "plaintext:", plaintext,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+                               (tdata->plaintext.len_bits >> 3) -
+                               tdata->digest_enc.len);
                debug_hexdump(stdout, "plaintext expected:",
-                       tdata->plaintext.data,
-                       (tdata->plaintext.len >> 3) - tdata->digest.len);
+                               tdata->plaintext.data,
+                               (tdata->plaintext.len_bits >> 3) -
+                               tdata->digest_enc.len);
        } else {
                if (ut_params->obuf)
                        ciphertext = rte_pktmbuf_read(ut_params->obuf, 0,
@@ -5758,1429 +6471,1417 @@ test_zuc_auth_cipher_sgl(const struct wireless_test_data *tdata,
                debug_hexdump(stdout, "ciphertext:", ciphertext,
                        ciphertext_len);
                debug_hexdump(stdout, "ciphertext expected:",
-                       tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len_bits >> 3);
 
                if (ut_params->obuf)
                        digest = rte_pktmbuf_read(ut_params->obuf,
-                               (tdata->digest.offset_bytes == 0 ?
-                               plaintext_pad_len : tdata->digest.offset_bytes),
-                               tdata->digest.len, digest_buffer);
+                                       (tdata->digest_enc.offset == 0 ?
+                                               plaintext_pad_len :
+                                               tdata->digest_enc.offset),
+                                       tdata->digest_enc.len, digest_buffer);
                else
                        digest = rte_pktmbuf_read(ut_params->ibuf,
-                               (tdata->digest.offset_bytes == 0 ?
-                               plaintext_pad_len : tdata->digest.offset_bytes),
-                               tdata->digest.len, digest_buffer);
+                                       (tdata->digest_enc.offset == 0 ?
+                                               plaintext_pad_len :
+                                               tdata->digest_enc.offset),
+                                       tdata->digest_enc.len, digest_buffer);
 
                debug_hexdump(stdout, "digest:", digest,
-                       tdata->digest.len);
+                               tdata->digest_enc.len);
                debug_hexdump(stdout, "digest expected:",
-                       tdata->digest.data, tdata->digest.len);
+                               tdata->digest_enc.data, tdata->digest_enc.len);
        }
 
        /* Validate obuf */
        if (verify) {
                TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       plaintext,
-                       tdata->plaintext.data,
-                       tdata->plaintext.len >> 3,
-                       "ZUC Plaintext data not as expected");
+                               plaintext,
+                               tdata->plaintext.data,
+                               tdata->plaintext.len_bits >> 3,
+                               "Plaintext data not as expected");
        } else {
                TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->validDataLenInBits.len,
-                       "ZUC Ciphertext data not as expected");
-
+                               ciphertext,
+                               tdata->ciphertext.data,
+                               tdata->validDataLen.len_bits,
+                               "Ciphertext data not as expected");
                TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       digest,
-                       tdata->digest.data,
-                       DIGEST_BYTE_LENGTH_KASUMI_F9,
-                       "ZUC Generated auth tag not as expected");
+                               digest,
+                               tdata->digest_enc.data,
+                               tdata->digest_enc.len,
+                               "Generated auth tag not as expected");
        }
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
+
        return 0;
 }
 
-static int
-test_kasumi_encryption_test_case_1(void)
-{
-       return test_kasumi_encryption(&kasumi_test_case_1);
-}
+/** AUTH AES CMAC + CIPHER AES CTR */
 
 static int
-test_kasumi_encryption_test_case_1_sgl(void)
+test_aes_cmac_aes_ctr_digest_enc_test_case_1(void)
 {
-       return test_kasumi_encryption_sgl(&kasumi_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 0);
 }
 
 static int
-test_kasumi_encryption_test_case_1_oop(void)
+test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop(void)
 {
-       return test_kasumi_encryption_oop(&kasumi_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_kasumi_encryption_test_case_1_oop_sgl(void)
+test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl(void)
 {
-       return test_kasumi_encryption_oop_sgl(&kasumi_test_case_1);
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 0);
 }
 
 static int
-test_kasumi_encryption_test_case_2(void)
+test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl(void)
 {
-       return test_kasumi_encryption(&kasumi_test_case_2);
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_kasumi_encryption_test_case_3(void)
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1(void)
 {
-       return test_kasumi_encryption(&kasumi_test_case_3);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 1);
 }
 
 static int
-test_kasumi_encryption_test_case_4(void)
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop(void)
 {
-       return test_kasumi_encryption(&kasumi_test_case_4);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_kasumi_encryption_test_case_5(void)
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl(void)
 {
-       return test_kasumi_encryption(&kasumi_test_case_5);
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, IN_PLACE, 1);
 }
 
 static int
-test_kasumi_decryption_test_case_1(void)
+test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl(void)
 {
-       return test_kasumi_decryption(&kasumi_test_case_1);
+       return test_mixed_auth_cipher_sgl(
+               &auth_aes_cmac_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
 }
 
-static int
-test_kasumi_decryption_test_case_1_oop(void)
-{
-       return test_kasumi_decryption_oop(&kasumi_test_case_1);
-}
+/** MIXED AUTH + CIPHER */
 
 static int
-test_kasumi_decryption_test_case_2(void)
+test_auth_zuc_cipher_snow_test_case_1(void)
 {
-       return test_kasumi_decryption(&kasumi_test_case_2);
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_snow_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_kasumi_decryption_test_case_3(void)
+test_verify_auth_zuc_cipher_snow_test_case_1(void)
 {
-       return test_kasumi_decryption(&kasumi_test_case_3);
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_snow_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_kasumi_decryption_test_case_4(void)
+test_auth_aes_cmac_cipher_snow_test_case_1(void)
 {
-       return test_kasumi_decryption(&kasumi_test_case_4);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_snow_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_kasumi_decryption_test_case_5(void)
-{
-       return test_kasumi_decryption(&kasumi_test_case_5);
-}
-static int
-test_snow3g_encryption_test_case_1(void)
+test_verify_auth_aes_cmac_cipher_snow_test_case_1(void)
 {
-       return test_snow3g_encryption(&snow3g_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_snow_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_encryption_test_case_1_oop(void)
+test_auth_zuc_cipher_aes_ctr_test_case_1(void)
 {
-       return test_snow3g_encryption_oop(&snow3g_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_encryption_test_case_1_oop_sgl(void)
+test_verify_auth_zuc_cipher_aes_ctr_test_case_1(void)
 {
-       return test_snow3g_encryption_oop_sgl(&snow3g_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
 }
 
-
 static int
-test_snow3g_encryption_test_case_1_offset_oop(void)
+test_auth_snow_cipher_aes_ctr_test_case_1(void)
 {
-       return test_snow3g_encryption_offset_oop(&snow3g_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_encryption_test_case_2(void)
+test_verify_auth_snow_cipher_aes_ctr_test_case_1(void)
 {
-       return test_snow3g_encryption(&snow3g_test_case_2);
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_encryption_test_case_3(void)
+test_auth_snow_cipher_zuc_test_case_1(void)
 {
-       return test_snow3g_encryption(&snow3g_test_case_3);
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_zuc_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_encryption_test_case_4(void)
+test_verify_auth_snow_cipher_zuc_test_case_1(void)
 {
-       return test_snow3g_encryption(&snow3g_test_case_4);
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_zuc_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_encryption_test_case_5(void)
+test_auth_aes_cmac_cipher_zuc_test_case_1(void)
 {
-       return test_snow3g_encryption(&snow3g_test_case_5);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_zuc_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_decryption_test_case_1(void)
+test_verify_auth_aes_cmac_cipher_zuc_test_case_1(void)
 {
-       return test_snow3g_decryption(&snow3g_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_zuc_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_decryption_test_case_1_oop(void)
+test_auth_null_cipher_snow_test_case_1(void)
 {
-       return test_snow3g_decryption_oop(&snow3g_test_case_1);
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_snow_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_decryption_test_case_2(void)
+test_verify_auth_null_cipher_snow_test_case_1(void)
 {
-       return test_snow3g_decryption(&snow3g_test_case_2);
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_snow_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_decryption_test_case_3(void)
+test_auth_null_cipher_zuc_test_case_1(void)
 {
-       return test_snow3g_decryption(&snow3g_test_case_3);
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_zuc_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_decryption_test_case_4(void)
+test_verify_auth_null_cipher_zuc_test_case_1(void)
 {
-       return test_snow3g_decryption(&snow3g_test_case_4);
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_zuc_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_decryption_test_case_5(void)
-{
-       return test_snow3g_decryption(&snow3g_test_case_5);
-}
-
-/*
- * Function prepares snow3g_hash_test_data from snow3g_test_data.
- * Pattern digest from snow3g_test_data must be allocated as
- * 4 last bytes in plaintext.
- */
-static void
-snow3g_hash_test_vector_setup(const struct snow3g_test_data *pattern,
-               struct snow3g_hash_test_data *output)
+test_auth_snow_cipher_null_test_case_1(void)
 {
-       if ((pattern != NULL) && (output != NULL)) {
-               output->key.len = pattern->key.len;
-
-               memcpy(output->key.data,
-               pattern->key.data, pattern->key.len);
-
-               output->auth_iv.len = pattern->auth_iv.len;
-
-               memcpy(output->auth_iv.data,
-               pattern->auth_iv.data, pattern->auth_iv.len);
-
-               output->plaintext.len = pattern->plaintext.len;
-
-               memcpy(output->plaintext.data,
-               pattern->plaintext.data, pattern->plaintext.len >> 3);
-
-               output->digest.len = pattern->digest.len;
-
-               memcpy(output->digest.data,
-               &pattern->plaintext.data[pattern->digest.offset_bytes],
-               pattern->digest.len);
-
-               output->validAuthLenInBits.len =
-               pattern->validAuthLenInBits.len;
-       }
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_null_test_case_1, OUT_OF_PLACE, 0);
 }
 
-/*
- * Test case verify computed cipher and digest from snow3g_test_case_7 data.
- */
 static int
-test_snow3g_decryption_with_digest_test_case_1(void)
+test_verify_auth_snow_cipher_null_test_case_1(void)
 {
-       struct snow3g_hash_test_data snow3g_hash_data;
-
-       /*
-        * Function prepare data for hash veryfication test case.
-        * Digest is allocated in 4 last bytes in plaintext, pattern.
-        */
-       snow3g_hash_test_vector_setup(&snow3g_test_case_7, &snow3g_hash_data);
-
-       return test_snow3g_decryption(&snow3g_test_case_7) &
-                       test_snow3g_authentication_verify(&snow3g_hash_data);
+       return test_mixed_auth_cipher(
+               &auth_snow_cipher_null_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_cipher_auth_test_case_1(void)
+test_auth_zuc_cipher_null_test_case_1(void)
 {
-       return test_snow3g_cipher_auth(&snow3g_test_case_3);
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_null_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_auth_cipher_test_case_1(void)
+test_verify_auth_zuc_cipher_null_test_case_1(void)
 {
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_test_case_1, IN_PLACE, 0);
+       return test_mixed_auth_cipher(
+               &auth_zuc_cipher_null_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_auth_cipher_test_case_2(void)
+test_auth_null_cipher_aes_ctr_test_case_1(void)
 {
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_test_case_2, IN_PLACE, 0);
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_auth_cipher_test_case_2_oop(void)
+test_verify_auth_null_cipher_aes_ctr_test_case_1(void)
 {
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
+       return test_mixed_auth_cipher(
+               &auth_null_cipher_aes_ctr_test_case_1, OUT_OF_PLACE, 1);
 }
 
 static int
-test_snow3g_auth_cipher_part_digest_enc(void)
+test_auth_aes_cmac_cipher_null_test_case_1(void)
 {
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       IN_PLACE, 0);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_null_test_case_1, OUT_OF_PLACE, 0);
 }
 
 static int
-test_snow3g_auth_cipher_part_digest_enc_oop(void)
+test_verify_auth_aes_cmac_cipher_null_test_case_1(void)
 {
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       OUT_OF_PLACE, 0);
+       return test_mixed_auth_cipher(
+               &auth_aes_cmac_cipher_null_test_case_1, OUT_OF_PLACE, 1);
 }
 
-static int
-test_snow3g_auth_cipher_test_case_3_sgl(void)
-{
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_test_case_3, IN_PLACE, 0);
-}
+/* ***** AEAD algorithm Tests ***** */
 
 static int
-test_snow3g_auth_cipher_test_case_3_oop_sgl(void)
+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)
 {
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_test_case_3, OUT_OF_PLACE, 0);
-}
+       uint8_t aead_key[key_len];
 
-static int
-test_snow3g_auth_cipher_part_digest_enc_sgl(void)
-{
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       IN_PLACE, 0);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_snow3g_auth_cipher_part_digest_enc_oop_sgl(void)
-{
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       OUT_OF_PLACE, 0);
-}
+       memcpy(aead_key, key, key_len);
 
-static int
-test_snow3g_auth_cipher_verify_test_case_1(void)
-{
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_test_case_1, IN_PLACE, 1);
-}
+       /* 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;
 
-static int
-test_snow3g_auth_cipher_verify_test_case_2(void)
-{
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_test_case_2, IN_PLACE, 1);
-}
+       debug_hexdump(stdout, "key:", key, key_len);
 
-static int
-test_snow3g_auth_cipher_verify_test_case_2_oop(void)
-{
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
+       /* 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
-test_snow3g_auth_cipher_verify_part_digest_enc(void)
-{
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       IN_PLACE, 1);
-}
-
-static int
-test_snow3g_auth_cipher_verify_part_digest_enc_oop(void)
-{
-       return test_snow3g_auth_cipher(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       OUT_OF_PLACE, 1);
-}
-
-static int
-test_snow3g_auth_cipher_verify_test_case_3_sgl(void)
-{
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_test_case_3, IN_PLACE, 1);
-}
-
-static int
-test_snow3g_auth_cipher_verify_test_case_3_oop_sgl(void)
+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)
 {
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_test_case_3, OUT_OF_PLACE, 1);
-}
+       TEST_ASSERT_NOT_NULL(rte_crypto_op_sym_xforms_alloc(op, 1),
+                       "failed to allocate space for crypto transform");
 
-static int
-test_snow3g_auth_cipher_verify_part_digest_enc_sgl(void)
-{
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       IN_PLACE, 1);
-}
+       struct rte_crypto_sym_op *sym_op = op->sym;
 
-static int
-test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl(void)
-{
-       return test_snow3g_auth_cipher_sgl(
-               &snow3g_auth_cipher_partial_digest_encryption,
-                       OUT_OF_PLACE, 1);
-}
+       /* Setup AEAD Parameters */
+       sym_op->xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       sym_op->xform->next = NULL;
+       sym_op->xform->aead.algo = algo;
+       sym_op->xform->aead.op = aead_op;
+       sym_op->xform->aead.key.data = key;
+       sym_op->xform->aead.key.length = key_len;
+       sym_op->xform->aead.iv.offset = IV_OFFSET;
+       sym_op->xform->aead.iv.length = iv_len;
+       sym_op->xform->aead.digest_length = auth_len;
+       sym_op->xform->aead.aad_length = aad_len;
 
-static int
-test_snow3g_auth_cipher_with_digest_test_case_1(void)
-{
-       return test_snow3g_auth_cipher(
-               &snow3g_test_case_7, IN_PLACE, 0);
-}
+       debug_hexdump(stdout, "key:", key, key_len);
 
-static int
-test_kasumi_auth_cipher_test_case_1(void)
-{
-       return test_kasumi_auth_cipher(
-               &kasumi_test_case_3, IN_PLACE, 0);
+       return 0;
 }
 
 static int
-test_kasumi_auth_cipher_test_case_2(void)
+create_aead_operation(enum rte_crypto_aead_operation op,
+               const struct aead_test_data *tdata)
 {
-       return test_kasumi_auth_cipher(
-               &kasumi_auth_cipher_test_case_2, IN_PLACE, 0);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_kasumi_auth_cipher_test_case_2_oop(void)
-{
-       return test_kasumi_auth_cipher(
-               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
-}
+       uint8_t *plaintext, *ciphertext;
+       unsigned int aad_pad_len, plaintext_pad_len;
 
-static int
-test_kasumi_auth_cipher_test_case_2_sgl(void)
-{
-       return test_kasumi_auth_cipher_sgl(
-               &kasumi_auth_cipher_test_case_2, IN_PLACE, 0);
-}
+       /* Generate Crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       TEST_ASSERT_NOT_NULL(ut_params->op,
+                       "Failed to allocate symmetric crypto operation struct");
 
-static int
-test_kasumi_auth_cipher_test_case_2_oop_sgl(void)
-{
-       return test_kasumi_auth_cipher_sgl(
-               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 0);
-}
+       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-static int
-test_kasumi_auth_cipher_verify_test_case_1(void)
-{
-       return test_kasumi_auth_cipher(
-               &kasumi_test_case_3, IN_PLACE, 1);
-}
+       /* Append aad data */
+       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");
 
-static int
-test_kasumi_auth_cipher_verify_test_case_2(void)
-{
-       return test_kasumi_auth_cipher(
-               &kasumi_auth_cipher_test_case_2, IN_PLACE, 1);
-}
+               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);
 
-static int
-test_kasumi_auth_cipher_verify_test_case_2_oop(void)
-{
-       return test_kasumi_auth_cipher(
-               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
-}
+               /* 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);
 
-static int
-test_kasumi_auth_cipher_verify_test_case_2_sgl(void)
-{
-       return test_kasumi_auth_cipher_sgl(
-               &kasumi_auth_cipher_test_case_2, IN_PLACE, 1);
-}
+               /* 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");
 
-static int
-test_kasumi_auth_cipher_verify_test_case_2_oop_sgl(void)
-{
-       return test_kasumi_auth_cipher_sgl(
-               &kasumi_auth_cipher_test_case_2, OUT_OF_PLACE, 1);
-}
+               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);
 
-static int
-test_kasumi_cipher_auth_test_case_1(void)
-{
-       return test_kasumi_cipher_auth(&kasumi_test_case_6);
-}
+               /* 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);
 
-static int
-test_zuc_encryption_test_case_1(void)
-{
-       return test_zuc_encryption(&zuc_test_case_cipher_193b);
-}
+               if (tdata->iv.len == 0) {
+                       rte_memcpy(iv_ptr, tdata->iv.data, AES_GCM_J0_LENGTH);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               AES_GCM_J0_LENGTH);
+               } else {
+                       rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
+                       debug_hexdump(stdout, "iv:", iv_ptr,
+                               tdata->iv.len);
+               }
+       }
 
-static int
-test_zuc_encryption_test_case_2(void)
-{
-       return test_zuc_encryption(&zuc_test_case_cipher_800b);
-}
+       /* Append plaintext/ciphertext */
+       if (op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
+               plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+               TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
-static int
-test_zuc_encryption_test_case_3(void)
-{
-       return test_zuc_encryption(&zuc_test_case_cipher_1570b);
-}
+               memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
+               debug_hexdump(stdout, "plaintext:", plaintext,
+                               tdata->plaintext.len);
 
-static int
-test_zuc_encryption_test_case_4(void)
-{
-       return test_zuc_encryption(&zuc_test_case_cipher_2798b);
-}
+               if (ut_params->obuf) {
+                       ciphertext = (uint8_t *)rte_pktmbuf_append(
+                                       ut_params->obuf,
+                                       plaintext_pad_len + aad_pad_len);
+                       TEST_ASSERT_NOT_NULL(ciphertext,
+                                       "no room to append ciphertext");
 
-static int
-test_zuc_encryption_test_case_5(void)
-{
-       return test_zuc_encryption(&zuc_test_case_cipher_4019b);
-}
+                       memset(ciphertext + aad_pad_len, 0,
+                                       tdata->ciphertext.len);
+               }
+       } else {
+               plaintext_pad_len = RTE_ALIGN_CEIL(tdata->ciphertext.len, 16);
+               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+               TEST_ASSERT_NOT_NULL(ciphertext,
+                               "no room to append ciphertext");
 
-static int
-test_zuc_encryption_test_case_6_sgl(void)
-{
-       return test_zuc_encryption_sgl(&zuc_test_case_cipher_193b);
-}
+               memcpy(ciphertext, tdata->ciphertext.data,
+                               tdata->ciphertext.len);
+               debug_hexdump(stdout, "ciphertext:", ciphertext,
+                               tdata->ciphertext.len);
 
-static int
-test_zuc_hash_generate_test_case_1(void)
-{
-       return test_zuc_authentication(&zuc_test_case_auth_1b);
-}
+               if (ut_params->obuf) {
+                       plaintext = (uint8_t *)rte_pktmbuf_append(
+                                       ut_params->obuf,
+                                       plaintext_pad_len + aad_pad_len);
+                       TEST_ASSERT_NOT_NULL(plaintext,
+                                       "no room to append plaintext");
 
-static int
-test_zuc_hash_generate_test_case_2(void)
-{
-       return test_zuc_authentication(&zuc_test_case_auth_90b);
-}
+                       memset(plaintext + aad_pad_len, 0,
+                                       tdata->plaintext.len);
+               }
+       }
 
-static int
-test_zuc_hash_generate_test_case_3(void)
-{
-       return test_zuc_authentication(&zuc_test_case_auth_577b);
-}
-
-static int
-test_zuc_hash_generate_test_case_4(void)
-{
-       return test_zuc_authentication(&zuc_test_case_auth_2079b);
-}
-
-static int
-test_zuc_hash_generate_test_case_5(void)
-{
-       return test_zuc_authentication(&zuc_test_auth_5670b);
-}
+       /* Append digest data */
+       if (op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
+               sym_op->aead.digest.data = (uint8_t *)rte_pktmbuf_append(
+                               ut_params->obuf ? ut_params->obuf :
+                                               ut_params->ibuf,
+                                               tdata->auth_tag.len);
+               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_iova_offset(
+                               ut_params->obuf ? ut_params->obuf :
+                                               ut_params->ibuf,
+                                               plaintext_pad_len +
+                                               aad_pad_len);
+       } else {
+               sym_op->aead.digest.data = (uint8_t *)rte_pktmbuf_append(
+                               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_iova_offset(
+                               ut_params->ibuf,
+                               plaintext_pad_len + aad_pad_len);
 
-static int
-test_zuc_hash_generate_test_case_6(void)
-{
-       return test_zuc_authentication(&zuc_test_case_auth_128b);
-}
+               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
+                       tdata->auth_tag.len);
+               debug_hexdump(stdout, "digest:",
+                       sym_op->aead.digest.data,
+                       tdata->auth_tag.len);
+       }
 
-static int
-test_zuc_hash_generate_test_case_7(void)
-{
-       return test_zuc_authentication(&zuc_test_case_auth_2080b);
-}
+       sym_op->aead.data.length = tdata->plaintext.len;
+       sym_op->aead.data.offset = aad_pad_len;
 
-static int
-test_zuc_hash_generate_test_case_8(void)
-{
-       return test_zuc_authentication(&zuc_test_case_auth_584b);
+       return 0;
 }
 
 static int
-test_zuc_cipher_auth_test_case_1(void)
+test_authenticated_encryption(const struct aead_test_data *tdata)
 {
-       return test_zuc_cipher_auth(&zuc_test_case_cipher_200b_auth_200b);
-}
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
 
-static int
-test_zuc_cipher_auth_test_case_2(void)
-{
-       return test_zuc_cipher_auth(&zuc_test_case_cipher_800b_auth_120b);
-}
+       int retval;
+       uint8_t *ciphertext, *auth_tag;
+       uint16_t plaintext_pad_len;
+       uint32_t i;
 
-static int
-test_zuc_auth_cipher_test_case_1(void)
-{
-       return test_zuc_auth_cipher(
-               &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
-}
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       const struct rte_cryptodev_symmetric_capability *capability;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       capability = rte_cryptodev_sym_capability_get(
+                       ts_params->valid_devs[0], &cap_idx);
+       if (capability == NULL)
+               return -ENOTSUP;
+       if (rte_cryptodev_sym_capability_check_aead(
+                       capability, tdata->key.len, tdata->auth_tag.len,
+                       tdata->aad.len, tdata->iv.len))
+               return -ENOTSUP;
 
-static int
-test_zuc_auth_cipher_test_case_1_oop(void)
-{
-       return test_zuc_auth_cipher(
-               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 0);
-}
+       /* Create AEAD session */
+       retval = create_aead_session(ts_params->valid_devs[0],
+                       tdata->algo,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
+                       tdata->key.data, tdata->key.len,
+                       tdata->aad.len, tdata->auth_tag.len,
+                       tdata->iv.len);
+       if (retval < 0)
+               return retval;
 
-static int
-test_zuc_auth_cipher_test_case_1_sgl(void)
-{
-       return test_zuc_auth_cipher_sgl(
-               &zuc_auth_cipher_test_case_1, IN_PLACE, 0);
-}
+       if (tdata->aad.len > MBUF_SIZE) {
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
+               /* Populate full size of add data */
+               for (i = 32; i < MAX_AAD_LENGTH; i += 32)
+                       memcpy(&tdata->aad.data[i], &tdata->aad.data[0], 32);
+       } else
+               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-static int
-test_zuc_auth_cipher_test_case_1_oop_sgl(void)
-{
-       return test_zuc_auth_cipher_sgl(
-               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 0);
-}
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-test_zuc_auth_cipher_verify_test_case_1(void)
-{
-       return test_zuc_auth_cipher(
-               &zuc_auth_cipher_test_case_1, IN_PLACE, 1);
-}
+       /* Create AEAD operation */
+       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
+       if (retval < 0)
+               return retval;
 
-static int
-test_zuc_auth_cipher_verify_test_case_1_oop(void)
-{
-       return test_zuc_auth_cipher(
-               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 1);
-}
+       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
 
-static int
-test_zuc_auth_cipher_verify_test_case_1_sgl(void)
-{
-       return test_zuc_auth_cipher_sgl(
-               &zuc_auth_cipher_test_case_1, IN_PLACE, 1);
-}
+       ut_params->op->sym->m_src = ut_params->ibuf;
 
-static int
-test_zuc_auth_cipher_verify_test_case_1_oop_sgl(void)
-{
-       return test_zuc_auth_cipher_sgl(
-               &zuc_auth_cipher_test_case_1, OUT_OF_PLACE, 1);
-}
+       /* Process crypto operation */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op), "failed to process sym crypto op");
 
-static int
-test_3DES_chain_qat_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       if (ut_params->op->sym->m_dst) {
+               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
+                               uint8_t *);
+               auth_tag = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
+                               uint8_t *, plaintext_pad_len);
+       } else {
+               ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
+                               uint8_t *,
+                               ut_params->op->sym->cipher.data.offset);
+               auth_tag = ciphertext + plaintext_pad_len;
+       }
 
-       return TEST_SUCCESS;
-}
+       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
 
-static int
-test_DES_cipheronly_qat_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       ciphertext,
+                       tdata->ciphertext.data,
+                       tdata->ciphertext.len,
+                       "Ciphertext data not as expected");
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD)),
-               BLKCIPHER_DES_CIPHERONLY_TYPE);
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       tdata->auth_tag.data,
+                       tdata->auth_tag.len,
+                       "Generated auth tag not as expected");
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       return 0;
 
-       return TEST_SUCCESS;
 }
 
+#ifdef RTE_LIBRTE_SECURITY
 static int
-test_DES_cipheronly_openssl_all(void)
+security_proto_supported(enum rte_security_session_protocol proto)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_DES_CIPHERONLY_TYPE);
+       const struct rte_security_capability *capabilities;
+       const struct rte_security_capability *capability;
+       uint16_t i = 0;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
 
-       return TEST_SUCCESS;
-}
 
-static int
-test_DES_docsis_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       capabilities = rte_security_capabilities_get(ctx);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)),
-               BLKCIPHER_DES_DOCSIS_TYPE);
+       if (capabilities == NULL)
+               return -ENOTSUP;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       while ((capability = &capabilities[i++])->action !=
+                       RTE_SECURITY_ACTION_TYPE_NONE) {
+               if (capability->protocol == proto)
+                       return 0;
+       }
 
-       return TEST_SUCCESS;
+       return -ENOTSUP;
 }
 
+/* Basic algorithm run function for async inplace mode.
+ * Creates a session from input parameters and runs one operation
+ * on input_vec. Checks the output of the crypto operation against
+ * output_vec.
+ */
 static int
-test_DES_cipheronly_mb_all(void)
+test_pdcp_proto(int i, int oop,
+       enum rte_crypto_cipher_operation opc,
+       enum rte_crypto_auth_operation opa,
+       uint8_t *input_vec,
+       unsigned int input_vec_len,
+       uint8_t *output_vec,
+       unsigned int output_vec_len)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext;
+       int ret = TEST_SUCCESS;
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_DES_CIPHERONLY_TYPE);
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
+       sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
+       if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
+               return -ENOTSUP;
 
-       return TEST_SUCCESS;
-}
-static int
-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_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
-
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Generate test mbuf data */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       return TEST_SUCCESS;
-}
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-static int
-test_DES_docsis_mb_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                                 input_vec_len);
+       memcpy(plaintext, input_vec, input_vec_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_AESNI_MB_PMD)),
-               BLKCIPHER_DES_DOCSIS_TYPE);
+       /* Out of place support */
+       if (oop) {
+               /*
+                * For out-op-place we need to alloc another mbuf
+                */
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               rte_pktmbuf_append(ut_params->obuf, output_vec_len);
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Set crypto type as IPSEC */
+       ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
 
-       return TEST_SUCCESS;
-}
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
+       ut_params->cipher_xform.cipher.op = opc;
+       ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
+       ut_params->cipher_xform.cipher.key.length =
+                                       pdcp_test_params[i].cipher_key_len;
+       ut_params->cipher_xform.cipher.iv.length = 0;
 
-static int
-test_3DES_chain_caam_jr_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Setup HMAC Parameters if ICV header is required */
+       if (pdcp_test_params[i].auth_alg != 0) {
+               ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+               ut_params->auth_xform.next = NULL;
+               ut_params->auth_xform.auth.algo = pdcp_test_params[i].auth_alg;
+               ut_params->auth_xform.auth.op = opa;
+               ut_params->auth_xform.auth.key.data = pdcp_test_auth_key[i];
+               ut_params->auth_xform.auth.key.length =
+                                       pdcp_test_params[i].auth_key_len;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+               ut_params->cipher_xform.next = &ut_params->auth_xform;
+       } else {
+               ut_params->cipher_xform.next = NULL;
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       struct rte_security_session_conf sess_conf = {
+               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+               .protocol = RTE_SECURITY_PROTOCOL_PDCP,
+               {.pdcp = {
+                       .bearer = pdcp_test_bearer[i],
+                       .domain = pdcp_test_params[i].domain,
+                       .pkt_dir = pdcp_test_packet_direction[i],
+                       .sn_size = pdcp_test_data_sn_size[i],
+                       .hfn = pdcp_test_hfn[i],
+                       .hfn_threshold = pdcp_test_hfn_threshold[i],
+               } },
+               .crypto_xform = &ut_params->cipher_xform
+       };
 
-       return TEST_SUCCESS;
-}
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx,
+                               &sess_conf, ts_params->session_priv_mpool);
 
-static int
-test_3DES_cipheronly_caam_jr_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       if (!ut_params->sec_session) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "Failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CAAM_JR_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "Failed to allocate symmetric crypto operation struct");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
 
-       return TEST_SUCCESS;
-}
+       /* set crypto operation source mbuf */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       if (oop)
+               ut_params->op->sym->m_dst = ut_params->obuf;
 
-static int
-test_3DES_chain_dpaa_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op)
+               == NULL) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "failed to process sym crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_DPAA_SEC_PMD)),
-               BLKCIPHER_3DES_CHAIN_TYPE);
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /* Validate obuf */
+       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
+                       uint8_t *);
+       if (oop) {
+               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
+                               uint8_t *);
+       }
 
-       return TEST_SUCCESS;
-}
+       if (memcmp(ciphertext, output_vec, output_vec_len)) {
+               printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
+               rte_hexdump(stdout, "encrypted", ciphertext, output_vec_len);
+               rte_hexdump(stdout, "reference", output_vec, output_vec_len);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-static int
-test_3DES_cipheronly_dpaa_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = 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_DPAA_SEC_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+       if (oop) {
+               rte_pktmbuf_free(ut_params->obuf);
+               ut_params->obuf = NULL;
+       }
 
-       return TEST_SUCCESS;
+       return ret;
 }
 
 static int
-test_3DES_chain_dpaa2_sec_all(void)
+test_pdcp_proto_SGL(int i, int oop,
+       enum rte_crypto_cipher_operation opc,
+       enum rte_crypto_auth_operation opa,
+       uint8_t *input_vec,
+       unsigned int input_vec_len,
+       uint8_t *output_vec,
+       unsigned int output_vec_len,
+       uint32_t fragsz,
+       uint32_t fragsz_oop)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext;
+       struct rte_mbuf *buf, *buf_oop = NULL;
+       int ret = TEST_SUCCESS;
+       int to_trn = 0;
+       int to_trn_tbl[16];
+       int segs = 1;
+       unsigned int trn_data = 0;
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                               rte_cryptodev_get_sec_ctx(
+                               ts_params->valid_devs[0]);
 
-       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);
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_PDCP;
+       sec_cap_idx.pdcp.domain = pdcp_test_params[i].domain;
+       if (rte_security_capability_get(ctx, &sec_cap_idx) == NULL)
+               return -ENOTSUP;
 
-       return TEST_SUCCESS;
-}
+       if (fragsz > input_vec_len)
+               fragsz = input_vec_len;
 
-static int
-test_3DES_cipheronly_dpaa2_sec_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       uint16_t plaintext_len = fragsz;
+       uint16_t frag_size_oop = fragsz_oop ? fragsz_oop : fragsz;
 
-       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);
+       if (fragsz_oop > output_vec_len)
+               frag_size_oop = output_vec_len;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       int ecx = 0;
+       if (input_vec_len % fragsz != 0) {
+               if (input_vec_len / fragsz + 1 > 16)
+                       return 1;
+       } else if (input_vec_len / fragsz > 16)
+               return 1;
 
-       return TEST_SUCCESS;
-}
+       /* Out of place support */
+       if (oop) {
+               /*
+                * For out-op-place we need to alloc another mbuf
+                */
+               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               rte_pktmbuf_append(ut_params->obuf, frag_size_oop);
+               buf_oop = ut_params->obuf;
+       }
 
-static int
-test_3DES_chain_ccp_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+       /* Generate test mbuf data */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       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);
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       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;
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                                                 plaintext_len);
+       memcpy(plaintext, input_vec, plaintext_len);
+       trn_data += plaintext_len;
 
-       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
-               ts_params->op_mpool,
-               ts_params->session_mpool, ts_params->session_priv_mpool,
-               ts_params->valid_devs[0],
-               rte_cryptodev_driver_id_get(
-               RTE_STR(CRYPTODEV_NAME_CCP_PMD)),
-               BLKCIPHER_3DES_CIPHERONLY_TYPE);
+       buf = ut_params->ibuf;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       /*
+        * Loop until no more fragments
+        */
 
-       return TEST_SUCCESS;
-}
+       while (trn_data < input_vec_len) {
+               ++segs;
+               to_trn = (input_vec_len - trn_data < fragsz) ?
+                               (input_vec_len - trn_data) : fragsz;
 
-static int
-test_3DES_cipheronly_qat_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+               to_trn_tbl[ecx++] = to_trn;
 
-       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);
+               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+               buf = buf->next;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
+                               rte_pktmbuf_tailroom(buf));
 
-       return TEST_SUCCESS;
-}
+               /* OOP */
+               if (oop && !fragsz_oop) {
+                       buf_oop->next =
+                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
+               }
 
-static int
-test_3DES_chain_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
+                               to_trn);
 
-       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);
+               memcpy(plaintext, input_vec + trn_data, to_trn);
+               trn_data += to_trn;
+       }
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+       ut_params->ibuf->nb_segs = segs;
 
-       return TEST_SUCCESS;
-}
+       segs = 1;
+       if (fragsz_oop && oop) {
+               to_trn = 0;
+               ecx = 0;
 
-static int
-test_3DES_cipheronly_openssl_all(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       int status;
+               trn_data = frag_size_oop;
+               while (trn_data < output_vec_len) {
+                       ++segs;
+                       to_trn =
+                               (output_vec_len - trn_data <
+                                               frag_size_oop) ?
+                               (output_vec_len - trn_data) :
+                                               frag_size_oop;
 
-       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);
+                       to_trn_tbl[ecx++] = to_trn;
 
-       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+                       buf_oop->next =
+                               rte_pktmbuf_alloc(ts_params->mbuf_pool);
+                       buf_oop = buf_oop->next;
+                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
+                                       0, rte_pktmbuf_tailroom(buf_oop));
+                       rte_pktmbuf_append(buf_oop, to_trn);
 
-       return TEST_SUCCESS;
-}
+                       trn_data += to_trn;
+               }
+               ut_params->obuf->nb_segs = segs;
+       }
 
-/* ***** AEAD algorithm Tests ***** */
+       ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
 
-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];
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
+       ut_params->cipher_xform.cipher.op = opc;
+       ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
+       ut_params->cipher_xform.cipher.key.length =
+                                       pdcp_test_params[i].cipher_key_len;
+       ut_params->cipher_xform.cipher.iv.length = 0;
 
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
+       /* Setup HMAC Parameters if ICV header is required */
+       if (pdcp_test_params[i].auth_alg != 0) {
+               ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+               ut_params->auth_xform.next = NULL;
+               ut_params->auth_xform.auth.algo = pdcp_test_params[i].auth_alg;
+               ut_params->auth_xform.auth.op = opa;
+               ut_params->auth_xform.auth.key.data = pdcp_test_auth_key[i];
+               ut_params->auth_xform.auth.key.length =
+                                       pdcp_test_params[i].auth_key_len;
 
-       memcpy(aead_key, key, key_len);
+               ut_params->cipher_xform.next = &ut_params->auth_xform;
+       } else {
+               ut_params->cipher_xform.next = NULL;
+       }
 
-       /* 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;
+       struct rte_security_session_conf sess_conf = {
+               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
+               .protocol = RTE_SECURITY_PROTOCOL_PDCP,
+               {.pdcp = {
+                       .bearer = pdcp_test_bearer[i],
+                       .domain = pdcp_test_params[i].domain,
+                       .pkt_dir = pdcp_test_packet_direction[i],
+                       .sn_size = pdcp_test_data_sn_size[i],
+                       .hfn = pdcp_test_hfn[i],
+                       .hfn_threshold = pdcp_test_hfn_threshold[i],
+               } },
+               .crypto_xform = &ut_params->cipher_xform
+       };
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       /* Create security session */
+       ut_params->sec_session = rte_security_session_create(ctx,
+                               &sess_conf, ts_params->session_priv_mpool);
 
-       /* Create Crypto session*/
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       if (!ut_params->sec_session) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "Failed to allocate session");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       rte_cryptodev_sym_session_init(dev_id, ut_params->sess,
-                       &ut_params->aead_xform,
-                       ts_params->session_priv_mpool);
+       /* Generate crypto op data structure */
+       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       if (!ut_params->op) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "Failed to allocate symmetric crypto operation struct");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       rte_security_attach_session(ut_params->op, ut_params->sec_session);
 
-       return 0;
-}
+       /* set crypto operation source mbuf */
+       ut_params->op->sym->m_src = ut_params->ibuf;
+       if (oop)
+               ut_params->op->sym->m_dst = ut_params->obuf;
 
-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");
+       /* Process crypto operation */
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op)
+               == NULL) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__,
+                       "failed to process sym crypto op");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       struct rte_crypto_sym_op *sym_op = op->sym;
+       if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
+               printf("TestCase %s()-%d line %d failed %s: ",
+                       __func__, i, __LINE__, "crypto op processing failed");
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       /* 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;
+       /* Validate obuf */
+       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
+                       uint8_t *);
+       if (oop) {
+               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
+                               uint8_t *);
+       }
+       if (fragsz_oop)
+               fragsz = frag_size_oop;
+       if (memcmp(ciphertext, output_vec, fragsz)) {
+               printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
+               rte_hexdump(stdout, "encrypted", ciphertext, fragsz);
+               rte_hexdump(stdout, "reference", output_vec, fragsz);
+               ret = TEST_FAILED;
+               goto on_err;
+       }
 
-       debug_hexdump(stdout, "key:", key, key_len);
+       buf = ut_params->op->sym->m_src->next;
+       if (oop)
+               buf = ut_params->op->sym->m_dst->next;
 
-       return 0;
-}
+       unsigned int off = fragsz;
 
-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;
+       ecx = 0;
+       while (buf) {
+               ciphertext = rte_pktmbuf_mtod(buf,
+                               uint8_t *);
+               if (memcmp(ciphertext, output_vec + off, to_trn_tbl[ecx])) {
+                       printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
+                       rte_hexdump(stdout, "encrypted", ciphertext, to_trn_tbl[ecx]);
+                       rte_hexdump(stdout, "reference", output_vec + off,
+                                       to_trn_tbl[ecx]);
+                       ret = TEST_FAILED;
+                       goto on_err;
+               }
+               off += to_trn_tbl[ecx++];
+               buf = buf->next;
+       }
+on_err:
+       rte_crypto_op_free(ut_params->op);
+       ut_params->op = NULL;
 
-       uint8_t *plaintext, *ciphertext;
-       unsigned int aad_pad_len, plaintext_pad_len;
+       if (ut_params->sec_session)
+               rte_security_session_destroy(ctx, ut_params->sec_session);
+       ut_params->sec_session = NULL;
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       rte_pktmbuf_free(ut_params->ibuf);
+       ut_params->ibuf = NULL;
+       if (oop) {
+               rte_pktmbuf_free(ut_params->obuf);
+               ut_params->obuf = NULL;
+       }
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       return ret;
+}
 
-       /* Append aad data */
-       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");
+int
+test_pdcp_proto_cplane_encap(int i)
+{
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i]+4);
+}
 
-               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);
+int
+test_pdcp_proto_uplane_encap(int i)
+{
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i]);
 
-               /* 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");
+int
+test_pdcp_proto_uplane_encap_with_int(int i)
+{
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+               RTE_CRYPTO_AUTH_OP_GENERATE,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i] + 4);
+}
 
-               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);
+int
+test_pdcp_proto_cplane_decap(int i)
+{
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+               RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i] + 4,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i]);
+}
 
-               /* 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);
+int
+test_pdcp_proto_uplane_decap(int i)
+{
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+               RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i],
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i]);
+}
 
-               rte_memcpy(iv_ptr, tdata->iv.data, tdata->iv.len);
-               debug_hexdump(stdout, "iv:", iv_ptr,
-                       tdata->iv.len);
-       }
+int
+test_pdcp_proto_uplane_decap_with_int(int i)
+{
+       return test_pdcp_proto(i, 0,
+               RTE_CRYPTO_CIPHER_OP_DECRYPT,
+               RTE_CRYPTO_AUTH_OP_VERIFY,
+               pdcp_test_data_out[i],
+               pdcp_test_data_in_len[i] + 4,
+               pdcp_test_data_in[i],
+               pdcp_test_data_in_len[i]);
+}
 
-       /* Append plaintext/ciphertext */
-       if (op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
-               plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
-               plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-               TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+static int
+test_PDCP_PROTO_SGL_in_place_32B(void)
+{
+       /* i can be used for running any PDCP case
+        * In this case it is uplane 12-bit AES-SNOW DL encap
+        */
+       int i = PDCP_UPLANE_12BIT_OFFSET + AES_ENC + SNOW_AUTH + DOWNLINK;
+       return test_pdcp_proto_SGL(i, IN_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i]+4,
+                       32, 0);
+}
+static int
+test_PDCP_PROTO_SGL_oop_32B_128B(void)
+{
+       /* i can be used for running any PDCP case
+        * In this case it is uplane 18-bit NULL-NULL DL encap
+        */
+       int i = PDCP_UPLANE_18BIT_OFFSET + NULL_ENC + NULL_AUTH + DOWNLINK;
+       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i]+4,
+                       32, 128);
+}
+static int
+test_PDCP_PROTO_SGL_oop_32B_40B(void)
+{
+       /* i can be used for running any PDCP case
+        * In this case it is uplane 18-bit AES DL encap
+        */
+       int i = PDCP_UPLANE_OFFSET + AES_ENC + EIGHTEEN_BIT_SEQ_NUM_OFFSET
+                       + DOWNLINK;
+       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i],
+                       32, 40);
+}
+static int
+test_PDCP_PROTO_SGL_oop_128B_32B(void)
+{
+       /* i can be used for running any PDCP case
+        * In this case it is cplane 12-bit AES-ZUC DL encap
+        */
+       int i = PDCP_CPLANE_LONG_SN_OFFSET + AES_ENC + ZUC_AUTH + DOWNLINK;
+       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       pdcp_test_data_in[i],
+                       pdcp_test_data_in_len[i],
+                       pdcp_test_data_out[i],
+                       pdcp_test_data_in_len[i]+4,
+                       128, 32);
+}
 
-               memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
-               debug_hexdump(stdout, "plaintext:", plaintext,
-                               tdata->plaintext.len);
+static int
+test_PDCP_PROTO_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
 
-               if (ut_params->obuf) {
-                       ciphertext = (uint8_t *)rte_pktmbuf_append(
-                                       ut_params->obuf,
-                                       plaintext_pad_len + aad_pad_len);
-                       TEST_ASSERT_NOT_NULL(ciphertext,
-                                       "no room to append ciphertext");
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
-                       memset(ciphertext + aad_pad_len, 0,
-                                       tdata->ciphertext.len);
-               }
-       } else {
-               plaintext_pad_len = RTE_ALIGN_CEIL(tdata->ciphertext.len, 16);
-               ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                               plaintext_pad_len);
-               TEST_ASSERT_NOT_NULL(ciphertext,
-                               "no room to append ciphertext");
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return -ENOTSUP;
 
-               memcpy(ciphertext, tdata->ciphertext.data,
-                               tdata->ciphertext.len);
-               debug_hexdump(stdout, "ciphertext:", ciphertext,
-                               tdata->ciphertext.len);
+       if (security_proto_supported(RTE_SECURITY_PROTOCOL_PDCP) < 0)
+               return -ENOTSUP;
 
-               if (ut_params->obuf) {
-                       plaintext = (uint8_t *)rte_pktmbuf_append(
-                                       ut_params->obuf,
-                                       plaintext_pad_len + aad_pad_len);
-                       TEST_ASSERT_NOT_NULL(plaintext,
-                                       "no room to append plaintext");
+       status = test_PDCP_PROTO_cplane_encap_all();
+       status += test_PDCP_PROTO_cplane_decap_all();
+       status += test_PDCP_PROTO_uplane_encap_all();
+       status += test_PDCP_PROTO_uplane_decap_all();
+       status += test_PDCP_PROTO_SGL_in_place_32B();
+       status += test_PDCP_PROTO_SGL_oop_32B_128B();
+       status += test_PDCP_PROTO_SGL_oop_32B_40B();
+       status += test_PDCP_PROTO_SGL_oop_128B_32B();
 
-                       memset(plaintext + aad_pad_len, 0,
-                                       tdata->plaintext.len);
-               }
-       }
-
-       /* Append digest data */
-       if (op == RTE_CRYPTO_AEAD_OP_ENCRYPT) {
-               sym_op->aead.digest.data = (uint8_t *)rte_pktmbuf_append(
-                               ut_params->obuf ? ut_params->obuf :
-                                               ut_params->ibuf,
-                                               tdata->auth_tag.len);
-               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_iova_offset(
-                               ut_params->obuf ? ut_params->obuf :
-                                               ut_params->ibuf,
-                                               plaintext_pad_len +
-                                               aad_pad_len);
-       } else {
-               sym_op->aead.digest.data = (uint8_t *)rte_pktmbuf_append(
-                               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_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);
-               debug_hexdump(stdout, "digest:",
-                       sym_op->aead.digest.data,
-                       tdata->auth_tag.len);
-       }
-
-       sym_op->aead.data.length = tdata->plaintext.len;
-       sym_op->aead.data.offset = aad_pad_len;
-
-       return 0;
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
 
 static int
-test_authenticated_encryption(const struct aead_test_data *tdata)
+test_docsis_proto_uplink(int i, struct docsis_test_data *d_td)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
+       uint32_t crc_data_len;
+       int ret = TEST_SUCCESS;
 
-       int retval;
-       uint8_t *ciphertext, *auth_tag;
-       uint16_t plaintext_pad_len;
-       uint32_t i;
-
-       /* Create AEAD session */
-       retval = create_aead_session(ts_params->valid_devs[0],
-                       tdata->algo,
-                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
-                       tdata->key.data, tdata->key.len,
-                       tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len);
-       if (retval < 0)
-               return retval;
-
-       if (tdata->aad.len > MBUF_SIZE) {
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
-               /* Populate full size of add data */
-               for (i = 32; i < MAX_AAD_LENGTH; i += 32)
-                       memcpy(&tdata->aad.data[i], &tdata->aad.data[0], 32);
-       } else
-               ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-       /* clear mbuf payload */
-       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
-                       rte_pktmbuf_tailroom(ut_params->ibuf));
-
-       /* Create AEAD operation */
-       retval = create_aead_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
-       if (retval < 0)
-               return retval;
-
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       ut_params->op->sym->m_src = ut_params->ibuf;
-
-       /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto op processing failed");
-
-       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
+
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
+
+       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_UPLINK;
+
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return -ENOTSUP;
 
-       if (ut_params->op->sym->m_dst) {
-               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
-                               uint8_t *);
-               auth_tag = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
-                               uint8_t *, plaintext_pad_len);
-       } else {
-               ciphertext = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_src,
-                               uint8_t *,
-                               ut_params->op->sym->cipher.data.offset);
-               auth_tag = ciphertext + plaintext_pad_len;
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
        }
 
-       debug_hexdump(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
-       debug_hexdump(stdout, "auth tag:", auth_tag, tdata->auth_tag.len);
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       ciphertext,
-                       tdata->ciphertext.data,
-                       tdata->ciphertext.len,
-                       "Ciphertext data not as expected");
-
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       auth_tag,
-                       tdata->auth_tag.data,
-                       tdata->auth_tag.len,
-                       "Generated auth tag not as expected");
-
-       return 0;
-
-}
-
-#ifdef RTE_LIBRTE_SECURITY
-/* Basic algorithm run function for async inplace mode.
- * Creates a session from input parameters and runs one operation
- * on input_vec. Checks the output of the crypto operation against
- * output_vec.
- */
-static int
-test_pdcp_proto(int i, int oop,
-       enum rte_crypto_cipher_operation opc,
-       enum rte_crypto_auth_operation opa,
-       uint8_t *input_vec,
-       unsigned int input_vec_len,
-       uint8_t *output_vec,
-       unsigned int output_vec_len)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *plaintext;
-       int ret = TEST_SUCCESS;
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return -ENOTSUP;
 
-       /* Generate test mbuf data */
+       /* Setup source mbuf 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));
 
-       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                                                 input_vec_len);
-       memcpy(plaintext, input_vec, input_vec_len);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       d_td->ciphertext.len);
 
-       /* Out of place support */
-       if (oop) {
-               /*
-                * For out-op-place we need to alloc another mbuf
-                */
-               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-               rte_pktmbuf_append(ut_params->obuf, output_vec_len);
-       }
+       memcpy(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len);
 
-       /* Set crypto type as IPSEC */
+       /* Set session action type */
        ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
 
-       /* Setup Cipher Parameters */
+       /* Setup cipher session parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
-       ut_params->cipher_xform.cipher.op = opc;
-       ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
-       ut_params->cipher_xform.cipher.key.length =
-                                       pdcp_test_params[i].cipher_key_len;
-       ut_params->cipher_xform.cipher.iv.length = 0;
-
-       /* Setup HMAC Parameters if ICV header is required */
-       if (pdcp_test_params[i].auth_alg != 0) {
-               ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-               ut_params->auth_xform.next = NULL;
-               ut_params->auth_xform.auth.algo = pdcp_test_params[i].auth_alg;
-               ut_params->auth_xform.auth.op = opa;
-               ut_params->auth_xform.auth.key.data = pdcp_test_auth_key[i];
-               ut_params->auth_xform.auth.key.length =
-                                       pdcp_test_params[i].auth_key_len;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
 
-               ut_params->cipher_xform.next = &ut_params->auth_xform;
-       } else {
-               ut_params->cipher_xform.next = NULL;
-       }
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_UPLINK;
 
        struct rte_security_session_conf sess_conf = {
-               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
-               .protocol = RTE_SECURITY_PROTOCOL_PDCP,
-               {.pdcp = {
-                       .bearer = pdcp_test_bearer[i],
-                       .domain = pdcp_test_params[i].domain,
-                       .pkt_dir = pdcp_test_packet_direction[i],
-                       .sn_size = pdcp_test_data_sn_size[i],
-                       .hfn = pdcp_test_hfn[i],
-                       .hfn_threshold = pdcp_test_hfn_threshold[i],
-               } },
-               .crypto_xform = &ut_params->cipher_xform
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
        };
 
-       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
-                               rte_cryptodev_get_sec_ctx(
-                               ts_params->valid_devs[0]);
-
        /* Create security session */
-       ut_params->sec_session = rte_security_session_create(ctx,
-                               &sess_conf, ts_params->session_mpool);
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_priv_mpool);
 
        if (!ut_params->sec_session) {
-               printf("TestCase %s()-%d line %d failed %s: ",
-                       __func__, i, __LINE__, "Failed to allocate session");
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
                ret = TEST_FAILED;
                goto on_err;
        }
 
        /* Generate crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        if (!ut_params->op) {
-               printf("TestCase %s()-%d line %d failed %s: ",
+               printf("TestCase %s(%d) line %d: %s\n",
                        __func__, i, __LINE__,
-                       "Failed to allocate symmetric crypto operation struct");
+                       "failed to allocate symmetric crypto operation");
                ret = TEST_FAILED;
                goto on_err;
        }
 
+       /* Setup CRC operation parameters */
+       crc_len = d_td->ciphertext.no_crc == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       crc_data_len = crc_len == 0 ? 0 : RTE_ETHER_CRC_LEN;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->ciphertext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->ciphertext.no_cipher == false ?
+                       (d_td->ciphertext.len -
+                               d_td->ciphertext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->ciphertext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
        rte_security_attach_session(ut_params->op, ut_params->sec_session);
 
-       /* set crypto operation source mbuf */
+       /* Set crypto operation mbufs */
        ut_params->op->sym->m_src = ut_params->ibuf;
-       if (oop)
-               ut_params->op->sym->m_dst = ut_params->obuf;
+       ut_params->op->sym->m_dst = NULL;
 
        /* Process crypto operation */
-       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op)
-               == NULL) {
-               printf("TestCase %s()-%d line %d failed %s: ",
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
                        __func__, i, __LINE__,
-                       "failed to process sym crypto op");
+                       "failed to process security crypto op");
                ret = TEST_FAILED;
                goto on_err;
        }
 
        if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
-               printf("TestCase %s()-%d line %d failed %s: ",
+               printf("TestCase %s(%d) line %d: %s\n",
                        __func__, i, __LINE__, "crypto op processing failed");
                ret = TEST_FAILED;
                goto on_err;
        }
 
-       /* Validate obuf */
-       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
-                       uint8_t *);
-       if (oop) {
-               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
-                               uint8_t *);
-       }
+       /* Validate plaintext */
+       plaintext = ciphertext;
 
-       if (memcmp(ciphertext, output_vec, output_vec_len)) {
-               printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
-               rte_hexdump(stdout, "encrypted", ciphertext, output_vec_len);
-               rte_hexdump(stdout, "reference", output_vec, output_vec_len);
+       if (memcmp(plaintext, d_td->plaintext.data,
+                       d_td->plaintext.len - crc_data_len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "plaintext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->plaintext.data,
+                               d_td->plaintext.len);
+               rte_hexdump(stdout, "actual", plaintext, d_td->plaintext.len);
                ret = TEST_FAILED;
                goto on_err;
        }
@@ -7195,267 +7896,172 @@ on_err:
 
        rte_pktmbuf_free(ut_params->ibuf);
        ut_params->ibuf = NULL;
-       if (oop) {
-               rte_pktmbuf_free(ut_params->obuf);
-               ut_params->obuf = NULL;
-       }
 
        return ret;
 }
 
 static int
-test_pdcp_proto_SGL(int i, int oop,
-       enum rte_crypto_cipher_operation opc,
-       enum rte_crypto_auth_operation opa,
-       uint8_t *input_vec,
-       unsigned int input_vec_len,
-       uint8_t *output_vec,
-       unsigned int output_vec_len,
-       uint32_t fragsz,
-       uint32_t fragsz_oop)
+test_docsis_proto_downlink(int i, struct docsis_test_data *d_td)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *plaintext;
-       struct rte_mbuf *buf, *buf_oop = NULL;
+       uint8_t *plaintext, *ciphertext;
+       uint8_t *iv_ptr;
+       int32_t cipher_len, crc_len;
        int ret = TEST_SUCCESS;
-       int to_trn = 0;
-       int to_trn_tbl[16];
-       int segs = 1;
-       unsigned int trn_data = 0;
 
-       if (fragsz > input_vec_len)
-               fragsz = input_vec_len;
+       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
+                                       rte_cryptodev_get_sec_ctx(
+                                               ts_params->valid_devs[0]);
+
+       /* Verify the capabilities */
+       struct rte_security_capability_idx sec_cap_idx;
+       const struct rte_security_capability *sec_cap;
+       const struct rte_cryptodev_capabilities *crypto_cap;
+       const struct rte_cryptodev_symmetric_capability *sym_cap;
+       int j = 0;
+
+       sec_cap_idx.action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
+       sec_cap_idx.protocol = RTE_SECURITY_PROTOCOL_DOCSIS;
+       sec_cap_idx.docsis.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
+
+       sec_cap = rte_security_capability_get(ctx, &sec_cap_idx);
+       if (sec_cap == NULL)
+               return -ENOTSUP;
 
-       uint16_t plaintext_len = fragsz;
-       uint16_t frag_size_oop = fragsz_oop ? fragsz_oop : fragsz;
+       while ((crypto_cap = &sec_cap->crypto_capabilities[j++])->op !=
+                       RTE_CRYPTO_OP_TYPE_UNDEFINED) {
+               if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_SYMMETRIC &&
+                               crypto_cap->sym.xform_type ==
+                                       RTE_CRYPTO_SYM_XFORM_CIPHER &&
+                               crypto_cap->sym.cipher.algo ==
+                                       RTE_CRYPTO_CIPHER_AES_DOCSISBPI) {
+                       sym_cap = &crypto_cap->sym;
+                       if (rte_cryptodev_sym_capability_check_cipher(sym_cap,
+                                               d_td->key.len,
+                                               d_td->iv.len) == 0)
+                               break;
+               }
+       }
 
-       if (fragsz_oop > output_vec_len)
-               frag_size_oop = output_vec_len;
+       if (crypto_cap->op == RTE_CRYPTO_OP_TYPE_UNDEFINED)
+               return -ENOTSUP;
 
-       int ecx = 0;
-       if (input_vec_len % fragsz != 0) {
-               if (input_vec_len / fragsz + 1 > 16)
-                       return 1;
-       } else if (input_vec_len / fragsz > 16)
-               return 1;
-
-       /* Out of place support */
-       if (oop) {
-               /*
-                * For out-op-place we need to alloc another mbuf
-                */
-               ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-               rte_pktmbuf_append(ut_params->obuf, frag_size_oop);
-               buf_oop = ut_params->obuf;
-       }
-
-       /* Generate test mbuf data */
+       /* Setup source mbuf 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));
 
        plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                                                 plaintext_len);
-       memcpy(plaintext, input_vec, plaintext_len);
-       trn_data += plaintext_len;
-
-       buf = ut_params->ibuf;
-
-       /*
-        * Loop until no more fragments
-        */
-
-       while (trn_data < input_vec_len) {
-               ++segs;
-               to_trn = (input_vec_len - trn_data < fragsz) ?
-                               (input_vec_len - trn_data) : fragsz;
-
-               to_trn_tbl[ecx++] = to_trn;
-
-               buf->next = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-               buf = buf->next;
-
-               memset(rte_pktmbuf_mtod(buf, uint8_t *), 0,
-                               rte_pktmbuf_tailroom(buf));
-
-               /* OOP */
-               if (oop && !fragsz_oop) {
-                       buf_oop->next =
-                                       rte_pktmbuf_alloc(ts_params->mbuf_pool);
-                       buf_oop = buf_oop->next;
-                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
-                                       0, rte_pktmbuf_tailroom(buf_oop));
-                       rte_pktmbuf_append(buf_oop, to_trn);
-               }
-
-               plaintext = (uint8_t *)rte_pktmbuf_append(buf,
-                               to_trn);
-
-               memcpy(plaintext, input_vec + trn_data, to_trn);
-               trn_data += to_trn;
-       }
-
-       ut_params->ibuf->nb_segs = segs;
-
-       segs = 1;
-       if (fragsz_oop && oop) {
-               to_trn = 0;
-               ecx = 0;
-
-               trn_data = frag_size_oop;
-               while (trn_data < output_vec_len) {
-                       ++segs;
-                       to_trn =
-                               (output_vec_len - trn_data <
-                                               frag_size_oop) ?
-                               (output_vec_len - trn_data) :
-                                               frag_size_oop;
-
-                       to_trn_tbl[ecx++] = to_trn;
-
-                       buf_oop->next =
-                               rte_pktmbuf_alloc(ts_params->mbuf_pool);
-                       buf_oop = buf_oop->next;
-                       memset(rte_pktmbuf_mtod(buf_oop, uint8_t *),
-                                       0, rte_pktmbuf_tailroom(buf_oop));
-                       rte_pktmbuf_append(buf_oop, to_trn);
+                       d_td->plaintext.len);
 
-                       trn_data += to_trn;
-               }
-               ut_params->obuf->nb_segs = segs;
-       }
+       memcpy(plaintext, d_td->plaintext.data, d_td->plaintext.len);
 
+       /* Set session action type */
        ut_params->type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL;
 
-       /* Setup Cipher Parameters */
+       /* Setup cipher session parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.cipher.algo = pdcp_test_params[i].cipher_alg;
-       ut_params->cipher_xform.cipher.op = opc;
-       ut_params->cipher_xform.cipher.key.data = pdcp_test_crypto_key[i];
-       ut_params->cipher_xform.cipher.key.length =
-                                       pdcp_test_params[i].cipher_key_len;
-       ut_params->cipher_xform.cipher.iv.length = 0;
-
-       /* Setup HMAC Parameters if ICV header is required */
-       if (pdcp_test_params[i].auth_alg != 0) {
-               ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-               ut_params->auth_xform.next = NULL;
-               ut_params->auth_xform.auth.algo = pdcp_test_params[i].auth_alg;
-               ut_params->auth_xform.auth.op = opa;
-               ut_params->auth_xform.auth.key.data = pdcp_test_auth_key[i];
-               ut_params->auth_xform.auth.key.length =
-                                       pdcp_test_params[i].auth_key_len;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_DOCSISBPI;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = d_td->key.data;
+       ut_params->cipher_xform.cipher.key.length = d_td->key.len;
+       ut_params->cipher_xform.cipher.iv.length = d_td->iv.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.next = NULL;
 
-               ut_params->cipher_xform.next = &ut_params->auth_xform;
-       } else {
-               ut_params->cipher_xform.next = NULL;
-       }
+       /* Setup DOCSIS session parameters */
+       ut_params->docsis_xform.direction = RTE_SECURITY_DOCSIS_DOWNLINK;
 
        struct rte_security_session_conf sess_conf = {
-               .action_type = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL,
-               .protocol = RTE_SECURITY_PROTOCOL_PDCP,
-               {.pdcp = {
-                       .bearer = pdcp_test_bearer[i],
-                       .domain = pdcp_test_params[i].domain,
-                       .pkt_dir = pdcp_test_packet_direction[i],
-                       .sn_size = pdcp_test_data_sn_size[i],
-                       .hfn = pdcp_test_hfn[i],
-                       .hfn_threshold = pdcp_test_hfn_threshold[i],
-               } },
-               .crypto_xform = &ut_params->cipher_xform
+               .action_type = ut_params->type,
+               .protocol = RTE_SECURITY_PROTOCOL_DOCSIS,
+               .docsis = ut_params->docsis_xform,
+               .crypto_xform = &ut_params->cipher_xform,
        };
 
-       struct rte_security_ctx *ctx = (struct rte_security_ctx *)
-                               rte_cryptodev_get_sec_ctx(
-                               ts_params->valid_devs[0]);
-
        /* Create security session */
-       ut_params->sec_session = rte_security_session_create(ctx,
-                               &sess_conf, ts_params->session_mpool);
+       ut_params->sec_session = rte_security_session_create(ctx, &sess_conf,
+                                       ts_params->session_priv_mpool);
 
        if (!ut_params->sec_session) {
-               printf("TestCase %s()-%d line %d failed %s: ",
-                       __func__, i, __LINE__, "Failed to allocate session");
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "failed to allocate session");
                ret = TEST_FAILED;
                goto on_err;
        }
 
        /* Generate crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+                               RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        if (!ut_params->op) {
-               printf("TestCase %s()-%d line %d failed %s: ",
+               printf("TestCase %s(%d) line %d: %s\n",
                        __func__, i, __LINE__,
-                       "Failed to allocate symmetric crypto operation struct");
+                       "failed to allocate security crypto operation");
                ret = TEST_FAILED;
                goto on_err;
        }
 
+       /* Setup CRC operation parameters */
+       crc_len = d_td->plaintext.no_crc == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.crc_offset -
+                               RTE_ETHER_CRC_LEN) :
+                       0;
+       crc_len = crc_len > 0 ? crc_len : 0;
+       ut_params->op->sym->auth.data.length = crc_len;
+       ut_params->op->sym->auth.data.offset = d_td->plaintext.crc_offset;
+
+       /* Setup cipher operation parameters */
+       cipher_len = d_td->plaintext.no_cipher == false ?
+                       (d_td->plaintext.len -
+                               d_td->plaintext.cipher_offset) :
+                       0;
+       cipher_len = cipher_len > 0 ? cipher_len : 0;
+       ut_params->op->sym->cipher.data.length = cipher_len;
+       ut_params->op->sym->cipher.data.offset = d_td->plaintext.cipher_offset;
+
+       /* Setup cipher IV */
+       iv_ptr = (uint8_t *)ut_params->op + IV_OFFSET;
+       rte_memcpy(iv_ptr, d_td->iv.data, d_td->iv.len);
+
+       /* Attach session to operation */
        rte_security_attach_session(ut_params->op, ut_params->sec_session);
 
-       /* set crypto operation source mbuf */
+       /* Set crypto operation mbufs */
        ut_params->op->sym->m_src = ut_params->ibuf;
-       if (oop)
-               ut_params->op->sym->m_dst = ut_params->obuf;
+       ut_params->op->sym->m_dst = NULL;
 
        /* Process crypto operation */
-       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op)
-               == NULL) {
-               printf("TestCase %s()-%d line %d failed %s: ",
+       if (process_crypto_request(ts_params->valid_devs[0], ut_params->op) ==
+                       NULL) {
+               printf("TestCase %s(%d) line %d: %s\n",
                        __func__, i, __LINE__,
-                       "failed to process sym crypto op");
+                       "failed to process security crypto op");
                ret = TEST_FAILED;
                goto on_err;
        }
 
        if (ut_params->op->status != RTE_CRYPTO_OP_STATUS_SUCCESS) {
-               printf("TestCase %s()-%d line %d failed %s: ",
+               printf("TestCase %s(%d) line %d: %s\n",
                        __func__, i, __LINE__, "crypto op processing failed");
                ret = TEST_FAILED;
                goto on_err;
        }
 
-       /* Validate obuf */
-       uint8_t *ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_src,
-                       uint8_t *);
-       if (oop) {
-               ciphertext = rte_pktmbuf_mtod(ut_params->op->sym->m_dst,
-                               uint8_t *);
-       }
-       if (fragsz_oop)
-               fragsz = frag_size_oop;
-       if (memcmp(ciphertext, output_vec, fragsz)) {
-               printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
-               rte_hexdump(stdout, "encrypted", ciphertext, fragsz);
-               rte_hexdump(stdout, "reference", output_vec, fragsz);
+       /* Validate ciphertext */
+       ciphertext = plaintext;
+
+       if (memcmp(ciphertext, d_td->ciphertext.data, d_td->ciphertext.len)) {
+               printf("TestCase %s(%d) line %d: %s\n",
+                       __func__, i, __LINE__, "ciphertext not as expected\n");
+               rte_hexdump(stdout, "expected", d_td->ciphertext.data,
+                               d_td->ciphertext.len);
+               rte_hexdump(stdout, "actual", ciphertext, d_td->ciphertext.len);
                ret = TEST_FAILED;
                goto on_err;
        }
 
-       buf = ut_params->op->sym->m_src->next;
-       if (oop)
-               buf = ut_params->op->sym->m_dst->next;
-
-       unsigned int off = fragsz;
-
-       ecx = 0;
-       while (buf) {
-               ciphertext = rte_pktmbuf_mtod(buf,
-                               uint8_t *);
-               if (memcmp(ciphertext, output_vec + off, to_trn_tbl[ecx])) {
-                       printf("\n=======PDCP TestCase #%d failed: Data Mismatch ", i);
-                       rte_hexdump(stdout, "encrypted", ciphertext, to_trn_tbl[ecx]);
-                       rte_hexdump(stdout, "reference", output_vec + off,
-                                       to_trn_tbl[ecx]);
-                       ret = TEST_FAILED;
-                       goto on_err;
-               }
-               off += to_trn_tbl[ecx++];
-               buf = buf->next;
-       }
 on_err:
        rte_crypto_op_free(ut_params->op);
        ut_params->op = NULL;
@@ -7466,194 +8072,183 @@ on_err:
 
        rte_pktmbuf_free(ut_params->ibuf);
        ut_params->ibuf = NULL;
-       if (oop) {
-               rte_pktmbuf_free(ut_params->obuf);
-               ut_params->obuf = NULL;
-       }
 
        return ret;
 }
 
-int
-test_pdcp_proto_cplane_encap(int i)
-{
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i]+4);
-}
+#define TEST_DOCSIS_COUNT(func) do {                   \
+       int ret = func;                                 \
+       if (ret == TEST_SUCCESS)  {                     \
+               printf("\t%2d)", n++);                  \
+               printf("+++++ PASSED:" #func"\n");      \
+               p++;                                    \
+       } else if (ret == -ENOTSUP) {                   \
+               printf("\t%2d)", n++);                  \
+               printf("~~~~~ UNSUPP:" #func"\n");      \
+               u++;                                    \
+       } else {                                        \
+               printf("\t%2d)", n++);                  \
+               printf("----- FAILED:" #func"\n");      \
+               f++;                                    \
+       }                                               \
+} while (0)
+
+static int
+test_DOCSIS_PROTO_uplink_all(void)
+{
+       int p = 0, u = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_uplink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d unsupported)\n",
+                       __func__, p, n, u);
+
+       return f;
+};
 
-int
-test_pdcp_proto_uplane_encap(int i)
+static int
+test_DOCSIS_PROTO_downlink_all(void)
+{
+       int p = 0, u = 0, f = 0, n = 0;
+
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(1, &docsis_test_case_1));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(2, &docsis_test_case_2));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(3, &docsis_test_case_3));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(4, &docsis_test_case_4));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(5, &docsis_test_case_5));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(6, &docsis_test_case_6));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(7, &docsis_test_case_7));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(8, &docsis_test_case_8));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(9, &docsis_test_case_9));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(10, &docsis_test_case_10));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(11, &docsis_test_case_11));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(12, &docsis_test_case_12));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(13, &docsis_test_case_13));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(14, &docsis_test_case_14));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(15, &docsis_test_case_15));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(16, &docsis_test_case_16));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(17, &docsis_test_case_17));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(18, &docsis_test_case_18));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(19, &docsis_test_case_19));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(20, &docsis_test_case_20));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(21, &docsis_test_case_21));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(22, &docsis_test_case_22));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(23, &docsis_test_case_23));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(24, &docsis_test_case_24));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(25, &docsis_test_case_25));
+       TEST_DOCSIS_COUNT(test_docsis_proto_downlink(26, &docsis_test_case_26));
+
+       if (f)
+               printf("## %s: %d passed out of %d (%d unsupported)\n",
+                       __func__, p, n, u);
+
+       return f;
+};
+
+static int
+test_DOCSIS_PROTO_all(void)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i]);
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct rte_cryptodev_info dev_info;
+       int status;
+
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       uint64_t feat_flags = dev_info.feature_flags;
 
+       if (!(feat_flags & RTE_CRYPTODEV_FF_SECURITY))
+               return -ENOTSUP;
+
+       if (security_proto_supported(RTE_SECURITY_PROTOCOL_DOCSIS) < 0)
+               return -ENOTSUP;
+
+       status = test_DOCSIS_PROTO_uplink_all();
+       status += test_DOCSIS_PROTO_downlink_all();
+
+       if (status)
+               return TEST_FAILED;
+       else
+               return TEST_SUCCESS;
 }
+#endif
 
-int
-test_pdcp_proto_uplane_encap_with_int(int i)
+static int
+test_AES_GCM_authenticated_encryption_test_case_1(void)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-               RTE_CRYPTO_AUTH_OP_GENERATE,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i] + 4);
+       return test_authenticated_encryption(&gcm_test_case_1);
 }
 
-int
-test_pdcp_proto_cplane_decap(int i)
+static int
+test_AES_GCM_authenticated_encryption_test_case_2(void)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_DECRYPT,
-               RTE_CRYPTO_AUTH_OP_VERIFY,
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i] + 4,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i]);
+       return test_authenticated_encryption(&gcm_test_case_2);
 }
 
-int
-test_pdcp_proto_uplane_decap(int i)
+static int
+test_AES_GCM_authenticated_encryption_test_case_3(void)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_DECRYPT,
-               RTE_CRYPTO_AUTH_OP_VERIFY,
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i],
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i]);
+       return test_authenticated_encryption(&gcm_test_case_3);
 }
 
-int
-test_pdcp_proto_uplane_decap_with_int(int i)
+static int
+test_AES_GCM_authenticated_encryption_test_case_4(void)
 {
-       return test_pdcp_proto(i, 0,
-               RTE_CRYPTO_CIPHER_OP_DECRYPT,
-               RTE_CRYPTO_AUTH_OP_VERIFY,
-               pdcp_test_data_out[i],
-               pdcp_test_data_in_len[i] + 4,
-               pdcp_test_data_in[i],
-               pdcp_test_data_in_len[i]);
-}
-
-static int
-test_PDCP_PROTO_SGL_in_place_32B(void)
-{
-       /* i can be used for running any PDCP case
-        * In this case it is uplane 12-bit AES-SNOW DL encap
-        */
-       int i = PDCP_UPLANE_12BIT_OFFSET + AES_ENC + SNOW_AUTH + DOWNLINK;
-       return test_pdcp_proto_SGL(i, IN_PLACE,
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       pdcp_test_data_in[i],
-                       pdcp_test_data_in_len[i],
-                       pdcp_test_data_out[i],
-                       pdcp_test_data_in_len[i]+4,
-                       32, 0);
-}
-static int
-test_PDCP_PROTO_SGL_oop_32B_128B(void)
-{
-       /* i can be used for running any PDCP case
-        * In this case it is uplane 18-bit NULL-NULL DL encap
-        */
-       int i = PDCP_UPLANE_18BIT_OFFSET + NULL_ENC + NULL_AUTH + DOWNLINK;
-       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       pdcp_test_data_in[i],
-                       pdcp_test_data_in_len[i],
-                       pdcp_test_data_out[i],
-                       pdcp_test_data_in_len[i]+4,
-                       32, 128);
-}
-static int
-test_PDCP_PROTO_SGL_oop_32B_40B(void)
-{
-       /* i can be used for running any PDCP case
-        * In this case it is uplane 18-bit AES DL encap
-        */
-       int i = PDCP_UPLANE_OFFSET + AES_ENC + EIGHTEEN_BIT_SEQ_NUM_OFFSET
-                       + DOWNLINK;
-       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       pdcp_test_data_in[i],
-                       pdcp_test_data_in_len[i],
-                       pdcp_test_data_out[i],
-                       pdcp_test_data_in_len[i],
-                       32, 40);
-}
-static int
-test_PDCP_PROTO_SGL_oop_128B_32B(void)
-{
-       /* i can be used for running any PDCP case
-        * In this case it is cplane 12-bit AES-ZUC DL encap
-        */
-       int i = PDCP_CPLANE_LONG_SN_OFFSET + AES_ENC + ZUC_AUTH + DOWNLINK;
-       return test_pdcp_proto_SGL(i, OUT_OF_PLACE,
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
-                       RTE_CRYPTO_AUTH_OP_GENERATE,
-                       pdcp_test_data_in[i],
-                       pdcp_test_data_in_len[i],
-                       pdcp_test_data_out[i],
-                       pdcp_test_data_in_len[i]+4,
-                       128, 32);
-}
-#endif
-
-static int
-test_AES_GCM_authenticated_encryption_test_case_1(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_1);
-}
-
-static int
-test_AES_GCM_authenticated_encryption_test_case_2(void)
-{
-       return test_authenticated_encryption(&gcm_test_case_2);
+       return test_authenticated_encryption(&gcm_test_case_4);
 }
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_3(void)
+test_AES_GCM_authenticated_encryption_test_case_5(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_3);
+       return test_authenticated_encryption(&gcm_test_case_5);
 }
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_4(void)
+test_AES_GCM_authenticated_encryption_test_case_6(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_4);
+       return test_authenticated_encryption(&gcm_test_case_6);
 }
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_5(void)
+test_AES_GCM_authenticated_encryption_test_case_7(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_5);
+       return test_authenticated_encryption(&gcm_test_case_7);
 }
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_6(void)
+test_AES_GCM_authenticated_encryption_test_case_8(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_6);
+       return test_authenticated_encryption(&gcm_test_case_8);
 }
 
 static int
-test_AES_GCM_authenticated_encryption_test_case_7(void)
+test_AES_GCM_J0_authenticated_encryption_test_case_1(void)
 {
-       return test_authenticated_encryption(&gcm_test_case_7);
+       return test_authenticated_encryption(&gcm_J0_test_case_1);
 }
 
 static int
@@ -7752,6 +8347,105 @@ test_AES_GCM_auth_encryption_test_case_aad_2(void)
        return test_authenticated_encryption(&gcm_test_case_aad_2);
 }
 
+static int
+test_AES_GCM_auth_encryption_fail_iv_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.iv.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_in_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.plaintext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_out_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.ciphertext.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_aad_len_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.aad.len += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_aad_corrupt(void)
+{
+       struct aead_test_data tdata;
+       uint8_t aad[gcm_test_case_7.aad.len];
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       memcpy(aad, gcm_test_case_7.aad.data, gcm_test_case_7.aad.len);
+       aad[0] += 1;
+       tdata.aad.data = aad;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_encryption_fail_tag_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.auth_tag.data[0] += 1;
+       res = test_authenticated_encryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "encryption not failed");
+       return TEST_SUCCESS;
+}
+
 static int
 test_authenticated_decryption(const struct aead_test_data *tdata)
 {
@@ -7762,6 +8456,20 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        uint8_t *plaintext;
        uint32_t i;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       const struct rte_cryptodev_symmetric_capability *capability;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       capability = rte_cryptodev_sym_capability_get(
+                       ts_params->valid_devs[0], &cap_idx);
+       if (capability == NULL)
+               return -ENOTSUP;
+       if (rte_cryptodev_sym_capability_check_aead(
+                       capability, tdata->key.len, tdata->auth_tag.len,
+                       tdata->aad.len, tdata->iv.len))
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -7794,7 +8502,11 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        ut_params->op->sym->m_src = ut_params->ibuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -7820,6 +8532,7 @@ test_authenticated_decryption(const struct aead_test_data *tdata)
        TEST_ASSERT_EQUAL(ut_params->op->status,
                        RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "Authentication failed");
+
        return 0;
 }
 
@@ -7865,6 +8578,18 @@ test_AES_GCM_authenticated_decryption_test_case_7(void)
        return test_authenticated_decryption(&gcm_test_case_7);
 }
 
+static int
+test_AES_GCM_authenticated_decryption_test_case_8(void)
+{
+       return test_authenticated_decryption(&gcm_test_case_8);
+}
+
+static int
+test_AES_GCM_J0_authenticated_decryption_test_case_1(void)
+{
+       return test_authenticated_decryption(&gcm_J0_test_case_1);
+}
+
 static int
 test_AES_GCM_auth_decryption_test_case_192_1(void)
 {
@@ -7961,6 +8686,100 @@ test_AES_GCM_auth_decryption_test_case_aad_2(void)
        return test_authenticated_decryption(&gcm_test_case_aad_2);
 }
 
+static int
+test_AES_GCM_auth_decryption_fail_iv_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.iv.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_decryption_fail_in_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       RTE_LOG(INFO, USER1, "This is a negative test, errors are expected\n");
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.plaintext.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_decryption_fail_out_data_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.ciphertext.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_decryption_fail_aad_len_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.aad.len += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_decryption_fail_aad_corrupt(void)
+{
+       struct aead_test_data tdata;
+       uint8_t aad[gcm_test_case_7.aad.len];
+       int res;
+
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       memcpy(aad, gcm_test_case_7.aad.data, gcm_test_case_7.aad.len);
+       aad[0] += 1;
+       tdata.aad.data = aad;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "decryption not failed");
+       return TEST_SUCCESS;
+}
+
+static int
+test_AES_GCM_auth_decryption_fail_tag_corrupt(void)
+{
+       struct aead_test_data tdata;
+       int res;
+
+       memcpy(&tdata, &gcm_test_case_7, sizeof(struct aead_test_data));
+       tdata.auth_tag.data[0] += 1;
+       res = test_authenticated_decryption(&tdata);
+       if (res == -ENOTSUP)
+               return res;
+       TEST_ASSERT_EQUAL(res, TEST_FAILED, "authentication not failed");
+       return TEST_SUCCESS;
+}
+
 static int
 test_authenticated_encryption_oop(const struct aead_test_data *tdata)
 {
@@ -7971,6 +8790,18 @@ test_authenticated_encryption_oop(const struct aead_test_data *tdata)
        uint8_t *ciphertext, *auth_tag;
        uint16_t plaintext_pad_len;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -8048,6 +8879,18 @@ test_authenticated_decryption_oop(const struct aead_test_data *tdata)
        int retval;
        uint8_t *plaintext;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
        /* Create AEAD session */
        retval = create_aead_session(ts_params->valid_devs[0],
                        tdata->algo,
@@ -8119,6 +8962,27 @@ test_authenticated_encryption_sessionless(
        uint8_t *ciphertext, *auth_tag;
        uint16_t plaintext_pad_len;
        uint8_t key[tdata->key.len + 1];
+       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_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
+
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
@@ -8200,6 +9064,27 @@ test_authenticated_decryption_sessionless(
        int retval;
        uint8_t *plaintext;
        uint8_t key[tdata->key.len + 1];
+       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_SYM_SESSIONLESS)) {
+               printf("Device doesn't support Sessionless ops.\n");
+               return -ENOTSUP;
+       }
+
+       /* not supported with CPU crypto */
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
 
        /* alloc mbuf and set payload */
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -8376,8 +9261,26 @@ test_stats(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct rte_cryptodev_stats stats;
-       struct rte_cryptodev *dev;
-       cryptodev_stats_get_t temp_pfn;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA1_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       if (rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
+                       == -ENOTSUP)
+               return -ENOTSUP;
 
        rte_cryptodev_stats_reset(ts_params->valid_devs[0]);
        TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0] + 600,
@@ -8385,13 +9288,6 @@ test_stats(void)
                "rte_cryptodev_stats_get invalid dev failed");
        TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], 0) != 0),
                "rte_cryptodev_stats_get invalid Param failed");
-       dev = &rte_cryptodevs[ts_params->valid_devs[0]];
-       temp_pfn = dev->dev_ops->stats_get;
-       dev->dev_ops->stats_get = (cryptodev_stats_get_t)0;
-       TEST_ASSERT((rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats)
-                       == -ENOTSUP),
-               "rte_cryptodev_stats_get invalid Param failed");
-       dev->dev_ops->stats_get = temp_pfn;
 
        /* Test expected values */
        ut_setup();
@@ -8513,6 +9409,14 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_MD5_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        if (MD5_HMAC_create_session(ts_params, ut_params,
                        RTE_CRYPTO_AUTH_OP_GENERATE, test_case))
                return TEST_FAILED;
@@ -8529,9 +9433,15 @@ test_MD5_HMAC_generate(const struct HMAC_MD5_vector *test_case)
        if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
                return TEST_FAILED;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
-
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
+
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "crypto op processing failed");
 
@@ -8559,6 +9469,14 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_MD5_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        if (MD5_HMAC_create_session(ts_params, ut_params,
                        RTE_CRYPTO_AUTH_OP_VERIFY, test_case)) {
                return TEST_FAILED;
@@ -8573,8 +9491,14 @@ test_MD5_HMAC_verify(const struct HMAC_MD5_vector *test_case)
        if (MD5_HMAC_create_op(ut_params, test_case, &plaintext))
                return TEST_FAILED;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op), "failed to process sym crypto op");
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
+                               ut_params->op),
+                               "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "HMAC_MD5 crypto op processing failed");
@@ -8617,6 +9541,19 @@ test_multi_session(void)
 
        uint16_t i;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA512_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        test_AES_CBC_HMAC_SHA512_decrypt_create_session_params(ut_params,
                        aes_cbc_key, hmac_sha512_key);
 
@@ -8732,6 +9669,19 @@ test_multi_session_random_usage(void)
 
        };
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_SHA512_HMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
 
        sessions = rte_malloc(NULL,
@@ -8808,161 +9758,79 @@ test_multi_session_random_usage(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_cipher_only_operation(void)
+test_null_invalid_operation(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       int ret;
 
-       /* 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);
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+               return -ENOTSUP;
 
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
        ut_params->cipher_xform.next = NULL;
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
+       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
        ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
 
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
        /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                               ut_params->sess,
-                               &ut_params->cipher_xform,
-                               ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       /* set crypto operation source mbuf */
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
-
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
-
-       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);
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                       ut_params->sess, &ut_params->cipher_xform,
+                       ts_params->session_priv_mpool);
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
 
-       /* 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;
 
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
+       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
        ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
 
        ut_params->sess = rte_cryptodev_sym_session_create(
                        ts_params->session_mpool);
 
        /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
                        ut_params->sess, &ut_params->auth_xform,
                        ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
-
-       sym_op->m_src = ut_params->ibuf;
-
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                       QUOTE_512_BYTES);
-
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
-
-       TEST_ASSERT_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");
+       TEST_ASSERT(ret < 0,
+                       "Session creation succeeded unexpectedly");
 
        return TEST_SUCCESS;
 }
 
 
+#define NULL_BURST_LENGTH (32)
+
 static int
-test_null_cipher_auth_operation(void)
+test_null_burst_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);
+       unsigned i, burst_len = NULL_BURST_LENGTH;
 
-       /* 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));
+       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
+       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
+
+       /* This test is for NULL PMD only */
+       if (gbl_driver_id != rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NULL_PMD)))
+               return -ENOTSUP;
 
        /* Setup Cipher Parameters */
        ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
@@ -8987,93 +9855,69 @@ test_null_cipher_auth_operation(void)
                        ts_params->session_priv_mpool);
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
+       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
+                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
+                       burst_len, "failed to generate burst of crypto ops");
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
+       /* Generate an operation for each mbuf in burst */
+       for (i = 0; i < burst_len; i++) {
+               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
 
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
 
-       sym_op->m_src = ut_params->ibuf;
+               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
+                               sizeof(unsigned));
+               *data = i;
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
+               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
 
-       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);
+               burst[i]->sym->m_src = m;
+       }
 
        /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
+                       0, burst, burst_len),
+                       burst_len,
+                       "Error enqueuing burst");
 
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
+       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
+                       0, burst_dequeued, burst_len),
+                       burst_len,
+                       "Error dequeuing burst");
 
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
+
+       for (i = 0; i < burst_len; i++) {
+               TEST_ASSERT_EQUAL(
+                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
+                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
+                                       uint32_t *),
+                       "data not as expected");
+
+               rte_pktmbuf_free(burst[i]->sym->m_src);
+               rte_crypto_op_free(burst[i]);
+       }
 
        return TEST_SUCCESS;
 }
 
+static void
+generate_gmac_large_plaintext(uint8_t *data)
+{
+       uint16_t i;
+
+       for (i = 32; i < GMAC_LARGE_PLAINTEXT_LENGTH; i += 32)
+               memcpy(&data[i], &data[0], 32);
+}
+
 static int
-test_null_auth_cipher_operation(void)
+create_gmac_operation(enum rte_crypto_auth_operation op,
+               const struct gmac_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *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;
-
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = &ut_params->cipher_xform;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
+       struct rte_crypto_sym_op *sym_op;
 
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+       uint32_t plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
 
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
@@ -9081,208 +9925,15 @@ test_null_auth_cipher_operation(void)
        TEST_ASSERT_NOT_NULL(ut_params->op,
                        "Failed to allocate symmetric crypto operation struct");
 
-       /* Set crypto operation data parameters */
-       rte_crypto_op_attach_sym_session(ut_params->op, ut_params->sess);
-
-       struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
+       sym_op = ut_params->op->sym;
 
-       sym_op->m_src = ut_params->ibuf;
+       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+                       ut_params->ibuf, tdata->gmac_tag.len);
+       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+                       "no room to append digest");
 
-       sym_op->cipher.data.offset = 0;
-       sym_op->cipher.data.length = QUOTE_512_BYTES;
-
-       sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = QUOTE_512_BYTES;
-       sym_op->auth.digest.data = digest;
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(ut_params->ibuf,
-                                       QUOTE_512_BYTES);
-
-       /* Process crypto operation */
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
-                       ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
-
-       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "crypto operation processing failed");
-
-       /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       rte_pktmbuf_mtod(ut_params->op->sym->m_src, uint8_t *),
-                       catch_22_quote,
-                       QUOTE_512_BYTES,
-                       "Ciphertext data not as expected");
-       /* Make sure memory pointed to by digest hasn't been overwritten */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
-                       orig_data,
-                       digest,
-                       sizeof(orig_data),
-                       "Memory at digest ptr overwritten unexpectedly");
-
-       return TEST_SUCCESS;
-}
-
-
-static int
-test_null_invalid_operation(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       int ret;
-
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
-
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_CBC;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
-
-
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SHA1_HMAC;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       /* Create Crypto session*/
-       ret = rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->auth_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT(ret < 0,
-                       "Session creation succeeded unexpectedly");
-
-       return TEST_SUCCESS;
-}
-
-
-#define NULL_BURST_LENGTH (32)
-
-static int
-test_null_burst_operation(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-
-       unsigned i, burst_len = NULL_BURST_LENGTH;
-
-       struct rte_crypto_op *burst[NULL_BURST_LENGTH] = { NULL };
-       struct rte_crypto_op *burst_dequeued[NULL_BURST_LENGTH] = { NULL };
-
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
-
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_NULL;
-       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
-
-       /* Setup HMAC Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_NULL;
-       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
-
-       ut_params->sess = rte_cryptodev_sym_session_create(
-                       ts_params->session_mpool);
-
-       /* Create Crypto session*/
-       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
-                       ut_params->sess, &ut_params->cipher_xform,
-                       ts_params->session_priv_mpool);
-       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
-
-       TEST_ASSERT_EQUAL(rte_crypto_op_bulk_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC, burst, burst_len),
-                       burst_len, "failed to generate burst of crypto ops");
-
-       /* Generate an operation for each mbuf in burst */
-       for (i = 0; i < burst_len; i++) {
-               struct rte_mbuf *m = rte_pktmbuf_alloc(ts_params->mbuf_pool);
-
-               TEST_ASSERT_NOT_NULL(m, "Failed to allocate mbuf");
-
-               unsigned *data = (unsigned *)rte_pktmbuf_append(m,
-                               sizeof(unsigned));
-               *data = i;
-
-               rte_crypto_op_attach_sym_session(burst[i], ut_params->sess);
-
-               burst[i]->sym->m_src = m;
-       }
-
-       /* Process crypto operation */
-       TEST_ASSERT_EQUAL(rte_cryptodev_enqueue_burst(ts_params->valid_devs[0],
-                       0, burst, burst_len),
-                       burst_len,
-                       "Error enqueuing burst");
-
-       TEST_ASSERT_EQUAL(rte_cryptodev_dequeue_burst(ts_params->valid_devs[0],
-                       0, burst_dequeued, burst_len),
-                       burst_len,
-                       "Error dequeuing burst");
-
-
-       for (i = 0; i < burst_len; i++) {
-               TEST_ASSERT_EQUAL(
-                       *rte_pktmbuf_mtod(burst[i]->sym->m_src, uint32_t *),
-                       *rte_pktmbuf_mtod(burst_dequeued[i]->sym->m_src,
-                                       uint32_t *),
-                       "data not as expected");
-
-               rte_pktmbuf_free(burst[i]->sym->m_src);
-               rte_crypto_op_free(burst[i]);
-       }
-
-       return TEST_SUCCESS;
-}
-
-static void
-generate_gmac_large_plaintext(uint8_t *data)
-{
-       uint16_t i;
-
-       for (i = 32; i < GMAC_LARGE_PLAINTEXT_LENGTH; i += 32)
-               memcpy(&data[i], &data[0], 32);
-}
-
-static int
-create_gmac_operation(enum rte_crypto_auth_operation op,
-               const struct gmac_test_data *tdata)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       struct crypto_unittest_params *ut_params = &unittest_params;
-       struct rte_crypto_sym_op *sym_op;
-
-       uint32_t plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
-
-       /* Generate Crypto op data structure */
-       ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
-                       RTE_CRYPTO_OP_TYPE_SYMMETRIC);
-       TEST_ASSERT_NOT_NULL(ut_params->op,
-                       "Failed to allocate symmetric crypto operation struct");
-
-       sym_op = ut_params->op->sym;
-
-       sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
-                       ut_params->ibuf, tdata->gmac_tag.len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
-                       "no room to append digest");
-
-       sym_op->auth.digest.phys_addr = rte_pktmbuf_iova_offset(
-                       ut_params->ibuf, plaintext_pad_len);
+       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,
@@ -9357,6 +10008,14 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
        TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
                              "No GMAC length in the source data");
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        retval = create_gmac_session(ts_params->valid_devs[0],
                        tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
 
@@ -9400,7 +10059,12 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
 
        ut_params->op->sym->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -9460,6 +10124,14 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
                              "No GMAC length in the source data");
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = RTE_CRYPTO_AUTH_AES_GMAC;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        retval = create_gmac_session(ts_params->valid_devs[0],
                        tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
 
@@ -9504,7 +10176,12 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
 
        ut_params->op->sym->m_src = ut_params->ibuf;
 
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -9540,6 +10217,8 @@ test_AES_GMAC_authentication_verify_test_case_4(void)
 
 struct test_crypto_vector {
        enum rte_crypto_cipher_algorithm crypto_algo;
+       unsigned int cipher_offset;
+       unsigned int cipher_len;
 
        struct {
                uint8_t data[64];
@@ -9562,6 +10241,7 @@ struct test_crypto_vector {
        } ciphertext;
 
        enum rte_crypto_auth_algorithm auth_algo;
+       unsigned int auth_offset;
 
        struct {
                uint8_t data[128];
@@ -9637,6 +10317,8 @@ aes128_gmac_test_vector = {
 static const struct test_crypto_vector
 aes128cbc_hmac_sha1_test_vector = {
        .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_offset = 0,
+       .cipher_len = 512,
        .cipher_key = {
                .data = {
                        0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
@@ -9660,6 +10342,7 @@ aes128cbc_hmac_sha1_test_vector = {
                .len = 512
        },
        .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_offset = 0,
        .auth_key = {
                .data = {
                        0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
@@ -9678,6 +10361,53 @@ aes128cbc_hmac_sha1_test_vector = {
        }
 };
 
+static const struct test_crypto_vector
+aes128cbc_hmac_sha1_aad_test_vector = {
+       .crypto_algo = RTE_CRYPTO_CIPHER_AES_CBC,
+       .cipher_offset = 12,
+       .cipher_len = 496,
+       .cipher_key = {
+               .data = {
+                       0xE4, 0x23, 0x33, 0x8A, 0x35, 0x64, 0x61, 0xE2,
+                       0x49, 0x03, 0xDD, 0xC6, 0xB8, 0xCA, 0x55, 0x7A
+               },
+               .len = 16
+       },
+       .iv = {
+               .data = {
+                       0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
+                       0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F
+               },
+               .len = 16
+       },
+       .plaintext = {
+               .data = plaintext_hash,
+               .len = 512
+       },
+       .ciphertext = {
+               .data = ciphertext512_aes128cbc_aad,
+               .len = 512
+       },
+       .auth_algo = RTE_CRYPTO_AUTH_SHA1_HMAC,
+       .auth_offset = 0,
+       .auth_key = {
+               .data = {
+                       0xF8, 0x2A, 0xC7, 0x54, 0xDB, 0x96, 0x18, 0xAA,
+                       0xC3, 0xA1, 0x53, 0xF6, 0x1F, 0x17, 0x60, 0xBD,
+                       0xDE, 0xF4, 0xDE, 0xAD
+               },
+               .len = 20
+       },
+       .digest = {
+               .data = {
+                       0x1F, 0x6A, 0xD2, 0x8B, 0x4B, 0xB3, 0xC0, 0x9E,
+                       0x86, 0x9B, 0x3A, 0xF2, 0x00, 0x5B, 0x4F, 0x08,
+                       0x62, 0x8D, 0x62, 0x65
+               },
+               .len = 20
+       }
+};
+
 static void
 data_corruption(uint8_t *data)
 {
@@ -9920,11 +10650,11 @@ create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
        rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
                        reference->iv.data, reference->iv.len);
 
-       sym_op->cipher.data.length = reference->ciphertext.len;
-       sym_op->cipher.data.offset = 0;
+       sym_op->cipher.data.length = reference->cipher_len;
+       sym_op->cipher.data.offset = reference->cipher_offset;
 
-       sym_op->auth.data.length = reference->ciphertext.len;
-       sym_op->auth.data.offset = 0;
+       sym_op->auth.data.length = reference->plaintext.len;
+       sym_op->auth.data.offset = reference->auth_offset;
 
        return 0;
 }
@@ -9965,6 +10695,14 @@ test_authentication_verify_fail_when_data_corruption(
 
        uint8_t *plaintext;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        /* Create session */
        retval = create_auth_session(ut_params,
                        ts_params->valid_devs[0],
@@ -10000,15 +10738,17 @@ test_authentication_verify_fail_when_data_corruption(
        else
                tag_corruption(plaintext, reference->plaintext.len);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-       TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
                        RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "authentication not failed");
-
-       ut_params->obuf = ut_params->op->sym->m_src;
-       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
 
        return 0;
 }
@@ -10023,6 +10763,14 @@ test_authentication_verify_GMAC_fail_when_corruption(
        int retval;
        uint8_t *plaintext;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        /* Create session */
        retval = create_auth_cipher_session(ut_params,
                        ts_params->valid_devs[0],
@@ -10061,15 +10809,17 @@ test_authentication_verify_GMAC_fail_when_corruption(
        else
                tag_corruption(plaintext, reference->aad.len);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
                        ut_params->op);
-       TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-       TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
                        RTE_CRYPTO_OP_STATUS_SUCCESS,
                        "authentication not failed");
-
-       ut_params->obuf = ut_params->op->sym->m_src;
-       TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
 
        return 0;
 }
@@ -10085,6 +10835,19 @@ test_authenticated_decryption_fail_when_corruption(
 
        uint8_t *ciphertext;
 
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
        /* Create session */
        retval = create_auth_cipher_session(ut_params,
                        ts_params->valid_devs[0],
@@ -10121,13 +10884,235 @@ test_authenticated_decryption_fail_when_corruption(
        else
                tag_corruption(ciphertext, reference->ciphertext.len);
 
-       ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO) {
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+                       RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "authentication not failed");
+       } else {
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
+                       ut_params->op);
+               TEST_ASSERT_NULL(ut_params->op, "authentication not failed");
+       }
+
+       return 0;
+}
+
+static int
+test_authenticated_encryt_with_esn(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       int retval;
+
+       uint8_t *authciphertext, *plaintext, *auth_tag;
+       uint16_t plaintext_pad_len;
+       uint8_t cipher_key[reference->cipher_key.len + 1];
+       uint8_t auth_key[reference->auth_key.len + 1];
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create session */
+       memcpy(cipher_key, reference->cipher_key.data,
+                       reference->cipher_key.len);
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_ENCRYPT;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+
+       ut_params->cipher_xform.next = &ut_params->auth_xform;
+
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
+       ut_params->auth_xform.next = NULL;
+
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                               ut_params->sess,
+                               &ut_params->cipher_xform,
+                               ts_params->session_priv_mpool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->plaintext.len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+       memcpy(plaintext, reference->plaintext.data, reference->plaintext.len);
+
+       /* Create operation */
+       retval = create_cipher_auth_operation(ts_params,
+                       ut_params,
+                       reference, 0);
+
+       if (retval < 0)
+               return retval;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(
+                       ts_params->valid_devs[0], ut_params->op);
+
+       TEST_ASSERT_NOT_NULL(ut_params->op, "no crypto operation returned");
+
+       TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
+                       "crypto op processing failed");
+
+       plaintext_pad_len = RTE_ALIGN_CEIL(reference->plaintext.len, 16);
+
+       authciphertext = rte_pktmbuf_mtod_offset(ut_params->ibuf, uint8_t *,
+                       ut_params->op->sym->auth.data.offset);
+       auth_tag = authciphertext + plaintext_pad_len;
+       debug_hexdump(stdout, "ciphertext:", authciphertext,
+                       reference->ciphertext.len);
+       debug_hexdump(stdout, "auth tag:", auth_tag, reference->digest.len);
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       authciphertext,
+                       reference->ciphertext.data,
+                       reference->ciphertext.len,
+                       "Ciphertext data not as expected");
+
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+                       auth_tag,
+                       reference->digest.data,
+                       reference->digest.len,
+                       "Generated digest not as expected");
+
+       return TEST_SUCCESS;
+
+}
+
+static int
+test_authenticated_decrypt_with_esn(
+               struct crypto_testsuite_params *ts_params,
+               struct crypto_unittest_params *ut_params,
+               const struct test_crypto_vector *reference)
+{
+       int retval;
+
+       uint8_t *ciphertext;
+       uint8_t cipher_key[reference->cipher_key.len + 1];
+       uint8_t auth_key[reference->auth_key.len + 1];
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       cap_idx.algo.auth = reference->auth_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       cap_idx.algo.cipher = reference->crypto_algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* Create session */
+       memcpy(cipher_key, reference->cipher_key.data,
+                       reference->cipher_key.len);
+       memcpy(auth_key, reference->auth_key.data, reference->auth_key.len);
+
+       /* Setup Authentication Parameters */
+       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY;
+       ut_params->auth_xform.auth.algo = reference->auth_algo;
+       ut_params->auth_xform.auth.key.length = reference->auth_key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.digest_length = reference->digest.len;
+       ut_params->auth_xform.next = &ut_params->cipher_xform;
+
+       /* Setup Cipher Parameters */
+       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+       ut_params->cipher_xform.next = NULL;
+       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+       ut_params->cipher_xform.cipher.op = RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       ut_params->cipher_xform.cipher.key.data = cipher_key;
+       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(
+                       ts_params->session_mpool);
+
+       rte_cryptodev_sym_session_init(ts_params->valid_devs[0],
+                               ut_params->sess,
+                               &ut_params->auth_xform,
+                               ts_params->session_priv_mpool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+
+       /* clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+                       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                       reference->ciphertext.len);
+       TEST_ASSERT_NOT_NULL(ciphertext, "no room to append ciphertext");
+       memcpy(ciphertext, reference->ciphertext.data,
+                       reference->ciphertext.len);
+
+       /* Create operation */
+       retval = create_cipher_auth_verify_operation(ts_params,
+                       ut_params,
+                       reference);
+
+       if (retval < 0)
+               return retval;
+
+       if (gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_crypt_auth_op(ts_params->valid_devs[0],
+                       ut_params->op);
+       else
+               ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
 
        TEST_ASSERT_NOT_NULL(ut_params->op, "failed crypto process");
-       TEST_ASSERT_NOT_EQUAL(ut_params->op->status,
+       TEST_ASSERT_EQUAL(ut_params->op->status,
                        RTE_CRYPTO_OP_STATUS_SUCCESS,
-                       "authentication not failed");
+                       "crypto op processing passed");
 
        ut_params->obuf = ut_params->op->sym->m_src;
        TEST_ASSERT_NOT_NULL(ut_params->obuf, "failed to retrieve obuf");
@@ -10146,6 +11131,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;
        unsigned int aad_len = tdata->aad.len;
+       unsigned int aad_len_pad = 0;
 
        /* Generate Crypto op data structure */
        ut_params->op = rte_crypto_op_alloc(ts_params->op_mpool,
@@ -10200,8 +11186,10 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,
 
                rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
 
+               aad_len_pad = RTE_ALIGN_CEIL(aad_len, 16);
+
                sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
-                               ut_params->ibuf, aad_len);
+                               ut_params->ibuf, aad_len_pad);
                TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
                                "no room to prepend aad");
                sym_op->aead.aad.phys_addr = rte_pktmbuf_iova(
@@ -10216,7 +11204,7 @@ create_aead_operation_SGL(enum rte_crypto_aead_operation op,
        }
 
        sym_op->aead.data.length = tdata->plaintext.len;
-       sym_op->aead.data.offset = aad_len;
+       sym_op->aead.data.offset = aad_len_pad;
 
        return 0;
 }
@@ -10236,6 +11224,45 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
        int segs = 1;
        unsigned int trn_data = 0;
        uint8_t *plaintext, *ciphertext, *auth_tag;
+       struct rte_cryptodev_info dev_info;
+
+       /* Verify the capabilities */
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       cap_idx.algo.aead = tdata->algo;
+       if (rte_cryptodev_sym_capability_get(ts_params->valid_devs[0],
+                       &cap_idx) == NULL)
+               return -ENOTSUP;
+
+       /* OOP not supported with CPU crypto */
+       if (oop && gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               return -ENOTSUP;
+
+       /* Detailed check for the particular SGL support flag */
+       rte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);
+       if (!oop) {
+               unsigned int sgl_in = fragsz < tdata->plaintext.len;
+               if (sgl_in && (!(dev_info.feature_flags &
+                               RTE_CRYPTODEV_FF_IN_PLACE_SGL)))
+                       return -ENOTSUP;
+       } else {
+               unsigned int sgl_in = fragsz < tdata->plaintext.len;
+               unsigned int sgl_out = (fragsz_oop ? fragsz_oop : fragsz) <
+                               tdata->plaintext.len;
+               if (sgl_in && !sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT))
+                               return -ENOTSUP;
+               } else if (!sgl_in && sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT))
+                               return -ENOTSUP;
+               } else if (sgl_in && sgl_out) {
+                       if (!(dev_info.feature_flags &
+                                       RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT))
+                               return -ENOTSUP;
+               }
+       }
 
        if (fragsz > tdata->plaintext.len)
                fragsz = tdata->plaintext.len;
@@ -10249,7 +11276,7 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
        int ecx = 0;
        void *digest_mem = NULL;
 
-       uint32_t prepend_len = tdata->aad.len;
+       uint32_t prepend_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
 
        if (tdata->plaintext.len % fragsz != 0) {
                if (tdata->plaintext.len / fragsz + 1 > SGL_MAX_NO)
@@ -10414,7 +11441,12 @@ test_authenticated_encryption_SGL(const struct aead_test_data *tdata,
                ut_params->op->sym->m_dst = ut_params->obuf;
 
        /* Process crypto operation */
-       TEST_ASSERT_NOT_NULL(process_crypto_request(ts_params->valid_devs[0],
+       if (oop == IN_PLACE &&
+                       gbl_action_type == RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO)
+               process_cpu_aead_op(ts_params->valid_devs[0], ut_params->op);
+       else
+               TEST_ASSERT_NOT_NULL(
+                       process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op), "failed to process sym crypto op");
 
        TEST_ASSERT_EQUAL(ut_params->op->status, RTE_CRYPTO_OP_STATUS_SUCCESS,
@@ -10493,6 +11525,10 @@ test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg(void)
 static int
 test_AES_GCM_auth_encrypt_SGL_in_place_1500B(void)
 {
+       /* This test is not for OPENSSL PMD */
+       if (gbl_driver_id == rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OPENSSL_PMD)))
+               return -ENOTSUP;
 
        return test_authenticated_encryption_SGL(
                        &gcm_test_case_SGL_1, IN_PLACE, 1500, 0);
@@ -10608,6 +11644,24 @@ auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt(void)
                        &aes128cbc_hmac_sha1_test_vector);
 }
 
+static int
+auth_encrypt_AES128CBC_HMAC_SHA1_esn_check(void)
+{
+       return test_authenticated_encryt_with_esn(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_aad_test_vector);
+}
+
+static int
+auth_decrypt_AES128CBC_HMAC_SHA1_esn_check(void)
+{
+       return test_authenticated_decrypt_with_esn(
+                       &testsuite_params,
+                       &unittest_params,
+                       &aes128cbc_hmac_sha1_aad_test_vector);
+}
+
 #ifdef RTE_LIBRTE_PMD_CRYPTO_SCHEDULER
 
 /* global AESNI slave IDs for the scheduler test */
@@ -10700,1482 +11754,224 @@ test_scheduler_attach_slave_op(void)
                                        NULL, SOCKET_ID_ANY,
                                        0);
 
-                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
-                                       "session mempool allocation failed");
-               }
-
-               ts_params->qp_conf.mp_session = ts_params->session_mpool;
-               ts_params->qp_conf.mp_session_private =
-                               ts_params->session_priv_mpool;
-
-               ret = rte_cryptodev_scheduler_slave_attach(sched_id,
-                               (uint8_t)i);
-
-               TEST_ASSERT(ret == 0,
-                       "Failed to attach device %u of pmd : %s", i,
-                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
-
-               aesni_ids[nb_devs_attached] = (uint8_t)i;
-
-               nb_devs_attached++;
-       }
-
-       return 0;
-}
-
-static int
-test_scheduler_detach_slave_op(void)
-{
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
-       uint8_t sched_id = ts_params->valid_devs[0];
-       uint32_t i;
-       int ret;
-
-       for (i = 0; i < 2; i++) {
-               ret = rte_cryptodev_scheduler_slave_detach(sched_id,
-                               aesni_ids[i]);
-               TEST_ASSERT(ret == 0,
-                       "Failed to detach device %u", aesni_ids[i]);
-       }
-
-       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 generate auth, then encrypt (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
-
-               /** SNOW 3G decrypt (UEA2), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
-
-               /** SNOW 3G decrypt only (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_with_digest_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
-               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_with_digest_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),
-
-               /** ZUC generate auth, then encrypt (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_test_case_1_oop_sgl),
-
-               /** ZUC decrypt (EEA3), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_auth_cipher_verify_test_case_1_oop_sgl),
-
-               /** 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 algo tests done in chain_all,
-                * cipheronly and authonly suites
-                */
-
-               /** 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_cipher_auth_test_case_1),
-
-               /** KASUMI generate auth, then encrypt (F8) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
-
-               /** KASUMI decrypt (F8), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
-
-               /** 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),
-
-               /** 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 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),
-
-               /** 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 CCM Authenticated Encryption 192 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_192_3),
-
-               /** AES CCM Authenticated Decryption 192 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_192_3),
-
-               /** AES CCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_encryption_test_case_256_3),
-
-               /** AES CCM Authenticated Decryption 256 bits key*/
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_CCM_authenticated_decryption_test_case_256_3),
-
-               /** 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_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,
-                       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),
-
-               /** 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),
-
-               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_kasumi_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
-               /** KASUMI decrypt only (UEA1) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
-
-               /** 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_cipher_auth_test_case_1),
-
-               /** KASUMI generate auth, then encrypt (F8) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
-
-               /** KASUMI decrypt (F8), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
-               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),
-               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_auth_cipher_with_digest_test_case_1),
-
-               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),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_with_digest_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_3),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_generate_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_3),
-               /* Tests with buffers which length is not byte-aligned */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_hash_verify_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_cipher_auth_test_case_1),
-
-               /** SNOW 3G generate auth, then encrypt (UEA2) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
-
-               /** SNOW 3G decrypt (UEA2), then verify auth */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_2_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
+                       TEST_ASSERT_NOT_NULL(ts_params->session_priv_mpool,
+                                       "session mempool allocation failed");
+               }
+
+               ts_params->qp_conf.mp_session = ts_params->session_mpool;
+               ts_params->qp_conf.mp_session_private =
+                               ts_params->session_priv_mpool;
+
+               ret = rte_cryptodev_scheduler_slave_attach(sched_id,
+                               (uint8_t)i);
+
+               TEST_ASSERT(ret == 0,
+                       "Failed to attach device %u of pmd : %s", i,
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+
+               aesni_ids[nb_devs_attached] = (uint8_t)i;
+
+               nb_devs_attached++;
        }
-};
 
-static struct unit_test_suite cryptodev_sw_zuc_testsuite  = {
-       .suite_name = "Crypto Device SW ZUC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               /** ZUC encrypt only (EEA3) */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
-               TEST_CASES_END() /**< NULL terminate unit test array */
+       return 0;
+}
+
+static int
+test_scheduler_detach_slave_op(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       uint8_t sched_id = ts_params->valid_devs[0];
+       uint32_t i;
+       int ret;
+
+       for (i = 0; i < 2; i++) {
+               ret = rte_cryptodev_scheduler_slave_detach(sched_id,
+                               aesni_ids[i]);
+               TEST_ASSERT(ret == 0,
+                       "Failed to detach device %u", aesni_ids[i]);
        }
-};
 
-static struct unit_test_suite cryptodev_caam_jr_testsuite  = {
-       .suite_name = "Crypto CAAM JR Unit Test Suite",
+       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 = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
+               /* Multi Core */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_multicore_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_chain_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_chain_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_cipheronly_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_cipheronly_caam_jr_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_authonly_caam_jr_all),
+               /* Round Robin */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_roundrobin_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
+               /* Fail over */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_failover_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
+
+               /* PKT SIZE */
+               TEST_CASE_ST(NULL, NULL, test_scheduler_attach_slave_op),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_mode_pkt_size_distr_op),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(NULL, NULL, test_scheduler_detach_slave_op),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
 
-static struct unit_test_suite cryptodev_dpaa_sec_testsuite  = {
-       .suite_name = "Crypto DPAA_SEC Unit Test Suite",
+#endif /* RTE_LIBRTE_PMD_CRYPTO_SCHEDULER */
+
+static struct unit_test_suite cryptodev_testsuite  = {
+       .suite_name = "Crypto Unit Test Suite",
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_chain_dpaa_sec_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_chain_dpaa_sec_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_cipheronly_dpaa_sec_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_cipheronly_dpaa_sec_all),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_authonly_dpaa_sec_all),
-
-#ifdef RTE_LIBRTE_SECURITY
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_all),
-
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_decap_all),
-
+                               test_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
-
+                               test_queue_pair_descriptor_setup),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
+                               test_device_configure_invalid_queue_pair_ids),
 
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
-               /** AES GCM Authenticated Encryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                               test_multi_session),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                               test_multi_session_random_usage),
 
-               /** AES GCM Authenticated Decryption */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
+                       test_null_invalid_operation),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_null_burst_operation),
+
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_docsis_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_DES_docsis_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_stats),
 
-               /** AES GCM Authenticated Encryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_4),
+               /** AES CCM Authenticated Encryption 128 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_5),
+                       test_AES_CCM_authenticated_encryption_test_case_128_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_6),
+                       test_AES_CCM_authenticated_encryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encryption_test_case_256_7),
+                       test_AES_CCM_authenticated_encryption_test_case_128_3),
 
-               /** AES GCM Authenticated Decryption 256 bits key */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_1),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_2),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_3),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_4),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_5),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_6),
+               /** AES CCM Authenticated Decryption 128 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_decryption_test_case_256_7),
-
-               /** Out of place tests */
+                       test_AES_CCM_authenticated_decryption_test_case_128_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
+                       test_AES_CCM_authenticated_decryption_test_case_128_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
+                       test_AES_CCM_authenticated_decryption_test_case_128_3),
 
-               /** Scatter-Gather */
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
-               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_400B_1seg),
+               /** AES CCM Authenticated Encryption 192 bits key */
                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_dpaa2_sec_testsuite  = {
-       .suite_name = "Crypto DPAA2_SEC Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+                       test_AES_CCM_authenticated_encryption_test_case_192_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_device_configure_invalid_dev_id),
+                       test_AES_CCM_authenticated_encryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_multi_session),
+                       test_AES_CCM_authenticated_encryption_test_case_192_3),
 
+               /** AES CCM Authenticated Decryption 192 bits key*/
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_chain_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_decryption_test_case_192_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_chain_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_decryption_test_case_192_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_cipheronly_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_decryption_test_case_192_3),
+
+               /** AES CCM Authenticated Encryption 256 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_cipheronly_dpaa2_sec_all),
+                       test_AES_CCM_authenticated_encryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_authonly_dpaa2_sec_all),
-
-#ifdef RTE_LIBRTE_SECURITY
+                       test_AES_CCM_authenticated_encryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_cplane_encap_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_PDCP_PROTO_cplane_decap_all),
-
+                       test_AES_CCM_authenticated_decryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_encap_all),
-
+                       test_AES_CCM_authenticated_decryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_uplane_decap_all),
+                       test_AES_CCM_authenticated_decryption_test_case_256_3),
 
+               /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_in_place_32B),
+                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_128B),
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_32B_40B),
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_PDCP_PROTO_SGL_oop_128B_32B),
-#endif
-               /** AES GCM Authenticated Encryption */
+                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12190,6 +11986,10 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_test_case_7),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_encryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_encryption_test_case_1),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12206,6 +12006,10 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_test_case_7),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_authenticated_decryption_test_case_8),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_J0_authenticated_decryption_test_case_1),
 
                /** AES GCM Authenticated Encryption 192 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12271,21 +12075,47 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_auth_decryption_test_case_256_7),
 
+               /** AES GCM Authenticated Encryption big aad size */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_aad_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_aad_2),
+
+               /** AES GCM Authenticated Decryption big aad size */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_aad_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_aad_2),
+
                /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
-               /** Scatter-Gather */
+               /** Session-less tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_in_place_1500B),
+                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_400B),
+                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
+
+               /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_400B_1seg),
+                       test_AES_GMAC_authentication_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_auth_encrypt_SGL_out_of_place_1500B_2000B),
+                       test_AES_GMAC_authentication_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GMAC_authentication_verify_test_case_4),
 
                /** SNOW 3G encrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12301,10 +12131,52 @@ static struct unit_test_suite cryptodev_dpaa2_sec_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_encryption_test_case_1_offset_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_decryption_test_case_1_oop),
+
+               /** SNOW 3G generate auth, then encrypt (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop_sgl),
+                       test_snow3g_auth_cipher_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_2_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_3_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_test_case_3_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_part_digest_enc_oop_sgl),
+
+               /** SNOW 3G decrypt (UEA2), then verify auth */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_2_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_3_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_test_case_3_oop_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_verify_part_digest_enc_oop_sgl),
 
                /** SNOW 3G decrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12317,19 +12189,38 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_snow3g_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_decryption_test_case_5),
-
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_decryption_with_digest_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_generate_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_cipher_auth_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_auth_cipher_with_digest_test_case_1),
 
                /** ZUC encrypt only (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12342,8 +12233,20 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                        test_zuc_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_encryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_encryption_test_case_6_sgl),
 
                /** ZUC authenticate (EIA3) */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -12351,321 +12254,377 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_zuc_hash_generate_test_case_8),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-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 = {
+               /** ZUC alg-chain (EEA3/EIA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_invalid_operation),
+                       test_zuc_cipher_auth_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_burst_operation),
+                       test_zuc_cipher_auth_test_case_2),
+
+               /** ZUC generate auth, then encrypt (EEA3) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_chain_null_all),
+                       test_zuc_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_cipheronly_null_all),
+                       test_zuc_auth_cipher_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_null_all),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
-
-static struct unit_test_suite cryptodev_armv8_testsuite  = {
-       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_armv8_all),
+                       test_zuc_auth_cipher_test_case_1_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_auth_cipher_test_case_1_oop_sgl),
 
-               /** Negative tests */
+               /** ZUC decrypt (EEA3), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_zuc_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       test_zuc_auth_cipher_verify_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_auth_cipher_verify_test_case_1_sgl),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_zuc_auth_cipher_verify_test_case_1_oop_sgl),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               /** HMAC_MD5 Authentication */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_generate_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_verify_case_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_generate_case_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_MD5_HMAC_verify_case_2),
 
-static struct unit_test_suite cryptodev_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),
+               /** KASUMI hash only (UIA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
+                       test_kasumi_hash_generate_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_chain_mrvl_all),
+                       test_kasumi_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_mrvl_all),
+                       test_kasumi_hash_generate_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_mrvl_all),
+                       test_kasumi_hash_generate_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_chain_mrvl_all),
+                       test_kasumi_hash_generate_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_cipheronly_mrvl_all),
+                       test_kasumi_hash_generate_test_case_6),
 
-               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_kasumi_hash_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_hash_verify_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
-
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+                       test_kasumi_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_hash_verify_test_case_5),
 
-static struct unit_test_suite cryptodev_ccp_testsuite  = {
-       .suite_name = "Crypto Device CCP Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
+               /** KASUMI encrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_multi_session_random_usage),
+                       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_AES_chain_ccp_all),
+                       test_kasumi_encryption_test_case_1_oop),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_encryption_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_AES_cipheronly_ccp_all),
+                       test_kasumi_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_chain_ccp_all),
+                       test_kasumi_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_3DES_cipheronly_ccp_all),
+                       test_kasumi_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                               test_authonly_ccp_all),
+                       test_kasumi_encryption_test_case_5),
 
-               /** Negative tests */
+               /** KASUMI decrypt only (UEA1) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
+                       test_kasumi_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
+                       test_kasumi_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+                       test_kasumi_decryption_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_decryption_test_case_1_oop),
 
-               TEST_CASES_END() /**< NULL terminate unit test array */
-       }
-};
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_kasumi_cipher_auth_test_case_1),
 
-static struct unit_test_suite cryptodev_octeontx_testsuite  = {
-       .suite_name = "Crypto Device OCTEONTX Unit Test Suite",
-       .setup = testsuite_setup,
-       .teardown = testsuite_teardown,
-       .unit_test_cases = {
+               /** KASUMI generate auth, then encrypt (F8) */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_chain_octeontx_all),
+                       test_kasumi_auth_cipher_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_cipheronly_octeontx_all),
+                       test_kasumi_auth_cipher_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_chain_octeontx_all),
+                       test_kasumi_auth_cipher_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_3DES_cipheronly_octeontx_all),
+                       test_kasumi_auth_cipher_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_authonly_octeontx_all),
+                       test_kasumi_auth_cipher_test_case_2_oop_sgl),
 
-               /** AES GCM Authenticated Encryption */
+               /** KASUMI decrypt (F8), then verify auth */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_1),
+                       test_kasumi_auth_cipher_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_2),
+                       test_kasumi_auth_cipher_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_3),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_4),
+                       test_kasumi_auth_cipher_verify_test_case_2_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_5),
+                       test_kasumi_auth_cipher_verify_test_case_2_oop_sgl),
+
+               /** ESN Testcase */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_6),
+                       auth_encrypt_AES128CBC_HMAC_SHA1_esn_check),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_encryption_test_case_7),
+                       auth_decrypt_AES128CBC_HMAC_SHA1_esn_check),
 
-               /** AES GCM Authenticated Decryption */
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_1),
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_2),
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_3),
+                       test_AES_GCM_auth_encryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_auth_encryption_fail_in_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_auth_encryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_auth_encryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GCM_authenticated_decryption_test_case_7),
-               /** AES GMAC Authentication */
+                       test_AES_GCM_auth_encryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_1),
+                       test_AES_GCM_auth_encryption_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_1),
+                       test_AES_GCM_auth_decryption_fail_iv_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_2),
+                       test_AES_GCM_auth_decryption_fail_in_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_2),
+                       test_AES_GCM_auth_decryption_fail_out_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_test_case_3),
+                       test_AES_GCM_auth_decryption_fail_aad_len_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_AES_GMAC_authentication_verify_test_case_3),
-
-               /** SNOW 3G encrypt only (UEA2) */
+                       test_AES_GCM_auth_decryption_fail_aad_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1),
+                       test_AES_GCM_auth_decryption_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_2),
+                       authentication_verify_AES128_GMAC_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_3),
+                       authentication_verify_AES128_GMAC_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_4),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_5),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
 
+               /** Mixed CIPHER + HASH algorithms */
+               /** AUTH AES CMAC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1_oop),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_encryption_test_case_1_oop_sgl),
-
-               /** SNOW 3G decrypt only (UEA2) */
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_1),
+                       test_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_2),
+                       test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_3),
+                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_4),
+                      test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_sgl),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_snow3g_decryption_test_case_5),
+                  test_verify_aes_cmac_aes_ctr_digest_enc_test_case_1_oop_sgl),
 
+               /** AUTH ZUC + CIPHER SNOW3G */
                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),
-
-               /** ZUC encrypt only (EEA3) */
+                       test_auth_zuc_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_1),
+                       test_verify_auth_zuc_cipher_snow_test_case_1),
+               /** AUTH AES CMAC + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_2),
+                       test_auth_aes_cmac_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_3),
+                       test_verify_auth_aes_cmac_cipher_snow_test_case_1),
+               /** AUTH ZUC + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_4),
+                       test_auth_zuc_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_5),
+                       test_verify_auth_zuc_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_1),
+                       test_auth_snow_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_2),
+                       test_verify_auth_snow_cipher_aes_ctr_test_case_1),
+               /** AUTH SNOW3G + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_3),
+                       test_auth_snow_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_4),
+                       test_verify_auth_snow_cipher_zuc_test_case_1),
+               /** AUTH AES CMAC + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_hash_generate_test_case_5),
+                       test_auth_aes_cmac_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_zuc_encryption_test_case_6_sgl),
+                       test_verify_auth_aes_cmac_cipher_zuc_test_case_1),
 
-               /** KASUMI encrypt only (UEA1) */
+               /** AUTH NULL + CIPHER SNOW3G */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1),
+                       test_auth_null_cipher_snow_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_2),
+                       test_verify_auth_null_cipher_snow_test_case_1),
+               /** AUTH NULL + CIPHER ZUC */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_3),
+                       test_auth_null_cipher_zuc_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_4),
+                       test_verify_auth_null_cipher_zuc_test_case_1),
+               /** AUTH SNOW3G + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_5),
+                       test_auth_snow_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_sgl),
+                       test_verify_auth_snow_cipher_null_test_case_1),
+               /** AUTH ZUC + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop_sgl),
-               /** KASUMI decrypt only (UEA1) */
+                       test_auth_zuc_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1),
+                       test_verify_auth_zuc_cipher_null_test_case_1),
+               /** AUTH NULL + CIPHER AES CTR */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_2),
+                       test_auth_null_cipher_aes_ctr_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_3),
+                       test_verify_auth_null_cipher_aes_ctr_test_case_1),
+               /** AUTH AES CMAC + CIPHER NULL */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_4),
+                       test_auth_aes_cmac_cipher_null_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_5),
+                       test_verify_auth_aes_cmac_cipher_null_test_case_1),
 
+#ifdef RTE_LIBRTE_SECURITY
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_encryption_test_case_1_oop),
+                       test_PDCP_PROTO_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_decryption_test_case_1_oop),
+                       test_DOCSIS_PROTO_all),
+#endif
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
 
-               /** 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),
+static struct unit_test_suite cryptodev_virtio_testsuite = {
+       .suite_name = "Crypto VIRTIO Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+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_hash_generate_test_case_3),
+                            test_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_4),
+                            test_multi_session),
+
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_armv8_testsuite  = {
+       .suite_name = "Crypto Device ARMv8 Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_5),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_generate_test_case_6),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
+
+               TEST_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_mrvl_testsuite  = {
+       .suite_name = "Crypto Device Marvell Component Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_1),
+                               test_multi_session_random_usage),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+
+               /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_2),
+                       authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_3),
+                       authentication_verify_HMAC_SHA1_fail_tag_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_4),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_kasumi_hash_verify_test_case_5),
+                       auth_decryption_AES128CBC_HMAC_SHA1_fail_tag_corrupt),
 
-               /** 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_CASES_END() /**< NULL terminate unit test array */
+       }
+};
+
+static struct unit_test_suite cryptodev_ccp_testsuite  = {
+       .suite_name = "Crypto Device CCP Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown, test_multi_session),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_null_auth_cipher_operation),
+                               test_multi_session_random_usage),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_cipheronly_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_authonly_all),
 
                /** Negative tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
                        authentication_verify_HMAC_SHA1_fail_data_corrupt),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        authentication_verify_HMAC_SHA1_fail_tag_corrupt),
-               TEST_CASE_ST(ut_setup, ut_teardown,
-                       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_nitrox_testsuite  = {
+       .suite_name = "Crypto NITROX Unit Test Suite",
+       .setup = testsuite_setup,
+       .teardown = testsuite_teardown,
+       .unit_test_cases = {
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                            test_device_configure_invalid_dev_id),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                               test_device_configure_invalid_queue_pair_ids),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_AES_chain_all),
+               TEST_CASE_ST(ut_setup, ut_teardown, test_3DES_chain_all),
+
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -12683,7 +12642,7 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_qat_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12715,7 +12674,30 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_aesni_mb_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
+}
+
+static int
+test_cryptodev_cpu_aesni_mb(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "AESNI MB PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_AESNI_MB is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
 }
 
 static int
@@ -12731,7 +12713,7 @@ test_cryptodev_openssl(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_openssl_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12747,7 +12729,30 @@ test_cryptodev_aesni_gcm(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_aesni_gcm_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
+}
+
+static int
+test_cryptodev_cpu_aesni_gcm(void)
+{
+       int32_t rc;
+       enum rte_security_session_action_type at;
+
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "AESNI GCM PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_AESNI_GCM is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_SKIPPED;
+       }
+
+       at = gbl_action_type;
+       gbl_action_type = RTE_SECURITY_ACTION_TYPE_CPU_CRYPTO;
+       rc = unit_test_suite_runner(&cryptodev_testsuite);
+       gbl_action_type = at;
+       return rc;
 }
 
 static int
@@ -12763,7 +12768,7 @@ test_cryptodev_null(void)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_null_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12779,7 +12784,7 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_snow3g_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12795,7 +12800,7 @@ test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_kasumi_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12811,7 +12816,7 @@ test_cryptodev_sw_zuc(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_sw_zuc_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12887,7 +12892,7 @@ test_cryptodev_dpaa2_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa2_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12903,7 +12908,7 @@ test_cryptodev_dpaa_sec(void /*argv __rte_unused, int argc __rte_unused*/)
                return TEST_SKIPPED;
        }
 
-       return unit_test_suite_runner(&cryptodev_dpaa_sec_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12934,7 +12939,22 @@ test_cryptodev_octeontx(void)
                                "testsuite.\n");
                return TEST_FAILED;
        }
-       return unit_test_suite_runner(&cryptodev_octeontx_testsuite);
+       return unit_test_suite_runner(&cryptodev_testsuite);
+}
+
+static int
+test_cryptodev_octeontx2(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_OCTEONTX2_PMD));
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "OCTEON TX2 PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_CRYPTO is "
+                               "enabled in config file to run this "
+                               "testsuite.\n");
+               return TEST_FAILED;
+       }
+       return unit_test_suite_runner(&cryptodev_testsuite);
 }
 
 static int
@@ -12953,10 +12973,30 @@ test_cryptodev_caam_jr(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_caam_jr_testsuite);
 }
 
+static int
+test_cryptodev_nitrox(void)
+{
+       gbl_driver_id = rte_cryptodev_driver_id_get(
+                       RTE_STR(CRYPTODEV_NAME_NITROX_PMD));
+
+       if (gbl_driver_id == -1) {
+               RTE_LOG(ERR, USER1, "NITROX PMD must be loaded. Check if "
+                               "CONFIG_RTE_LIBRTE_PMD_NITROX is enabled "
+                               "in config file to run this testsuite.\n");
+               return TEST_FAILED;
+       }
+
+       return unit_test_suite_runner(&cryptodev_nitrox_testsuite);
+}
+
 REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
 REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_mb_autotest,
+       test_cryptodev_cpu_aesni_mb);
 REGISTER_TEST_COMMAND(cryptodev_openssl_autotest, test_cryptodev_openssl);
 REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_autotest, test_cryptodev_aesni_gcm);
+REGISTER_TEST_COMMAND(cryptodev_cpu_aesni_gcm_autotest,
+       test_cryptodev_cpu_aesni_gcm);
 REGISTER_TEST_COMMAND(cryptodev_null_autotest, test_cryptodev_null);
 REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_autotest, test_cryptodev_sw_snow3g);
 REGISTER_TEST_COMMAND(cryptodev_sw_kasumi_autotest, test_cryptodev_sw_kasumi);
@@ -12968,4 +13008,6 @@ REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);
 REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);
 REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);
 REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, test_cryptodev_octeontx);
+REGISTER_TEST_COMMAND(cryptodev_octeontx2_autotest, test_cryptodev_octeontx2);
 REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);
+REGISTER_TEST_COMMAND(cryptodev_nitrox_autotest, test_cryptodev_nitrox);