Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 106611,
    "url": "http://patches.dpdk.org/api/patches/106611/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20220127145142.86742-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": "<20220127145142.86742-5-blo@iol.unh.edu>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20220127145142.86742-5-blo@iol.unh.edu",
    "date": "2022-01-27T14:51:41",
    "name": "[4/5] examples/fips_validation: allow json file as input",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "8e6804cceea5d765183919c94391b8eb5fc03f17",
    "submitter": {
        "id": 1678,
        "url": "http://patches.dpdk.org/api/people/1678/?format=api",
        "name": "Brandon Lo",
        "email": "blo@iol.unh.edu"
    },
    "delegate": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20220127145142.86742-5-blo@iol.unh.edu/mbox/",
    "series": [
        {
            "id": 21400,
            "url": "http://patches.dpdk.org/api/series/21400/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=21400",
            "date": "2022-01-27T14:51:37",
            "name": "Add JSON vector set support to fips validation",
            "version": 1,
            "mbox": "http://patches.dpdk.org/series/21400/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/106611/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/106611/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 E154DA04A6;\n\tThu, 27 Jan 2022 15:52:16 +0100 (CET)",
            "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id EB84942824;\n\tThu, 27 Jan 2022 15:51:52 +0100 (CET)",
            "from mail-qt1-f176.google.com (mail-qt1-f176.google.com\n [209.85.160.176])\n by mails.dpdk.org (Postfix) with ESMTP id 09C4D42807\n for <dev@dpdk.org>; Thu, 27 Jan 2022 15:51:50 +0100 (CET)",
            "by mail-qt1-f176.google.com with SMTP id g12so2610219qto.13\n for <dev@dpdk.org>; Thu, 27 Jan 2022 06:51:49 -0800 (PST)",
            "from blo.iol.unh.edu ([2606:4100:3880:1270:8f3:b5b9:6ccc:8a5c])\n by smtp.gmail.com with ESMTPSA id 195sm1507324qkf.30.2022.01.27.06.51.48\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Thu, 27 Jan 2022 06:51:48 -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=5dPqdn2ivva1M8IJ8Ne8TykR021/m3X5V6a50Esek/s=;\n b=O7R5yLYT2I4f/o2e1AGqyASHSRWGuRkJLmHbuKcOJ9W0VFeCyjkWGRAcaPQ1vAOUWC\n BP0jZM8aiYuuty2jdLxWCf99spjgCZP1OIFPF0XcOBeBOZ9QzRCIUlfQ4USbxPOBcyJw\n w0yb5cI9Pti6onGODvm+/XoRSO9V7eTIhQFpI=",
        "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=5dPqdn2ivva1M8IJ8Ne8TykR021/m3X5V6a50Esek/s=;\n b=1lkHgg4jf2rPODbiOg7vyrRYy34NvnoOK32aBq+zJHDon61FiU3QohxSbfukISlPNw\n EbtUTgVUi/TPAc1qzLhanNxLgQpA9jSpV9oc4sDvcGSxqrGEJ7w157rwQ7vdg/gd2McI\n 5Cd+AtqM76nFKXVX3cUzo1zfIf2Cae+l6qn23ZsDqP2JyAQmLXS7w1SqjPKFeEV3KIot\n 9rA+Npix3NxcCENbueWrNm+FZRx6BYrjAqC7A1stvnAJtrnOUR1Eb3HTLK73MUbMXAhI\n BKVipvx1OEsFnmXpH6j9wN/yx6I1d/czObRQ20iIr4vZUd/T3GDdVjIlmhY6OSx76cA+\n mAaA==",
        "X-Gm-Message-State": "AOAM530t7ge08rTxdqA97pBCnQIXk1PVIwcUS0Pzf4qwoHlQFJgZK/Aw\n 3eleZiItNom3djjB2msmM8WiPUtm+/vyCuBPM28P6keV2c4ObpWUGOXVZ63jFoMxskKVuRG3pQ1\n 7MF/D0MTh4J5+3lOho53Fz4j5EUaMctAHeZO7ZTt0J9XvnAxiBVY=",
        "X-Google-Smtp-Source": "\n ABdhPJwen9++2lWJp3m3m+dOtJVW97XJqL081q64TXcKYZMWkAuUx7LSOgsJqVALS2qDZvizd99JNg==",
        "X-Received": "by 2002:a05:622a:1788:: with SMTP id\n s8mr2947862qtk.344.1643295109144;\n Thu, 27 Jan 2022 06:51:49 -0800 (PST)",
        "From": "Brandon Lo <blo@iol.unh.edu>",
        "To": "dev@dpdk.org",
        "Cc": "ciara.power@intel.com, roy.fan.zhang@intel.com,\n Brandon Lo <blo@iol.unh.edu>",
        "Subject": "[PATCH 4/5] examples/fips_validation: allow json file as input",
        "Date": "Thu, 27 Jan 2022 09:51:41 -0500",
        "Message-Id": "<20220127145142.86742-5-blo@iol.unh.edu>",
        "X-Mailer": "git-send-email 2.25.1",
        "In-Reply-To": "<20220127145142.86742-1-blo@iol.unh.edu>",
        "References": "<20220127145142.86742-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---\n examples/fips_validation/main.c | 192 +++++++++++++++++++++++++++++++-\n 1 file changed, 189 insertions(+), 3 deletions(-)",
    "diff": "diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c\nindex dc40bffe7d..40d0d10ec7 100644\n--- a/examples/fips_validation/main.c\n+++ b/examples/fips_validation/main.c\n@@ -34,11 +34,17 @@ enum {\n \tOPT_CRYPTODEV_BK_ID_NUM,\n #define OPT_CRYPTODEV_BK_DIR_KEY    \"broken-test-dir\"\n \tOPT_CRYPTODEV_BK_DIR_KEY_NUM,\n+#define OPT_USE_JSON                \"use-json\"\n+\tOPT_USE_JSON_NUM,\n };\n \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 +175,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@@ -392,6 +403,7 @@ int\n main(int argc, char *argv[])\n {\n \tint ret;\n+\tchar use_json;\n \n \tret = rte_eal_init(argc, argv);\n \tif (ret < 0) {\n@@ -427,9 +439,16 @@ main(int argc, char *argv[])\n \t\t\t\t\tret, env.req_path);\n \t\t\tgoto exit;\n \t\t}\n+\t\tuse_json = info.file_type == FIPS_TYPE_JSON;\n \n-\n+#ifdef RTE_HAS_JANSSON\n+\t\tret = info.file_type == FIPS_TYPE_JSON ?\n+\t\t\tfips_test_one_json_file() : fips_test_one_file();\n+\t\tif (use_json) json_decref(json_info.json_root);\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@@ -483,8 +502,19 @@ main(int argc, char *argv[])\n \t\t\t\t\t\tret, req_path);\n \t\t\t\tbreak;\n \t\t\t}\n+\t\t\tuse_json = info.file_type == FIPS_TYPE_JSON;\n \n+#ifdef RTE_HAS_JANSSON\n+\t\t\tif (use_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 +1256,7 @@ 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) fips_test_write_one_case();\n \n \tret = fips_run_test();\n \tif (ret < 0) {\n@@ -1245,6 +1275,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 +1291,7 @@ fips_generic_test(void)\n \t\tbreak;\n \t}\n \n-\tfprintf(info.fp_wr, \"\\n\");\n+\tif (info.file_type != FIPS_TYPE_JSON) fprintf(info.fp_wr, \"\\n\");\n \tfree(val.val);\n \n \treturn 0;\n@@ -1856,3 +1887,158 @@ 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+\t\tcase FIPS_TEST_ALGO_AES_GCM:\n+\t\t\tret = parse_test_gcm_init();\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn -EINVAL;\n+\t}\n+\tif (ret < 0) return ret;\n+\n+\tret = fips_test_parse_one_json_group();\n+\tif (ret < 0) return ret;\n+\n+\tret = init_test_ops();\n+\tif (ret < 0) return 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": [
        "4/5"
    ]
}