security: update session create API

[dpdk.git] / app / test / test_ipsec.c

diff --git a/app/test/test_ipsec.c b/app/test/test_ipsec.c
index 7dc83fe..9ad07a1 100644 (file)
--- a/app/test/test_ipsec.c
+++ b/app/test/test_ipsec.c
@@ -237,7 +237,7 @@ fill_crypto_xform(struct ipsec_unitest_params *ut_params,
 }
 
 static int
-check_cryptodev_capablity(const struct ipsec_unitest_params *ut,
+check_cryptodev_capability(const struct ipsec_unitest_params *ut,
                uint8_t dev_id)
 {
        struct rte_cryptodev_sym_capability_idx cap_idx;
@@ -302,7 +302,7 @@ testsuite_setup(void)
 
        /* Find first valid crypto device */
        for (i = 0; i < nb_devs; i++) {
-               rc = check_cryptodev_capablity(ut_params, i);
+               rc = check_cryptodev_capability(ut_params, i);
                if (rc == 0) {
                        ts_params->valid_dev = i;
                        ts_params->valid_dev_found = 1;
@@ -632,7 +632,8 @@ create_dummy_sec_session(struct ipsec_unitest_params *ut,
        static struct rte_security_session_conf conf;
 
        ut->ss[j].security.ses = rte_security_session_create(&dummy_sec_ctx,
-                                       &conf, qp->mp_session_private);
+                                       &conf, qp->mp_session,
+                                       qp->mp_session_private);
 
        if (ut->ss[j].security.ses == NULL)
                return -ENOMEM;
@@ -1167,6 +1168,34 @@ test_ipsec_dump_buffers(struct ipsec_unitest_params *ut_params, int i)
        }
 }
 
+static void
+destroy_dummy_sec_session(struct ipsec_unitest_params *ut,
+       uint32_t j)
+{
+       rte_security_session_destroy(&dummy_sec_ctx,
+                                       ut->ss[j].security.ses);
+       ut->ss[j].security.ctx = NULL;
+}
+
+static void
+destroy_crypto_session(struct ipsec_unitest_params *ut,
+       uint8_t crypto_dev, uint32_t j)
+{
+       rte_cryptodev_sym_session_clear(crypto_dev, ut->ss[j].crypto.ses);
+       rte_cryptodev_sym_session_free(ut->ss[j].crypto.ses);
+       memset(&ut->ss[j], 0, sizeof(ut->ss[j]));
+}
+
+static void
+destroy_session(struct ipsec_unitest_params *ut,
+       uint8_t crypto_dev, uint32_t j)
+{
+       if (ut->ss[j].type == RTE_SECURITY_ACTION_TYPE_NONE)
+               return destroy_crypto_session(ut, crypto_dev, j);
+       else
+               return destroy_dummy_sec_session(ut, j);
+}
+
 static void
 destroy_sa(uint32_t j)
 {
@@ -1175,9 +1204,8 @@ destroy_sa(uint32_t j)
 
        rte_ipsec_sa_fini(ut->ss[j].sa);
        rte_free(ut->ss[j].sa);
-       rte_cryptodev_sym_session_clear(ts->valid_dev, ut->ss[j].crypto.ses);
-       rte_cryptodev_sym_session_free(ut->ss[j].crypto.ses);
-       memset(&ut->ss[j], 0, sizeof(ut->ss[j]));
+
+       destroy_session(ut, ts->valid_dev, j);
 }
 
 static int