test/crypto: add AES-GCM 192
[dpdk.git] / test / test / test_cryptodev.c
index 204933a..8978f8c 100644 (file)
@@ -77,6 +77,7 @@ struct crypto_testsuite_params {
 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;
 
        struct rte_cryptodev_sym_session *sess;
 
@@ -1308,7 +1309,6 @@ test_AES_CBC_HMAC_SHA1_encrypt_digest(void)
        sym_op->auth.digest.data = ut_params->digest;
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, QUOTE_512_BYTES);
-       sym_op->auth.digest.length = DIGEST_BYTE_LENGTH_SHA1;
 
        sym_op->auth.data.offset = 0;
        sym_op->auth.data.length = QUOTE_512_BYTES;
@@ -1460,7 +1460,6 @@ test_AES_CBC_HMAC_SHA512_decrypt_perform(struct rte_cryptodev_sym_session *sess,
        sym_op->auth.digest.data = ut_params->digest;
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, QUOTE_512_BYTES);
-       sym_op->auth.digest.length = DIGEST_BYTE_LENGTH_SHA512;
 
        sym_op->auth.data.offset = 0;
        sym_op->auth.data.length = QUOTE_512_BYTES;
@@ -1739,6 +1738,22 @@ test_AES_cipheronly_dpaa2_sec_all(void)
        return TEST_SUCCESS;
 }
 
+static int
+test_authonly_dpaa2_sec_all(void)
+{
+       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       int status;
+
+       status = test_blockcipher_all_tests(ts_params->mbuf_pool,
+               ts_params->op_mpool, ts_params->valid_devs[0],
+               RTE_CRYPTODEV_DPAA2_SEC_PMD,
+               BLKCIPHER_AUTHONLY_TYPE);
+
+       TEST_ASSERT_EQUAL(status, 0, "Test failed");
+
+       return TEST_SUCCESS;
+}
+
 static int
 test_authonly_openssl_all(void)
 {
@@ -2103,7 +2118,6 @@ create_wireless_algo_hash_operation(const uint8_t *auth_tag,
        ut_params->digest = sym_op->auth.digest.data;
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, data_pad_len);
-       sym_op->auth.digest.length = auth_tag_len;
        if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
                memset(sym_op->auth.digest.data, 0, auth_tag_len);
        else
@@ -2111,7 +2125,7 @@ create_wireless_algo_hash_operation(const uint8_t *auth_tag,
 
        TEST_HEXDUMP(stdout, "digest:",
                sym_op->auth.digest.data,
-               sym_op->auth.digest.length);
+               auth_tag_len);
 
        sym_op->auth.data.length = auth_len;
        sym_op->auth.data.offset = auth_offset;
@@ -2160,7 +2174,6 @@ create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
        ut_params->digest = sym_op->auth.digest.data;
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, data_pad_len);
-       sym_op->auth.digest.length = auth_tag_len;
        if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
                memset(sym_op->auth.digest.data, 0, auth_tag_len);
        else
@@ -2168,7 +2181,7 @@ create_wireless_cipher_hash_operation(const struct wireless_test_data *tdata,
 
        TEST_HEXDUMP(stdout, "digest:",
                sym_op->auth.digest.data,
-               sym_op->auth.digest.length);
+               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 *,
@@ -2228,7 +2241,6 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
        ut_params->digest = sym_op->auth.digest.data;
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, data_pad_len);
-       sym_op->auth.digest.length = auth_tag_len;
        if (op == RTE_CRYPTO_AUTH_OP_GENERATE)
                memset(sym_op->auth.digest.data, 0, auth_tag_len);
        else
@@ -2236,7 +2248,7 @@ create_wireless_algo_cipher_hash_operation(const uint8_t *auth_tag,
 
        TEST_HEXDUMP(stdout, "digest:",
                sym_op->auth.digest.data,
-               sym_op->auth.digest.length);
+               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 *,
@@ -2287,13 +2299,12 @@ create_wireless_algo_auth_cipher_operation(unsigned int auth_tag_len,
 
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, data_pad_len);
-       sym_op->auth.digest.length = auth_tag_len;
 
        memset(sym_op->auth.digest.data, 0, auth_tag_len);
 
        TEST_HEXDUMP(stdout, "digest:",
                        sym_op->auth.digest.data,
-                       sym_op->auth.digest.length);
+                       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 *,
@@ -4636,54 +4647,34 @@ test_3DES_cipheronly_openssl_all(void)
 /* ***** AES-GCM Tests ***** */
 
 static int
-create_gcm_session(uint8_t dev_id, enum rte_crypto_cipher_operation op,
+create_gcm_session(uint8_t dev_id, 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,
-               enum rte_crypto_auth_operation auth_op)
+               uint8_t iv_len)
 {
-       uint8_t cipher_key[key_len];
+       uint8_t aead_key[key_len];
 
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(cipher_key, key, key_len);
-
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
+       memcpy(aead_key, key, key_len);
 
-       ut_params->cipher_xform.cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
-       ut_params->auth_xform.auth.op = auth_op;
-       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;
+       /* 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 = RTE_CRYPTO_AEAD_AES_GCM;
+       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.add_auth_data_length = aad_len;
 
        TEST_HEXDUMP(stdout, "key:", key, key_len);
 
-       /* Setup Authentication Parameters */
-       ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       ut_params->auth_xform.next = NULL;
-
-       ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GCM;
-
-       ut_params->auth_xform.auth.digest_length = auth_len;
-       ut_params->auth_xform.auth.add_auth_data_length = aad_len;
-       ut_params->auth_xform.auth.key.length = 0;
-       ut_params->auth_xform.auth.key.data = NULL;
-
-       if (op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
-               ut_params->cipher_xform.next = &ut_params->auth_xform;
-
-               /* Create Crypto session*/
-               ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
-                               &ut_params->cipher_xform);
-       } else {/* Create Crypto session*/
-               ut_params->auth_xform.next = &ut_params->cipher_xform;
-               ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
-                               &ut_params->auth_xform);
-       }
+       /* Create Crypto session*/
+       ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
+                       &ut_params->aead_xform);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
@@ -4692,43 +4683,35 @@ create_gcm_session(uint8_t dev_id, enum rte_crypto_cipher_operation op,
 
 static int
 create_gcm_xforms(struct rte_crypto_op *op,
-               enum rte_crypto_cipher_operation cipher_op,
+               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,
-               enum rte_crypto_auth_operation auth_op)
+               uint8_t iv_len)
 {
-       TEST_ASSERT_NOT_NULL(rte_crypto_op_sym_xforms_alloc(op, 2),
-                       "failed to allocate space for crypto transforms");
+       TEST_ASSERT_NOT_NULL(rte_crypto_op_sym_xforms_alloc(op, 1),
+                       "failed to allocate space for crypto transform");
 
        struct rte_crypto_sym_op *sym_op = op->sym;
 
-       /* Setup Cipher Parameters */
-       sym_op->xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       sym_op->xform->cipher.algo = RTE_CRYPTO_CIPHER_AES_GCM;
-       sym_op->xform->cipher.op = cipher_op;
-       sym_op->xform->cipher.key.data = key;
-       sym_op->xform->cipher.key.length = key_len;
-       sym_op->xform->cipher.iv.offset = IV_OFFSET;
-       sym_op->xform->cipher.iv.length = iv_len;
+       /* Setup AEAD Parameters */
+       sym_op->xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
+       sym_op->xform->next = NULL;
+       sym_op->xform->aead.algo = RTE_CRYPTO_AEAD_AES_GCM;
+       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.add_auth_data_length = aad_len;
 
        TEST_HEXDUMP(stdout, "key:", key, key_len);
 
-       /* Setup Authentication Parameters */
-       sym_op->xform->next->type = RTE_CRYPTO_SYM_XFORM_AUTH;
-       sym_op->xform->next->auth.algo = RTE_CRYPTO_AUTH_AES_GCM;
-       sym_op->xform->next->auth.op = auth_op;
-       sym_op->xform->next->auth.digest_length = auth_len;
-       sym_op->xform->next->auth.add_auth_data_length = aad_len;
-       sym_op->xform->next->auth.key.length = 0;
-       sym_op->xform->next->auth.key.data = NULL;
-       sym_op->xform->next->next = NULL;
-
        return 0;
 }
 
 static int
-create_gcm_operation(enum rte_crypto_cipher_operation op,
+create_gcm_operation(enum rte_crypto_aead_operation op,
                const struct gcm_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
@@ -4747,15 +4730,15 @@ create_gcm_operation(enum rte_crypto_cipher_operation op,
 
        /* Append aad data */
        aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
-       sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+       sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
                        aad_pad_len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data,
+       TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
                        "no room to append aad");
 
-       sym_op->auth.aad.phys_addr =
+       sym_op->aead.aad.phys_addr =
                        rte_pktmbuf_mtophys(ut_params->ibuf);
-       memcpy(sym_op->auth.aad.data, tdata->aad.data, tdata->aad.len);
-       TEST_HEXDUMP(stdout, "aad:", sym_op->auth.aad.data,
+       memcpy(sym_op->aead.aad.data, tdata->aad.data, tdata->aad.len);
+       TEST_HEXDUMP(stdout, "aad:", sym_op->aead.aad.data,
                tdata->aad.len);
 
        /* Append IV at the end of the crypto operation*/
@@ -4767,7 +4750,7 @@ create_gcm_operation(enum rte_crypto_cipher_operation op,
                tdata->iv.len);
 
        /* Append plaintext/ciphertext */
-       if (op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
+       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);
@@ -4812,48 +4795,43 @@ create_gcm_operation(enum rte_crypto_cipher_operation op,
        }
 
        /* Append digest data */
-       if (op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) {
-               sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+       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->auth.digest.data,
+               TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                                "no room to append digest");
-               memset(sym_op->auth.digest.data, 0, tdata->auth_tag.len);
-               sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+               memset(sym_op->aead.digest.data, 0, tdata->auth_tag.len);
+               sym_op->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                                ut_params->obuf ? ut_params->obuf :
                                                ut_params->ibuf,
                                                plaintext_pad_len +
                                                aad_pad_len);
-               sym_op->auth.digest.length = tdata->auth_tag.len;
        } else {
-               sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
+               sym_op->aead.digest.data = (uint8_t *)rte_pktmbuf_append(
                                ut_params->ibuf, tdata->auth_tag.len);
-               TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+               TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                                "no room to append digest");
-               sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+               sym_op->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                                ut_params->ibuf,
                                plaintext_pad_len + aad_pad_len);
-               sym_op->auth.digest.length = tdata->auth_tag.len;
 
-               rte_memcpy(sym_op->auth.digest.data, tdata->auth_tag.data,
+               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                        tdata->auth_tag.len);
                TEST_HEXDUMP(stdout, "digest:",
-                       sym_op->auth.digest.data,
-                       sym_op->auth.digest.length);
+                       sym_op->aead.digest.data,
+                       tdata->auth_tag.len);
        }
 
-       sym_op->cipher.data.length = tdata->plaintext.len;
-       sym_op->cipher.data.offset = aad_pad_len;
-
-       sym_op->auth.data.length = tdata->plaintext.len;
-       sym_op->auth.data.offset = aad_pad_len;
+       sym_op->aead.data.length = tdata->plaintext.len;
+       sym_op->aead.data.offset = aad_pad_len;
 
        return 0;
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
+test_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -4865,11 +4843,10 @@ test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -4886,7 +4863,7 @@ test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_ENCRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -4936,103 +4913,145 @@ test_mb_AES_GCM_authenticated_encryption(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_1(void)
+test_AES_GCM_authenticated_encryption_test_case_1(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_1);
+}
+
+static int
+test_AES_GCM_authenticated_encryption_test_case_2(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_2);
+}
+
+static int
+test_AES_GCM_authenticated_encryption_test_case_3(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_3);
+}
+
+static int
+test_AES_GCM_authenticated_encryption_test_case_4(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_4);
+}
+
+static int
+test_AES_GCM_authenticated_encryption_test_case_5(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_5);
+}
+
+static int
+test_AES_GCM_authenticated_encryption_test_case_6(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_6);
+}
+
+static int
+test_AES_GCM_authenticated_encryption_test_case_7(void)
+{
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_7);
+}
+
+static int
+test_AES_GCM_auth_encryption_test_case_192_1(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_1);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_1);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_2(void)
+test_AES_GCM_auth_encryption_test_case_192_2(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_2);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_2);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_3(void)
+test_AES_GCM_auth_encryption_test_case_192_3(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_3);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_3);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_4(void)
+test_AES_GCM_auth_encryption_test_case_192_4(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_4);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_4);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_5(void)
+test_AES_GCM_auth_encryption_test_case_192_5(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_5);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_5);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_6(void)
+test_AES_GCM_auth_encryption_test_case_192_6(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_6);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_6);
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_test_case_7(void)
+test_AES_GCM_auth_encryption_test_case_192_7(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_7);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_192_7);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_1(void)
+test_AES_GCM_auth_encryption_test_case_256_1(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_1);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_1);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_2(void)
+test_AES_GCM_auth_encryption_test_case_256_2(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_2);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_2);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_3(void)
+test_AES_GCM_auth_encryption_test_case_256_3(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_3);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_3);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_4(void)
+test_AES_GCM_auth_encryption_test_case_256_4(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_4);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_4);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_5(void)
+test_AES_GCM_auth_encryption_test_case_256_5(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_5);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_5);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_6(void)
+test_AES_GCM_auth_encryption_test_case_256_6(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_6);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_6);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_256_7(void)
+test_AES_GCM_auth_encryption_test_case_256_7(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_256_7);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_256_7);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_aad_1(void)
+test_AES_GCM_auth_encryption_test_case_aad_1(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_aad_1);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_aad_1);
 }
 
 static int
-test_mb_AES_GCM_auth_encryption_test_case_aad_2(void)
+test_AES_GCM_auth_encryption_test_case_aad_2(void)
 {
-       return test_mb_AES_GCM_authenticated_encryption(&gcm_test_case_aad_2);
+       return test_AES_GCM_authenticated_encryption(&gcm_test_case_aad_2);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
+test_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
@@ -5043,11 +5062,10 @@ test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5064,7 +5082,7 @@ test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_DECRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -5103,99 +5121,141 @@ test_mb_AES_GCM_authenticated_decryption(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_1(void)
+test_AES_GCM_authenticated_decryption_test_case_1(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_1);
+}
+
+static int
+test_AES_GCM_authenticated_decryption_test_case_2(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_2);
+}
+
+static int
+test_AES_GCM_authenticated_decryption_test_case_3(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_3);
+}
+
+static int
+test_AES_GCM_authenticated_decryption_test_case_4(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_1);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_4);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_2(void)
+test_AES_GCM_authenticated_decryption_test_case_5(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_2);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_5);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_3(void)
+test_AES_GCM_authenticated_decryption_test_case_6(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_3);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_6);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_4(void)
+test_AES_GCM_authenticated_decryption_test_case_7(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_4);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_7);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_5(void)
+test_AES_GCM_auth_decryption_test_case_192_1(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_5);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_1);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_6(void)
+test_AES_GCM_auth_decryption_test_case_192_2(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_6);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_2);
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_test_case_7(void)
+test_AES_GCM_auth_decryption_test_case_192_3(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_7);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_3);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_1(void)
+test_AES_GCM_auth_decryption_test_case_192_4(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_1);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_4);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_2(void)
+test_AES_GCM_auth_decryption_test_case_192_5(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_2);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_5);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_3(void)
+test_AES_GCM_auth_decryption_test_case_192_6(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_3);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_6);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_4(void)
+test_AES_GCM_auth_decryption_test_case_192_7(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_4);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_192_7);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_5(void)
+test_AES_GCM_auth_decryption_test_case_256_1(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_5);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_1);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_6(void)
+test_AES_GCM_auth_decryption_test_case_256_2(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_6);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_2);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_256_7(void)
+test_AES_GCM_auth_decryption_test_case_256_3(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_256_7);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_3);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_aad_1(void)
+test_AES_GCM_auth_decryption_test_case_256_4(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_aad_1);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_4);
 }
 
 static int
-test_mb_AES_GCM_auth_decryption_test_case_aad_2(void)
+test_AES_GCM_auth_decryption_test_case_256_5(void)
 {
-       return test_mb_AES_GCM_authenticated_decryption(&gcm_test_case_aad_2);
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_5);
+}
+
+static int
+test_AES_GCM_auth_decryption_test_case_256_6(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_6);
+}
+
+static int
+test_AES_GCM_auth_decryption_test_case_256_7(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_256_7);
+}
+
+static int
+test_AES_GCM_auth_decryption_test_case_aad_1(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_aad_1);
+}
+
+static int
+test_AES_GCM_auth_decryption_test_case_aad_2(void)
+{
+       return test_AES_GCM_authenticated_decryption(&gcm_test_case_aad_2);
 }
 
 static int
@@ -5210,11 +5270,10 @@ test_AES_GCM_authenticated_encryption_oop(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5228,7 +5287,7 @@ test_AES_GCM_authenticated_encryption_oop(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->obuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_ENCRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -5271,7 +5330,7 @@ test_AES_GCM_authenticated_encryption_oop(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_oop(void)
+test_AES_GCM_authenticated_encryption_oop_test_case_1(void)
 {
        return test_AES_GCM_authenticated_encryption_oop(&gcm_test_case_5);
 }
@@ -5287,11 +5346,10 @@ test_AES_GCM_authenticated_decryption_oop(const struct gcm_test_data *tdata)
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5305,7 +5363,7 @@ test_AES_GCM_authenticated_decryption_oop(const struct gcm_test_data *tdata)
                        rte_pktmbuf_tailroom(ut_params->obuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_DECRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
        if (retval < 0)
                return retval;
 
@@ -5340,7 +5398,7 @@ test_AES_GCM_authenticated_decryption_oop(const struct gcm_test_data *tdata)
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_oop(void)
+test_AES_GCM_authenticated_decryption_oop_test_case_1(void)
 {
        return test_AES_GCM_authenticated_decryption_oop(&gcm_test_case_5);
 }
@@ -5364,18 +5422,17 @@ test_AES_GCM_authenticated_encryption_sessionless(
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_ENCRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_ENCRYPT, tdata);
        if (retval < 0)
                return retval;
 
        /* Create GCM xforms */
        memcpy(key, tdata->key.data, tdata->key.len);
        retval = create_gcm_xforms(ut_params->op,
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        key, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5421,7 +5478,7 @@ test_AES_GCM_authenticated_encryption_sessionless(
 }
 
 static int
-test_mb_AES_GCM_authenticated_encryption_sessionless(void)
+test_AES_GCM_authenticated_encryption_sessionless_test_case_1(void)
 {
        return test_AES_GCM_authenticated_encryption_sessionless(
                        &gcm_test_case_5);
@@ -5445,18 +5502,17 @@ test_AES_GCM_authenticated_decryption_sessionless(
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
        /* Create GCM operation */
-       retval = create_gcm_operation(RTE_CRYPTO_CIPHER_OP_DECRYPT, tdata);
+       retval = create_gcm_operation(RTE_CRYPTO_AEAD_OP_DECRYPT, tdata);
        if (retval < 0)
                return retval;
 
        /* Create GCM xforms */
        memcpy(key, tdata->key.data, tdata->key.len);
        retval = create_gcm_xforms(ut_params->op,
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
+                       RTE_CRYPTO_AEAD_OP_DECRYPT,
                        key, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_VERIFY);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -5494,7 +5550,7 @@ test_AES_GCM_authenticated_decryption_sessionless(
 }
 
 static int
-test_mb_AES_GCM_authenticated_decryption_sessionless(void)
+test_AES_GCM_authenticated_decryption_sessionless_test_case_1(void)
 {
        return test_AES_GCM_authenticated_decryption_sessionless(
                        &gcm_test_case_5);
@@ -5575,7 +5631,6 @@ static int MD5_HMAC_create_session(struct crypto_testsuite_params *ts_params,
        ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_MD5_HMAC;
 
        ut_params->auth_xform.auth.digest_length = MD5_DIGEST_LEN;
-       ut_params->auth_xform.auth.add_auth_data_length = 0;
        ut_params->auth_xform.auth.key.length = test_case->key.len;
        ut_params->auth_xform.auth.key.data = key;
 
@@ -5615,7 +5670,6 @@ static int MD5_HMAC_create_op(struct crypto_unittest_params *ut_params,
                        "no room to append digest");
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, plaintext_pad_len);
-       sym_op->auth.digest.length = MD5_DIGEST_LEN;
 
        if (ut_params->auth_xform.auth.op == RTE_CRYPTO_AUTH_OP_VERIFY) {
                rte_memcpy(sym_op->auth.digest.data, test_case->auth_tag.data,
@@ -6291,17 +6345,7 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
        struct crypto_unittest_params *ut_params = &unittest_params;
        struct rte_crypto_sym_op *sym_op;
 
-       unsigned aad_pad_len;
-
-       aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
-
-       /*
-        * Runtime generate the large plain text instead of use hard code
-        * plain text vector. It is done to avoid create huge source file
-        * with the test vector.
-        */
-       if (tdata->aad.len == GMAC_LARGE_PLAINTEXT_LENGTH)
-               generate_gmac_large_plaintext(tdata->aad.data);
+       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,
@@ -6310,14 +6354,6 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
                        "Failed to allocate symmetric crypto operation struct");
 
        sym_op = ut_params->op->sym;
-       sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       aad_pad_len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data,
-                       "no room to append aad");
-
-       sym_op->auth.aad.phys_addr =
-                       rte_pktmbuf_mtophys(ut_params->ibuf);
-       memcpy(sym_op->auth.aad.data, tdata->aad.data, tdata->aad.len);
 
        sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
                        ut_params->ibuf, tdata->gmac_tag.len);
@@ -6325,15 +6361,14 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
                        "no room to append digest");
 
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
-                       ut_params->ibuf, aad_pad_len);
-       sym_op->auth.digest.length = tdata->gmac_tag.len;
+                       ut_params->ibuf, plaintext_pad_len);
 
        if (op == RTE_CRYPTO_AUTH_OP_VERIFY) {
                rte_memcpy(sym_op->auth.digest.data, tdata->gmac_tag.data,
                                tdata->gmac_tag.len);
                TEST_HEXDUMP(stdout, "digest:",
                                sym_op->auth.digest.data,
-                               sym_op->auth.digest.length);
+                               tdata->gmac_tag.len);
        }
 
        uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
@@ -6347,31 +6382,20 @@ create_gmac_operation(enum rte_crypto_auth_operation op,
        sym_op->cipher.data.offset = 0;
 
        sym_op->auth.data.offset = 0;
-       sym_op->auth.data.length = 0;
+       sym_op->auth.data.length = tdata->plaintext.len;
 
        return 0;
 }
 
 static int create_gmac_session(uint8_t dev_id,
-               enum rte_crypto_cipher_operation op,
                const struct gmac_test_data *tdata,
                enum rte_crypto_auth_operation auth_op)
 {
-       uint8_t cipher_key[tdata->key.len];
+       uint8_t auth_key[tdata->key.len];
 
        struct crypto_unittest_params *ut_params = &unittest_params;
 
-       memcpy(cipher_key, tdata->key.data, tdata->key.len);
-
-       /* For GMAC we 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_GCM;
-       ut_params->cipher_xform.cipher.op = op;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = tdata->key.len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = tdata->iv.len;
+       memcpy(auth_key, tdata->key.data, tdata->key.len);
 
        ut_params->auth_xform.type = RTE_CRYPTO_SYM_XFORM_AUTH;
        ut_params->auth_xform.next = NULL;
@@ -6379,14 +6403,14 @@ static int create_gmac_session(uint8_t dev_id,
        ut_params->auth_xform.auth.algo = RTE_CRYPTO_AUTH_AES_GMAC;
        ut_params->auth_xform.auth.op = auth_op;
        ut_params->auth_xform.auth.digest_length = tdata->gmac_tag.len;
-       ut_params->auth_xform.auth.add_auth_data_length = tdata->aad.len;
-       ut_params->auth_xform.auth.key.length = 0;
-       ut_params->auth_xform.auth.key.data = NULL;
+       ut_params->auth_xform.auth.key.length = tdata->key.len;
+       ut_params->auth_xform.auth.key.data = auth_key;
+       ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+       ut_params->auth_xform.auth.iv.length = tdata->iv.len;
 
-       ut_params->cipher_xform.next = &ut_params->auth_xform;
 
        ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
-                       &ut_params->cipher_xform);
+                       &ut_params->auth_xform);
 
        TEST_ASSERT_NOT_NULL(ut_params->sess, "Session creation failed");
 
@@ -6401,20 +6425,19 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
 
        int retval;
 
-       uint8_t *auth_tag, *p;
-       uint16_t aad_pad_len;
+       uint8_t *auth_tag, *plaintext;
+       uint16_t plaintext_pad_len;
 
        TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
                              "No GMAC length in the source data");
 
        retval = create_gmac_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
                        tdata, RTE_CRYPTO_AUTH_OP_GENERATE);
 
        if (retval < 0)
                return retval;
 
-       if (tdata->aad.len > MBUF_SIZE)
+       if (tdata->plaintext.len > MBUF_SIZE)
                ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
        else
                ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -6424,9 +6447,22 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
-       aad_pad_len = RTE_ALIGN_CEIL(tdata->aad.len, 16);
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+       /*
+        * Runtime generate the large plain text instead of use hard code
+        * plain text vector. It is done to avoid create huge source file
+        * with the test vector.
+        */
+       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
+               generate_gmac_large_plaintext(tdata->plaintext.data);
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
 
-       p = rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *);
+       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+                       tdata->plaintext.len);
 
        retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_GENERATE,
                        tdata);
@@ -6446,9 +6482,9 @@ test_AES_GMAC_authentication(const struct gmac_test_data *tdata)
 
        if (ut_params->op->sym->m_dst) {
                auth_tag = rte_pktmbuf_mtod_offset(ut_params->op->sym->m_dst,
-                               uint8_t *, aad_pad_len);
+                               uint8_t *, plaintext_pad_len);
        } else {
-               auth_tag = p + aad_pad_len;
+               auth_tag = plaintext + plaintext_pad_len;
        }
 
        TEST_HEXDUMP(stdout, "auth tag:", auth_tag, tdata->gmac_tag.len);
@@ -6492,18 +6528,19 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        struct crypto_testsuite_params *ts_params = &testsuite_params;
        struct crypto_unittest_params *ut_params = &unittest_params;
        int retval;
+       uint32_t plaintext_pad_len;
+       uint8_t *plaintext;
 
        TEST_ASSERT_NOT_EQUAL(tdata->gmac_tag.len, 0,
                              "No GMAC length in the source data");
 
        retval = create_gmac_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_DECRYPT,
                        tdata, RTE_CRYPTO_AUTH_OP_VERIFY);
 
        if (retval < 0)
                return retval;
 
-       if (tdata->aad.len > MBUF_SIZE)
+       if (tdata->plaintext.len > MBUF_SIZE)
                ut_params->ibuf = rte_pktmbuf_alloc(ts_params->large_mbuf_pool);
        else
                ut_params->ibuf = rte_pktmbuf_alloc(ts_params->mbuf_pool);
@@ -6513,6 +6550,24 @@ test_AES_GMAC_authentication_verify(const struct gmac_test_data *tdata)
        memset(rte_pktmbuf_mtod(ut_params->ibuf, uint8_t *), 0,
                        rte_pktmbuf_tailroom(ut_params->ibuf));
 
+       plaintext_pad_len = RTE_ALIGN_CEIL(tdata->plaintext.len, 16);
+
+       /*
+        * Runtime generate the large plain text instead of use hard code
+        * plain text vector. It is done to avoid create huge source file
+        * with the test vector.
+        */
+       if (tdata->plaintext.len == GMAC_LARGE_PLAINTEXT_LENGTH)
+               generate_gmac_large_plaintext(tdata->plaintext.data);
+
+       plaintext = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
+                               plaintext_pad_len);
+       TEST_ASSERT_NOT_NULL(plaintext, "no room to append plaintext");
+
+       memcpy(plaintext, tdata->plaintext.data, tdata->plaintext.len);
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext,
+                       tdata->plaintext.len);
+
        retval = create_gmac_operation(RTE_CRYPTO_AUTH_OP_VERIFY,
                        tdata);
 
@@ -6626,8 +6681,7 @@ hmac_sha1_test_crypto_vector = {
 static const struct test_crypto_vector
 aes128_gmac_test_vector = {
        .auth_algo = RTE_CRYPTO_AUTH_AES_GMAC,
-       .crypto_algo = RTE_CRYPTO_CIPHER_AES_GCM,
-       .aad = {
+       .plaintext = {
                .data = plaintext_hash,
                .len = 512
        },
@@ -6638,7 +6692,7 @@ aes128_gmac_test_vector = {
                },
                .len = 12
        },
-       .cipher_key = {
+       .auth_key = {
                .data = {
                        0x42, 0x1A, 0x7D, 0x3D, 0xF5, 0x82, 0x80, 0xF1,
                        0xF1, 0x35, 0x5C, 0x3B, 0xDD, 0x9A, 0x65, 0xBA
@@ -6728,7 +6782,6 @@ create_auth_session(struct crypto_unittest_params *ut_params,
        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.auth.add_auth_data_length = reference->aad.len;
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
@@ -6756,22 +6809,27 @@ create_auth_cipher_session(struct crypto_unittest_params *ut_params,
        /* 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 = 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.auth.add_auth_data_length = reference->aad.len;
 
-       /* Setup Cipher Parameters */
-       ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
-       ut_params->cipher_xform.next = NULL;
-       ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
-       ut_params->cipher_xform.cipher.op = cipher_op;
-       ut_params->cipher_xform.cipher.key.data = cipher_key;
-       ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
-       ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
-       ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+       if (reference->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) {
+               ut_params->auth_xform.auth.iv.offset = IV_OFFSET;
+               ut_params->auth_xform.auth.iv.length = reference->iv.len;
+       } else {
+               ut_params->auth_xform.next = &ut_params->cipher_xform;
+
+               /* Setup Cipher Parameters */
+               ut_params->cipher_xform.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+               ut_params->cipher_xform.next = NULL;
+               ut_params->cipher_xform.cipher.algo = reference->crypto_algo;
+               ut_params->cipher_xform.cipher.op = cipher_op;
+               ut_params->cipher_xform.cipher.key.data = cipher_key;
+               ut_params->cipher_xform.cipher.key.length = reference->cipher_key.len;
+               ut_params->cipher_xform.cipher.iv.offset = IV_OFFSET;
+               ut_params->cipher_xform.cipher.iv.length = reference->iv.len;
+       }
 
        /* Create Crypto session*/
        ut_params->sess = rte_cryptodev_sym_session_create(dev_id,
@@ -6811,7 +6869,6 @@ create_auth_operation(struct crypto_testsuite_params *ts_params,
 
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, reference->plaintext.len);
-       sym_op->auth.digest.length = reference->digest.len;
 
        if (auth_generate)
                memset(sym_op->auth.digest.data, 0, reference->digest.len);
@@ -6822,7 +6879,7 @@ create_auth_operation(struct crypto_testsuite_params *ts_params,
 
        TEST_HEXDUMP(stdout, "digest:",
                        sym_op->auth.digest.data,
-                       sym_op->auth.digest.length);
+                       reference->digest.len);
 
        sym_op->auth.data.length = reference->plaintext.len;
        sym_op->auth.data.offset = 0;
@@ -6850,16 +6907,6 @@ create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
        /* set crypto operation source mbuf */
        sym_op->m_src = ut_params->ibuf;
 
-       /* aad */
-       sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_append(ut_params->ibuf,
-                       reference->aad.len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data, "no room to append AAD");
-       memcpy(sym_op->auth.aad.data, reference->aad.data, reference->aad.len);
-
-       TEST_HEXDUMP(stdout, "AAD:", sym_op->auth.aad.data, reference->aad.len);
-
-       sym_op->auth.aad.phys_addr = rte_pktmbuf_mtophys(ut_params->ibuf);
-
        /* digest */
        sym_op->auth.digest.data = (uint8_t *)rte_pktmbuf_append(
                        ut_params->ibuf, reference->digest.len);
@@ -6869,7 +6916,6 @@ create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
 
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, reference->ciphertext.len);
-       sym_op->auth.digest.length = reference->digest.len;
 
        if (auth_generate)
                memset(sym_op->auth.digest.data, 0, reference->digest.len);
@@ -6880,7 +6926,7 @@ create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
 
        TEST_HEXDUMP(stdout, "digest:",
                        sym_op->auth.digest.data,
-                       sym_op->auth.digest.length);
+                       reference->digest.len);
 
        rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
                        reference->iv.data, reference->iv.len);
@@ -6888,7 +6934,7 @@ create_auth_GMAC_operation(struct crypto_testsuite_params *ts_params,
        sym_op->cipher.data.length = 0;
        sym_op->cipher.data.offset = 0;
 
-       sym_op->auth.data.length = 0;
+       sym_op->auth.data.length = reference->plaintext.len;
        sym_op->auth.data.offset = 0;
 
        return 0;
@@ -6923,7 +6969,6 @@ create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
 
        sym_op->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                        ut_params->ibuf, reference->ciphertext.len);
-       sym_op->auth.digest.length = reference->digest.len;
 
        if (auth_generate)
                memset(sym_op->auth.digest.data, 0, reference->digest.len);
@@ -6934,7 +6979,7 @@ create_cipher_auth_operation(struct crypto_testsuite_params *ts_params,
 
        TEST_HEXDUMP(stdout, "digest:",
                        sym_op->auth.digest.data,
-                       sym_op->auth.digest.length);
+                       reference->digest.len);
 
        rte_memcpy(rte_crypto_op_ctod_offset(ut_params->op, uint8_t *, IV_OFFSET),
                        reference->iv.data, reference->iv.len);
@@ -7039,6 +7084,7 @@ test_authentication_verify_GMAC_fail_when_corruption(
                unsigned int data_corrupted)
 {
        int retval;
+       uint8_t *plaintext;
 
        /* Create session */
        retval = create_auth_cipher_session(ut_params,
@@ -7057,6 +7103,13 @@ test_authentication_verify_GMAC_fail_when_corruption(
        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);
+
+       TEST_HEXDUMP(stdout, "plaintext:", plaintext, reference->plaintext.len);
+
        /* Create operation */
        retval = create_auth_verify_GMAC_operation(ts_params,
                        ut_params,
@@ -7066,10 +7119,9 @@ test_authentication_verify_GMAC_fail_when_corruption(
                return retval;
 
        if (data_corrupted)
-               data_corruption(ut_params->op->sym->auth.aad.data);
+               data_corruption(plaintext);
        else
-               tag_corruption(ut_params->op->sym->auth.aad.data,
-                               reference->aad.len);
+               tag_corruption(plaintext, reference->aad.len);
 
        ut_params->op = process_crypto_request(ts_params->valid_devs[0],
                        ut_params->op);
@@ -7146,7 +7198,7 @@ test_authenticated_decryption_fail_when_corruption(
 }
 
 static int
-create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
+create_gcm_operation_SGL(enum rte_crypto_aead_operation op,
                const struct gcm_test_data *tdata,
                void *digest_mem, uint64_t digest_phys)
 {
@@ -7165,20 +7217,19 @@ create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
 
        struct rte_crypto_sym_op *sym_op = ut_params->op->sym;
 
-       sym_op->auth.digest.data = digest_mem;
+       sym_op->aead.digest.data = digest_mem;
 
-       TEST_ASSERT_NOT_NULL(sym_op->auth.digest.data,
+       TEST_ASSERT_NOT_NULL(sym_op->aead.digest.data,
                        "no room to append digest");
 
-       sym_op->auth.digest.phys_addr = digest_phys;
-       sym_op->auth.digest.length = auth_tag_len;
+       sym_op->aead.digest.phys_addr = digest_phys;
 
-       if (op == RTE_CRYPTO_CIPHER_OP_DECRYPT) {
-               rte_memcpy(sym_op->auth.digest.data, tdata->auth_tag.data,
+       if (op == RTE_CRYPTO_AEAD_OP_DECRYPT) {
+               rte_memcpy(sym_op->aead.digest.data, tdata->auth_tag.data,
                                auth_tag_len);
                TEST_HEXDUMP(stdout, "digest:",
-                               sym_op->auth.digest.data,
-                               sym_op->auth.digest.length);
+                               sym_op->aead.digest.data,
+                               auth_tag_len);
        }
 
        uint8_t *iv_ptr = rte_crypto_op_ctod_offset(ut_params->op,
@@ -7186,25 +7237,22 @@ create_gcm_operation_SGL(enum rte_crypto_cipher_operation op,
 
        rte_memcpy(iv_ptr, tdata->iv.data, iv_len);
 
-       sym_op->auth.aad.data = (uint8_t *)rte_pktmbuf_prepend(
+       sym_op->aead.aad.data = (uint8_t *)rte_pktmbuf_prepend(
                        ut_params->ibuf, aad_len);
-       TEST_ASSERT_NOT_NULL(sym_op->auth.aad.data,
+       TEST_ASSERT_NOT_NULL(sym_op->aead.aad.data,
                        "no room to prepend aad");
-       sym_op->auth.aad.phys_addr = rte_pktmbuf_mtophys(
+       sym_op->aead.aad.phys_addr = rte_pktmbuf_mtophys(
                        ut_params->ibuf);
 
-       memset(sym_op->auth.aad.data, 0, aad_len);
-       rte_memcpy(sym_op->auth.aad.data, tdata->aad.data, aad_len);
+       memset(sym_op->aead.aad.data, 0, aad_len);
+       rte_memcpy(sym_op->aead.aad.data, tdata->aad.data, aad_len);
 
        TEST_HEXDUMP(stdout, "iv:", iv_ptr, iv_len);
        TEST_HEXDUMP(stdout, "aad:",
-                       sym_op->auth.aad.data, aad_len);
+                       sym_op->aead.aad.data, aad_len);
 
-       sym_op->cipher.data.length = tdata->plaintext.len;
-       sym_op->cipher.data.offset = aad_len;
-
-       sym_op->auth.data.offset = aad_len;
-       sym_op->auth.data.length = tdata->plaintext.len;
+       sym_op->aead.data.length = tdata->plaintext.len;
+       sym_op->aead.data.offset = aad_len;
 
        return 0;
 }
@@ -7259,11 +7307,10 @@ test_AES_GCM_authenticated_encryption_SGL(const struct gcm_test_data *tdata,
 
        /* Create GCM session */
        retval = create_gcm_session(ts_params->valid_devs[0],
-                       RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata->key.data, tdata->key.len,
                        tdata->aad.len, tdata->auth_tag.len,
-                       tdata->iv.len,
-                       RTE_CRYPTO_AUTH_OP_GENERATE);
+                       tdata->iv.len);
        if (retval < 0)
                return retval;
 
@@ -7389,7 +7436,7 @@ test_AES_GCM_authenticated_encryption_SGL(const struct gcm_test_data *tdata,
        }
 
        /* Create GCM opertaion */
-       retval = create_gcm_operation_SGL(RTE_CRYPTO_CIPHER_OP_ENCRYPT,
+       retval = create_gcm_operation_SGL(RTE_CRYPTO_AEAD_OP_ENCRYPT,
                        tdata, digest_mem, digest_phys);
 
        if (retval < 0)
@@ -7760,35 +7807,35 @@ static struct unit_test_suite cryptodev_qat_testsuite  = {
                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_mb_AES_GCM_authenticated_encryption_test_case_1),
+                       test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_2),
+                       test_AES_GCM_authenticated_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_3),
+                       test_AES_GCM_authenticated_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_5),
+                       test_AES_GCM_authenticated_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_6),
+                       test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_7),
+                       test_AES_GCM_authenticated_encryption_test_case_7),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_1),
+                       test_AES_GCM_authenticated_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_2),
+                       test_AES_GCM_authenticated_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_3),
+                       test_AES_GCM_authenticated_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_authenticated_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_authenticated_decryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_7),
+                       test_AES_GCM_authenticated_decryption_test_case_7),
 
                /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -7963,35 +8010,35 @@ static struct unit_test_suite cryptodev_openssl_testsuite  = {
 
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_1),
+                       test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_2),
+                       test_AES_GCM_authenticated_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_3),
+                       test_AES_GCM_authenticated_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_5),
+                       test_AES_GCM_authenticated_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_6),
+                       test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_7),
+                       test_AES_GCM_authenticated_encryption_test_case_7),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_1),
+                       test_AES_GCM_authenticated_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_2),
+                       test_AES_GCM_authenticated_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_3),
+                       test_AES_GCM_authenticated_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_authenticated_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_authenticated_decryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_7),
+                       test_AES_GCM_authenticated_decryption_test_case_7),
 
                /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8040,79 +8087,111 @@ static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
        .unit_test_cases = {
                /** AES GCM Authenticated Encryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_1),
+                       test_AES_GCM_authenticated_encryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_2),
+                       test_AES_GCM_authenticated_encryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_3),
+                       test_AES_GCM_authenticated_encryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_4),
+                       test_AES_GCM_authenticated_encryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_5),
+                       test_AES_GCM_authenticated_encryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_6),
+                       test_AES_GCM_authenticated_encryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_test_case_7),
+                       test_AES_GCM_authenticated_encryption_test_case_7),
 
                /** AES GCM Authenticated Decryption */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_1),
+                       test_AES_GCM_authenticated_decryption_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_2),
+                       test_AES_GCM_authenticated_decryption_test_case_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_3),
+                       test_AES_GCM_authenticated_decryption_test_case_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_4),
+                       test_AES_GCM_authenticated_decryption_test_case_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_5),
+                       test_AES_GCM_authenticated_decryption_test_case_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_6),
+                       test_AES_GCM_authenticated_decryption_test_case_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_test_case_7),
+                       test_AES_GCM_authenticated_decryption_test_case_7),
+
+               /** AES GCM Authenticated Encryption 192 bits key */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_192_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_192_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_192_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_192_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_192_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_192_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_encryption_test_case_192_7),
+
+               /** AES GCM Authenticated Decryption 192 bits key */
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_192_1),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_192_2),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_192_3),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_192_4),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_192_5),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_192_6),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_AES_GCM_auth_decryption_test_case_192_7),
 
                /** AES GCM Authenticated Encryption 256 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_1),
+                       test_AES_GCM_auth_encryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_2),
+                       test_AES_GCM_auth_encryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_3),
+                       test_AES_GCM_auth_encryption_test_case_256_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_4),
+                       test_AES_GCM_auth_encryption_test_case_256_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_5),
+                       test_AES_GCM_auth_encryption_test_case_256_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_6),
+                       test_AES_GCM_auth_encryption_test_case_256_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_256_7),
+                       test_AES_GCM_auth_encryption_test_case_256_7),
 
                /** AES GCM Authenticated Decryption 256 bits key */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_1),
+                       test_AES_GCM_auth_decryption_test_case_256_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_2),
+                       test_AES_GCM_auth_decryption_test_case_256_2),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_3),
+                       test_AES_GCM_auth_decryption_test_case_256_3),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_4),
+                       test_AES_GCM_auth_decryption_test_case_256_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_5),
+                       test_AES_GCM_auth_decryption_test_case_256_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_6),
+                       test_AES_GCM_auth_decryption_test_case_256_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_256_7),
+                       test_AES_GCM_auth_decryption_test_case_256_7),
 
                /** AES GCM Authenticated Encryption big aad size */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_aad_1),
+                       test_AES_GCM_auth_encryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_encryption_test_case_aad_2),
+                       test_AES_GCM_auth_encryption_test_case_aad_2),
 
                /** AES GCM Authenticated Decryption big aad size */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_aad_1),
+                       test_AES_GCM_auth_decryption_test_case_aad_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_auth_decryption_test_case_aad_2),
+                       test_AES_GCM_auth_decryption_test_case_aad_2),
 
                /** AES GMAC Authentication */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8136,15 +8215,15 @@ static struct unit_test_suite cryptodev_aesni_gcm_testsuite  = {
 
                /** Out of place tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_oop),
+                       test_AES_GCM_authenticated_encryption_oop_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_oop),
+                       test_AES_GCM_authenticated_decryption_oop_test_case_1),
 
                /** Session-less tests */
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_encryption_sessionless),
+                       test_AES_GCM_authenticated_encryption_sessionless_test_case_1),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                       test_mb_AES_GCM_authenticated_decryption_sessionless),
+                       test_AES_GCM_authenticated_decryption_sessionless_test_case_1),
 
                /** Scatter-Gather */
                TEST_CASE_ST(ut_setup, ut_teardown,
@@ -8334,28 +8413,84 @@ static struct unit_test_suite cryptodev_dpaa2_sec_testsuite  = {
        .teardown = testsuite_teardown,
        .unit_test_cases = {
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_device_configure_invalid_dev_id),
+                       test_device_configure_invalid_dev_id),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_multi_session),
+                       test_multi_session),
 
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_chain_dpaa2_sec_all),
+                       test_AES_chain_dpaa2_sec_all),
+               TEST_CASE_ST(ut_setup, ut_teardown,
+                       test_3DES_chain_dpaa2_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_chain_dpaa2_sec_all),
+                       test_AES_cipheronly_dpaa2_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_AES_cipheronly_dpaa2_sec_all),
+                       test_3DES_cipheronly_dpaa2_sec_all),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_3DES_cipheronly_dpaa2_sec_all),
+                       test_authonly_dpaa2_sec_all),
 
-               /** HMAC_MD5 Authentication */
+               /** 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 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_MD5_HMAC_generate_case_1),
+                       test_AES_GCM_auth_decryption_test_case_256_4),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_MD5_HMAC_verify_case_1),
+                       test_AES_GCM_auth_decryption_test_case_256_5),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_MD5_HMAC_generate_case_2),
+                       test_AES_GCM_auth_decryption_test_case_256_6),
                TEST_CASE_ST(ut_setup, ut_teardown,
-                            test_MD5_HMAC_verify_case_2),
+                       test_AES_GCM_auth_decryption_test_case_256_7),
 
                TEST_CASES_END() /**< NULL terminate unit test array */
        }