test/crypto: move test suite parameters to header file
authorCiara Power <ciara.power@intel.com>
Wed, 12 May 2021 11:36:53 +0000 (11:36 +0000)
committerAkhil Goyal <gakhil@marvell.com>
Wed, 12 May 2021 14:17:07 +0000 (16:17 +0200)
The testsuite params struct and ut functions are now in the cryptodev
test header file. This will allow them be used outside of the
cryptodev_test.c file. They will be used in a subsequent patch by the
blockcipher test.

As a result of this change, slight renaming changes were necessary
for ipsec and asym tests, to avoid a clash in names.

Signed-off-by: Ciara Power <ciara.power@intel.com>
Acked-by: Declan Doherty <declan.doherty@intel.com>
Acked-by: Hemant Agrawal <hemant.agrawal@nxp.com>
Acked-by: Akhil Goyal <gakhil@marvell.com>
Tested-by: Ruifeng Wang <ruifeng.wang@arm.com>
app/test/test_cryptodev.c
app/test/test_cryptodev.h
app/test/test_cryptodev_asym.c
app/test/test_ipsec.c

index e4c440b..cf0b694 100644 (file)
@@ -72,19 +72,6 @@ static enum rte_security_session_action_type gbl_action_type =
 
 enum cryptodev_api_test_type global_api_test_type = CRYPTODEV_API_TEST;
 
 
 enum cryptodev_api_test_type global_api_test_type = CRYPTODEV_API_TEST;
 
-struct crypto_testsuite_params {
-       struct rte_mempool *mbuf_pool;
-       struct rte_mempool *large_mbuf_pool;
-       struct rte_mempool *op_mpool;
-       struct rte_mempool *session_mpool;
-       struct rte_mempool *session_priv_mpool;
-       struct rte_cryptodev_config conf;
-       struct rte_cryptodev_qp_conf qp_conf;
-
-       uint8_t valid_devs[RTE_CRYPTO_MAX_DEVS];
-       uint8_t valid_dev_count;
-};
-
 struct crypto_unittest_params {
        struct rte_crypto_sym_xform cipher_xform;
        struct rte_crypto_sym_xform auth_xform;
 struct crypto_unittest_params {
        struct rte_crypto_sym_xform cipher_xform;
        struct rte_crypto_sym_xform auth_xform;
@@ -486,6 +473,7 @@ process_crypto_request(uint8_t dev_id, struct rte_crypto_op *op)
 }
 
 static struct crypto_testsuite_params testsuite_params = { NULL };
 }
 
 static struct crypto_testsuite_params testsuite_params = { NULL };
+struct crypto_testsuite_params *p_testsuite_params = &testsuite_params;
 static struct crypto_unittest_params unittest_params;
 
 static int
 static struct crypto_unittest_params unittest_params;
 
 static int
@@ -1313,7 +1301,7 @@ dev_configure_and_start(uint64_t ff_disable)
        return TEST_SUCCESS;
 }
 
        return TEST_SUCCESS;
 }
 
-static int
+int
 ut_setup(void)
 {
        /* Configure and start the device with security feature disabled */
 ut_setup(void)
 {
        /* Configure and start the device with security feature disabled */
@@ -1327,7 +1315,7 @@ ut_setup_security(void)
        return dev_configure_and_start(0);
 }
 
        return dev_configure_and_start(0);
 }
 
-static void
+void
 ut_teardown(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
 ut_teardown(void)
 {
        struct crypto_testsuite_params *ts_params = &testsuite_params;
index 5c41e36..f81f8e3 100644 (file)
@@ -79,6 +79,20 @@ enum cryptodev_api_test_type {
 
 extern enum cryptodev_api_test_type global_api_test_type;
 
 
 extern enum cryptodev_api_test_type global_api_test_type;
 
+extern struct crypto_testsuite_params *p_testsuite_params;
+struct crypto_testsuite_params {
+       struct rte_mempool *mbuf_pool;
+       struct rte_mempool *large_mbuf_pool;
+       struct rte_mempool *op_mpool;
+       struct rte_mempool *session_mpool;
+       struct rte_mempool *session_priv_mpool;
+       struct rte_cryptodev_config conf;
+       struct rte_cryptodev_qp_conf qp_conf;
+
+       uint8_t valid_devs[RTE_CRYPTO_MAX_DEVS];
+       uint8_t valid_dev_count;
+};
+
 /**
  * Write (spread) data from buffer to mbuf data
  *
 /**
  * Write (spread) data from buffer to mbuf data
  *
@@ -234,4 +248,10 @@ int
 check_aead_capabilities_supported(const enum rte_crypto_aead_algorithm *aeads,
                uint16_t num_aeads);
 
 check_aead_capabilities_supported(const enum rte_crypto_aead_algorithm *aeads,
                uint16_t num_aeads);
 
+int
+ut_setup(void);
+
+void
+ut_teardown(void);
+
 #endif /* TEST_CRYPTODEV_H_ */
 #endif /* TEST_CRYPTODEV_H_ */
index e935f38..b36eec9 100644 (file)
@@ -35,7 +35,7 @@
 #define TEST_VECTOR_SIZE 256
 
 static int gbl_driver_id;
 #define TEST_VECTOR_SIZE 256
 
 static int gbl_driver_id;
-struct crypto_testsuite_params {
+struct crypto_testsuite_params_asym {
        struct rte_mempool *op_mpool;
        struct rte_mempool *session_mpool;
        struct rte_cryptodev_config conf;
        struct rte_mempool *op_mpool;
        struct rte_mempool *session_mpool;
        struct rte_cryptodev_config conf;
@@ -63,12 +63,12 @@ static struct test_cases_array test_vector = {0, { NULL } };
 
 static uint32_t test_index;
 
 
 static uint32_t test_index;
 
-static struct crypto_testsuite_params testsuite_params = { NULL };
+static struct crypto_testsuite_params_asym testsuite_params = { NULL };
 
 static int
 queue_ops_rsa_sign_verify(struct rte_cryptodev_asym_session *sess)
 {
 
 static int
 queue_ops_rsa_sign_verify(struct rte_cryptodev_asym_session *sess)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_crypto_op *op, *result_op;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_crypto_op *op, *result_op;
@@ -159,7 +159,7 @@ error_exit:
 static int
 queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess)
 {
 static int
 queue_ops_rsa_enc_dec(struct rte_cryptodev_asym_session *sess)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_crypto_op *op, *result_op;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_crypto_op *op, *result_op;
@@ -300,7 +300,7 @@ test_cryptodev_asym_ver(struct rte_crypto_op *op,
 }
 
 static int
 }
 
 static int
-test_cryptodev_asym_op(struct crypto_testsuite_params *ts_params,
+test_cryptodev_asym_op(struct crypto_testsuite_params_asym *ts_params,
        union test_case_structure *data_tc,
        char *test_msg, int sessionless, enum rte_crypto_asym_op_type type,
        enum rte_crypto_rsa_priv_key_type key_type)
        union test_case_structure *data_tc,
        char *test_msg, int sessionless, enum rte_crypto_asym_op_type type,
        enum rte_crypto_rsa_priv_key_type key_type)
@@ -617,7 +617,7 @@ static int
 test_one_by_one(void)
 {
        int status = TEST_SUCCESS;
 test_one_by_one(void)
 {
        int status = TEST_SUCCESS;
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        uint32_t i = 0;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_info dev_info;
        uint32_t i = 0;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_info dev_info;
@@ -650,7 +650,7 @@ test_one_by_one(void)
 static int
 test_rsa_sign_verify(void)
 {
 static int
 test_rsa_sign_verify(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
@@ -699,7 +699,7 @@ error_exit:
 static int
 test_rsa_enc_dec(void)
 {
 static int
 test_rsa_enc_dec(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
@@ -747,7 +747,7 @@ error_exit:
 static int
 test_rsa_sign_verify_crt(void)
 {
 static int
 test_rsa_sign_verify_crt(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
@@ -795,7 +795,7 @@ error_exit:
 static int
 test_rsa_enc_dec_crt(void)
 {
 static int
 test_rsa_enc_dec_crt(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_asym_session *sess;
@@ -842,7 +842,7 @@ error_exit:
 static int
 testsuite_setup(void)
 {
 static int
 testsuite_setup(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        uint8_t valid_devs[RTE_CRYPTO_MAX_DEVS];
        struct rte_cryptodev_info info;
        int ret, dev_id = -1;
        uint8_t valid_devs[RTE_CRYPTO_MAX_DEVS];
        struct rte_cryptodev_info info;
        int ret, dev_id = -1;
@@ -959,7 +959,7 @@ testsuite_setup(void)
 static void
 testsuite_teardown(void)
 {
 static void
 testsuite_teardown(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
 
        if (ts_params->op_mpool != NULL) {
                RTE_LOG(DEBUG, USER1, "CRYPTO_OP_POOL count %u\n",
 
        if (ts_params->op_mpool != NULL) {
                RTE_LOG(DEBUG, USER1, "CRYPTO_OP_POOL count %u\n",
@@ -974,9 +974,9 @@ testsuite_teardown(void)
 }
 
 static int
 }
 
 static int
-ut_setup(void)
+ut_setup_asym(void)
 {
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
 
        uint16_t qp_id;
 
 
        uint16_t qp_id;
 
@@ -1008,9 +1008,9 @@ ut_setup(void)
 }
 
 static void
 }
 
 static void
-ut_teardown(void)
+ut_teardown_asym(void)
 {
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_cryptodev_stats stats;
 
        rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats);
        struct rte_cryptodev_stats stats;
 
        rte_cryptodev_stats_get(ts_params->valid_devs[0], &stats);
@@ -1056,7 +1056,7 @@ static inline void print_asym_capa(
 static int
 test_capability(void)
 {
 static int
 test_capability(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_info dev_info;
        const struct rte_cryptodev_capabilities *dev_capa;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_cryptodev_info dev_info;
        const struct rte_cryptodev_capabilities *dev_capa;
@@ -1093,7 +1093,7 @@ test_capability(void)
 static int
 test_dh_gen_shared_sec(struct rte_crypto_asym_xform *xfrm)
 {
 static int
 test_dh_gen_shared_sec(struct rte_crypto_asym_xform *xfrm)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
@@ -1186,7 +1186,7 @@ error_exit:
 static int
 test_dh_gen_priv_key(struct rte_crypto_asym_xform *xfrm)
 {
 static int
 test_dh_gen_priv_key(struct rte_crypto_asym_xform *xfrm)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
@@ -1277,7 +1277,7 @@ error_exit:
 static int
 test_dh_gen_pub_key(struct rte_crypto_asym_xform *xfrm)
 {
 static int
 test_dh_gen_pub_key(struct rte_crypto_asym_xform *xfrm)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
@@ -1376,7 +1376,7 @@ error_exit:
 static int
 test_dh_gen_kp(struct rte_crypto_asym_xform *xfrm)
 {
 static int
 test_dh_gen_kp(struct rte_crypto_asym_xform *xfrm)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
@@ -1473,7 +1473,7 @@ error_exit:
 static int
 test_mod_inv(void)
 {
 static int
 test_mod_inv(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
@@ -1597,7 +1597,7 @@ error_exit:
 static int
 test_mod_exp(void)
 {
 static int
 test_mod_exp(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
@@ -1757,7 +1757,7 @@ test_dh_keygenration(void)
 static int
 test_dsa_sign(void)
 {
 static int
 test_dsa_sign(void)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        uint8_t dev_id = ts_params->valid_devs[0];
@@ -1901,7 +1901,7 @@ test_dsa(void)
 static int
 test_ecdsa_sign_verify(enum curve curve_id)
 {
 static int
 test_ecdsa_sign_verify(enum curve curve_id)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct crypto_testsuite_ecdsa_params input_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct crypto_testsuite_ecdsa_params input_params;
@@ -2114,7 +2114,7 @@ test_ecdsa_sign_verify_all_curve(void)
 static int
 test_ecpm(enum curve curve_id)
 {
 static int
 test_ecpm(enum curve curve_id)
 {
-       struct crypto_testsuite_params *ts_params = &testsuite_params;
+       struct crypto_testsuite_params_asym *ts_params = &testsuite_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct crypto_testsuite_ecpm_params input_params;
        struct rte_mempool *sess_mpool = ts_params->session_mpool;
        struct rte_mempool *op_mpool = ts_params->op_mpool;
        struct crypto_testsuite_ecpm_params input_params;
@@ -2289,16 +2289,20 @@ static struct unit_test_suite cryptodev_openssl_asym_testsuite  = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_capability),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_dsa),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_dh_keygenration),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_rsa_enc_dec),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_rsa_sign_verify),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_rsa_enc_dec_crt),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_rsa_sign_verify_crt),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_mod_inv),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_mod_exp),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_one_by_one),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_capability),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_dsa),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+                               test_dh_keygenration),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_rsa_enc_dec),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+                               test_rsa_sign_verify),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+                               test_rsa_enc_dec_crt),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+                               test_rsa_sign_verify_crt),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_mod_inv),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_mod_exp),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_one_by_one),
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -2308,7 +2312,7 @@ static struct unit_test_suite cryptodev_qat_asym_testsuite  = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_one_by_one),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_one_by_one),
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
@@ -2318,13 +2322,16 @@ static struct unit_test_suite cryptodev_octeontx_asym_testsuite  = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown, test_capability),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_rsa_enc_dec_crt),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_rsa_sign_verify_crt),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_mod_exp),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_capability),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+                               test_rsa_enc_dec_crt),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+                               test_rsa_sign_verify_crt),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym, test_mod_exp),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
                             test_ecdsa_sign_verify_all_curve),
                             test_ecdsa_sign_verify_all_curve),
-               TEST_CASE_ST(ut_setup, ut_teardown, test_ecpm_all_curve),
+               TEST_CASE_ST(ut_setup_asym, ut_teardown_asym,
+                               test_ecpm_all_curve),
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
 };
index d18220a..fb90130 100644 (file)
@@ -424,7 +424,7 @@ testsuite_teardown(void)
 }
 
 static int
 }
 
 static int
-ut_setup(void)
+ut_setup_ipsec(void)
 {
        struct ipsec_testsuite_params *ts_params = &testsuite_params;
        struct ipsec_unitest_params *ut_params = &unittest_params;
 {
        struct ipsec_testsuite_params *ts_params = &testsuite_params;
        struct ipsec_unitest_params *ut_params = &unittest_params;
@@ -444,7 +444,7 @@ ut_setup(void)
 }
 
 static void
 }
 
 static void
-ut_teardown(void)
+ut_teardown_ipsec(void)
 {
        struct ipsec_testsuite_params *ts_params = &testsuite_params;
        struct ipsec_unitest_params *ut_params = &unittest_params;
 {
        struct ipsec_testsuite_params *ts_params = &testsuite_params;
        struct ipsec_unitest_params *ut_params = &unittest_params;
@@ -2499,33 +2499,33 @@ static struct unit_test_suite ipsec_testsuite  = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
        .setup = testsuite_setup,
        .teardown = testsuite_teardown,
        .unit_test_cases = {
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_inb_burst_null_null_wrapper),
                        test_ipsec_crypto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_outb_burst_null_null_wrapper),
                        test_ipsec_crypto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_crypto_inb_burst_null_null_wrapper),
                        test_ipsec_inline_crypto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_crypto_outb_burst_null_null_wrapper),
                        test_ipsec_inline_crypto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_proto_inb_burst_null_null_wrapper),
                        test_ipsec_inline_proto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_inline_proto_outb_burst_null_null_wrapper),
                        test_ipsec_inline_proto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_lksd_proto_inb_burst_null_null_wrapper),
                        test_ipsec_lksd_proto_inb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_lksd_proto_outb_burst_null_null_wrapper),
                        test_ipsec_lksd_proto_outb_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_inside_null_null_wrapper),
                        test_ipsec_replay_inb_inside_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_outside_null_null_wrapper),
                        test_ipsec_replay_inb_outside_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_repeat_null_null_wrapper),
                        test_ipsec_replay_inb_repeat_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_replay_inb_inside_burst_null_null_wrapper),
                        test_ipsec_replay_inb_inside_burst_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_inb_burst_2sa_null_null_wrapper),
                        test_ipsec_crypto_inb_burst_2sa_null_null_wrapper),
-               TEST_CASE_ST(ut_setup, ut_teardown,
+               TEST_CASE_ST(ut_setup_ipsec, ut_teardown_ipsec,
                        test_ipsec_crypto_inb_burst_2sa_4grp_null_null_wrapper),
                TEST_CASES_END() /**< NULL terminate unit test array */
        }
                        test_ipsec_crypto_inb_burst_2sa_4grp_null_null_wrapper),
                TEST_CASES_END() /**< NULL terminate unit test array */
        }