From patchwork Mon Oct 24 10:36:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dooley, Brian" X-Patchwork-Id: 118985 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 4F982A034C; Mon, 24 Oct 2022 12:36:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EED084069C; Mon, 24 Oct 2022 12:36:57 +0200 (CEST) Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id 5B6A540693 for ; Mon, 24 Oct 2022 12:36:57 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1666607817; x=1698143817; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=VYYnJjTqhubc2INOYBYeUdV72R+Sba38BFIknxpSYeU=; b=fPI0zXiHWDWkyMVRZwtPVIX0YFb1jRftMt96AeKbys6by656uEK5L5hL k2jKiAJ9CN3Feml/4TOD4VtF+G0BkjrAjFdLXtt3zBZsPepF9VUtfDxno VHaKupA0bbnI8OsbJk5/dE1LYf6Fftzf1dSu6wj2ndd31YR+H7I7csx6R WwDi95LMWLfXRkp96dNQJx988z/yKFyvgCLxgeAsqiLOThtDRHAXutW8Z c65IhJBmLcgfzNNFMuXsn/bYyoiziRy12YWmIrp/o3d0ULbPhI356JAwC w8SczuGoyxksKbNmHfXaQ30a0LKteREEwOq3Guci9yDiGMVY8ndWqUMda Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10509"; a="369453395" X-IronPort-AV: E=Sophos;i="5.95,209,1661842800"; d="scan'208";a="369453395" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Oct 2022 03:36:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10509"; a="582377248" X-IronPort-AV: E=Sophos;i="5.95,209,1661842800"; d="scan'208";a="582377248" Received: from silpixa00400883.ir.intel.com ([10.243.23.148]) by orsmga003.jf.intel.com with ESMTP; 24 Oct 2022 03:36:55 -0700 From: Brian Dooley To: Brian Dooley Cc: dev@dpdk.org, gmuthukrishn@marvell.com, gakhil@marvell.com Subject: [PATCH v1] examples/fips_validation: parse block error fix Date: Mon, 24 Oct 2022 10:36:51 +0000 Message-Id: <20221024103652.499554-1-brian.dooley@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 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 When parsing request files check for file type. This fix will remove dependence on command line parameter for using libjansson Fixes: 0f42f3d6034c ("examples/fips_validation: share callback with multiple keys") Cc: gmuthukrishn@marvell.com Signed-off-by: Brian Dooley Acked-by: Ciara Power Acked-by: Gowrishankar Muthukrishnan --- examples/fips_validation/fips_validation.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 363e17a6f3..5a2a5f86e6 100644 --- a/examples/fips_validation/fips_validation.c +++ b/examples/fips_validation/fips_validation.c @@ -638,10 +638,11 @@ parse_uint8_hex_str(const char *key, char *src, struct fips_val *val) /* * Offset not applicable in case of JSON test vectors. */ - RTE_SET_USED(key); -#else - src += strlen(key); + if (info.file_type == FIPS_TYPE_JSON) { + RTE_SET_USED(key); + } else #endif + src += strlen(key); len = strlen(src) / 2; @@ -669,18 +670,16 @@ parse_uint8_hex_str(const char *key, char *src, struct fips_val *val) return 0; } -#ifdef USE_JANSSON int parser_read_uint32_val(const char *key, char *src, struct fips_val *val) { - RTE_SET_USED(key); +#ifdef USE_JANSSON + if (info.file_type == FIPS_TYPE_JSON) { + RTE_SET_USED(key); - return parser_read_uint32(&val->len, src); -} -#else -int -parser_read_uint32_val(const char *key, char *src, struct fips_val *val) -{ + return parser_read_uint32(&val->len, src); + } +# endif char *data = src + strlen(key); size_t data_len = strlen(data); int ret; @@ -701,7 +700,6 @@ parser_read_uint32_val(const char *key, char *src, struct fips_val *val) return ret; } -#endif int parser_read_uint32_bit_val(const char *key, char *src, struct fips_val *val)