Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/106718/?format=api
{ "id": 106718, "url": "http://patches.dpdk.org/api/patches/106718/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220129175514.746925-5-blo@iol.unh.edu/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20220129175514.746925-5-blo@iol.unh.edu>", "list_archive_url": "https://inbox.dpdk.org/dev/20220129175514.746925-5-blo@iol.unh.edu", "date": "2022-01-29T17:55:13", "name": "[v3,4/5] examples/fips_validation: allow json file as input", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "0c5b915843f97b4bd31d3b43733d23fccf311bc5", "submitter": { "id": 1678, "url": "http://patches.dpdk.org/api/people/1678/?format=api", "name": "Brandon Lo", "email": "blo@iol.unh.edu" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220129175514.746925-5-blo@iol.unh.edu/mbox/", "series": [ { "id": 21426, "url": "http://patches.dpdk.org/api/series/21426/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=21426", "date": "2022-01-29T17:55:09", "name": "Add JSON vector set support to fips validation", "version": 3, "mbox": "http://patches.dpdk.org/series/21426/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/106718/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/106718/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id ABF59A00C4;\n\tSat, 29 Jan 2022 18:55:37 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8273B41145;\n\tSat, 29 Jan 2022 18:55:24 +0100 (CET)", "from mail-qv1-f67.google.com (mail-qv1-f67.google.com\n [209.85.219.67]) by mails.dpdk.org (Postfix) with ESMTP id ACFF840041\n for <dev@dpdk.org>; Sat, 29 Jan 2022 18:55:21 +0100 (CET)", "by mail-qv1-f67.google.com with SMTP id e17so148223qvb.8\n for <dev@dpdk.org>; Sat, 29 Jan 2022 09:55:21 -0800 (PST)", "from blo.hsd1.nh.comcast.net\n ([2601:187:807e:37c0:8f3:b5b9:6ccc:8a5c])\n by smtp.gmail.com with ESMTPSA id 195sm5423654qkf.30.2022.01.29.09.55.20\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Sat, 29 Jan 2022 09:55:20 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu;\n s=unh-iol;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=/cGbARic2yPKQ0Z0nZpv6ptmu+VAFlWNxutVJ9T/JZo=;\n b=ABB5Cf7DAB4eYHrGOI2kz0WtqxRckGFIAYS3mky860dmbczXp+WOoHq08i40QT7r6f\n 5L5Y0xOVF74dJSPw6c/2x9qpk1M9Xa+KNZXpdRCgEaffjmWLJUERnli/07e3cvZD0rbM\n of9QKEfXpYSzlW/TG6x0RqY6J298gn6bhSmgo=", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20210112;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=/cGbARic2yPKQ0Z0nZpv6ptmu+VAFlWNxutVJ9T/JZo=;\n b=PLQQEpH0YD7Ycnu2pb99SFiFST9YCKFfaaHAz06e3Ghcf08o9QqqcdwHOaJgrZPKxY\n tzwyJOL5lwC5oYLglTYc5DTM9sTGV62qD3AVzZx9a2IFepm8n2Efocp9PNtYnxYaELkK\n oky27lf8VKPRDEoq2m5jwZiFLa15CXNVZzs7y8xtsvA3LFHCaMAgwd2aT5hk/tUK75sV\n ExdmF5JGTU82pTkoLC1j7950V8hstD08USzAUvKSD5XfqCnmtyiAshKomDeyo7DSeqZP\n eTX2GguQBK5T9Q7INM+kCaPuNvYUqTlEkApRGSzDvHANh/4A9pr/1qW70L9MAMMAIrOs\n OsTQ==", "X-Gm-Message-State": "AOAM530ly1m1eoVaMQPpwmHr6KVncxBQfK8c78TBsfGQXvQmPqKaCXLe\n TIe4ZVgInGrGU82zJaTg56G+tg==", "X-Google-Smtp-Source": "\n ABdhPJzoLlF1RnMHFOHxvN80geDh1oMbcnlUOF/dCbmbHwlJtFzQRLB/kxOWSXSygFTeDjWQIZCP0A==", "X-Received": "by 2002:ad4:5ccd:: with SMTP id\n iu13mr11168864qvb.89.1643478921056;\n Sat, 29 Jan 2022 09:55:21 -0800 (PST)", "From": "Brandon Lo <blo@iol.unh.edu>", "To": "roy.fan.zhang@intel.com,\n\tciara.power@intel.com", "Cc": "dev@dpdk.org,\n\tBrandon Lo <blo@iol.unh.edu>", "Subject": "[PATCH v3 4/5] examples/fips_validation: allow json file as input", "Date": "Sat, 29 Jan 2022 12:55:13 -0500", "Message-Id": "<20220129175514.746925-5-blo@iol.unh.edu>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220129175514.746925-1-blo@iol.unh.edu>", "References": "<20220129170313.489986-1-blo@iol.unh.edu>\n <20220129175514.746925-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>,\n <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>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Added the ability to use the json format as the input\nand output of the example application.\n\nSigned-off-by: Brandon Lo <blo@iol.unh.edu>\n---\nv3:\n* fix checkpatch warnings\n\nv2:\n* remove use_json variable\n\n examples/fips_validation/main.c | 195 +++++++++++++++++++++++++++++++-\n 1 file changed, 192 insertions(+), 3 deletions(-)", "diff": "diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c\nindex dc40bffe7d..6a6794fab1 100644\n--- a/examples/fips_validation/main.c\n+++ b/examples/fips_validation/main.c\n@@ -39,6 +39,10 @@ enum {\n struct fips_test_vector vec;\n struct fips_test_interim_info info;\n \n+#ifdef RTE_HAS_JANSSON\n+struct fips_test_json_info json_info;\n+#endif /* RTE_HAS_JANSSON */\n+\n struct cryptodev_fips_validate_env {\n \tconst char *req_path;\n \tconst char *rsp_path;\n@@ -169,6 +173,11 @@ cryptodev_fips_validate_app_uninit(void)\n static int\n fips_test_one_file(void);\n \n+#ifdef RTE_HAS_JANSSON\n+static int\n+fips_test_one_json_file(void);\n+#endif /* RTE_HAS_JANSSON */\n+\n static int\n parse_cryptodev_arg(char *arg)\n {\n@@ -428,8 +437,17 @@ main(int argc, char *argv[])\n \t\t\tgoto exit;\n \t\t}\n \n-\n+#ifdef RTE_HAS_JANSSON\n+\t\tif (info.file_type == FIPS_TYPE_JSON) {\n+\t\t\tret = fips_test_one_json_file();\n+\t\t\tjson_decref(json_info.json_root);\n+\t\t} else {\n+\t\t\tret = fips_test_one_file();\n+\t\t}\n+#else /* RTE_HAS_JANSSON */\n \t\tret = fips_test_one_file();\n+#endif /* RTE_HAS_JANSSON */\n+\n \t\tif (ret < 0) {\n \t\t\tRTE_LOG(ERR, USER1, \"Error %i: Failed test %s\\n\",\n \t\t\t\t\tret, env.req_path);\n@@ -484,7 +502,17 @@ main(int argc, char *argv[])\n \t\t\t\tbreak;\n \t\t\t}\n \n+#ifdef RTE_HAS_JANSSON\n+\t\t\tif (info.file_type == FIPS_TYPE_JSON) {\n+\t\t\t\tret = fips_test_one_json_file();\n+\t\t\t\tjson_decref(json_info.json_root);\n+\t\t\t} else {\n+\t\t\t\tret = fips_test_one_file();\n+\t\t\t}\n+#else /* RTE_HAS_JANSSON */\n \t\t\tret = fips_test_one_file();\n+#endif /* RTE_HAS_JANSSON */\n+\n \t\t\tif (ret < 0) {\n \t\t\t\tRTE_LOG(ERR, USER1, \"Error %i: Failed test %s\\n\",\n \t\t\t\t\t\tret, req_path);\n@@ -1226,7 +1254,8 @@ fips_generic_test(void)\n \tstruct fips_val val = {NULL, 0};\n \tint ret;\n \n-\tfips_test_write_one_case();\n+\tif (info.file_type != FIPS_TYPE_JSON)\n+\t\tfips_test_write_one_case();\n \n \tret = fips_run_test();\n \tif (ret < 0) {\n@@ -1245,6 +1274,7 @@ fips_generic_test(void)\n \tswitch (info.file_type) {\n \tcase FIPS_TYPE_REQ:\n \tcase FIPS_TYPE_RSP:\n+\tcase FIPS_TYPE_JSON:\n \t\tif (info.parse_writeback == NULL)\n \t\t\treturn -EPERM;\n \t\tret = info.parse_writeback(&val);\n@@ -1260,7 +1290,8 @@ fips_generic_test(void)\n \t\tbreak;\n \t}\n \n-\tfprintf(info.fp_wr, \"\\n\");\n+\tif (info.file_type != FIPS_TYPE_JSON)\n+\t\tfprintf(info.fp_wr, \"\\n\");\n \tfree(val.val);\n \n \treturn 0;\n@@ -1856,3 +1887,161 @@ fips_test_one_file(void)\n \n \treturn ret;\n }\n+\n+#ifdef RTE_HAS_JANSSON\n+static int\n+fips_test_json_init_writeback(void)\n+{\n+\tjson_t *session_info, *session_write;\n+\tsession_info = json_array_get(json_info.json_root, 0);\n+\tsession_write = json_object();\n+\tjson_info.json_write_root = json_array();\n+\n+\tjson_object_set(session_write, \"jwt\",\n+\t\tjson_object_get(session_info, \"jwt\"));\n+\tjson_object_set(session_write, \"url\",\n+\t\tjson_object_get(session_info, \"url\"));\n+\tjson_object_set(session_write, \"isSample\",\n+\t\tjson_object_get(session_info, \"isSample\"));\n+\n+\tjson_info.is_sample = json_boolean_value(\n+\t\tjson_object_get(session_info, \"isSample\"));\n+\n+\tjson_array_append_new(json_info.json_write_root, session_write);\n+\treturn 0;\n+}\n+\n+static int\n+fips_test_one_test_case(void)\n+{\n+\tint ret;\n+\n+\tret = fips_test_parse_one_json_case();\n+\n+\tswitch (ret) {\n+\tcase 0:\n+\t\tret = test_ops.test();\n+\t\tif (ret == 0)\n+\t\t\tbreak;\n+\t\tRTE_LOG(ERR, USER1, \"Error %i: test block\\n\",\n+\t\t\t\tret);\n+\t\tbreak;\n+\tcase 1:\n+\t\tbreak;\n+\tdefault:\n+\t\tRTE_LOG(ERR, USER1, \"Error %i: Parse block\\n\",\n+\t\t\t\tret);\n+\t}\n+\treturn 0;\n+}\n+\n+static int\n+fips_test_one_test_group(void)\n+{\n+\tint ret;\n+\tjson_t *tests, *write_tests;\n+\tsize_t test_idx, tests_size;\n+\n+\twrite_tests = json_array();\n+\tjson_info.json_write_group = json_object();\n+\tjson_object_set(json_info.json_write_group, \"tgId\",\n+\t\tjson_object_get(json_info.json_test_group, \"tgId\"));\n+\tjson_object_set_new(json_info.json_write_group, \"tests\", write_tests);\n+\n+\tswitch (info.algo) {\n+\tcase FIPS_TEST_ALGO_AES_GCM:\n+\t\tret = parse_test_gcm_init();\n+\t\tbreak;\n+\tdefault:\n+\t\treturn -EINVAL;\n+\t}\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = fips_test_parse_one_json_group();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\tret = init_test_ops();\n+\tif (ret < 0)\n+\t\treturn ret;\n+\n+\ttests = json_object_get(json_info.json_test_group, \"tests\");\n+\ttests_size = json_array_size(tests);\n+\tfor (test_idx = 0; test_idx < tests_size; test_idx++) {\n+\t\tjson_info.json_test_case = json_array_get(tests, test_idx);\n+\t\tfips_test_one_test_case();\n+\t\tjson_array_append_new(write_tests, json_info.json_write_case);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+fips_test_one_vector_set(void)\n+{\n+\tint ret;\n+\tjson_t *test_groups, *write_groups, *write_version, *write_set;\n+\tsize_t group_idx, num_groups;\n+\n+\ttest_groups = json_object_get(json_info.json_vector_set, \"testGroups\");\n+\tnum_groups = json_array_size(test_groups);\n+\n+\tjson_info.json_write_set = json_array();\n+\twrite_version = json_object();\n+\tjson_object_set_new(write_version, \"acvVersion\", json_string(ACVVERSION));\n+\tjson_array_append_new(json_info.json_write_set, write_version);\n+\n+\twrite_set = json_object();\n+\tjson_array_append_new(json_info.json_write_set, write_set);\n+\twrite_groups = json_array();\n+\n+\tjson_object_set(write_set, \"vsId\",\n+\t\tjson_object_get(json_info.json_vector_set, \"vsId\"));\n+\tjson_object_set(write_set, \"algorithm\",\n+\t\tjson_object_get(json_info.json_vector_set, \"algorithm\"));\n+\tjson_object_set(write_set, \"revision\",\n+\t\tjson_object_get(json_info.json_vector_set, \"revision\"));\n+\tjson_object_set_new(write_set, \"isSample\",\n+\t\tjson_boolean(json_info.is_sample));\n+\tjson_object_set_new(write_set, \"testGroups\", write_groups);\n+\n+\tret = fips_test_parse_one_json_vector_set();\n+\tif (ret < 0) {\n+\t\tRTE_LOG(ERR, USER1, \"Error: Unsupported or invalid vector set algorithm: %s\\n\",\n+\t\t\tjson_string_value(json_object_get(json_info.json_vector_set, \"algorithm\")));\n+\t\treturn ret;\n+\t}\n+\n+\tfor (group_idx = 0; group_idx < num_groups; group_idx++) {\n+\t\tjson_info.json_test_group = json_array_get(test_groups, group_idx);\n+\t\tret = fips_test_one_test_group();\n+\t\tjson_array_append_new(write_groups, json_info.json_write_group);\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+fips_test_one_json_file(void)\n+{\n+\tsize_t vector_set_idx, root_size;\n+\n+\troot_size = json_array_size(json_info.json_root);\n+\tfips_test_json_init_writeback();\n+\n+\tfor (vector_set_idx = 1; vector_set_idx < root_size; vector_set_idx++) {\n+\t\t/* Vector set index starts at 1, the 0th index contains test session\n+\t\t * information.\n+\t\t */\n+\t\tjson_info.json_vector_set = json_array_get(json_info.json_root, vector_set_idx);\n+\t\tfips_test_one_vector_set();\n+\t\tjson_array_append_new(json_info.json_write_root, json_info.json_write_set);\n+\t}\n+\n+\tjson_dumpf(json_info.json_write_root, info.fp_wr, JSON_INDENT(4));\n+\tjson_decref(json_info.json_write_root);\n+\n+\treturn 0;\n+}\n+#endif /* RTE_HAS_JANSSON */\n", "prefixes": [ "v3", "4/5" ] }