Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/116944/?format=api
{ "id": 116944, "url": "http://patches.dpdk.org/api/patches/116944/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/90201b8b1bfe6b156838152c4544c76d123c60d0.1664263264.git.gmuthukrishn@marvell.com/", "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": "<90201b8b1bfe6b156838152c4544c76d123c60d0.1664263264.git.gmuthukrishn@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/90201b8b1bfe6b156838152c4544c76d123c60d0.1664263264.git.gmuthukrishn@marvell.com", "date": "2022-09-27T07:26:12", "name": "[v2,7/7] examples/fips_validation: randomize message for conformance test", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "37d36b944b47ee256f0ec0c6fef55f24d22a7827", "submitter": { "id": 2301, "url": "http://patches.dpdk.org/api/people/2301/?format=api", "name": "Gowrishankar Muthukrishnan", "email": "gmuthukrishn@marvell.com" }, "delegate": { "id": 6690, "url": "http://patches.dpdk.org/api/users/6690/?format=api", "username": "akhil", "first_name": "akhil", "last_name": "goyal", "email": "gakhil@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/90201b8b1bfe6b156838152c4544c76d123c60d0.1664263264.git.gmuthukrishn@marvell.com/mbox/", "series": [ { "id": 24851, "url": "http://patches.dpdk.org/api/series/24851/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=24851", "date": "2022-09-27T07:26:05", "name": "FIPS asymmetric validation", "version": 2, "mbox": "http://patches.dpdk.org/series/24851/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/116944/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/116944/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 EFE34A00C2;\n\tTue, 27 Sep 2022 09:27:10 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CA90542836;\n\tTue, 27 Sep 2022 09:26:40 +0200 (CEST)", "from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com\n [67.231.148.174])\n by mails.dpdk.org (Postfix) with ESMTP id BA62642B7B\n for <dev@dpdk.org>; Tue, 27 Sep 2022 09:26:38 +0200 (CEST)", "from pps.filterd (m0045849.ppops.net [127.0.0.1])\n by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id\n 28R491WY031941;\n Tue, 27 Sep 2022 00:26:37 -0700", "from dc5-exch02.marvell.com ([199.233.59.182])\n by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3jucsq36c8-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Tue, 27 Sep 2022 00:26:37 -0700", "from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18;\n Tue, 27 Sep 2022 00:26:36 -0700", "from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com\n (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend\n Transport; Tue, 27 Sep 2022 00:26:35 -0700", "from localhost.localdomain (unknown [10.28.34.38])\n by maili.marvell.com (Postfix) with ESMTP id C99D45E6863;\n Tue, 27 Sep 2022 00:26:33 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-transfer-encoding : content-type; s=pfpt0220;\n bh=Pr1YwH7I9dQXLQXwm9sUwXJxJRoOSSz7qK3yQD/c+/4=;\n b=ko29K+jLq2OpW55/LZhX5jHm4yPSaCgjPGWTVPP1inB0ivSxYNGsHIm3LvjFbXM/gUcP\n YhbXXfafdxxxPnnK58NzV4rsQUGd/vZ2cOGp2CdeoW3/03k6Y/Is7UwzrOuxNNSoD4II\n RWqa7jSA7UKJziMCKSve2ygJ81b8f/LqphzBt/88jA48EcljZs/pyLa+6Wv833IrSsU/\n bERN+TOVg2GSuiquKUaOQjRSTsemN09PrMmjS8jPUqq5ms+JBWE5H9Ej243xhJ7Ul6rZ\n LmVkEqjUR63DPZaKcpWRJHMv1WoSckLwvZvCLxb0s8UF2Z5sw9KHcT6LIFJ1vYPsxUYe FQ==", "From": "Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>", "To": "<dev@dpdk.org>", "CC": "Anoob Joseph <anoobj@marvell.com>, Fan Zhang <roy.fan.zhang@intel.com>,\n Brian Dooley <brian.dooley@intel.com>,\n Akhil Goyal <gakhil@marvell.com>, <jerinj@marvell.com>,\n Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>", "Subject": "[v2 7/7] examples/fips_validation: randomize message for conformance\n test", "Date": "Tue, 27 Sep 2022 12:56:12 +0530", "Message-ID": "\n <90201b8b1bfe6b156838152c4544c76d123c60d0.1664263264.git.gmuthukrishn@marvell.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<cover.1664263264.git.gmuthukrishn@marvell.com>", "References": "<cover.1664263264.git.gmuthukrishn@marvell.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Proofpoint-GUID": "8X6i2Zmu6FCtA6yl2cVGhuTwVGSOybin", "X-Proofpoint-ORIG-GUID": "8X6i2Zmu6FCtA6yl2cVGhuTwVGSOybin", "X-Proofpoint-Virus-Version": "vendor=baseguard\n engine=ICAP:2.0.205,Aquarius:18.0.895,Hydra:6.0.528,FMLib:17.11.122.1\n definitions=2022-09-27_02,2022-09-22_02,2022-06-22_01", "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": "FIPS conformance tests require randomizing message based on SP 800-106.\n\nSigned-off-by: Gowrishankar Muthukrishnan <gmuthukrishn@marvell.com>\n---\n examples/fips_validation/fips_validation.h | 4 +\n .../fips_validation/fips_validation_rsa.c | 112 +++++++++++++++++-\n 2 files changed, 115 insertions(+), 1 deletion(-)", "diff": "diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h\nindex ed59322635..7cbbc1f084 100644\n--- a/examples/fips_validation/fips_validation.h\n+++ b/examples/fips_validation/fips_validation.h\n@@ -210,6 +210,7 @@ struct rsa_interim_data {\n \tuint16_t saltlen;\n \tenum rte_crypto_rsa_padding_type padding;\n \tenum rte_crypto_rsa_priv_key_type privkey;\n+\tuint8_t random_msg;\n };\n \n #ifdef USE_JANSSON\n@@ -336,6 +337,9 @@ parse_test_tdes_json_init(void);\n \n int\n parse_test_rsa_json_init(void);\n+\n+int\n+fips_test_randomize_message(struct fips_val *msg, struct fips_val *rand);\n #endif /* USE_JANSSON */\n \n int\ndiff --git a/examples/fips_validation/fips_validation_rsa.c b/examples/fips_validation/fips_validation_rsa.c\nindex d3699f54d0..22c0faf3cb 100644\n--- a/examples/fips_validation/fips_validation_rsa.c\n+++ b/examples/fips_validation/fips_validation_rsa.c\n@@ -19,11 +19,13 @@\n \n #include \"fips_validation.h\"\n \n+#define CONFORMANCE_JSON_STR\t\"conformance\"\n #define TESTTYPE_JSON_STR\t\"testType\"\n #define SIGTYPE_JSON_STR \"sigType\"\n #define MOD_JSON_STR\t\"modulo\"\n #define HASH_JSON_STR\t\"hashAlg\"\n #define SALT_JSON_STR\t\"saltLen\"\n+#define RV_JSON_STR\t\"randomValue\"\n #define E_JSON_STR\t\"e\"\n #define N_JSON_STR\t\"n\"\n \n@@ -31,6 +33,10 @@\n #define MSG_JSON_STR\t\"message\"\n #define SIG_JSON_STR\t\"signature\"\n \n+\n+#define RV_BUF_LEN (1024/8)\n+#define RV_BIT_LEN (256)\n+\n #ifdef USE_JANSSON\n struct {\n \tuint8_t type;\n@@ -259,6 +265,13 @@ prepare_vec_rsa(void)\n \tif (!BN_mod_inverse(qinv, q, p, ctx))\n \t\tgoto err;\n \n+\tif (info.interim_info.rsa_data.random_msg) {\n+\t\tif (!BN_generate_prime_ex(r, RV_BIT_LEN, 0, NULL, NULL, NULL))\n+\t\t\tgoto err;\n+\n+\t\tparse_uint8_hex_str(\"\", BN_bn2hex(r), &vec.rsa.seed);\n+\t}\n+\n \tparse_uint8_hex_str(\"\", BN_bn2hex(e), &vec.rsa.e);\n \tparse_uint8_hex_str(\"\", BN_bn2hex(p), &vec.rsa.p);\n \tparse_uint8_hex_str(\"\", BN_bn2hex(q), &vec.rsa.q);\n@@ -297,6 +310,11 @@ parse_test_rsa_json_interim_writeback(struct fips_val *val)\n {\n \tRTE_SET_USED(val);\n \n+\tif (info.interim_info.rsa_data.random_msg) {\n+\t\tjson_object_set_new(json_info.json_write_group, \"conformance\",\n+\t\t\t\t\t\t\tjson_string(\"SP800-106\"));\n+\t}\n+\n \tif (info.op == FIPS_TEST_ASYM_SIGGEN) {\n \t\tjson_t *obj;\n \n@@ -367,6 +385,14 @@ parse_test_rsa_json_writeback(struct fips_val *val)\n \t\twriteback_hex_str(\"\", info.one_line_text, &vec.rsa.signature);\n \t\tobj = json_string(info.one_line_text);\n \t\tjson_object_set_new(json_info.json_write_case, \"signature\", obj);\n+\n+\t\tif (info.interim_info.rsa_data.random_msg) {\n+\t\t\twriteback_hex_str(\"\", info.one_line_text, &vec.rsa.seed);\n+\t\t\tobj = json_string(info.one_line_text);\n+\t\t\tjson_object_set_new(json_info.json_write_case, \"randomValue\", obj);\n+\t\t\tjson_object_set_new(json_info.json_write_case, \"randomValueLen\",\n+\t\t\t\tjson_integer(vec.rsa.seed.len * 8));\n+\t\t}\n \t} else if (info.op == FIPS_TEST_ASYM_SIGVER) {\n \t\tif (vec.status == RTE_CRYPTO_OP_STATUS_SUCCESS)\n \t\t\tjson_object_set_new(json_info.json_write_case, \"testPassed\", json_true());\n@@ -406,6 +432,8 @@ parse_interim_str(const char *key, char *src, struct fips_val *val)\n \t\tif (i >= RTE_DIM(rsa_auth_algs))\n \t\t\treturn -EINVAL;\n \n+\t} else if (strcmp(key, CONFORMANCE_JSON_STR) == 0) {\n+\t\tinfo.interim_info.rsa_data.random_msg = 1;\n \t} else if (strcmp(key, SALT_JSON_STR) == 0) {\n \t\tinfo.interim_info.rsa_data.saltlen = atoi(src);\n \t} else if (strcmp(key, TESTTYPE_JSON_STR) == 0) {\n@@ -436,6 +464,83 @@ parse_keygen_e_str(const char *key, char *src, struct fips_val *val)\n \treturn prepare_vec_rsa();\n }\n \n+/*\n+ * Message randomization function as per NIST SP 800-106.\n+ */\n+int\n+fips_test_randomize_message(struct fips_val *msg, struct fips_val *rand)\n+{\n+\tuint8_t m[FIPS_TEST_JSON_BUF_LEN], rv[RV_BUF_LEN];\n+\tuint32_t m_bitlen, rv_bitlen, count, remain, i, j;\n+\tuint16_t rv_len;\n+\n+\tif (!msg->val || !rand->val || rand->len > RV_BUF_LEN\n+\t\t|| msg->len > FIPS_TEST_JSON_BUF_LEN)\n+\t\treturn -EINVAL;\n+\n+\tmemset(rv, 0, sizeof(rv));\n+\tmemcpy(rv, rand->val, rand->len);\n+\trv_bitlen = rand->len * 8;\n+\trv_len = rand->len;\n+\n+\tmemset(m, 0, sizeof(m));\n+\tmemcpy(m, msg->val, msg->len);\n+\tm_bitlen = msg->len * 8;\n+\n+\tif (m_bitlen >= (rv_bitlen - 1)) {\n+\t\tm[msg->len] = 0x80;\n+\t\tm_bitlen += 8;\n+\t} else {\n+\t\tm[msg->len] = 0x80;\n+\t\tm_bitlen += (rv_bitlen - m_bitlen - 8);\n+\t}\n+\n+\tcount = m_bitlen / rv_bitlen;\n+\tremain = m_bitlen % rv_bitlen;\n+\tfor (i = 0; i < count * rv_len; i++)\n+\t\tm[i] ^= rv[i % rv_len];\n+\n+\tfor (j = 0; j < remain / 8; j++)\n+\t\tm[i + j] ^= rv[j];\n+\n+\tm[i + j] = ((uint8_t *)&rv_bitlen)[0];\n+\tm[i + j + 1] = (((uint8_t *)&rv_bitlen)[1] >> 8) & 0xFF;\n+\n+\trte_free(msg->val);\n+\tmsg->len = (rv_bitlen + m_bitlen + 16) / 8;\n+\tmsg->val = rte_zmalloc(NULL, msg->len, 0);\n+\tif (!msg->val)\n+\t\treturn -EPERM;\n+\n+\tmemcpy(msg->val, rv, rv_len);\n+\tmemcpy(&msg->val[rv_len], m, (m_bitlen + 16) / 8);\n+\treturn 0;\n+}\n+\n+static int\n+parse_siggen_message_str(const char *key, char *src, struct fips_val *val)\n+{\n+\tint ret = 0;\n+\n+\tparse_uint8_hex_str(key, src, val);\n+\tif (info.interim_info.rsa_data.random_msg)\n+\t\tret = fips_test_randomize_message(val, &vec.rsa.seed);\n+\n+\treturn ret;\n+}\n+\n+static int\n+parse_sigver_randomvalue_str(const char *key, char *src, struct fips_val *val)\n+{\n+\tint ret = 0;\n+\n+\tparse_uint8_hex_str(key, src, val);\n+\tif (info.interim_info.rsa_data.random_msg)\n+\t\tret = fips_test_randomize_message(&vec.pt, val);\n+\n+\treturn ret;\n+}\n+\n struct fips_test_callback rsa_keygen_interim_json_vectors[] = {\n \t\t{MOD_JSON_STR, parse_interim_str, NULL},\n \t\t{HASH_JSON_STR, parse_interim_str, NULL},\n@@ -447,6 +552,7 @@ struct fips_test_callback rsa_siggen_interim_json_vectors[] = {\n \t\t{SIGTYPE_JSON_STR, parse_interim_str, NULL},\n \t\t{MOD_JSON_STR, parse_interim_str, NULL},\n \t\t{HASH_JSON_STR, parse_interim_str, NULL},\n+\t\t{CONFORMANCE_JSON_STR, parse_interim_str, NULL},\n \t\t{SALT_JSON_STR, parse_interim_str, NULL},\n \t\t{TESTTYPE_JSON_STR, parse_interim_str, NULL},\n \t\t{NULL, NULL, NULL} /**< end pointer */\n@@ -456,6 +562,7 @@ struct fips_test_callback rsa_sigver_interim_json_vectors[] = {\n \t\t{SIGTYPE_JSON_STR, parse_interim_str, NULL},\n \t\t{MOD_JSON_STR, parse_interim_str, NULL},\n \t\t{HASH_JSON_STR, parse_interim_str, NULL},\n+\t\t{CONFORMANCE_JSON_STR, parse_interim_str, NULL},\n \t\t{SALT_JSON_STR, parse_interim_str, NULL},\n \t\t{N_JSON_STR, parse_uint8_hex_str, &vec.rsa.n},\n \t\t{E_JSON_STR, parse_uint8_hex_str, &vec.rsa.e},\n@@ -470,13 +577,14 @@ struct fips_test_callback rsa_keygen_json_vectors[] = {\n };\n \n struct fips_test_callback rsa_siggen_json_vectors[] = {\n-\t\t{MSG_JSON_STR, parse_uint8_hex_str, &vec.pt},\n+\t\t{MSG_JSON_STR, parse_siggen_message_str, &vec.pt},\n \t\t{NULL, NULL, NULL} /**< end pointer */\n };\n \n struct fips_test_callback rsa_sigver_json_vectors[] = {\n \t\t{MSG_JSON_STR, parse_uint8_hex_str, &vec.pt},\n \t\t{SIG_JSON_STR, parse_uint8_hex_str, &vec.rsa.signature},\n+\t\t{RV_JSON_STR, parse_sigver_randomvalue_str, &vec.rsa.seed},\n \t\t{NULL, NULL, NULL} /**< end pointer */\n };\n \n@@ -492,6 +600,7 @@ parse_test_rsa_json_init(void)\n \tinfo.parse_writeback = NULL;\n \tinfo.interim_callbacks = NULL;\n \tinfo.parse_interim_writeback = NULL;\n+\tinfo.interim_info.rsa_data.random_msg = 0;\n \n \tif (strcmp(mode_str, \"keyGen\") == 0) {\n \t\tinfo.op = FIPS_TEST_ASYM_KEYGEN;\n@@ -506,6 +615,7 @@ parse_test_rsa_json_init(void)\n \t\tinfo.op = FIPS_TEST_ASYM_SIGVER;\n \t\tinfo.callbacks = rsa_sigver_json_vectors;\n \t\tinfo.interim_callbacks = rsa_sigver_interim_json_vectors;\n+\t\tinfo.parse_interim_writeback = parse_test_rsa_json_interim_writeback;\n \t} else {\n \t\treturn -EINVAL;\n \t}\n", "prefixes": [ "v2", "7/7" ] }