app/test: rework command registration
[dpdk.git] / app / test / test_cryptodev.c
index 1acb324..647787d 100644 (file)
@@ -44,6 +44,8 @@
 #include "test_cryptodev.h"
 
 #include "test_cryptodev_aes.h"
+#include "test_cryptodev_kasumi_test_vectors.h"
+#include "test_cryptodev_kasumi_hash_test_vectors.h"
 #include "test_cryptodev_snow3g_test_vectors.h"
 #include "test_cryptodev_snow3g_hash_test_vectors.h"
 #include "test_cryptodev_gcm_test_vectors.h"
@@ -112,6 +114,16 @@ setup_test_string(struct rte_mempool *mpool,
        return m;
 }
 
+/* Get number of bytes in X bits (rounding up) */
+static uint32_t
+ceil_byte_length(uint32_t num_bits)
+{
+       if (num_bits % 8)
+               return ((num_bits >> 3) + 1);
+       else
+               return (num_bits >> 3);
+}
+
 static struct rte_crypto_op *
 process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
 {
@@ -174,12 +186,12 @@ testsuite_setup(void)
                if (nb_devs < 2) {
                        for (i = nb_devs; i < 2; i++) {
                                ret = rte_eal_vdev_init(
-                                       CRYPTODEV_NAME_AESNI_MB_PMD, NULL);
+                                       RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD), NULL);
 
                                TEST_ASSERT(ret == 0,
                                        "Failed to create instance %u of"
                                        " pmd : %s",
-                                       i, CRYPTODEV_NAME_AESNI_MB_PMD);
+                                       i, RTE_STR(CRYPTODEV_NAME_AESNI_MB_PMD));
                        }
                }
        }
@@ -191,10 +203,10 @@ testsuite_setup(void)
                if (nb_devs < 2) {
                        for (i = nb_devs; i < 2; i++) {
                                TEST_ASSERT_SUCCESS(rte_eal_vdev_init(
-                                       CRYPTODEV_NAME_AESNI_GCM_PMD, NULL),
+                                       RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD), NULL),
                                        "Failed to create instance %u of"
                                        " pmd : %s",
-                                       i, CRYPTODEV_NAME_AESNI_GCM_PMD);
+                                       i, RTE_STR(CRYPTODEV_NAME_AESNI_GCM_PMD));
                        }
                }
        }
@@ -205,10 +217,24 @@ testsuite_setup(void)
                if (nb_devs < 2) {
                        for (i = nb_devs; i < 2; i++) {
                                TEST_ASSERT_SUCCESS(rte_eal_vdev_init(
-                                       CRYPTODEV_NAME_SNOW3G_PMD, NULL),
+                                       RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD), NULL),
+                                       "Failed to create instance %u of"
+                                       " pmd : %s",
+                                       i, RTE_STR(CRYPTODEV_NAME_SNOW3G_PMD));
+                       }
+               }
+       }
+
+       /* Create 2 KASUMI devices if required */
+       if (gbl_cryptodev_type == RTE_CRYPTODEV_KASUMI_PMD) {
+               nb_devs = rte_cryptodev_count_devtype(RTE_CRYPTODEV_KASUMI_PMD);
+               if (nb_devs < 2) {
+                       for (i = nb_devs; i < 2; i++) {
+                               TEST_ASSERT_SUCCESS(rte_eal_vdev_init(
+                                       RTE_STR(CRYPTODEV_NAME_KASUMI_PMD), NULL),
                                        "Failed to create instance %u of"
                                        " pmd : %s",
-                                       i, CRYPTODEV_NAME_SNOW3G_PMD);
+                                       i, RTE_STR(CRYPTODEV_NAME_KASUMI_PMD));
                        }
                }
        }
@@ -220,12 +246,12 @@ testsuite_setup(void)
                if (nb_devs < 2) {
                        for (i = nb_devs; i < 2; i++) {
                                int dev_id = rte_eal_vdev_init(
-                                       CRYPTODEV_NAME_NULL_PMD, NULL);
+                                       RTE_STR(CRYPTODEV_NAME_NULL_PMD), NULL);
 
                                TEST_ASSERT(dev_id >= 0,
                                        "Failed to create instance %u of"
                                        " pmd : %s",
-                                       i, CRYPTODEV_NAME_NULL_PMD);
+                                       i, RTE_STR(CRYPTODEV_NAME_NULL_PMD));
                        }
                }
        }
@@ -290,12 +316,12 @@ testsuite_teardown(void)
 
        if (ts_params->mbuf_pool != NULL) {
                RTE_LOG(DEBUG, USER1, "CRYPTO_MBUFPOOL count %u\n",
-               rte_mempool_count(ts_params->mbuf_pool));
+               rte_mempool_avail_count(ts_params->mbuf_pool));
        }
 
        if (ts_params->op_mpool != NULL) {
                RTE_LOG(DEBUG, USER1, "CRYPTO_OP_POOL count %u\n",
-               rte_mempool_count(ts_params->op_mpool));
+               rte_mempool_avail_count(ts_params->op_mpool));
        }
 
 }
@@ -370,10 +396,13 @@ ut_teardown(void)
 
        /*
         * free mbuf - both obuf and ibuf are usually the same,
-        * but rte copes even if we call free twice
+        * so check if they point at the same address is necessary,
+        * to avoid freeing the mbuf twice.
         */
        if (ut_params->obuf) {
                rte_pktmbuf_free(ut_params->obuf);
+               if (ut_params->ibuf == ut_params->obuf)
+                       ut_params->ibuf = 0;
                ut_params->obuf = 0;
        }
        if (ut_params->ibuf) {
@@ -383,7 +412,7 @@ ut_teardown(void)
 
        if (ts_params->mbuf_pool != NULL)
                RTE_LOG(DEBUG, USER1, "CRYPTO_MBUFPOOL count %u\n",
-                               rte_mempool_count(ts_params->mbuf_pool));
+                       rte_mempool_avail_count(ts_params->mbuf_pool));
 
        rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats);
 
@@ -1065,10 +1094,11 @@ test_AES_qat_all(void)
 
 /* ***** Snow3G Tests ***** */
 static int
-create_snow3g_hash_session(uint8_t dev_id,
+create_snow3g_kasumi_hash_session(uint8_t dev_id,
        const uint8_t *key, const uint8_t key_len,
        const uint8_t aad_len, const uint8_t auth_len,
-       enum rte_crypto_auth_operation op)
+       enum rte_crypto_auth_operation op,
+       enum rte_crypto_auth_algorithm algo)
 {
        uint8_t hash_key[key_len];
 
@@ -1083,7 +1113,7 @@ create_snow3g_hash_session(uint8_t dev_id,
        ut_params->auth_xform.next = NULL;
 
        ut_params->auth_xform.auth.op = op;
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       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;
@@ -1093,9 +1123,11 @@ create_snow3g_hash_session(uint8_t dev_id,
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
        return 0;
 }
+
 static int
-create_snow3g_cipher_session(uint8_t dev_id,
+create_snow3g_kasumi_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 cipher_key[key_len];
@@ -1108,7 +1140,7 @@ create_snow3g_cipher_session(uint8_t dev_id,
        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_SNOW3G_UEA2;
+       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;
@@ -1124,9 +1156,10 @@ create_snow3g_cipher_session(uint8_t dev_id,
 }
 
 static int
-create_snow3g_cipher_operation(const uint8_t *iv, const unsigned iv_len,
+create_snow3g_kasumi_cipher_operation(const uint8_t *iv, const unsigned iv_len,
                        const unsigned cipher_len,
-                       const unsigned cipher_offset)
+                       const unsigned cipher_offset,
+                       enum rte_crypto_cipher_algorithm algo)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -1147,7 +1180,11 @@ create_snow3g_cipher_operation(const uint8_t *iv, const unsigned iv_len,
        sym_op->m_src = ut_params->ibuf;
 
        /* iv */
-       iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
+       if (algo == RTE_CRYPTO_CIPHER_KASUMI_F8)
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 8);
+       else
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
+
        sym_op->cipher.iv.data = (uint8_t *)rte_pktmbuf_prepend(ut_params->ibuf
                        , iv_pad_len);
 
@@ -1164,9 +1201,10 @@ create_snow3g_cipher_operation(const uint8_t *iv, const unsigned iv_len,
 }
 
 static int
-create_snow3g_cipher_operation_oop(const uint8_t *iv, const uint8_t iv_len,
+create_snow3g_kasumi_cipher_operation_oop(const uint8_t *iv, const uint8_t iv_len,
                        const unsigned cipher_len,
-                       const unsigned cipher_offset)
+                       const unsigned cipher_offset,
+                       enum rte_crypto_cipher_algorithm algo)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -1188,9 +1226,12 @@ create_snow3g_cipher_operation_oop(const uint8_t *iv, const uint8_t iv_len,
        sym_op->m_dst = ut_params->obuf;
 
        /* iv */
-       iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
-       sym_op->cipher.iv.data = (uint8_t *)rte_pktmbuf_prepend(ut_params->ibuf
-                       , iv_pad_len);
+       if (algo == RTE_CRYPTO_CIPHER_KASUMI_F8)
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 8);
+       else
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
+       sym_op->cipher.iv.data = (uint8_t *)rte_pktmbuf_prepend(ut_params->ibuf,
+                                       iv_pad_len);
 
        TEST_ASSERT_NOT_NULL(sym_op->cipher.iv.data, "no room to prepend iv");
 
@@ -1205,11 +1246,14 @@ create_snow3g_cipher_operation_oop(const uint8_t *iv, const uint8_t iv_len,
 }
 
 static int
-create_snow3g_cipher_auth_session(uint8_t dev_id,
+create_snow3g_kasumi_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, const uint8_t key_len,
                const uint8_t aad_len, const uint8_t auth_len)
+
 {
        uint8_t cipher_auth_key[key_len];
 
@@ -1222,7 +1266,7 @@ create_snow3g_cipher_auth_session(uint8_t dev_id,
        ut_params->auth_xform.next = NULL;
 
        ut_params->auth_xform.auth.op = auth_op;
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       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;
@@ -1233,7 +1277,7 @@ create_snow3g_cipher_auth_session(uint8_t dev_id,
        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_SNOW3G_UEA2;
+       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;
@@ -1249,12 +1293,14 @@ create_snow3g_cipher_auth_session(uint8_t dev_id,
 }
 
 static int
-create_snow3g_auth_cipher_session(uint8_t dev_id,
+create_snow3g_kasumi_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,
                const uint8_t aad_len, const uint8_t auth_len)
-       {
+{
        uint8_t auth_cipher_key[key_len];
 
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -1265,7 +1311,7 @@ create_snow3g_auth_cipher_session(uint8_t dev_id,
        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 = RTE_CRYPTO_AUTH_SNOW3G_UIA2;
+       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;
@@ -1274,7 +1320,7 @@ create_snow3g_auth_cipher_session(uint8_t dev_id,
        /* 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_SNOW3G_UEA2;
+       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;
@@ -1291,11 +1337,12 @@ create_snow3g_auth_cipher_session(uint8_t dev_id,
 }
 
 static int
-create_snow3g_hash_operation(const uint8_t *auth_tag,
+create_snow3g_kasumi_hash_operation(const uint8_t *auth_tag,
                const unsigned auth_tag_len,
                const uint8_t *aad, const unsigned aad_len,
                unsigned data_pad_len,
                enum rte_crypto_auth_operation op,
+               enum rte_crypto_auth_algorithm algo,
                const unsigned auth_len, const unsigned auth_offset)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -1324,9 +1371,12 @@ create_snow3g_hash_operation(const uint8_t *auth_tag,
        * The cryptodev API calls out -
        *  - the array must be big enough to hold the AAD, plus any
        *   space to round this up to the nearest multiple of the
-       *   block size (16 bytes).
+       *   block size (8 bytes for KASUMI and 16 bytes for SNOW3G).
        */
-       aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 16);
+       if (algo == RTE_CRYPTO_AUTH_KASUMI_F9)
+               aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 8);
+       else
+               aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 16);
        sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_prepend(
                        ut_params->ibuf, aad_buffer_len);
        TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data,
@@ -1367,11 +1417,13 @@ create_snow3g_hash_operation(const uint8_t *auth_tag,
 }
 
 static int
-create_snow3g_cipher_hash_operation(const uint8_t *auth_tag,
+create_snow3g_kasumi_cipher_hash_operation(const uint8_t *auth_tag,
                const unsigned auth_tag_len,
                const uint8_t *aad, const uint8_t aad_len,
                unsigned data_pad_len,
                enum rte_crypto_auth_operation op,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo,
                const uint8_t *iv, const uint8_t iv_len,
                const unsigned cipher_len, const unsigned cipher_offset,
                const unsigned auth_len, const unsigned auth_offset)
@@ -1397,7 +1449,10 @@ create_snow3g_cipher_hash_operation(const uint8_t *auth_tag,
 
 
        /* iv */
-       iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
+       if (cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8)
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 8);
+       else
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
 
        sym_op->cipher.iv.data = (uint8_t *)rte_pktmbuf_prepend(
                ut_params->ibuf, iv_pad_len);
@@ -1418,9 +1473,12 @@ create_snow3g_cipher_hash_operation(const uint8_t *auth_tag,
        * The cryptodev API calls out -
        *  - the array must be big enough to hold the AAD, plus any
        *   space to round this up to the nearest multiple of the
-       *   block size (16 bytes).
+       *   block size (8 bytes for KASUMI and 16 bytes for SNOW3G).
        */
-       aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 16);
+       if (auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9)
+               aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 8);
+       else
+               aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 16);
 
        sym_op->auth.aad.data =
                        (uint8_t *)rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *);
@@ -1462,12 +1520,14 @@ create_snow3g_cipher_hash_operation(const uint8_t *auth_tag,
 }
 
 static int
-create_snow3g_auth_cipher_operation(const unsigned auth_tag_len,
+create_snow3g_kasumi_auth_cipher_operation(const unsigned auth_tag_len,
                const uint8_t *iv, const uint8_t iv_len,
                const uint8_t *aad, const uint8_t aad_len,
                unsigned data_pad_len,
                const unsigned cipher_len, const unsigned cipher_offset,
-               const unsigned auth_len, const unsigned auth_offset)
+               const unsigned auth_len, const unsigned auth_offset,
+               enum rte_crypto_auth_algorithm auth_algo,
+               enum rte_crypto_cipher_algorithm cipher_algo)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -1507,7 +1567,10 @@ create_snow3g_auth_cipher_operation(const unsigned auth_tag_len,
                        sym_op->auth.digest.length);
 
        /* iv */
-       iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
+       if (cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8)
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 8);
+       else
+               iv_pad_len = RTE_ALIGN_CEIL(iv_len, 16);
 
        sym_op->cipher.iv.data = (uint8_t *)rte_pktmbuf_prepend(
                ut_params->ibuf, iv_pad_len);
@@ -1525,9 +1588,12 @@ create_snow3g_auth_cipher_operation(const unsigned auth_tag_len,
        * The cryptodev API calls out -
        *  - the array must be big enough to hold the AAD, plus any
        *   space to round this up to the nearest multiple of the
-       *   block size (16 bytes).
+       *   block size (8 bytes for KASUMI 16 bytes).
        */
-       aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 16);
+       if (auth_algo == RTE_CRYPTO_AUTH_KASUMI_F9)
+               aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 8);
+       else
+               aad_buffer_len = ALIGN_POW2_ROUNDUP(aad_len, 16);
 
        sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_prepend(
        ut_params->ibuf, aad_buffer_len);
@@ -1560,13 +1626,15 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
 
        int retval;
        unsigned plaintext_pad_len;
+       unsigned plaintext_len;
        uint8_t *plaintext;
 
        /* Create SNOW3G session */
-       retval = create_snow3g_hash_session(ts_params->valid_devs[0],
+       retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0],
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->digest.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2);
        if (retval < 0)
                return retval;
 
@@ -1576,17 +1644,19 @@ test_snow3g_authentication(const struct snow3g_hash_test_data *tdata)
        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 = tdata->plaintext.len >> 3;
+       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, tdata->plaintext.len >> 3);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       /* Create SNOW3G opertaion */
-       retval = create_snow3g_hash_operation(NULL, tdata->digest.len,
+       /* Create SNOW3G operation */
+       retval = create_snow3g_kasumi_hash_operation(NULL, tdata->digest.len,
                        tdata->aad.data, tdata->aad.len,
                        plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
                        tdata->validAuthLenInBits.len,
                        tdata->validAuthOffsetLenInBits.len);
        if (retval < 0)
@@ -1617,13 +1687,15 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
 
        int retval;
        unsigned plaintext_pad_len;
+       unsigned plaintext_len;
        uint8_t *plaintext;
 
        /* Create SNOW3G session */
-       retval = create_snow3g_hash_session(ts_params->valid_devs[0],
+       retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0],
                                tdata->key.data, tdata->key.len,
                                tdata->aad.len, tdata->digest.len,
-                               RTE_CRYPTO_AUTH_OP_VERIFY);
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               RTE_CRYPTO_AUTH_SNOW3G_UIA2);
        if (retval < 0)
                return retval;
        /* alloc mbuf and set payload */
@@ -1632,19 +1704,21 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
        rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = tdata->plaintext.len >> 3;
+       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, tdata->plaintext.len >> 3);
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
        /* Create SNOW3G operation */
-       retval = create_snow3g_hash_operation(tdata->digest.data,
+       retval = create_snow3g_kasumi_hash_operation(tdata->digest.data,
                        tdata->digest.len,
                        tdata->aad.data, tdata->aad.len,
                        plaintext_pad_len,
                        RTE_CRYPTO_AUTH_OP_VERIFY,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
                        tdata->validAuthLenInBits.len,
                        tdata->validAuthOffsetLenInBits.len);
        if (retval < 0)
@@ -1666,6 +1740,127 @@ test_snow3g_authentication_verify(const struct snow3g_hash_test_data *tdata)
        return 0;
 }
 
+static int
+test_kasumi_authentication(const struct kasumi_hash_test_data *tdata)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+
+       /* Create KASUMI session */
+       retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0],
+                       tdata->key.data, tdata->key.len,
+                       tdata->aad.len, tdata->digest.len,
+                       RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_KASUMI_F9);
+       if (retval < 0)
+               return retval;
+
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       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 KASUMI operation */
+       retval = create_snow3g_kasumi_hash_operation(NULL, tdata->digest.len,
+                       tdata->aad.data, tdata->aad.len,
+                       plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       tdata->validAuthLenInBits.len,
+                       tdata->validAuthOffsetLenInBits.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;
+       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 + ALIGN_POW2_ROUNDUP(tdata->aad.len, 8);
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       ut_params->digest,
+       tdata->digest.data,
+       DIGEST_BYTE_LENGTH_KASUMI_F9,
+       "KASUMI Generated auth tag not as expected");
+
+       return 0;
+}
+
+static int
+test_kasumi_authentication_verify(const struct kasumi_hash_test_data *tdata)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+       uint8_t *plaintext;
+
+       /* Create KASUMI session */
+       retval = create_snow3g_kasumi_hash_session(ts_params->valid_devs[0],
+                               tdata->key.data, tdata->key.len,
+                               tdata->aad.len, tdata->digest.len,
+                               RTE_CRYPTO_AUTH_OP_VERIFY,
+                               RTE_CRYPTO_AUTH_KASUMI_F9);
+       if (retval < 0)
+               return retval;
+       /* alloc mbuf and set payload */
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+       rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 8);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+
+       /* Create KASUMI operation */
+       retval = create_snow3g_kasumi_hash_operation(tdata->digest.data,
+                       tdata->digest.len,
+                       tdata->aad.data, tdata->aad.len,
+                       plaintext_pad_len,
+                       RTE_CRYPTO_AUTH_OP_VERIFY,
+                       RTE_CRYPTO_AUTH_KASUMI_F9,
+                       tdata->validAuthLenInBits.len,
+                       tdata->validAuthOffsetLenInBits.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_src;
+       ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                               + plaintext_pad_len + tdata->aad.len;
+
+       /* Validate obuf */
+       if (ut_params->op->status == RTE_CRYPTO_OP_STATUS_SUCCESS)
+               return 0;
+       else
+               return -1;
+
+       return 0;
+}
 
 static int
 test_snow3g_hash_generate_test_case_1(void)
@@ -1685,6 +1880,24 @@ test_snow3g_hash_generate_test_case_3(void)
        return test_snow3g_authentication(&snow3g_hash_test_case_3);
 }
 
+static int
+test_snow3g_hash_generate_test_case_4(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_4);
+}
+
+static int
+test_snow3g_hash_generate_test_case_5(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_5);
+}
+
+static int
+test_snow3g_hash_generate_test_case_6(void)
+{
+       return test_snow3g_authentication(&snow3g_hash_test_case_6);
+}
+
 static int
 test_snow3g_hash_verify_test_case_1(void)
 {
@@ -1705,20 +1918,98 @@ test_snow3g_hash_verify_test_case_3(void)
 }
 
 static int
-test_snow3g_encryption(const struct snow3g_test_data *tdata)
+test_snow3g_hash_verify_test_case_4(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_4);
+}
+
+static int
+test_snow3g_hash_verify_test_case_5(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_5);
+}
+
+static int
+test_snow3g_hash_verify_test_case_6(void)
+{
+       return test_snow3g_authentication_verify(&snow3g_hash_test_case_6);
+}
+
+static int
+test_kasumi_hash_generate_test_case_1(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_1);
+}
+
+static int
+test_kasumi_hash_generate_test_case_2(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_2);
+}
+
+static int
+test_kasumi_hash_generate_test_case_3(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_3);
+}
+
+static int
+test_kasumi_hash_generate_test_case_4(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_4);
+}
+
+static int
+test_kasumi_hash_generate_test_case_5(void)
+{
+       return test_kasumi_authentication(&kasumi_hash_test_case_5);
+}
+
+static int
+test_kasumi_hash_verify_test_case_1(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_1);
+}
+
+static int
+test_kasumi_hash_verify_test_case_2(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_2);
+}
+
+static int
+test_kasumi_hash_verify_test_case_3(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_3);
+}
+
+static int
+test_kasumi_hash_verify_test_case_4(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_4);
+}
+
+static int
+test_kasumi_hash_verify_test_case_5(void)
+{
+       return test_kasumi_authentication_verify(&kasumi_hash_test_case_5);
+}
+
+static int
+test_kasumi_encryption(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
 
        int retval;
        uint8_t *plaintext, *ciphertext;
-       uint8_t plaintext_pad_len;
-       uint8_t lastByteValidBits = 8;
-       uint8_t lastByteMask = 0xFF;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
-       /* Create SNOW3G session */
-       retval = create_snow3g_cipher_session(ts_params->valid_devs[0],
+       /* Create KASUMI session */
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
                                        tdata->key.data, tdata->key.len);
        if (retval < 0)
                return retval;
@@ -1729,23 +2020,21 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /*
-        * Append data which is padded to a
-        * multiple of the algorithms block size
-        */
-       /*tdata->plaintext.len = tdata->plaintext.len >> 3;*/
-       plaintext_pad_len = RTE_ALIGN_CEIL((tdata->plaintext.len >> 3), 16);
-
-       plaintext = (uint8_t *) rte_pktmbuf_append(ut_params->ibuf,
-                                               plaintext_pad_len);
-       memcpy(plaintext, tdata->plaintext.data, (tdata->plaintext.len >> 3));
+       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);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create SNOW3G operation */
-       retval = create_snow3g_cipher_operation(tdata->iv.data, tdata->iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       tdata->validCipherOffsetLenInBits.len);
+       /* Create KASUMI operation */
+       retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data, tdata->iv.len,
+                                       tdata->plaintext.len,
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8);
        if (retval < 0)
                return retval;
 
@@ -1760,39 +2049,32 @@ test_snow3g_encryption(const struct snow3g_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       lastByteValidBits = (tdata->validDataLenInBits.len % 8);
-       if (lastByteValidBits == 0)
-               lastByteValidBits = 8;
-       lastByteMask = lastByteMask << (8 - lastByteValidBits);
-       (*(ciphertext + (tdata->ciphertext.len >> 3) - 1)) &= lastByteMask;
-
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
                tdata->ciphertext.data,
-               tdata->ciphertext.len >> 3,
-               "Snow3G Ciphertext data not as expected");
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
        return 0;
 }
 
-
 static int
-test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
+test_kasumi_encryption_oop(const struct kasumi_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
-       uint8_t *plaintext, *ciphertext;
 
        int retval;
-       uint8_t plaintext_pad_len;
-       uint8_t lastByteValidBits = 8;
-       uint8_t lastByteMask = 0xFF;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
-       /* Create SNOW3G session */
-       retval = create_snow3g_cipher_session(ts_params->valid_devs[0],
+       /* Create KASUMI session */
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
                                        tdata->key.data, tdata->key.len);
        if (retval < 0)
                return retval;
@@ -1800,37 +2082,27 @@ test_snow3g_encryption_oop(const struct snow3g_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));
 
-       /*
-        * Append data which is padded to a
-        * multiple of the algorithms block size
-        */
-       /*tdata->plaintext.len = tdata->plaintext.len >> 3;*/
-       plaintext_pad_len = RTE_ALIGN_CEIL((tdata->plaintext.len >> 3), 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, (tdata->plaintext.len >> 3));
+       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);
+       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
 
-       /* Create SNOW3G operation */
-       retval = create_snow3g_cipher_operation_oop(tdata->iv.data,
+       /* Create KASUMI operation */
+       retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data,
                                        tdata->iv.len,
-                                       tdata->validCipherLenInBits.len,
-                                       tdata->validCipherOffsetLenInBits.len);
+                                       tdata->plaintext.len,
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8);
        if (retval < 0)
                return retval;
 
@@ -1845,89 +2117,464 @@ test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       lastByteValidBits = (tdata->validDataLenInBits.len % 8);
-       if (lastByteValidBits == 0)
-               lastByteValidBits = 8;
-       lastByteMask = lastByteMask << (8 - lastByteValidBits);
-       (*(ciphertext + (tdata->ciphertext.len >> 3) - 1)) &= lastByteMask;
-
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
                tdata->ciphertext.data,
-               tdata->ciphertext.len >> 3,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Ciphertext data not as expected");
+       return 0;
+}
+
+static int
+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;
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
+
+       /* Create KASUMI session */
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.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);
+       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);
+
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+
+       /* Create KASUMI operation */
+       retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data,
+                                       tdata->iv.len,
+                                       tdata->ciphertext.len,
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8);
+       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 *)
+                               + tdata->iv.len;
+       else
+               plaintext = ciphertext;
+
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               plaintext,
+               tdata->plaintext.data,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext data not as expected");
+       return 0;
+}
+
+static int
+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;
+       uint8_t *ciphertext, *plaintext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
+
+       /* Create KASUMI session */
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8,
+                                       tdata->key.data, tdata->key.len);
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       /* Append data which is padded to a multiple */
+       /* of the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 8);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+
+       /* Create KASUMI operation */
+       retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data,
+                                       tdata->iv.len,
+                                       tdata->ciphertext.len,
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_KASUMI_F8);
+       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 *)
+                               + tdata->iv.len;
+       else
+               plaintext = ciphertext;
+
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               plaintext,
+               tdata->plaintext.data,
+               tdata->validCipherLenInBits.len,
+               "KASUMI Plaintext data not as expected");
+       return 0;
+}
+
+static int
+test_snow3g_encryption(const struct snow3g_test_data *tdata)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_unittest_params *ut_params = &unittest_params;
+
+       int retval;
+       uint8_t *plaintext, *ciphertext;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+
+       /* Create SNOW3G session */
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       tdata->key.data, tdata->key.len);
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+
+       /* Create SNOW3G operation */
+       retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data, tdata->iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2);
+       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 *)
+                               + tdata->iv.len;
+       else
+               ciphertext = plaintext;
+
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
                "Snow3G Ciphertext data not as expected");
        return 0;
 }
 
 
-static int test_snow3g_decryption(const struct snow3g_test_data *tdata)
+static int
+test_snow3g_encryption_oop(const struct snow3g_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
+       uint8_t *plaintext, *ciphertext;
 
        int retval;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
+
+       /* Create SNOW3G session */
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       tdata->key.data, tdata->key.len);
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
+
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       plaintext_len = ceil_byte_length(tdata->plaintext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
+
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
+
+       /* Create SNOW3G operation */
+       retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data,
+                                       tdata->iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2);
+       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 *)
+                               + tdata->iv.len;
+       else
+               ciphertext = plaintext;
+
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
+
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
+               ciphertext,
+               tdata->ciphertext.data,
+               tdata->validDataLenInBits.len,
+               "Snow3G 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_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;
        uint8_t *plaintext, *ciphertext;
-       uint8_t ciphertext_pad_len;
-       uint8_t lastByteValidBits = 8;
-       uint8_t lastByteMask = 0xFF;
+       int retval;
+       uint32_t plaintext_len;
+       uint32_t plaintext_pad_len;
+       uint8_t extra_offset = 4;
+       uint8_t *expected_ciphertext_shifted;
 
        /* Create SNOW3G session */
-       retval = create_snow3g_cipher_session(ts_params->valid_devs[0],
-                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len);
        if (retval < 0)
                return retval;
 
        ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+       ut_params->obuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       TEST_ASSERT_NOT_NULL(ut_params->ibuf,
+                       "Failed to allocate input buffer in mempool");
+       TEST_ASSERT_NOT_NULL(ut_params->obuf,
+                       "Failed to allocate output buffer in mempool");
 
        /* Clear mbuf payload */
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
               rte_pktmbuf_tailroom(ut_params->ibuf));
 
+       plaintext_len = ceil_byte_length(tdata->plaintext.len + extra_offset);
        /*
         * Append data which is padded to a
         * multiple of the algorithms block size
         */
-       ciphertext_pad_len = RTE_ALIGN_CEIL((tdata->ciphertext.len >> 3), 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(plaintext_len, 16);
 
-       ciphertext = (uint8_t *) rte_pktmbuf_append(ut_params->ibuf,
-                                               ciphertext_pad_len);
-       memcpy(ciphertext, tdata->ciphertext.data, tdata->ciphertext.len >> 3);
+       plaintext = (uint8_t *) rte_pktmbuf_append(ut_params->ibuf,
+                                               plaintext_pad_len);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       rte_pktmbuf_append(ut_params->obuf, plaintext_pad_len);
+
+       memcpy(plaintext, tdata->plaintext.data, (tdata->plaintext.len >> 3));
+       buffer_shift_right(plaintext, tdata->plaintext.len, extra_offset);
 
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+#endif
        /* Create SNOW3G operation */
-       retval = create_snow3g_cipher_operation(tdata->iv.data, tdata->iv.len,
+       retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data,
+                                       tdata->iv.len,
                                        tdata->validCipherLenInBits.len,
-                                       tdata->validCipherOffsetLenInBits.len);
+                                       tdata->validCipherOffsetLenInBits.len +
+                                       extra_offset,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2);
        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;
+
+       ut_params->obuf = ut_params->op->sym->m_dst;
+       if (ut_params->obuf)
+               ciphertext = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
+                               + tdata->iv.len;
+       else
+               ciphertext = plaintext;
+
+#ifdef RTE_APP_TEST_DEBUG
+       rte_hexdump(stdout, "ciphertext:", ciphertext, plaintext_len);
+#endif
+
+       expected_ciphertext_shifted = rte_malloc(NULL,
+                       ceil_byte_length(plaintext_len + extra_offset), 0);
+
+       TEST_ASSERT_NOT_NULL(expected_ciphertext_shifted,
+                       "failed to reserve memory for ciphertext shifted\n");
+
+       memcpy(expected_ciphertext_shifted, tdata->ciphertext.data,
+                       ceil_byte_length(tdata->ciphertext.len));
+       buffer_shift_right(expected_ciphertext_shifted, tdata->ciphertext.len,
+                       extra_offset);
+       /* Validate obuf */
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT_OFFSET(
+               ciphertext,
+               expected_ciphertext_shifted,
+               tdata->validDataLenInBits.len,
+               extra_offset,
+               "Snow3G Ciphertext data not as expected");
+       return 0;
+}
+
+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 *plaintext, *ciphertext;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
+
+       /* Create SNOW3G session */
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
+                                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
+                                       tdata->key.data, tdata->key.len);
+       if (retval < 0)
+               return retval;
+
+       ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
+
+       /* Clear mbuf payload */
+       memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
+              rte_pktmbuf_tailroom(ut_params->ibuf));
+
+       ciphertext_len = ceil_byte_length(tdata->ciphertext.len);
+       /* Append data which is padded to a multiple of */
+       /* the algorithms block size */
+       ciphertext_pad_len = RTE_ALIGN_CEIL(ciphertext_len, 16);
+       ciphertext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               ciphertext_pad_len);
+       memcpy(ciphertext, tdata->ciphertext.data, ciphertext_len);
+
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
+
+       /* Create SNOW3G operation */
+       retval = create_snow3g_kasumi_cipher_operation(tdata->iv.data, tdata->iv.len,
+                                       tdata->validCipherLenInBits.len,
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2);
+       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 *)
                                + tdata->iv.len;
        else
                plaintext = ciphertext;
-       lastByteValidBits = (tdata->validDataLenInBits.len  % 8);
-       if (lastByteValidBits == 0)
-               lastByteValidBits = 8;
-       lastByteMask = lastByteMask << (8 - lastByteValidBits);
-       (*(ciphertext + (tdata->ciphertext.len >> 3) - 1)) &= lastByteMask;
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(plaintext,
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
                                tdata->plaintext.data,
-                               tdata->plaintext.len >> 3,
+                               tdata->validDataLenInBits.len,
                                "Snow3G Plaintext data not as expected");
        return 0;
 }
@@ -1940,13 +2587,13 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
        int retval;
 
        uint8_t *plaintext, *ciphertext;
-       uint8_t ciphertext_pad_len;
-       uint8_t lastByteValidBits = 8;
-       uint8_t lastByteMask = 0xFF;
+       unsigned ciphertext_pad_len;
+       unsigned ciphertext_len;
 
        /* Create SNOW3G session */
-       retval = create_snow3g_cipher_session(ts_params->valid_devs[0],
+       retval = create_snow3g_kasumi_cipher_session(ts_params->valid_devs[0],
                                        RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                                        tdata->key.data, tdata->key.len);
        if (retval < 0)
                return retval;
@@ -1966,27 +2613,23 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
        memset(rte_pktmbuf_mtod(ut_params->obuf, uint8_t *), 0,
                       rte_pktmbuf_tailroom(ut_params->obuf));
 
-       /*
-        * Append data which is padded to a
-        * multiple of the algorithms block size
-        */
-       ciphertext_pad_len = RTE_ALIGN_CEIL((tdata->ciphertext.len >> 3), 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, tdata->ciphertext.len >> 3);
+       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);
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, ciphertext_len);
 
        /* Create SNOW3G operation */
-       retval = create_snow3g_cipher_operation_oop(tdata->iv.data,
+       retval = create_snow3g_kasumi_cipher_operation_oop(tdata->iv.data,
                                        tdata->iv.len,
                                        tdata->validCipherLenInBits.len,
-                                       tdata->validCipherOffsetLenInBits.len);
+                                       tdata->validCipherOffsetLenInBits.len,
+                                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2);
        if (retval < 0)
                return retval;
 
@@ -1999,18 +2642,13 @@ static int test_snow3g_decryption_oop(const struct snow3g_test_data *tdata)
                                + tdata->iv.len;
        else
                plaintext = ciphertext;
-       lastByteValidBits = (tdata->validDataLenInBits.len  % 8);
-       if (lastByteValidBits == 0)
-               lastByteValidBits = 8;
-       lastByteMask = lastByteMask << (8 - lastByteValidBits);
-       (*(plaintext + (tdata->ciphertext.len >> 3) - 1)) &= lastByteMask;
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, ciphertext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(plaintext,
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(plaintext,
                                tdata->plaintext.data,
-                               tdata->plaintext.len >> 3,
+                               tdata->validDataLenInBits.len,
                                "Snow3G Plaintext data not as expected");
        return 0;
 }
@@ -2024,14 +2662,15 @@ test_snow3g_authenticated_encryption(const struct snow3g_test_data *tdata)
        int retval;
 
        uint8_t *plaintext, *ciphertext;
-       uint8_t plaintext_pad_len;
-       uint8_t lastByteValidBits = 8;
-       uint8_t lastByteMask = 0xFF;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
        /* Create SNOW3G session */
-       retval = create_snow3g_cipher_auth_session(ts_params->valid_devs[0],
+       retval = create_snow3g_kasumi_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->aad.len, tdata->digest.len);
        if (retval < 0)
@@ -2042,26 +2681,29 @@ test_snow3g_authenticated_encryption(const struct snow3g_test_data *tdata)
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Append data which is padded to a multiple */
-       /*  of the algorithms block size */
-       plaintext_pad_len = tdata->plaintext.len >> 3;
-
+       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, tdata->plaintext.len >> 3);
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW3G operation */
-       retval = create_snow3g_cipher_hash_operation(tdata->digest.data,
+       retval = create_snow3g_kasumi_cipher_hash_operation(tdata->digest.data,
                        tdata->digest.len, tdata->aad.data,
                        tdata->aad.len, /*tdata->plaintext.len,*/
                        plaintext_pad_len, RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                        tdata->iv.data, tdata->iv.len,
                        tdata->validCipherLenInBits.len,
                        tdata->validCipherOffsetLenInBits.len,
                        tdata->validAuthLenInBits.len,
-                       tdata->validAuthOffsetLenInBits.len);
+                       tdata->validAuthOffsetLenInBits.len
+                       );
        if (retval < 0)
                return retval;
 
@@ -2074,19 +2716,14 @@ test_snow3g_authenticated_encryption(const struct snow3g_test_data *tdata)
                                + tdata->iv.len;
        else
                ciphertext = plaintext;
-       lastByteValidBits = (tdata->validDataLenInBits.len % 8);
-       if (lastByteValidBits == 0)
-               lastByteValidBits = 8;
-       lastByteMask = lastByteMask << (8-lastByteValidBits);
-       (*(ciphertext + (tdata->ciphertext.len >> 3) - 1)) &= lastByteMask;
 
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                        ciphertext,
                        tdata->ciphertext.data,
-                       tdata->ciphertext.len >> 3,
+                       tdata->validDataLenInBits.len,
                        "Snow3G Ciphertext data not as expected");
 
        ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
@@ -2109,14 +2746,15 @@ test_snow3g_encrypted_authentication(const struct snow3g_test_data *tdata)
        int retval;
 
        uint8_t *plaintext, *ciphertext;
-       uint8_t plaintext_pad_len;
-       uint8_t lastByteValidBits = 8;
-       uint8_t lastByteMask = 0xFF;
+       unsigned plaintext_pad_len;
+       unsigned plaintext_len;
 
        /* Create SNOW3G session */
-       retval = create_snow3g_auth_cipher_session(ts_params->valid_devs[0],
+       retval = create_snow3g_kasumi_auth_cipher_session(ts_params->valid_devs[0],
                        RTE_CRYPTO_CIPHER_OP_ENCRYPT,
                        RTE_CRYPTO_AUTH_OP_GENERATE,
+                       RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+                       RTE_CRYPTO_CIPHER_SNOW3G_UEA2,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->digest.len);
        if (retval < 0)
@@ -2128,18 +2766,18 @@ test_snow3g_encrypted_authentication(const struct snow3g_test_data *tdata)
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       /* Append data which is padded to a multiple */
-       /* of the algorithms block size */
-       plaintext_pad_len = RTE_ALIGN_CEIL((tdata->plaintext.len >> 3), 8);
-
+       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, tdata->plaintext.len >> 3);
+                               plaintext_pad_len);
+       memcpy(plaintext, tdata->plaintext.data, plaintext_len);
 
-       TEST_HEXDUMP(stdout, "plaintext:", plaintext, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, plaintext_len);
 
        /* Create SNOW3G operation */
-       retval = create_snow3g_auth_cipher_operation(
+       retval = create_snow3g_kasumi_auth_cipher_operation(
                tdata->digest.len,
                tdata->iv.data, tdata->iv.len,
                tdata->aad.data, tdata->aad.len,
@@ -2147,7 +2785,9 @@ test_snow3g_encrypted_authentication(const struct snow3g_test_data *tdata)
                tdata->validCipherLenInBits.len,
                tdata->validCipherOffsetLenInBits.len,
                tdata->validAuthLenInBits.len,
-               tdata->validAuthOffsetLenInBits.len
+               tdata->validAuthOffsetLenInBits.len,
+               RTE_CRYPTO_AUTH_SNOW3G_UIA2,
+               RTE_CRYPTO_CIPHER_SNOW3G_UEA2
        );
 
        if (retval < 0)
@@ -2163,20 +2803,15 @@ test_snow3g_encrypted_authentication(const struct snow3g_test_data *tdata)
        else
                ciphertext = plaintext;
 
-       lastByteValidBits = (tdata->validDataLenInBits.len % 8);
-       if (lastByteValidBits == 0)
-               lastByteValidBits = 8;
-       lastByteMask = lastByteMask << (8-lastByteValidBits);
-       (*(ciphertext + (tdata->ciphertext.len >> 3) - 1)) &= lastByteMask;
        ut_params->digest = rte_pktmbuf_mtod(ut_params->obuf, uint8_t *)
                        + plaintext_pad_len + tdata->aad.len + tdata->iv.len;
-       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, tdata->ciphertext.len);
+       TEST_HEXDUMP(stdout, "ciphertext:", ciphertext, plaintext_len);
 
        /* Validate obuf */
-       TEST_ASSERT_BUFFERS_ARE_EQUAL(
+       TEST_ASSERT_BUFFERS_ARE_EQUAL_BIT(
                ciphertext,
                tdata->ciphertext.data,
-               tdata->ciphertext.len >> 3,
+               tdata->validDataLenInBits.len,
                "Snow3G Ciphertext data not as expected");
 
        /* Validate obuf */
@@ -2188,6 +2823,77 @@ test_snow3g_encrypted_authentication(const struct snow3g_test_data *tdata)
        return 0;
 }
 
+static int
+test_kasumi_encryption_test_case_1(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_encryption_test_case_1_oop(void)
+{
+       return test_kasumi_encryption_oop(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_encryption_test_case_2(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_2);
+}
+
+static int
+test_kasumi_encryption_test_case_3(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_3);
+}
+
+static int
+test_kasumi_encryption_test_case_4(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_4);
+}
+
+static int
+test_kasumi_encryption_test_case_5(void)
+{
+       return test_kasumi_encryption(&kasumi_test_case_5);
+}
+
+static int
+test_kasumi_decryption_test_case_1(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_decryption_test_case_1_oop(void)
+{
+       return test_kasumi_decryption_oop(&kasumi_test_case_1);
+}
+
+static int
+test_kasumi_decryption_test_case_2(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_2);
+}
+
+static int
+test_kasumi_decryption_test_case_3(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_3);
+}
+
+static int
+test_kasumi_decryption_test_case_4(void)
+{
+       return test_kasumi_decryption(&kasumi_test_case_4);
+}
+
+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)
 {
@@ -2200,6 +2906,12 @@ test_snow3g_encryption_test_case_1_oop(void)
        return test_snow3g_encryption_oop(&snow3g_test_case_1);
 }
 
+static int
+test_snow3g_encryption_test_case_1_offset_oop(void)
+{
+       return test_snow3g_encryption_offset_oop(&snow3g_test_case_1);
+}
+
 static int
 test_snow3g_encryption_test_case_2(void)
 {
@@ -2290,6 +3002,7 @@ create_gcm_session(uint8_t dev_id, enum rte_crypto_cipher_operation op,
        ut_params->cipher_xform.next = NULL;
 
        ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
+       ut_params->auth_xform.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE;
        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;
@@ -2759,12 +3472,19 @@ test_multi_session(void)
 
                /*
                 * free mbuf - both obuf and ibuf are usually the same,
-                * but rte copes even if we call free twice
+                * so check if they point at the same address is necessary,
+                * to avoid freeing the mbuf twice.
                 */
                if (ut_params->obuf) {
                        rte_pktmbuf_free(ut_params->obuf);
+                       if (ut_params->ibuf == ut_params->obuf)
+                               ut_params->ibuf = 0;
                        ut_params->obuf = 0;
                }
+               if (ut_params->ibuf) {
+                       rte_pktmbuf_free(ut_params->ibuf);
+                       ut_params->ibuf = 0;
+               }
        }
 
        /* Next session create should fail */
@@ -3287,6 +4007,64 @@ static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
        }
 };
 
+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_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_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_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_CASES_END() /**< NULL terminate unit test array */
+       }
+};
 static struct unit_test_suite cryptodev_sw_snow3g_testsuite  = {
        .suite_name = "Crypto Device SW Snow3G Unit Test Suite",
        .setup = testsuite_setup,
@@ -3304,6 +4082,13 @@ static struct unit_test_suite cryptodev_sw_snow3g_testsuite  = {
                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),
+
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_encryption_test_case_1_offset_oop),
 
                /** Snow3G decrypt only (UEA2) */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -3322,12 +4107,26 @@ static struct unit_test_suite cryptodev_sw_snow3g_testsuite  = {
                        test_snow3g_hash_generate_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_generate_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_generate_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_hash_verify_test_case_3),
+               /* Tests with buffers which length is not byte-aligned */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_snow3g_hash_verify_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
                        test_snow3g_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -3365,10 +4164,6 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)
        gbl_cryptodev_type = RTE_CRYPTODEV_QAT_SYM_PMD;
        return unit_test_suite_runner(&cryptodev_qat_testsuite);
 }
-static struct test_command cryptodev_qat_cmd = {
-       .command = "cryptodev_qat_autotest",
-       .callback = test_cryptodev_qat,
-};
 
 static int
 test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
@@ -3378,11 +4173,6 @@ test_cryptodev_aesni_mb(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_aesni_mb_testsuite);
 }
 
-static struct test_command cryptodev_aesni_mb_cmd = {
-       .command = "cryptodev_aesni_mb_autotest",
-       .callback = test_cryptodev_aesni_mb,
-};
-
 static int
 test_cryptodev_aesni_gcm(void)
 {
@@ -3391,11 +4181,6 @@ test_cryptodev_aesni_gcm(void)
        return unit_test_suite_runner(&cryptodev_aesni_gcm_testsuite);
 }
 
-static struct test_command cryptodev_aesni_gcm_cmd = {
-       .command = "cryptodev_aesni_gcm_autotest",
-       .callback = test_cryptodev_aesni_gcm,
-};
-
 static int
 test_cryptodev_null(void)
 {
@@ -3404,11 +4189,6 @@ test_cryptodev_null(void)
        return unit_test_suite_runner(&cryptodev_null_testsuite);
 }
 
-static struct test_command cryptodev_null_cmd = {
-       .command = "cryptodev_null_autotest",
-       .callback = test_cryptodev_null,
-};
-
 static int
 test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
 {
@@ -3417,13 +4197,17 @@ test_cryptodev_sw_snow3g(void /*argv __rte_unused, int argc __rte_unused*/)
        return unit_test_suite_runner(&cryptodev_sw_snow3g_testsuite);
 }
 
-static struct test_command cryptodev_sw_snow3g_cmd = {
-       .command = "cryptodev_sw_snow3g_autotest",
-       .callback = test_cryptodev_sw_snow3g,
-};
+static int
+test_cryptodev_sw_kasumi(void /*argv __rte_unused, int argc __rte_unused*/)
+{
+       gbl_cryptodev_type = RTE_CRYPTODEV_KASUMI_PMD;
+
+       return unit_test_suite_runner(&cryptodev_sw_kasumi_testsuite);
+}
 
-REGISTER_TEST_COMMAND(cryptodev_qat_cmd);
-REGISTER_TEST_COMMAND(cryptodev_aesni_mb_cmd);
-REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_cmd);
-REGISTER_TEST_COMMAND(cryptodev_null_cmd);
-REGISTER_TEST_COMMAND(cryptodev_sw_snow3g_cmd);
+REGISTER_TEST_COMMAND(cryptodev_qat_autotest, test_cryptodev_qat);
+REGISTER_TEST_COMMAND(cryptodev_aesni_mb_autotest, test_cryptodev_aesni_mb);
+REGISTER_TEST_COMMAND(cryptodev_aesni_gcm_autotest, test_cryptodev_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);