From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 24AFCA00C4;
Sat, 29 Jan 2022 18:03:41 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id F1824410FB;
Sat, 29 Jan 2022 18:03:22 +0100 (CET)
Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com
[209.85.222.194])
by mails.dpdk.org (Postfix) with ESMTP id 84E9C410E3
for <dev@dpdk.org>; Sat, 29 Jan 2022 18:03:20 +0100 (CET)
Received: by mail-qk1-f194.google.com with SMTP id w8so8318319qkw.8
for <dev@dpdk.org>; Sat, 29 Jan 2022 09:03:20 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol;
h=from:to:cc:subject:date:message-id:in-reply-to:references
:mime-version:content-transfer-encoding;
bh=miDU6fttI/TUAG4yupVdJGmJmq9eD8wG45sMpfV2ur4=;
b=OflZrFj0lpsmADhcr1mdc861aWJdw/OBHCllpvapfRdHYh8QLd+WsBHQd/niOagvFE
Egr/sHLYfZ1hg+zJiAcFbEIekshO4LONeUZYAivWXYQy6rXUt5ggE2JNKqZgWmgctaEz
A+dvBpj9FV1C2RzAkArxIPIPAuJv8wuUYsuz4=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=miDU6fttI/TUAG4yupVdJGmJmq9eD8wG45sMpfV2ur4=;
b=yxIv8SKjfYDkp5G3PpY5iuMqt3zKjDEbn5xinYa5cEHspbJQLlnt4h+gFQX7y4e8ZX
pUymTaNFY0YeHeu/uYhmIOF9OCRqKhqHIg/rDVQIisULQSoO7X6C6uHJekKMZ4qUsC2W
t/IMWoZSMPfwfWDz8Aj8Qi8XbGpWOyiP0qPKa/DQ6C6ADr/F+J/zRUopJvYx9C8Uuh83
SOryxwGUDCl5I0uMWhUkRA/Ws68yVEquUR4QXjDslukdw74FwwVQEUUr0epfN/6ra09U
8zUB5Snvk9+PoZgSOSs6Wc5s7juu23a+ae4cAyEMg7pn+Ira81EXLxVewD+nRz1Ay2Un
vZbg==
X-Gm-Message-State: AOAM531wL2ncHhccDbhDGkFaxkpCFdaV9A2gnz4jwU6VL+Uk83MbdBpJ
1vW37YExpSvLYAz+H0KtrkvAOQ==
X-Google-Smtp-Source: ABdhPJzNt+8VVeic2Za8BkhsvHDBlNI9hEY+C1cBwYMSfHKJMjkEdJP0MmqskUZAu9gOHWbXndT72Q==
X-Received: by 2002:ae9:e850:: with SMTP id a77mr9042318qkg.239.1643475799963;
Sat, 29 Jan 2022 09:03:19 -0800 (PST)
Received: from blo.hsd1.nh.comcast.net
([2601:187:807e:37c0:8f3:b5b9:6ccc:8a5c])
by smtp.gmail.com with ESMTPSA id f9sm5411879qkp.94.2022.01.29.09.03.18
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Sat, 29 Jan 2022 09:03:19 -0800 (PST)
From: Brandon Lo <blo@iol.unh.edu>
To: roy.fan.zhang@intel.com,
ciara.power@intel.com
Cc: dev@dpdk.org,
Brandon Lo <blo@iol.unh.edu>
Subject: [PATCH v2 4/5] examples/fips_validation: allow json file as input
Date: Sat, 29 Jan 2022 12:03:12 -0500
Message-Id: <20220129170313.489986-5-blo@iol.unh.edu>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20220129170313.489986-1-blo@iol.unh.edu>
References: <20220127145142.86742-1-blo@iol.unh.edu>
<20220129170313.489986-1-blo@iol.unh.edu>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Added the ability to use the json format as the input
and output of the example application.
Signed-off-by: Brandon Lo <blo@iol.unh.edu>
---
v2:
* remove use_json variable
examples/fips_validation/main.c | 190 +++++++++++++++++++++++++++++++-
1 file changed, 187 insertions(+), 3 deletions(-)
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index dc40bffe7d..2f82c7a541 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -39,6 +39,10 @@ enum {
struct fips_test_vector vec;
struct fips_test_interim_info info;
+#ifdef RTE_HAS_JANSSON
+struct fips_test_json_info json_info;
+#endif /* RTE_HAS_JANSSON */
+
struct cryptodev_fips_validate_env {
const char *req_path;
const char *rsp_path;
@@ -169,6 +173,11 @@ cryptodev_fips_validate_app_uninit(void)
static int
fips_test_one_file(void);
+#ifdef RTE_HAS_JANSSON
+static int
+fips_test_one_json_file(void);
+#endif /* RTE_HAS_JANSSON */
+
static int
parse_cryptodev_arg(char *arg)
{
@@ -428,8 +437,17 @@ main(int argc, char *argv[])
goto exit;
}
-
+#ifdef RTE_HAS_JANSSON
+ if (info.file_type == FIPS_TYPE_JSON) {
+ ret = fips_test_one_json_file();
+ json_decref(json_info.json_root);
+ } else {
+ ret = fips_test_one_file();
+ }
+#else /* RTE_HAS_JANSSON */
ret = fips_test_one_file();
+#endif /* RTE_HAS_JANSSON */
+
if (ret < 0) {
RTE_LOG(ERR, USER1, "Error %i: Failed test %s\n",
ret, env.req_path);
@@ -484,7 +502,17 @@ main(int argc, char *argv[])
break;
}
+#ifdef RTE_HAS_JANSSON
+ if (info.file_type == FIPS_TYPE_JSON) {
+ ret = fips_test_one_json_file();
+ json_decref(json_info.json_root);
+ } else {
+ ret = fips_test_one_file();
+ }
+#else /* RTE_HAS_JANSSON */
ret = fips_test_one_file();
+#endif /* RTE_HAS_JANSSON */
+
if (ret < 0) {
RTE_LOG(ERR, USER1, "Error %i: Failed test %s\n",
ret, req_path);
@@ -1226,7 +1254,7 @@ fips_generic_test(void)
struct fips_val val = {NULL, 0};
int ret;
- fips_test_write_one_case();
+ if (info.file_type != FIPS_TYPE_JSON) fips_test_write_one_case();
ret = fips_run_test();
if (ret < 0) {
@@ -1245,6 +1273,7 @@ fips_generic_test(void)
switch (info.file_type) {
case FIPS_TYPE_REQ:
case FIPS_TYPE_RSP:
+ case FIPS_TYPE_JSON:
if (info.parse_writeback == NULL)
return -EPERM;
ret = info.parse_writeback(&val);
@@ -1260,7 +1289,7 @@ fips_generic_test(void)
break;
}
- fprintf(info.fp_wr, "\n");
+ if (info.file_type != FIPS_TYPE_JSON) fprintf(info.fp_wr, "\n");
free(val.val);
return 0;
@@ -1856,3 +1885,158 @@ fips_test_one_file(void)
return ret;
}
+
+#ifdef RTE_HAS_JANSSON
+static int
+fips_test_json_init_writeback(void)
+{
+ json_t *session_info, *session_write;
+ session_info = json_array_get(json_info.json_root, 0);
+ session_write = json_object();
+ json_info.json_write_root = json_array();
+
+ json_object_set(session_write, "jwt",
+ json_object_get(session_info, "jwt"));
+ json_object_set(session_write, "url",
+ json_object_get(session_info, "url"));
+ json_object_set(session_write, "isSample",
+ json_object_get(session_info, "isSample"));
+
+ json_info.is_sample = json_boolean_value(
+ json_object_get(session_info, "isSample"));
+
+ json_array_append_new(json_info.json_write_root, session_write);
+ return 0;
+}
+
+static int
+fips_test_one_test_case(void)
+{
+ int ret;
+
+ ret = fips_test_parse_one_json_case();
+
+ switch (ret) {
+ case 0:
+ ret = test_ops.test();
+ if (ret == 0)
+ break;
+ RTE_LOG(ERR, USER1, "Error %i: test block\n",
+ ret);
+ break;
+ case 1:
+ break;
+ default:
+ RTE_LOG(ERR, USER1, "Error %i: Parse block\n",
+ ret);
+ }
+ return 0;
+}
+
+static int
+fips_test_one_test_group(void)
+{
+ int ret;
+ json_t *tests, *write_tests;
+ size_t test_idx, tests_size;
+
+ write_tests = json_array();
+ json_info.json_write_group = json_object();
+ json_object_set(json_info.json_write_group, "tgId",
+ json_object_get(json_info.json_test_group, "tgId"));
+ json_object_set_new(json_info.json_write_group, "tests", write_tests);
+
+ switch (info.algo) {
+ case FIPS_TEST_ALGO_AES_GCM:
+ ret = parse_test_gcm_init();
+ break;
+ default:
+ return -EINVAL;
+ }
+ if (ret < 0) return ret;
+
+ ret = fips_test_parse_one_json_group();
+ if (ret < 0) return ret;
+
+ ret = init_test_ops();
+ if (ret < 0) return ret;
+
+ tests = json_object_get(json_info.json_test_group, "tests");
+ tests_size = json_array_size(tests);
+ for (test_idx = 0; test_idx < tests_size; test_idx++) {
+ json_info.json_test_case = json_array_get(tests, test_idx);
+ fips_test_one_test_case();
+ json_array_append_new(write_tests, json_info.json_write_case);
+ }
+
+ return 0;
+}
+
+static int
+fips_test_one_vector_set(void)
+{
+ int ret;
+ json_t *test_groups, *write_groups, *write_version, *write_set;
+ size_t group_idx, num_groups;
+
+ test_groups = json_object_get(json_info.json_vector_set, "testGroups");
+ num_groups = json_array_size(test_groups);
+
+ json_info.json_write_set = json_array();
+ write_version = json_object();
+ json_object_set_new(write_version, "acvVersion", json_string(ACVVERSION));
+ json_array_append_new(json_info.json_write_set, write_version);
+
+ write_set = json_object();
+ json_array_append_new(json_info.json_write_set, write_set);
+ write_groups = json_array();
+
+ json_object_set(write_set, "vsId",
+ json_object_get(json_info.json_vector_set, "vsId"));
+ json_object_set(write_set, "algorithm",
+ json_object_get(json_info.json_vector_set, "algorithm"));
+ json_object_set(write_set, "revision",
+ json_object_get(json_info.json_vector_set, "revision"));
+ json_object_set_new(write_set, "isSample",
+ json_boolean(json_info.is_sample));
+ json_object_set_new(write_set, "testGroups", write_groups);
+
+ ret = fips_test_parse_one_json_vector_set();
+ if (ret < 0) {
+ RTE_LOG(ERR, USER1, "Error: Unsupported or invalid vector set algorithm: %s\n",
+ json_string_value(json_object_get(json_info.json_vector_set, "algorithm")));
+ return ret;
+ }
+
+ for (group_idx = 0; group_idx < num_groups; group_idx++) {
+ json_info.json_test_group = json_array_get(test_groups, group_idx);
+ ret = fips_test_one_test_group();
+ json_array_append_new(write_groups, json_info.json_write_group);
+ }
+
+ return 0;
+}
+
+static int
+fips_test_one_json_file(void)
+{
+ size_t vector_set_idx, root_size;
+
+ root_size = json_array_size(json_info.json_root);
+ fips_test_json_init_writeback();
+
+ for (vector_set_idx = 1; vector_set_idx < root_size; vector_set_idx++) {
+ /* Vector set index starts at 1, the 0th index contains test session
+ * information.
+ */
+ json_info.json_vector_set = json_array_get(json_info.json_root, vector_set_idx);
+ fips_test_one_vector_set();
+ json_array_append_new(json_info.json_write_root, json_info.json_write_set);
+ }
+
+ json_dumpf(json_info.json_write_root, info.fp_wr, JSON_INDENT(4));
+ json_decref(json_info.json_write_root);
+
+ return 0;
+}
+#endif /* RTE_HAS_JANSSON */
--
2.25.1