From patchwork Wed Jun 29 12:35:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gowrishankar Muthukrishnan X-Patchwork-Id: 113556 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 5C160A0545; Wed, 29 Jun 2022 14:35:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AE6CD41138; Wed, 29 Jun 2022 14:35:18 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 5FDAB410D5 for ; Wed, 29 Jun 2022 14:35:17 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25T954vm026870; Wed, 29 Jun 2022 05:35:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=aNGqdEUAzac6L8nekJfufXGOlNHxJIA/svwHEOg2vmY=; b=MbunUwurHizUJTfzoQSePCwjYdS14PZXN+QsstLKJAmB1Tk1BYkJ0BTn5mg9d75rBvCe BqqJvCxmAXMcaTcC3kbnwlFag1cwPoQi6DZ8fCjI61+AG9Q7R/FIuqfv1flyOO+ABZtB 6E/4s5AM1/P1XcH6mEYmBATWc0K7uO48PR3XrnL8tigz4JvIV5zo2UbdRMHzG2OuGliy MZTLpckgIB++f5nD9RWPtrPeK/vJHWCPbxOjWmrV/pSmA2m7vs4yCjt2uWHtE2Vyfivf rcEqkSw3+0xzzXkSpcFP4RvAIXA48t3eL9sdzLWSnk809HGH6vilUhcThNbRD4j7ULSl gw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3h0kgc8rgb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 29 Jun 2022 05:35:16 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 29 Jun 2022 05:35:14 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.18 via Frontend Transport; Wed, 29 Jun 2022 05:35:14 -0700 Received: from localhost.localdomain (unknown [10.28.34.38]) by maili.marvell.com (Postfix) with ESMTP id 0E5DB3F70A2; Wed, 29 Jun 2022 05:35:11 -0700 (PDT) From: Gowrishankar Muthukrishnan To: CC: Fan Zhang , Brian Dooley , Anoob Joseph , "Archana Muniganti" , Jerin Jacob , Gowrishankar Muthukrishnan Subject: [PATCH v4 1/3] examples/fips_validation: add aes_cbc specific enum Date: Wed, 29 Jun 2022 18:05:04 +0530 Message-ID: <2dafd9d3e4bd8e5a23e7d0db4b86eaae59b63a65.1656505921.git.gmuthukrishn@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: 6fIabZr1PRpzbt01InjIlrmGYVHdrfxf X-Proofpoint-ORIG-GUID: 6fIabZr1PRpzbt01InjIlrmGYVHdrfxf X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-06-29_17,2022-06-28_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add algorithm enum specifically for AES_CBC instead of relying on AES as such. Fixes: 8b8546aaedf ("examples/fips_validation: add parsing for AES-CBC") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Fan Zhang --- examples/fips_validation/fips_validation.c | 2 +- examples/fips_validation/fips_validation.h | 1 + examples/fips_validation/main.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 324abccb14..68b5572db2 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -463,7 +463,7 @@ fips_test_parse_one_json_vector_set(void) else if (strstr(algo_str, "CMAC")) info.algo = FIPS_TEST_ALGO_AES_CMAC; else if (strstr(algo_str, "AES-CBC")) - info.algo = FIPS_TEST_ALGO_AES; + info.algo = FIPS_TEST_ALGO_AES_CBC; else return -EINVAL; diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h index 69d738b718..819236983d 100644 --- a/examples/fips_validation/fips_validation.h +++ b/examples/fips_validation/fips_validation.h @@ -34,6 +34,7 @@ enum fips_test_algorithms { FIPS_TEST_ALGO_AES = 0, + FIPS_TEST_ALGO_AES_CBC, FIPS_TEST_ALGO_AES_GCM, FIPS_TEST_ALGO_AES_CMAC, FIPS_TEST_ALGO_AES_CCM, diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index ceabea788e..9c4951595d 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -1781,6 +1781,7 @@ static int init_test_ops(void) { switch (info.algo) { + case FIPS_TEST_ALGO_AES_CBC: case FIPS_TEST_ALGO_AES: test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_aes_xform; From patchwork Wed Jun 29 12:35:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gowrishankar Muthukrishnan X-Patchwork-Id: 113557 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 97D65A0545; Wed, 29 Jun 2022 14:35:27 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ACC244280E; Wed, 29 Jun 2022 14:35:22 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id C32754280E for ; Wed, 29 Jun 2022 14:35:20 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25T3s23p030830; Wed, 29 Jun 2022 05:35:19 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=e4hZ5LGg22/Uj5sfHxpiAql5cgzksdlWfBG+zJ9689c=; b=cCfC76WvnSUNGAyvn5iLdtWQmknyk4VwX6uSJF6PSVIvrHefc0jEovMspGgOsq67DZJJ ZaUJ8DTxRv35fWB+twptrB2UvRMAzIc4whqxdaGqGS7G7OsCLnnzmWKHgN/6dAM6gyKl fm/UayCbSplPinPO0o2BRZxAdrBhlc/9EHvSI5dtMhBhoXG+T3ZxNWsbflwpsQMbgOei 9Q2GQogXiTvXet2CkBLdgz+UL2EJcKHrJo+/u70DnXgDAdTFp0j7LniO6HOHB6uMR+D1 XaUNuIuwvjCIlOAUAR3XWXOsJ+1eFnczKC7uvO88xDt+fqknL4c9kJbaRUg/ia4lsUE7 +w== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3h0f859v9b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 29 Jun 2022 05:35:19 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 29 Jun 2022 05:35:17 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 29 Jun 2022 05:35:18 -0700 Received: from localhost.localdomain (unknown [10.28.34.38]) by maili.marvell.com (Postfix) with ESMTP id B84A13F70A6; Wed, 29 Jun 2022 05:35:14 -0700 (PDT) From: Gowrishankar Muthukrishnan To: CC: Fan Zhang , Brian Dooley , Anoob Joseph , "Archana Muniganti" , Jerin Jacob , Gowrishankar Muthukrishnan Subject: [PATCH v4 2/3] examples/fips_validation: add parsing for xts Date: Wed, 29 Jun 2022 18:05:05 +0530 Message-ID: <7a11c5b124c0cf1ce60b48982a206cb1c11c864b.1656505921.git.gmuthukrishn@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: Ma3P_gImeYBWA28Eh4BxblWAQ4c27QYJ X-Proofpoint-ORIG-GUID: Ma3P_gImeYBWA28Eh4BxblWAQ4c27QYJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-06-29_17,2022-06-28_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Added function to parse algorithm for AES XTS test. Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Fan Zhang --- v4: - doc update --- doc/guides/sample_app_ug/fips_validation.rst | 1 + examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 15 +- .../fips_validation/fips_validation_xts.c | 141 ++++++++++++++++++ examples/fips_validation/main.c | 4 + 5 files changed, 162 insertions(+), 1 deletion(-) diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 43190bb696..41d2e0da13 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -61,6 +61,7 @@ ACVP * AES-CBC (128,192,256) - AFT, MCT * AES-GCM (128,192,256) - AFT * AES-CMAC (128,192,256) - AFT + * AES-XTS (128,256) - AFT * HMAC (SHA1, SHA224, SHA256, SHA384, SHA512) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 68b5572db2..f181363ef7 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -464,6 +464,8 @@ fips_test_parse_one_json_vector_set(void) info.algo = FIPS_TEST_ALGO_AES_CMAC; else if (strstr(algo_str, "AES-CBC")) info.algo = FIPS_TEST_ALGO_AES_CBC; + else if (strstr(algo_str, "AES-XTS")) + info.algo = FIPS_TEST_ALGO_AES_XTS; else return -EINVAL; diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h index 819236983d..d716b198c6 100644 --- a/examples/fips_validation/fips_validation.h +++ b/examples/fips_validation/fips_validation.h @@ -38,10 +38,10 @@ enum fips_test_algorithms { FIPS_TEST_ALGO_AES_GCM, FIPS_TEST_ALGO_AES_CMAC, FIPS_TEST_ALGO_AES_CCM, + FIPS_TEST_ALGO_AES_XTS, FIPS_TEST_ALGO_HMAC, FIPS_TEST_ALGO_TDES, FIPS_TEST_ALGO_SHA, - FIPS_TEST_ALGO_AES_XTS, FIPS_TEST_ALGO_MAX }; @@ -171,6 +171,15 @@ struct gcm_interim_data { uint8_t gen_iv; }; +enum xts_tweak_modes { + XTS_TWEAK_MODE_HEX = 0, + XTS_TWEAK_MODE_NUMBER +}; + +struct xts_interim_data { + enum xts_tweak_modes tweak_mode; +}; + #ifdef USE_JANSSON struct fips_test_json_info { /* Information used for reading from json */ @@ -208,6 +217,7 @@ struct fips_test_interim_info { struct ccm_interim_data ccm_data; struct sha_interim_data sha_data; struct gcm_interim_data gcm_data; + struct xts_interim_data xts_data; } interim_info; enum fips_test_op op; @@ -267,6 +277,9 @@ parse_test_cmac_json_init(void); int parse_test_aes_json_init(void); + +int +parse_test_xts_json_init(void); #endif /* USE_JANSSON */ int diff --git a/examples/fips_validation/fips_validation_xts.c b/examples/fips_validation/fips_validation_xts.c index 5bb1966f6c..531e3c688e 100644 --- a/examples/fips_validation/fips_validation_xts.c +++ b/examples/fips_validation/fips_validation_xts.c @@ -24,6 +24,22 @@ #define OP_ENC_STR "ENCRYPT" #define OP_DEC_STR "DECRYPT" +#define ALGO_JSON_STR "algorithm" +#define TESTTYPE_JSON_STR "testType" +#define DIR_JSON_STR "direction" +#define KEYLEN_JSON_STR "keyLen" +#define TWEAKMODE_JSON_STR "tweakMode" + +#define KEY_JSON_STR "key" +#define DATAUNITLEN_JSON_STR "dataUnitLen" +#define PAYLOADLEN_JSON_STR "payloadLen" +#define TWEAKVALUE_JSON_STR "tweakValue" +#define PT_JSON_STR "pt" +#define CT_JSON_STR "ct" + +#define OP_ENC_JSON_STR "encrypt" +#define OP_DEC_JSON_STR "decrypt" + static int parse_interim_xts_enc_dec(const char *key, __rte_unused char *text, @@ -62,6 +78,131 @@ struct fips_test_callback xts_writeback_callbacks[] = { {NULL, NULL, NULL} /**< end pointer */ }; +#ifdef USE_JANSSON +static int +parser_xts_read_keylen(const char *key, char *src, struct fips_val *val) +{ + int ret; + + ret = parser_read_uint32_bit_val(key, src, val); + if (ret < 0) + return ret; + + val->len *= 2; + return 0; +} + +static int +parser_xts_read_tweakval(const char *key, char *src, struct fips_val *val) +{ + int ret; + + if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_HEX) + ret = parse_uint8_hex_str(key, src, val); + else if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_NUMBER) + ret = parser_read_uint32_bit_val(key, src, val); + else + ret = -1; + + return ret; +} + +struct fips_test_callback xts_dec_json_vectors[] = { + {KEY_JSON_STR, parse_uint8_known_len_hex_str, &vec.cipher_auth.key}, + {TWEAKVALUE_JSON_STR, parser_xts_read_tweakval, &vec.iv}, + {CT_JSON_STR, parse_uint8_hex_str, &vec.ct}, + {NULL, NULL, NULL} /**< end pointer */ +}; + +struct fips_test_callback xts_interim_json_vectors[] = { + {KEYLEN_JSON_STR, parser_xts_read_keylen, &vec.cipher_auth.key}, + {NULL, NULL, NULL} /**< end pointer */ +}; + +struct fips_test_callback xts_enc_json_vectors[] = { + {KEY_JSON_STR, parse_uint8_known_len_hex_str, &vec.cipher_auth.key}, + {TWEAKVALUE_JSON_STR, parser_xts_read_tweakval, &vec.iv}, + {PT_JSON_STR, parse_uint8_hex_str, &vec.pt}, + {NULL, NULL, NULL} /**< end pointer */ +}; + +static int +parse_test_xts_json_writeback(struct fips_val *val) +{ + struct fips_val tmp_val; + json_t *tcId; + + tcId = json_object_get(json_info.json_test_case, "tcId"); + + json_info.json_write_case = json_object(); + json_object_set(json_info.json_write_case, "tcId", tcId); + + if (info.op == FIPS_TEST_ENC_AUTH_GEN) { + json_t *ct; + + tmp_val.val = val->val; + tmp_val.len = vec.pt.len; + + writeback_hex_str("", info.one_line_text, &tmp_val); + ct = json_string(info.one_line_text); + json_object_set_new(json_info.json_write_case, CT_JSON_STR, ct); + + tmp_val.val = val->val + vec.pt.len; + tmp_val.len = val->len - vec.pt.len; + + writeback_hex_str("", info.one_line_text, &tmp_val); + } else { + if (vec.status == RTE_CRYPTO_OP_STATUS_SUCCESS) { + tmp_val.val = val->val; + tmp_val.len = vec.ct.len; + + writeback_hex_str("", info.one_line_text, &tmp_val); + json_object_set_new(json_info.json_write_case, PT_JSON_STR, + json_string(info.one_line_text)); + } else { + json_object_set_new(json_info.json_write_case, "testPassed", json_false()); + } + } + + return 0; +} + +int +parse_test_xts_json_init(void) +{ + if (json_info.json_test_group) { + json_t *direction_obj, *tweakmode_obj; + const char *direction_str, *tweakmode_str; + + direction_obj = json_object_get(json_info.json_test_group, DIR_JSON_STR); + direction_str = json_string_value(direction_obj); + + if (strcmp(direction_str, OP_ENC_JSON_STR) == 0) { + info.op = FIPS_TEST_ENC_AUTH_GEN; + info.callbacks = xts_enc_json_vectors; + + } else if (strcmp(direction_str, OP_DEC_JSON_STR) == 0) { + info.op = FIPS_TEST_DEC_AUTH_VERIF; + info.callbacks = xts_dec_json_vectors; + } else { + return -EINVAL; + } + + tweakmode_obj = json_object_get(json_info.json_test_group, TWEAKMODE_JSON_STR); + tweakmode_str = json_string_value(tweakmode_obj); + if (strcmp(tweakmode_str, "hex") == 0) + info.interim_info.xts_data.tweak_mode = XTS_TWEAK_MODE_HEX; + else + info.interim_info.xts_data.tweak_mode = XTS_TWEAK_MODE_NUMBER; + + info.interim_callbacks = xts_interim_json_vectors; + } + + info.parse_writeback = parse_test_xts_json_writeback; + return 0; +} +#endif /* USE_JANSSON */ + static int parse_test_xts_writeback(struct fips_val *val) { diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 9c4951595d..7ccb5f52f4 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -1989,6 +1989,10 @@ fips_test_one_test_group(void) case FIPS_TEST_ALGO_AES_CMAC: ret = parse_test_cmac_json_init(); break; + case FIPS_TEST_ALGO_AES_XTS: + ret = parse_test_xts_json_init(); + break; + case FIPS_TEST_ALGO_AES_CBC: case FIPS_TEST_ALGO_AES: ret = parse_test_aes_json_init(); break; From patchwork Wed Jun 29 12:35:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gowrishankar Muthukrishnan X-Patchwork-Id: 113558 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 4E8DFA0545; Wed, 29 Jun 2022 14:35:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2084442B6D; Wed, 29 Jun 2022 14:35:25 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 70B2140042 for ; Wed, 29 Jun 2022 14:35:22 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.5/8.17.1.5) with ESMTP id 25T956ah027296; Wed, 29 Jun 2022 05:35:21 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=6cz9WN/dTHkCdbky9Hhe2E1HFZTa7IoNKourh1JAZNc=; b=Lda6NO5oCqBvgOr3q5vYCGALu+gfxvOnYmLv2DZVBhyJhoVh4ryv1UURJJ1MZX0tIPl7 FduHEVtJroCEZUbG3su0mW8mGbPEqFEpUmVDdSh6urR61qdxMtFlNBpRU795Vq1fho6Z P11KOnWJiKNjbMCHoARmNTijWjBi8QUskfgi6aElaxdlm7WtXPuCx7HySx9dgxwR5j84 200h9zkBLJISbO16q+SIKg8VIv7zZA97G9VzRxGaKudVcQ1zIIiU2I0YwKqQ2/CesyIV Fzft416w3OXmczDNF5OcdYKDWMHxeSCoKCEXZgUhWq4hRYeNT9HIFNXO1EFEDeJxtTFg 0g== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3h0kgc8rgk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 29 Jun 2022 05:35:21 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 29 Jun 2022 05:35:19 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 29 Jun 2022 05:35:19 -0700 Received: from localhost.localdomain (unknown [10.28.34.38]) by maili.marvell.com (Postfix) with ESMTP id 6E6043F70C0; Wed, 29 Jun 2022 05:35:17 -0700 (PDT) From: Gowrishankar Muthukrishnan To: CC: Fan Zhang , Brian Dooley , Anoob Joseph , "Archana Muniganti" , Jerin Jacob , Gowrishankar Muthukrishnan Subject: [PATCH v4 3/3] examples/fips_validation: add parsing for sha Date: Wed, 29 Jun 2022 18:05:06 +0530 Message-ID: <93d797d94f1fb91dfdbd1dfedbb1c345259c076f.1656505921.git.gmuthukrishn@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: lTgZF6S4ELSvVCdOtq-z1e156TMJOYbZ X-Proofpoint-ORIG-GUID: lTgZF6S4ELSvVCdOtq-z1e156TMJOYbZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.883,Hydra:6.0.517,FMLib:17.11.122.1 definitions=2022-06-29_17,2022-06-28_01,2022-06-22_01 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Added function to parse algorithm for SHA test. Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Fan Zhang --- v4: - doc update --- doc/guides/sample_app_ug/fips_validation.rst | 1 + examples/fips_validation/fips_validation.c | 2 + examples/fips_validation/fips_validation.h | 10 + .../fips_validation/fips_validation_sha.c | 188 ++++++++++++++++++ examples/fips_validation/main.c | 39 +++- 5 files changed, 229 insertions(+), 11 deletions(-) diff --git a/doc/guides/sample_app_ug/fips_validation.rst b/doc/guides/sample_app_ug/fips_validation.rst index 41d2e0da13..4b68226665 100644 --- a/doc/guides/sample_app_ug/fips_validation.rst +++ b/doc/guides/sample_app_ug/fips_validation.rst @@ -63,6 +63,7 @@ ACVP * AES-CMAC (128,192,256) - AFT * AES-XTS (128,256) - AFT * HMAC (SHA1, SHA224, SHA256, SHA384, SHA512) + * SHA (1,256) - AFT, MCT Application Information diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index f181363ef7..12b9b03f56 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -466,6 +466,8 @@ fips_test_parse_one_json_vector_set(void) info.algo = FIPS_TEST_ALGO_AES_CBC; else if (strstr(algo_str, "AES-XTS")) info.algo = FIPS_TEST_ALGO_AES_XTS; + else if (strstr(algo_str, "SHA")) + info.algo = FIPS_TEST_ALGO_SHA; else return -EINVAL; diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h index d716b198c6..5c1abcbd91 100644 --- a/examples/fips_validation/fips_validation.h +++ b/examples/fips_validation/fips_validation.h @@ -133,6 +133,7 @@ enum fips_ccm_test_types { enum fips_sha_test_types { SHA_KAT = 0, + SHA_AFT, SHA_MCT }; @@ -280,6 +281,15 @@ parse_test_aes_json_init(void); int parse_test_xts_json_init(void); + +int +parse_test_sha_json_init(void); + +int +parse_test_sha_json_algorithm(void); + +int +parse_test_sha_json_test_type(void); #endif /* USE_JANSSON */ int diff --git a/examples/fips_validation/fips_validation_sha.c b/examples/fips_validation/fips_validation_sha.c index 34c364c75a..a2928618d7 100644 --- a/examples/fips_validation/fips_validation_sha.c +++ b/examples/fips_validation/fips_validation_sha.c @@ -17,6 +17,11 @@ #define SEED_STR "Seed = " #define MCT_STR "Monte" +#define ALGO_JSON_STR "algorithm" +#define TESTTYPE_JSON_STR "testType" + +#define PT_JSON_STR "msg" + struct plain_hash_size_conversion { const char *str; enum rte_crypto_auth_algorithm algo; @@ -62,6 +67,32 @@ struct fips_test_callback sha_tests_interim_vectors[] = { {NULL, NULL, NULL} /**< end pointer */ }; +#ifdef USE_JANSSON +static struct { + uint32_t type; + const char *desc; +} sha_test_types[] = { + {SHA_MCT, "MCT"}, + {SHA_AFT, "AFT"}, +}; + +static struct plain_hash_algorithms { + const char *str; + enum rte_crypto_auth_algorithm algo; +} json_algorithms[] = { + {"SHA-1", RTE_CRYPTO_AUTH_SHA1}, + {"SHA2-224", RTE_CRYPTO_AUTH_SHA224}, + {"SHA2-256", RTE_CRYPTO_AUTH_SHA256}, + {"SHA2-384", RTE_CRYPTO_AUTH_SHA384}, + {"SHA2-512", RTE_CRYPTO_AUTH_SHA512}, +}; + +struct fips_test_callback sha_tests_json_vectors[] = { + {PT_JSON_STR, parse_uint8_hex_str, &vec.pt}, + {NULL, NULL, NULL} /**< end pointer */ +}; +#endif /* USE_JANSSON */ + static int parse_test_sha_writeback(struct fips_val *val) // ! { @@ -108,3 +139,160 @@ parse_test_sha_init(void) info.kat_check = rsp_test_sha_check; return 0; } + +#ifdef USE_JANSSON +static int +parse_test_sha_json_writeback(struct fips_val *val) +{ + struct fips_val val_local; + json_t *tcId, *md; + + tcId = json_object_get(json_info.json_test_case, "tcId"); + + json_info.json_write_case = json_object(); + json_object_set_new(json_info.json_write_case, "tcId", tcId); + + val_local.val = val->val + vec.pt.len; + val_local.len = vec.cipher_auth.digest.len; + + writeback_hex_str("", info.one_line_text, &val_local); + md = json_string(info.one_line_text); + json_object_set_new(json_info.json_write_case, "md", md); + + return 0; +} + +static int +parse_test_sha_mct_json_writeback(struct fips_val *val) +{ + json_t *tcId, *msg, *md, *resArr, *res; + struct fips_val val_local; + + tcId = json_object_get(json_info.json_test_case, "tcId"); + if (json_info.json_write_case) { + json_t *wcId; + + wcId = json_object_get(json_info.json_write_case, "tcId"); + if (!json_equal(tcId, wcId)) { + json_info.json_write_case = json_object(); + json_object_set_new(json_info.json_write_case, "tcId", tcId); + json_object_set_new(json_info.json_write_case, "resultsArray", + json_array()); + } + } else { + json_info.json_write_case = json_object(); + json_object_set_new(json_info.json_write_case, "tcId", tcId); + json_object_set_new(json_info.json_write_case, "resultsArray", json_array()); + } + + resArr = json_object_get(json_info.json_write_case, "resultsArray"); + if (!json_is_array(resArr)) + return -EINVAL; + + res = json_object(); + + writeback_hex_str("", info.one_line_text, &val[1]); + msg = json_string(info.one_line_text); + json_object_set_new(res, "msg", msg); + + val_local.val = val[0].val + vec.pt.len; + val_local.len = vec.cipher_auth.digest.len; + + writeback_hex_str("", info.one_line_text, &val_local); + md = json_string(info.one_line_text); + json_object_set_new(res, "md", md); + + json_array_append_new(resArr, res); + return 0; +} + +int +parse_test_sha_json_algorithm(void) +{ + json_t *algorithm_object; + const char *algorithm_str; + uint32_t i; + + algorithm_object = json_object_get(json_info.json_vector_set, "algorithm"); + algorithm_str = json_string_value(algorithm_object); + + for (i = 0; i < RTE_DIM(json_algorithms); i++) { + if (strstr(algorithm_str, json_algorithms[i].str)) { + info.interim_info.sha_data.algo = json_algorithms[i].algo; + break; + } + } + + if (i == RTE_DIM(json_algorithms)) + return -1; + + for (i = 0; i < RTE_DIM(phsc); i++) { + if (info.interim_info.sha_data.algo == phsc[i].algo) { + vec.cipher_auth.digest.len = atoi(phsc[i].str); + vec.cipher_auth.digest.val = calloc(0, vec.cipher_auth.digest.len * 8); + break; + } + } + + if (i == RTE_DIM(phsc)) + return -1; + + return 0; +} + +int +parse_test_sha_json_test_type(void) +{ + json_t *type_object; + const char *type_str; + uint32_t i; + + type_object = json_object_get(json_info.json_test_group, TESTTYPE_JSON_STR); + type_str = json_string_value(type_object); + + for (i = 0; i < RTE_DIM(sha_test_types); i++) + if (strstr(type_str, sha_test_types[i].desc)) { + info.interim_info.aes_data.test_type = + sha_test_types[i].type; + break; + } + + if (i == RTE_DIM(sha_test_types)) + return -1; + + switch (info.interim_info.sha_data.test_type) { + case SHA_MCT: + info.parse_writeback = parse_test_sha_mct_json_writeback; + break; + case SHA_AFT: + info.parse_writeback = parse_test_sha_json_writeback; + break; + default: + info.parse_writeback = NULL; + } + + if (!info.parse_writeback) + return -1; + + return 0; +} + +int +parse_test_sha_json_init(void) +{ + info.op = FIPS_TEST_ENC_AUTH_GEN; + info.parse_writeback = parse_test_sha_json_writeback; + info.callbacks = sha_tests_json_vectors; + info.writeback_callbacks = NULL; + info.kat_check = rsp_test_sha_check; + info.interim_callbacks = NULL; + + if (parse_test_sha_json_algorithm() < 0) + return -1; + + if (parse_test_sha_json_test_type() < 0) + return -1; + + return 0; +} +#endif /* USE_JANSSON */ diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 7ccb5f52f4..6d52048b5c 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -1693,19 +1693,26 @@ fips_mct_sha_test(void) #define SHA_EXTERN_ITER 100 #define SHA_INTERN_ITER 1000 #define SHA_MD_BLOCK 3 - struct fips_val val = {NULL, 0}, md[SHA_MD_BLOCK]; + /* val[0] is op result and other value is for parse_writeback callback */ + struct fips_val val[2] = {{NULL, 0},}; + struct fips_val md[SHA_MD_BLOCK], msg; char temp[MAX_DIGEST_SIZE*2]; int ret; uint32_t i, j; + msg.len = SHA_MD_BLOCK * vec.cipher_auth.digest.len; + msg.val = calloc(1, msg.len); + memcpy(vec.cipher_auth.digest.val, vec.pt.val, vec.cipher_auth.digest.len); for (i = 0; i < SHA_MD_BLOCK; i++) md[i].val = rte_malloc(NULL, (MAX_DIGEST_SIZE*2), 0); rte_free(vec.pt.val); vec.pt.val = rte_malloc(NULL, (MAX_DIGEST_SIZE*SHA_MD_BLOCK), 0); - fips_test_write_one_case(); - fprintf(info.fp_wr, "\n"); + if (info.file_type != FIPS_TYPE_JSON) { + fips_test_write_one_case(); + fprintf(info.fp_wr, "\n"); + } for (j = 0; j < SHA_EXTERN_ITER; j++) { @@ -1719,6 +1726,9 @@ fips_mct_sha_test(void) vec.cipher_auth.digest.len); md[2].len = vec.cipher_auth.digest.len; + for (i = 0; i < SHA_MD_BLOCK; i++) + memcpy(&msg.val[i * md[i].len], md[i].val, md[i].len); + for (i = 0; i < (SHA_INTERN_ITER); i++) { memcpy(vec.pt.val, md[0].val, @@ -1742,7 +1752,7 @@ fips_mct_sha_test(void) return ret; } - ret = get_writeback_data(&val); + ret = get_writeback_data(&val[0]); if (ret < 0) return ret; @@ -1751,7 +1761,7 @@ fips_mct_sha_test(void) memcpy(md[1].val, md[2].val, md[2].len); md[1].len = md[2].len; - memcpy(md[2].val, (val.val + vec.pt.len), + memcpy(md[2].val, (val[0].val + vec.pt.len), vec.cipher_auth.digest.len); md[2].len = vec.cipher_auth.digest.len; } @@ -1759,11 +1769,14 @@ fips_mct_sha_test(void) memcpy(vec.cipher_auth.digest.val, md[2].val, md[2].len); vec.cipher_auth.digest.len = md[2].len; - fprintf(info.fp_wr, "COUNT = %u\n", j); - - writeback_hex_str("", temp, &vec.cipher_auth.digest); - - fprintf(info.fp_wr, "MD = %s\n\n", temp); + if (info.file_type != FIPS_TYPE_JSON) { + fprintf(info.fp_wr, "COUNT = %u\n", j); + writeback_hex_str("", temp, &vec.cipher_auth.digest); + fprintf(info.fp_wr, "MD = %s\n\n", temp); + } + val[1].val = msg.val; + val[1].len = msg.len; + info.parse_writeback(val); } for (i = 0; i < (SHA_MD_BLOCK); i++) @@ -1771,7 +1784,8 @@ fips_mct_sha_test(void) rte_free(vec.pt.val); - free(val.val); + free(val[0].val); + free(msg.val); return 0; } @@ -1996,6 +2010,9 @@ fips_test_one_test_group(void) case FIPS_TEST_ALGO_AES: ret = parse_test_aes_json_init(); break; + case FIPS_TEST_ALGO_SHA: + ret = parse_test_sha_json_init(); + break; default: return -EINVAL; }