net/sfc: rename array of SW stats descriptions

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

diff --git a/app/test/test_cryptodev_blockcipher.c b/app/test/test_cryptodev_blockcipher.c
index d342c7b..3cdb2c9 100644 (file)
--- a/app/test/test_cryptodev_blockcipher.c
+++ b/app/test/test_cryptodev_blockcipher.c
@@ -11,7 +11,6 @@
 
 #include <rte_crypto.h>
 #include <rte_cryptodev.h>
-#include <rte_cryptodev_pmd.h>
 
 #include "test.h"
 #include "test_cryptodev.h"
@@ -36,7 +35,8 @@ verify_algo_support(const struct blockcipher_test_case *t,
                if (capability == NULL)
                        return -1;
 
-               if (cap_idx.algo.cipher != RTE_CRYPTO_CIPHER_NULL)
+               if (cap_idx.algo.cipher != RTE_CRYPTO_CIPHER_NULL &&
+                               !(t->test_data->wrapped_key))
                        ret = rte_cryptodev_sym_capability_check_cipher(capability,
                                                        tdata->cipher_key.len,
                                                        tdata->iv.len);
@@ -145,6 +145,12 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,
 
                nb_segs = 3;
        }
+       if (!!(feat_flags & RTE_CRYPTODEV_FF_CIPHER_WRAPPED_KEY) ^
+               tdata->wrapped_key) {
+               snprintf(test_msg, BLOCKCIPHER_TEST_MSG_LEN,
+                       "SKIPPED");
+               return TEST_SKIPPED;
+       }
 
        if (global_api_test_type == CRYPTODEV_RAW_API_TEST &&
                !(feat_flags & RTE_CRYPTODEV_FF_SYM_RAW_DP)) {
@@ -450,6 +456,7 @@ iterate:
                cipher_xform->cipher.key.data = cipher_key;
                cipher_xform->cipher.key.length = tdata->cipher_key.len;
                cipher_xform->cipher.iv.offset = IV_OFFSET;
+               cipher_xform->cipher.dataunit_len = tdata->xts_dataunit_len;
 
                if (tdata->crypto_algo == RTE_CRYPTO_CIPHER_NULL)
                        cipher_xform->cipher.iv.length = 0;
@@ -1176,7 +1183,7 @@ build_blockcipher_test_suite(enum blockcipher_test_type test_type)
                ts_setup = authonly_setup;
                break;
        default:
-               break;
+               return NULL;
        }
 
        ts = calloc(1, sizeof(struct unit_test_suite) +