examples/fips_validation: support self-test only
[dpdk.git] / examples / fips_validation / main.c
index 3880681..08a1b9c 100644 (file)
 #include <rte_string_fns.h>
 
 #include "fips_validation.h"
+#include "fips_dev_self_test.h"
 
 #define REQ_FILE_PATH_KEYWORD  "req-file"
 #define RSP_FILE_PATH_KEYWORD  "rsp-file"
 #define FOLDER_KEYWORD         "path-is-folder"
 #define CRYPTODEV_KEYWORD      "cryptodev"
 #define CRYPTODEV_ID_KEYWORD   "cryptodev-id"
+#define CRYPTODEV_ST_KEYWORD   "self-test"
+#define CRYPTODEV_BK_ID_KEYWORD        "broken-test-id"
+#define CRYPTODEV_BK_DIR_KEY   "broken-test-dir"
+#define CRYPTODEV_ENC_KEYWORD  "enc"
+#define CRYPTODEV_DEC_KEYWORD  "dec"
 
 struct fips_test_vector vec;
 struct fips_test_interim_info info;
@@ -29,19 +35,37 @@ struct cryptodev_fips_validate_env {
        uint32_t is_path_folder;
        uint32_t dev_id;
        struct rte_mempool *mpool;
+       struct rte_mempool *sess_mpool;
+       struct rte_mempool *sess_priv_mpool;
        struct rte_mempool *op_pool;
        struct rte_mbuf *mbuf;
        struct rte_crypto_op *op;
        struct rte_cryptodev_sym_session *sess;
+       uint32_t self_test;
+       struct fips_dev_broken_test_config *broken_test_config;
 } env;
 
 static int
 cryptodev_fips_validate_app_int(void)
 {
-       struct rte_cryptodev_config conf = {rte_socket_id(), 1};
-       struct rte_cryptodev_qp_conf qp_conf = {128};
+       struct rte_cryptodev_config conf = {rte_socket_id(), 1, 0};
+       struct rte_cryptodev_qp_conf qp_conf = {128, NULL, NULL};
+       uint32_t sess_sz = rte_cryptodev_sym_get_private_session_size(
+                       env.dev_id);
        int ret;
 
+       if (env.self_test) {
+               ret = fips_dev_self_test(env.dev_id, env.broken_test_config);
+               if (ret < 0) {
+                       struct rte_cryptodev *cryptodev =
+                                       rte_cryptodev_pmd_get_dev(env.dev_id);
+
+                       rte_cryptodev_pmd_destroy(cryptodev);
+
+                       return ret;
+               }
+       }
+
        ret = rte_cryptodev_configure(env.dev_id, &conf);
        if (ret < 0)
                return ret;
@@ -52,12 +76,23 @@ cryptodev_fips_validate_app_int(void)
                return ret;
 
        ret = rte_cryptodev_queue_pair_setup(env.dev_id, 0, &qp_conf,
-                       rte_socket_id(), env.mpool);
+                       rte_socket_id());
        if (ret < 0)
                return ret;
 
        ret = -ENOMEM;
 
+       env.sess_mpool = rte_cryptodev_sym_session_pool_create(
+                       "FIPS_SESS_MEMPOOL", 16, 0, 0, 0, rte_socket_id());
+       if (!env.sess_mpool)
+               goto error_exit;
+
+       env.sess_priv_mpool = rte_mempool_create("FIPS_SESS_PRIV_MEMPOOL",
+                       16, sess_sz, 0, 0, NULL, NULL, NULL,
+                       NULL, rte_socket_id(), 0);
+       if (!env.sess_priv_mpool)
+               goto error_exit;
+
        env.op_pool = rte_crypto_op_pool_create(
                        "FIPS_OP_POOL",
                        RTE_CRYPTO_OP_TYPE_SYMMETRIC,
@@ -75,10 +110,23 @@ cryptodev_fips_validate_app_int(void)
        if (!env.op)
                goto error_exit;
 
+       qp_conf.mp_session = env.sess_mpool;
+       qp_conf.mp_session_private = env.sess_priv_mpool;
+
+       ret = rte_cryptodev_queue_pair_setup(env.dev_id, 0, &qp_conf,
+                       rte_socket_id());
+       if (ret < 0)
+               goto error_exit;
+
        return 0;
 
 error_exit:
+
        rte_mempool_free(env.mpool);
+       if (env.sess_mpool)
+               rte_mempool_free(env.sess_mpool);
+       if (env.sess_priv_mpool)
+               rte_mempool_free(env.sess_priv_mpool);
        if (env.op_pool)
                rte_mempool_free(env.op_pool);
 
@@ -93,6 +141,8 @@ cryptodev_fips_validate_app_uninit(void)
        rte_cryptodev_sym_session_clear(env.dev_id, env.sess);
        rte_cryptodev_sym_session_free(env.sess);
        rte_mempool_free(env.mpool);
+       rte_mempool_free(env.sess_mpool);
+       rte_mempool_free(env.sess_priv_mpool);
        rte_mempool_free(env.op_pool);
 }
 
@@ -146,9 +196,14 @@ cryptodev_fips_validate_usage(const char *prgname)
                "  --%s: RESPONSE-FILE-PATH\n"
                "  --%s: indicating both paths are folders\n"
                "  --%s: CRYPTODEV-NAME\n"
-               "  --%s: CRYPTODEV-ID-NAME\n",
+               "  --%s: CRYPTODEV-ID-NAME\n"
+               "  --%s: self test indicator\n"
+               "  --%s: self broken test ID\n"
+               "  --%s: self broken test direction\n",
                prgname, REQ_FILE_PATH_KEYWORD, RSP_FILE_PATH_KEYWORD,
-               FOLDER_KEYWORD, CRYPTODEV_KEYWORD, CRYPTODEV_ID_KEYWORD);
+               FOLDER_KEYWORD, CRYPTODEV_KEYWORD, CRYPTODEV_ID_KEYWORD,
+               CRYPTODEV_ST_KEYWORD, CRYPTODEV_BK_ID_KEYWORD,
+               CRYPTODEV_BK_DIR_KEY);
 }
 
 static int
@@ -164,6 +219,9 @@ cryptodev_fips_validate_parse_args(int argc, char **argv)
                        {FOLDER_KEYWORD, no_argument, 0, 0},
                        {CRYPTODEV_KEYWORD, required_argument, 0, 0},
                        {CRYPTODEV_ID_KEYWORD, required_argument, 0, 0},
+                       {CRYPTODEV_ST_KEYWORD, no_argument, 0, 0},
+                       {CRYPTODEV_BK_ID_KEYWORD, required_argument, 0, 0},
+                       {CRYPTODEV_BK_DIR_KEY, required_argument, 0, 0},
                        {NULL, 0, 0, 0}
        };
 
@@ -197,6 +255,56 @@ cryptodev_fips_validate_parse_args(int argc, char **argv)
                                        cryptodev_fips_validate_usage(prgname);
                                        return -EINVAL;
                                }
+                       } else if (strcmp(lgopts[option_index].name,
+                                       CRYPTODEV_ST_KEYWORD) == 0) {
+                               env.self_test = 1;
+                       } else if (strcmp(lgopts[option_index].name,
+                                       CRYPTODEV_BK_ID_KEYWORD) == 0) {
+                               if (!env.broken_test_config) {
+                                       env.broken_test_config = rte_malloc(
+                                               NULL,
+                                               sizeof(*env.broken_test_config),
+                                               0);
+                                       if (!env.broken_test_config)
+                                               return -ENOMEM;
+
+                                       env.broken_test_config->expect_fail_dir =
+                                               self_test_dir_enc_auth_gen;
+                               }
+
+                               if (parser_read_uint32(
+                                       &env.broken_test_config->expect_fail_test_idx,
+                                               optarg) < 0) {
+                                       rte_free(env.broken_test_config);
+                                       cryptodev_fips_validate_usage(prgname);
+                                       return -EINVAL;
+                               }
+                       } else if (strcmp(lgopts[option_index].name,
+                                       CRYPTODEV_BK_DIR_KEY) == 0) {
+                               if (!env.broken_test_config) {
+                                       env.broken_test_config = rte_malloc(
+                                               NULL,
+                                               sizeof(*env.broken_test_config),
+                                               0);
+                                       if (!env.broken_test_config)
+                                               return -ENOMEM;
+
+                                       env.broken_test_config->
+                                               expect_fail_test_idx = 0;
+                               }
+
+                               if (strcmp(optarg, CRYPTODEV_ENC_KEYWORD) == 0)
+                                       env.broken_test_config->expect_fail_dir =
+                                               self_test_dir_enc_auth_gen;
+                               else if (strcmp(optarg, CRYPTODEV_DEC_KEYWORD)
+                                               == 0)
+                                       env.broken_test_config->expect_fail_dir =
+                                               self_test_dir_dec_auth_verify;
+                               else {
+                                       rte_free(env.broken_test_config);
+                                       cryptodev_fips_validate_usage(prgname);
+                                       return -EINVAL;
+                               }
                        } else {
                                cryptodev_fips_validate_usage(prgname);
                                return -EINVAL;
@@ -207,8 +315,21 @@ cryptodev_fips_validate_parse_args(int argc, char **argv)
                }
        }
 
-       if (env.req_path == NULL || env.rsp_path == NULL ||
-                       env.dev_id == UINT32_MAX) {
+       if (env.dev_id == UINT32_MAX) {
+               RTE_LOG(ERR, USER1, "No device specified\n");
+               cryptodev_fips_validate_usage(prgname);
+               return -EINVAL;
+       }
+
+       if ((env.req_path == NULL && env.rsp_path != NULL) ||
+                       (env.req_path != NULL && env.rsp_path == NULL)) {
+               RTE_LOG(ERR, USER1, "Missing req path or rsp path\n");
+               cryptodev_fips_validate_usage(prgname);
+               return -EINVAL;
+       }
+
+       if (env.req_path == NULL && env.self_test == 0) {
+               RTE_LOG(ERR, USER1, "--self-test must be set if req path is missing\n");
                cryptodev_fips_validate_usage(prgname);
                return -EINVAL;
        }
@@ -240,6 +361,11 @@ main(int argc, char *argv[])
                return -1;
        }
 
+       if (env.req_path == NULL || env.rsp_path == NULL) {
+               printf("No request, exit.\n");
+               goto exit;
+       }
+
        if (!env.is_path_folder) {
                printf("Processing file %s... ", env.req_path);
 
@@ -404,6 +530,7 @@ static int
 prepare_auth_op(void)
 {
        struct rte_crypto_sym_op *sym = env.op->sym;
+       uint8_t *pt;
 
        __rte_crypto_op_reset(env.op, RTE_CRYPTO_OP_TYPE_SYMMETRIC);
        rte_pktmbuf_reset(env.mbuf);
@@ -411,6 +538,50 @@ prepare_auth_op(void)
        sym->m_src = env.mbuf;
        sym->auth.data.offset = 0;
 
+       pt = (uint8_t *)rte_pktmbuf_append(env.mbuf, vec.pt.len +
+                       vec.cipher_auth.digest.len);
+
+       if (!pt) {
+               RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
+                               -ENOMEM);
+               return -ENOMEM;
+       }
+
+       sym->auth.data.length = vec.pt.len;
+       sym->auth.digest.data = pt + vec.pt.len;
+       sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+                       env.mbuf, vec.pt.len);
+
+       memcpy(pt, vec.pt.val, vec.pt.len);
+
+       if (info.op == FIPS_TEST_DEC_AUTH_VERIF)
+               memcpy(pt + vec.pt.len, vec.cipher_auth.digest.val,
+                               vec.cipher_auth.digest.len);
+
+       rte_crypto_op_attach_sym_session(env.op, env.sess);
+
+       return 0;
+}
+
+static int
+prepare_aead_op(void)
+{
+       struct rte_crypto_sym_op *sym = env.op->sym;
+       uint8_t *iv = rte_crypto_op_ctod_offset(env.op, uint8_t *, IV_OFF);
+
+       __rte_crypto_op_reset(env.op, RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+       rte_pktmbuf_reset(env.mbuf);
+
+       if (info.algo == FIPS_TEST_ALGO_AES_CCM)
+               memcpy(iv + 1, vec.iv.val, vec.iv.len);
+       else
+               memcpy(iv, vec.iv.val, vec.iv.len);
+
+       sym->m_src = env.mbuf;
+       sym->aead.data.offset = 0;
+       sym->aead.aad.data = vec.aead.aad.val;
+       sym->aead.aad.phys_addr = rte_malloc_virt2iova(sym->aead.aad.data);
+
        if (info.op == FIPS_TEST_ENC_AUTH_GEN) {
                uint8_t *pt;
 
@@ -419,8 +590,8 @@ prepare_auth_op(void)
                        return -EPERM;
                }
 
-               pt = (uint8_t *)rte_pktmbuf_append(env.mbuf, vec.pt.len +
-                               vec.cipher_auth.digest.len);
+               pt = (uint8_t *)rte_pktmbuf_append(env.mbuf,
+                               vec.pt.len + vec.aead.digest.len);
 
                if (!pt) {
                        RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
@@ -429,11 +600,10 @@ prepare_auth_op(void)
                }
 
                memcpy(pt, vec.pt.val, vec.pt.len);
-               sym->auth.data.length = vec.pt.len;
-               sym->auth.digest.data = pt + vec.pt.len;
-               sym->auth.digest.phys_addr = rte_pktmbuf_mtophys_offset(
+               sym->aead.data.length = vec.pt.len;
+               sym->aead.digest.data = pt + vec.pt.len;
+               sym->aead.digest.phys_addr = rte_pktmbuf_mtophys_offset(
                                env.mbuf, vec.pt.len);
-
        } else {
                uint8_t *ct;
 
@@ -442,8 +612,7 @@ prepare_auth_op(void)
                        return -EPERM;
                }
 
-               ct = (uint8_t *)rte_pktmbuf_append(env.mbuf,
-                               vec.ct.len + vec.cipher_auth.digest.len);
+               ct = (uint8_t *)rte_pktmbuf_append(env.mbuf, vec.ct.len);
 
                if (!ct) {
                        RTE_LOG(ERR, USER1, "Error %i: MBUF too small\n",
@@ -452,13 +621,15 @@ prepare_auth_op(void)
                }
 
                memcpy(ct, vec.ct.val, vec.ct.len);
-               sym->auth.data.length = vec.ct.len;
-               sym->auth.digest.data = vec.cipher_auth.digest.val;
-               sym->auth.digest.phys_addr = rte_malloc_virt2iova(
-                               sym->auth.digest.data);
+               sym->aead.data.length = vec.ct.len;
+               sym->aead.digest.data = vec.aead.digest.val;
+               sym->aead.digest.phys_addr = rte_malloc_virt2iova(
+                               sym->aead.digest.data);
        }
 
        rte_crypto_op_attach_sym_session(env.op, env.sess);
+
+       return 0;
 }
 
 static int
@@ -470,16 +641,24 @@ prepare_aes_xform(struct rte_crypto_sym_xform *xform)
 
        xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
 
-       cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (info.interim_info.aes_data.cipher_algo == RTE_CRYPTO_CIPHER_AES_CBC)
+               cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_CBC;
+       else
+               cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_ECB;
+
        cipher_xform->op = (info.op == FIPS_TEST_ENC_AUTH_GEN) ?
                        RTE_CRYPTO_CIPHER_OP_ENCRYPT :
                        RTE_CRYPTO_CIPHER_OP_DECRYPT;
        cipher_xform->key.data = vec.cipher_auth.key.val;
        cipher_xform->key.length = vec.cipher_auth.key.len;
-       cipher_xform->iv.length = vec.iv.len;
-       cipher_xform->iv.offset = IV_OFF;
-
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_CBC;
+       if (cipher_xform->algo == RTE_CRYPTO_CIPHER_AES_CBC) {
+               cipher_xform->iv.length = vec.iv.len;
+               cipher_xform->iv.offset = IV_OFF;
+       } else {
+               cipher_xform->iv.length = 0;
+               cipher_xform->iv.offset = 0;
+       }
+       cap_idx.algo.cipher = cipher_xform->algo;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
 
        cap = rte_cryptodev_sym_capability_get(env.dev_id, &cap_idx);
@@ -510,16 +689,24 @@ prepare_tdes_xform(struct rte_crypto_sym_xform *xform)
 
        xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
 
-       cipher_xform->algo = RTE_CRYPTO_CIPHER_3DES_CBC;
+       if (info.interim_info.tdes_data.test_mode == TDES_MODE_CBC)
+               cipher_xform->algo = RTE_CRYPTO_CIPHER_3DES_CBC;
+       else
+               cipher_xform->algo = RTE_CRYPTO_CIPHER_3DES_ECB;
        cipher_xform->op = (info.op == FIPS_TEST_ENC_AUTH_GEN) ?
                        RTE_CRYPTO_CIPHER_OP_ENCRYPT :
                        RTE_CRYPTO_CIPHER_OP_DECRYPT;
        cipher_xform->key.data = vec.cipher_auth.key.val;
        cipher_xform->key.length = vec.cipher_auth.key.len;
-       cipher_xform->iv.length = vec.iv.len;
-       cipher_xform->iv.offset = IV_OFF;
 
-       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_3DES_CBC;
+       if (cipher_xform->algo == RTE_CRYPTO_CIPHER_3DES_CBC) {
+               cipher_xform->iv.length = vec.iv.len;
+               cipher_xform->iv.offset = IV_OFF;
+       } else {
+               cipher_xform->iv.length = 0;
+               cipher_xform->iv.offset = 0;
+       }
+       cap_idx.algo.cipher = cipher_xform->algo;
        cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
 
        cap = rte_cryptodev_sym_capability_get(env.dev_id, &cap_idx);
@@ -578,6 +765,211 @@ prepare_hmac_xform(struct rte_crypto_sym_xform *xform)
        return 0;
 }
 
+static int
+prepare_gcm_xform(struct rte_crypto_sym_xform *xform)
+{
+       const struct rte_cryptodev_symmetric_capability *cap;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_crypto_aead_xform *aead_xform = &xform->aead;
+
+       xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
+
+       aead_xform->algo = RTE_CRYPTO_AEAD_AES_GCM;
+       aead_xform->aad_length = vec.aead.aad.len;
+       aead_xform->digest_length = vec.aead.digest.len;
+       aead_xform->iv.offset = IV_OFF;
+       aead_xform->iv.length = vec.iv.len;
+       aead_xform->key.data = vec.aead.key.val;
+       aead_xform->key.length = vec.aead.key.len;
+       aead_xform->op = (info.op == FIPS_TEST_ENC_AUTH_GEN) ?
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT :
+                       RTE_CRYPTO_AEAD_OP_DECRYPT;
+
+       cap_idx.algo.aead = aead_xform->algo;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+
+       cap = rte_cryptodev_sym_capability_get(env.dev_id, &cap_idx);
+       if (!cap) {
+               RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
+                               env.dev_id);
+               return -EINVAL;
+       }
+
+       if (rte_cryptodev_sym_capability_check_aead(cap,
+                       aead_xform->key.length,
+                       aead_xform->digest_length, aead_xform->aad_length,
+                       aead_xform->iv.length) != 0) {
+               RTE_LOG(ERR, USER1,
+                       "PMD %s key_len %u tag_len %u aad_len %u iv_len %u\n",
+                               info.device_name, aead_xform->key.length,
+                               aead_xform->digest_length,
+                               aead_xform->aad_length,
+                               aead_xform->iv.length);
+               return -EPERM;
+       }
+
+       return 0;
+}
+
+static int
+prepare_cmac_xform(struct rte_crypto_sym_xform *xform)
+{
+       const struct rte_cryptodev_symmetric_capability *cap;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_crypto_auth_xform *auth_xform = &xform->auth;
+
+       xform->type = RTE_CRYPTO_SYM_XFORM_AUTH;
+
+       auth_xform->algo = RTE_CRYPTO_AUTH_AES_CMAC;
+       auth_xform->op = (info.op == FIPS_TEST_ENC_AUTH_GEN) ?
+                       RTE_CRYPTO_AUTH_OP_GENERATE : RTE_CRYPTO_AUTH_OP_VERIFY;
+       auth_xform->digest_length = vec.cipher_auth.digest.len;
+       auth_xform->key.data = vec.cipher_auth.key.val;
+       auth_xform->key.length = vec.cipher_auth.key.len;
+
+       cap_idx.algo.auth = auth_xform->algo;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+
+       cap = rte_cryptodev_sym_capability_get(env.dev_id, &cap_idx);
+       if (!cap) {
+               RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
+                               env.dev_id);
+               return -EINVAL;
+       }
+
+       if (rte_cryptodev_sym_capability_check_auth(cap,
+                       auth_xform->key.length,
+                       auth_xform->digest_length, 0) != 0) {
+               RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
+                               info.device_name, auth_xform->key.length,
+                               auth_xform->digest_length);
+               return -EPERM;
+       }
+
+       return 0;
+}
+
+static int
+prepare_ccm_xform(struct rte_crypto_sym_xform *xform)
+{
+       const struct rte_cryptodev_symmetric_capability *cap;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_crypto_aead_xform *aead_xform = &xform->aead;
+
+       xform->type = RTE_CRYPTO_SYM_XFORM_AEAD;
+
+       aead_xform->algo = RTE_CRYPTO_AEAD_AES_CCM;
+       aead_xform->aad_length = vec.aead.aad.len;
+       aead_xform->digest_length = vec.aead.digest.len;
+       aead_xform->iv.offset = IV_OFF;
+       aead_xform->iv.length = vec.iv.len;
+       aead_xform->key.data = vec.aead.key.val;
+       aead_xform->key.length = vec.aead.key.len;
+       aead_xform->op = (info.op == FIPS_TEST_ENC_AUTH_GEN) ?
+                       RTE_CRYPTO_AEAD_OP_ENCRYPT :
+                       RTE_CRYPTO_AEAD_OP_DECRYPT;
+
+       cap_idx.algo.aead = aead_xform->algo;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AEAD;
+
+       cap = rte_cryptodev_sym_capability_get(env.dev_id, &cap_idx);
+       if (!cap) {
+               RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
+                               env.dev_id);
+               return -EINVAL;
+       }
+
+       if (rte_cryptodev_sym_capability_check_aead(cap,
+                       aead_xform->key.length,
+                       aead_xform->digest_length, aead_xform->aad_length,
+                       aead_xform->iv.length) != 0) {
+               RTE_LOG(ERR, USER1,
+                       "PMD %s key_len %u tag_len %u aad_len %u iv_len %u\n",
+                               info.device_name, aead_xform->key.length,
+                               aead_xform->digest_length,
+                               aead_xform->aad_length,
+                               aead_xform->iv.length);
+               return -EPERM;
+       }
+
+       return 0;
+}
+
+static int
+prepare_sha_xform(struct rte_crypto_sym_xform *xform)
+{
+       const struct rte_cryptodev_symmetric_capability *cap;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_crypto_auth_xform *auth_xform = &xform->auth;
+
+       xform->type = RTE_CRYPTO_SYM_XFORM_AUTH;
+
+       auth_xform->algo = info.interim_info.sha_data.algo;
+       auth_xform->op = RTE_CRYPTO_AUTH_OP_GENERATE;
+       auth_xform->digest_length = vec.cipher_auth.digest.len;
+
+       cap_idx.algo.auth = auth_xform->algo;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_AUTH;
+
+       cap = rte_cryptodev_sym_capability_get(env.dev_id, &cap_idx);
+       if (!cap) {
+               RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
+                               env.dev_id);
+               return -EINVAL;
+       }
+
+       if (rte_cryptodev_sym_capability_check_auth(cap,
+                       auth_xform->key.length,
+                       auth_xform->digest_length, 0) != 0) {
+               RTE_LOG(ERR, USER1, "PMD %s key length %u digest length %u\n",
+                               info.device_name, auth_xform->key.length,
+                               auth_xform->digest_length);
+               return -EPERM;
+       }
+
+       return 0;
+}
+
+static int
+prepare_xts_xform(struct rte_crypto_sym_xform *xform)
+{
+       const struct rte_cryptodev_symmetric_capability *cap;
+       struct rte_cryptodev_sym_capability_idx cap_idx;
+       struct rte_crypto_cipher_xform *cipher_xform = &xform->cipher;
+
+       xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+
+       cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_XTS;
+       cipher_xform->op = (info.op == FIPS_TEST_ENC_AUTH_GEN) ?
+                       RTE_CRYPTO_CIPHER_OP_ENCRYPT :
+                       RTE_CRYPTO_CIPHER_OP_DECRYPT;
+       cipher_xform->key.data = vec.cipher_auth.key.val;
+       cipher_xform->key.length = vec.cipher_auth.key.len;
+       cipher_xform->iv.length = vec.iv.len;
+       cipher_xform->iv.offset = IV_OFF;
+
+       cap_idx.algo.cipher = RTE_CRYPTO_CIPHER_AES_XTS;
+       cap_idx.type = RTE_CRYPTO_SYM_XFORM_CIPHER;
+
+       cap = rte_cryptodev_sym_capability_get(env.dev_id, &cap_idx);
+       if (!cap) {
+               RTE_LOG(ERR, USER1, "Failed to get capability for cdev %u\n",
+                               env.dev_id);
+               return -EINVAL;
+       }
+
+       if (rte_cryptodev_sym_capability_check_cipher(cap,
+                       cipher_xform->key.length,
+                       cipher_xform->iv.length) != 0) {
+               RTE_LOG(ERR, USER1, "PMD %s key length %u IV length %u\n",
+                               info.device_name, cipher_xform->key.length,
+                               cipher_xform->iv.length);
+               return -EPERM;
+       }
+
+       return 0;
+}
+
 static void
 get_writeback_data(struct fips_val *val)
 {
@@ -596,28 +988,29 @@ fips_run_test(void)
        if (ret < 0)
                return ret;
 
-       env.sess = rte_cryptodev_sym_session_create(env.mpool);
+       env.sess = rte_cryptodev_sym_session_create(env.sess_mpool);
        if (!env.sess)
                return -ENOMEM;
 
        ret = rte_cryptodev_sym_session_init(env.dev_id,
-                       env.sess, &xform, env.mpool);
+                       env.sess, &xform, env.sess_priv_mpool);
        if (ret < 0) {
                RTE_LOG(ERR, USER1, "Error %i: Init session\n",
                                ret);
-               return ret;
+               goto exit;
        }
 
        ret = test_ops.prepare_op();
        if (ret < 0) {
                RTE_LOG(ERR, USER1, "Error %i: Prepare op\n",
                                ret);
-               return ret;
+               goto exit;
        }
 
        if (rte_cryptodev_enqueue_burst(env.dev_id, 0, &env.op, 1) < 1) {
                RTE_LOG(ERR, USER1, "Error: Failed enqueue\n");
-               return ret;
+               ret = -1;
+               goto exit;
        }
 
        do {
@@ -629,6 +1022,7 @@ fips_run_test(void)
 
        vec.status = env.op->status;
 
+exit:
        rte_cryptodev_sym_session_clear(env.dev_id, env.sess);
        rte_cryptodev_sym_session_free(env.sess);
        env.sess = NULL;
@@ -686,14 +1080,18 @@ fips_mct_tdes_test(void)
 #define TDES_EXTERN_ITER       400
 #define TDES_INTERN_ITER       10000
        struct fips_val val, val_key;
-       uint8_t prev_out[TDES_BLOCK_SIZE];
-       uint8_t prev_prev_out[TDES_BLOCK_SIZE];
-       uint8_t prev_in[TDES_BLOCK_SIZE];
+       uint8_t prev_out[TDES_BLOCK_SIZE] = {0};
+       uint8_t prev_prev_out[TDES_BLOCK_SIZE] = {0};
+       uint8_t prev_in[TDES_BLOCK_SIZE] = {0};
        uint32_t i, j, k;
        int ret;
+       int test_mode = info.interim_info.tdes_data.test_mode;
 
        for (i = 0; i < TDES_EXTERN_ITER; i++) {
-               if (i != 0)
+               if (i == 0) {
+                       if (!(strstr(info.vec[0], "COUNT")))
+                               fprintf(info.fp_wr, "%s%u\n", "COUNT = ", 0);
+               } else
                        update_info_vec(i);
 
                fips_test_write_one_case();
@@ -705,7 +1103,6 @@ fips_mct_tdes_test(void)
                                        fprintf(info.fp_wr, "Bypass\n");
                                        return 0;
                                }
-
                                return ret;
                        }
 
@@ -718,25 +1115,50 @@ fips_mct_tdes_test(void)
                                memcpy(prev_out, val.val, TDES_BLOCK_SIZE);
 
                                if (info.op == FIPS_TEST_ENC_AUTH_GEN) {
-                                       memcpy(vec.pt.val, vec.iv.val,
-                                                       TDES_BLOCK_SIZE);
-                                       memcpy(vec.iv.val, val.val,
-                                                       TDES_BLOCK_SIZE);
+                                       if (test_mode == TDES_MODE_ECB) {
+                                               memcpy(vec.pt.val, val.val,
+                                                          TDES_BLOCK_SIZE);
+                                       } else {
+                                               memcpy(vec.pt.val, vec.iv.val,
+                                                          TDES_BLOCK_SIZE);
+                                               memcpy(vec.iv.val, val.val,
+                                                          TDES_BLOCK_SIZE);
+                                       }
+
                                } else {
-                                       memcpy(vec.iv.val, vec.ct.val,
-                                                       TDES_BLOCK_SIZE);
-                                       memcpy(vec.ct.val, val.val,
-                                                       TDES_BLOCK_SIZE);
+                                       if (test_mode == TDES_MODE_ECB) {
+                                               memcpy(vec.ct.val, val.val,
+                                                          TDES_BLOCK_SIZE);
+                                       } else {
+                                               memcpy(vec.iv.val, vec.ct.val,
+                                                          TDES_BLOCK_SIZE);
+                                               memcpy(vec.ct.val, val.val,
+                                                          TDES_BLOCK_SIZE);
+                                       }
                                }
                                continue;
                        }
 
                        if (info.op == FIPS_TEST_ENC_AUTH_GEN) {
-                               memcpy(vec.iv.val, val.val, TDES_BLOCK_SIZE);
-                               memcpy(vec.pt.val, prev_out, TDES_BLOCK_SIZE);
+                               if (test_mode == TDES_MODE_ECB) {
+                                       memcpy(vec.pt.val, val.val,
+                                                  TDES_BLOCK_SIZE);
+                               } else {
+                                       memcpy(vec.iv.val, val.val,
+                                                  TDES_BLOCK_SIZE);
+                                       memcpy(vec.pt.val, prev_out,
+                                                  TDES_BLOCK_SIZE);
+                               }
                        } else {
-                               memcpy(vec.iv.val, vec.ct.val, TDES_BLOCK_SIZE);
-                               memcpy(vec.ct.val, val.val, TDES_BLOCK_SIZE);
+                               if (test_mode == TDES_MODE_ECB) {
+                                       memcpy(vec.ct.val, val.val,
+                                                  TDES_BLOCK_SIZE);
+                               } else {
+                                       memcpy(vec.iv.val, vec.ct.val,
+                                                  TDES_BLOCK_SIZE);
+                                       memcpy(vec.ct.val, val.val,
+                                                  TDES_BLOCK_SIZE);
+                               }
                        }
 
                        if (j == TDES_INTERN_ITER - 1)
@@ -795,17 +1217,99 @@ fips_mct_tdes_test(void)
                                        val_key.val[k] : (val_key.val[k] ^ 0x1);
 
                if (info.op == FIPS_TEST_ENC_AUTH_GEN) {
-                       memcpy(vec.iv.val, val.val, TDES_BLOCK_SIZE);
-                       memcpy(vec.pt.val, prev_out, TDES_BLOCK_SIZE);
+                       if (test_mode == TDES_MODE_ECB) {
+                               memcpy(vec.pt.val, val.val, TDES_BLOCK_SIZE);
+                       } else {
+                               memcpy(vec.iv.val, val.val, TDES_BLOCK_SIZE);
+                               memcpy(vec.pt.val, prev_out, TDES_BLOCK_SIZE);
+                       }
                } else {
-                       memcpy(vec.iv.val, prev_out, TDES_BLOCK_SIZE);
-                       memcpy(vec.ct.val, val.val, TDES_BLOCK_SIZE);
+                       if (test_mode == TDES_MODE_ECB) {
+                               memcpy(vec.ct.val, val.val, TDES_BLOCK_SIZE);
+                       } else {
+                               memcpy(vec.iv.val, prev_out, TDES_BLOCK_SIZE);
+                               memcpy(vec.ct.val, val.val, TDES_BLOCK_SIZE);
+                       }
                }
        }
 
        return 0;
 }
 
+static int
+fips_mct_aes_ecb_test(void)
+{
+#define AES_BLOCK_SIZE 16
+#define AES_EXTERN_ITER        100
+#define AES_INTERN_ITER        1000
+       struct fips_val val, val_key;
+       uint8_t prev_out[AES_BLOCK_SIZE] = {0};
+       uint32_t i, j, k;
+       int ret;
+
+       for (i = 0; i < AES_EXTERN_ITER; i++) {
+               if (i != 0)
+                       update_info_vec(i);
+
+               fips_test_write_one_case();
+
+               for (j = 0; j < AES_INTERN_ITER; j++) {
+                       ret = fips_run_test();
+                       if (ret < 0) {
+                               if (ret == -EPERM) {
+                                       fprintf(info.fp_wr, "Bypass\n");
+                                       return 0;
+                               }
+
+                               return ret;
+                       }
+
+                       get_writeback_data(&val);
+
+                       if (info.op == FIPS_TEST_ENC_AUTH_GEN)
+                               memcpy(vec.pt.val, val.val, AES_BLOCK_SIZE);
+                       else
+                               memcpy(vec.ct.val, val.val, AES_BLOCK_SIZE);
+
+                       if (j == AES_INTERN_ITER - 1)
+                               continue;
+
+                       memcpy(prev_out, val.val, AES_BLOCK_SIZE);
+               }
+
+               info.parse_writeback(&val);
+               fprintf(info.fp_wr, "\n");
+
+               if (i == AES_EXTERN_ITER - 1)
+                       continue;
+
+               /** update key */
+               memcpy(&val_key, &vec.cipher_auth.key, sizeof(val_key));
+               for (k = 0; k < vec.cipher_auth.key.len; k++) {
+                       switch (vec.cipher_auth.key.len) {
+                       case 16:
+                               val_key.val[k] ^= val.val[k];
+                               break;
+                       case 24:
+                               if (k < 8)
+                                       val_key.val[k] ^= prev_out[k + 8];
+                               else
+                                       val_key.val[k] ^= val.val[k - 8];
+                               break;
+                       case 32:
+                               if (k < 16)
+                                       val_key.val[k] ^= prev_out[k];
+                               else
+                                       val_key.val[k] ^= val.val[k - 16];
+                               break;
+                       default:
+                               return -1;
+                       }
+               }
+       }
+
+       return 0;
+}
 static int
 fips_mct_aes_test(void)
 {
@@ -818,6 +1322,9 @@ fips_mct_aes_test(void)
        uint32_t i, j, k;
        int ret;
 
+       if (info.interim_info.aes_data.cipher_algo == RTE_CRYPTO_CIPHER_AES_ECB)
+               return fips_mct_aes_ecb_test();
+
        for (i = 0; i < AES_EXTERN_ITER; i++) {
                if (i != 0)
                        update_info_vec(i);
@@ -908,6 +1415,90 @@ fips_mct_aes_test(void)
        return 0;
 }
 
+static int
+fips_mct_sha_test(void)
+{
+#define SHA_EXTERN_ITER        100
+#define SHA_INTERN_ITER        1000
+#define SHA_MD_BLOCK   3
+       struct fips_val val, md[SHA_MD_BLOCK];
+       char temp[MAX_DIGEST_SIZE*2];
+       int ret;
+       uint32_t i, j;
+
+       val.val = rte_malloc(NULL, (MAX_DIGEST_SIZE*SHA_MD_BLOCK), 0);
+       for (i = 0; i < SHA_MD_BLOCK; i++)
+               md[i].val = rte_malloc(NULL, (MAX_DIGEST_SIZE*2), 0);
+
+       rte_free(vec.pt.val);
+       vec.pt.val = rte_malloc(NULL, (MAX_DIGEST_SIZE*SHA_MD_BLOCK), 0);
+
+       fips_test_write_one_case();
+       fprintf(info.fp_wr, "\n");
+
+       for (j = 0; j < SHA_EXTERN_ITER; j++) {
+
+               memcpy(md[0].val, vec.cipher_auth.digest.val,
+                       vec.cipher_auth.digest.len);
+               md[0].len = vec.cipher_auth.digest.len;
+               memcpy(md[1].val, vec.cipher_auth.digest.val,
+                       vec.cipher_auth.digest.len);
+               md[1].len = vec.cipher_auth.digest.len;
+               memcpy(md[2].val, vec.cipher_auth.digest.val,
+                       vec.cipher_auth.digest.len);
+               md[2].len = vec.cipher_auth.digest.len;
+
+               for (i = 0; i < (SHA_INTERN_ITER); i++) {
+
+                       memcpy(vec.pt.val, md[0].val,
+                               (size_t)md[0].len);
+                       memcpy((vec.pt.val + md[0].len), md[1].val,
+                               (size_t)md[1].len);
+                       memcpy((vec.pt.val + md[0].len + md[1].len),
+                               md[2].val,
+                               (size_t)md[2].len);
+                       vec.pt.len = md[0].len + md[1].len + md[2].len;
+
+                       ret = fips_run_test();
+                       if (ret < 0) {
+                               if (ret == -EPERM) {
+                                       fprintf(info.fp_wr, "Bypass\n\n");
+                                       return 0;
+                               }
+                               return ret;
+                       }
+
+                       get_writeback_data(&val);
+
+                       memcpy(md[0].val, md[1].val, md[1].len);
+                       md[0].len = md[1].len;
+                       memcpy(md[1].val, md[2].val, md[2].len);
+                       md[1].len = md[2].len;
+
+                       memcpy(md[2].val, (val.val + vec.pt.len),
+                               vec.cipher_auth.digest.len);
+                       md[2].len = vec.cipher_auth.digest.len;
+               }
+
+               memcpy(vec.cipher_auth.digest.val, md[2].val, md[2].len);
+               vec.cipher_auth.digest.len = md[2].len;
+
+               fprintf(info.fp_wr, "COUNT = %u\n", j);
+
+               writeback_hex_str("", temp, &vec.cipher_auth.digest);
+
+               fprintf(info.fp_wr, "MD = %s\n\n", temp);
+       }
+
+       for (i = 0; i < (SHA_MD_BLOCK); i++)
+               rte_free(md[i].val);
+
+       rte_free(vec.pt.val);
+
+       return 0;
+}
+
+
 static int
 init_test_ops(void)
 {
@@ -933,8 +1524,46 @@ init_test_ops(void)
                else
                        test_ops.test = fips_generic_test;
                break;
-
+       case FIPS_TEST_ALGO_AES_GCM:
+               test_ops.prepare_op = prepare_aead_op;
+               test_ops.prepare_xform = prepare_gcm_xform;
+               test_ops.test = fips_generic_test;
+               break;
+       case FIPS_TEST_ALGO_AES_CMAC:
+               test_ops.prepare_op = prepare_auth_op;
+               test_ops.prepare_xform = prepare_cmac_xform;
+               test_ops.test = fips_generic_test;
+               break;
+       case FIPS_TEST_ALGO_AES_CCM:
+               test_ops.prepare_op = prepare_aead_op;
+               test_ops.prepare_xform = prepare_ccm_xform;
+               test_ops.test = fips_generic_test;
+               break;
+       case FIPS_TEST_ALGO_SHA:
+               test_ops.prepare_op = prepare_auth_op;
+               test_ops.prepare_xform = prepare_sha_xform;
+               if (info.interim_info.sha_data.test_type == SHA_MCT)
+                       test_ops.test = fips_mct_sha_test;
+               else
+                       test_ops.test = fips_generic_test;
+               break;
+       case FIPS_TEST_ALGO_AES_XTS:
+               test_ops.prepare_op = prepare_cipher_op;
+               test_ops.prepare_xform = prepare_xts_xform;
+               test_ops.test = fips_generic_test;
+               break;
        default:
+               if (strstr(info.file_name, "TECB") ||
+                               strstr(info.file_name, "TCBC")) {
+                       info.algo = FIPS_TEST_ALGO_TDES;
+                       test_ops.prepare_op = prepare_cipher_op;
+                       test_ops.prepare_xform  = prepare_tdes_xform;
+                       if (info.interim_info.tdes_data.test_type == TDES_MCT)
+                               test_ops.test = fips_mct_tdes_test;
+                       else
+                               test_ops.test = fips_generic_test;
+                       break;
+               }
                return -1;
        }