From patchwork Mon Feb 6 14:46:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gowrishankar Muthukrishnan X-Patchwork-Id: 123151 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 D8DB641C12; Mon, 6 Feb 2023 15:47:12 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 841E342D7E; Mon, 6 Feb 2023 15:46:44 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 48A2D42D6D for ; Mon, 6 Feb 2023 15:46:42 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31680KG4005847; Mon, 6 Feb 2023 06:46:41 -0800 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=QEO0yVuwKGt76J/mvS9aIMRRbIs1sVHCtblmZT9TwPI=; b=WjqI5fR54TqlHBNjvwXVPQcmYl6DJhOYUdJYt4y3aJm9D6jAJDMC9KW1H8hWlRxLEziP omYLYfez0mA3m4Ndk64sgFLJ0OJfFWcVDLfY36Qh7yaNsAY+389vwooPp5GelPvFvrTK +DRxCVR/pxe3YRT8MZ0ohIdmC7kvRngO1ouZsIpSGF8rWP8wG9buOaLtt8Z+xzKBcfEo C0nD2ddhpkocfelkEij2o+SP7lq7ktkUTHE3OI02rRRIJCudvGtWgIehUgovm1G6Bhb1 3EJlHMRw3M4Hyotk/NK+heN0+lfiHNX3lqXlJ9MW02F2JaWeAzRkZR0gvvli3UrYL6fB vQ== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nhqrtbkdt-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Mon, 06 Feb 2023 06:46:41 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Mon, 6 Feb 2023 06:46:33 -0800 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.42 via Frontend Transport; Mon, 6 Feb 2023 06:46:33 -0800 Received: from localhost.localdomain (unknown [10.28.34.38]) by maili.marvell.com (Postfix) with ESMTP id 2ABE53F705A; Mon, 6 Feb 2023 06:46:30 -0800 (PST) From: Gowrishankar Muthukrishnan To: CC: Anoob Joseph , , Akhil Goyal , Brian Dooley , "Gowrishankar Muthukrishnan" Subject: [v1, 09/10] examples/fips_validation: fix AES XTS to read seq number Date: Mon, 6 Feb 2023 20:16:01 +0530 Message-ID: <9a4bd9e1734efd66bdd4f064288db991e7dfe2e2.1675693844.git.gmuthukrishn@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Proofpoint-GUID: 7fismgNFjXho5zG9jmUeJmX4QHPsbK_Q X-Proofpoint-ORIG-GUID: 7fismgNFjXho5zG9jmUeJmX4QHPsbK_Q X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-06_07,2023-02-06_03,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 Fix AES XTS test to read sequence number correctly. Fixes: f8e431ed8f6 ("examples/fips_validation: add parsing for AES-XTS") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Brian Dooley --- examples/fips_validation/fips_validation_xts.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/examples/fips_validation/fips_validation_xts.c b/examples/fips_validation/fips_validation_xts.c index 531e3c688e..530df78ab4 100644 --- a/examples/fips_validation/fips_validation_xts.c +++ b/examples/fips_validation/fips_validation_xts.c @@ -34,6 +34,7 @@ #define DATAUNITLEN_JSON_STR "dataUnitLen" #define PAYLOADLEN_JSON_STR "payloadLen" #define TWEAKVALUE_JSON_STR "tweakValue" +#define SEQNUMBER_JSON_STR "sequenceNumber" #define PT_JSON_STR "pt" #define CT_JSON_STR "ct" @@ -95,14 +96,17 @@ parser_xts_read_keylen(const char *key, char *src, struct fips_val *val) static int parser_xts_read_tweakval(const char *key, char *src, struct fips_val *val) { + char num_str[4] = {0}; int ret; - if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_HEX) + 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 + } else if (info.interim_info.xts_data.tweak_mode == XTS_TWEAK_MODE_NUMBER) { + snprintf(num_str, RTE_DIM(num_str), "%x", atoi(src)); + ret = parse_uint8_hex_str(key, num_str, val); + } else { ret = -1; + } return ret; } @@ -122,6 +126,7 @@ struct fips_test_callback xts_interim_json_vectors[] = { 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}, + {SEQNUMBER_JSON_STR, parser_xts_read_tweakval, &vec.iv}, {PT_JSON_STR, parse_uint8_hex_str, &vec.pt}, {NULL, NULL, NULL} /**< end pointer */ };