From patchwork Fri Aug 19 08:42:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Dooley X-Patchwork-Id: 115248 X-Patchwork-Delegate: thomas@monjalon.net 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 EC856A034C; Fri, 19 Aug 2022 10:43:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DC1CC40DDC; Fri, 19 Aug 2022 10:43:04 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 802A040E2D for ; Fri, 19 Aug 2022 10:43:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1660898583; x=1692434583; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=E0D5pFDXBmFdV6XaRzWM/P0Kzi9IPQYGo9Z3oL2U584=; b=eZRy2/t+S/OwcNAzSjjVHKojmHb3cKnJSWRa06FKcxE/oo2v5zWrGVLD Nj5IqUnuqZH9hNwgz5O+bDyx9e4SPEJw5Ef3HO/mtl+q0Lwnf0978h5qw 5FIz9Jc0WUK1OtgvH5Z0Ox/LaEe3bZZ9yLlSLsuoqDkrlOPp2DoNjr+MZ 8wat6gYgru/snuR4ph4CtMe8vhAX6z5O4QoS08/5uwzgzfYTO7XI4QeiP khgoDmAJpA4YN3PHkdB70o5MGPH29Y0mzqKS7IZPvPP3JmCmJJJLGUxMH aN5OENwKYghtSJ2zHfZujw4xbhi/9k20bsj/3lA8mW3jbMU791aejDC3i Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10443"; a="279931463" X-IronPort-AV: E=Sophos;i="5.93,247,1654585200"; d="scan'208";a="279931463" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2022 01:43:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.93,247,1654585200"; d="scan'208";a="584583517" Received: from silpixa00400883.ir.intel.com ([10.243.22.74]) by orsmga006.jf.intel.com with ESMTP; 19 Aug 2022 01:43:00 -0700 From: Brian Dooley To: Fan Zhang , Brian Dooley Cc: dev@dpdk.org, gmuthukrishn@marvell.com, gakhil@marvell.com, kai.ji@intel.com Subject: [PATCH v1] examples/fips_validation: add parsing for AES CTR Date: Fri, 19 Aug 2022 08:42:53 +0000 Message-Id: <20220819084253.5257-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 Added functionality to parse algorithm for AES CTR test Signed-off-by: Brian Dooley --- examples/fips_validation/fips_validation.c | 2 ++ examples/fips_validation/fips_validation.h | 2 ++ examples/fips_validation/fips_validation_aes.c | 5 +++++ examples/fips_validation/main.c | 9 +++++++-- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/examples/fips_validation/fips_validation.c b/examples/fips_validation/fips_validation.c index 12b9b03f56..541eead078 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, "AES-CTR")) + info.algo = FIPS_TEST_ALGO_AES_CTR; else if (strstr(algo_str, "SHA")) info.algo = FIPS_TEST_ALGO_SHA; else diff --git a/examples/fips_validation/fips_validation.h b/examples/fips_validation/fips_validation.h index 5c1abcbd91..96fdbec41a 100644 --- a/examples/fips_validation/fips_validation.h +++ b/examples/fips_validation/fips_validation.h @@ -35,6 +35,7 @@ enum fips_test_algorithms { FIPS_TEST_ALGO_AES = 0, FIPS_TEST_ALGO_AES_CBC, + FIPS_TEST_ALGO_AES_CTR, FIPS_TEST_ALGO_AES_GCM, FIPS_TEST_ALGO_AES_CMAC, FIPS_TEST_ALGO_AES_CCM, @@ -105,6 +106,7 @@ enum fips_aesavs_test_types { AESAVS_TYPE_MMT, AESAVS_TYPE_MCT, AESAVS_TYPE_AFT, + AESAVS_TYPE_CTR, }; enum fips_tdes_test_types { diff --git a/examples/fips_validation/fips_validation_aes.c b/examples/fips_validation/fips_validation_aes.c index 4f61505bb3..0ef97aa03d 100644 --- a/examples/fips_validation/fips_validation_aes.c +++ b/examples/fips_validation/fips_validation_aes.c @@ -30,8 +30,10 @@ #define TESTTYPE_JSON_STR "testType" #define DIR_JSON_STR "direction" #define KEYLEN_JSON_STR "keyLen" +#define OVERFLOW_JSON_STR "overflow" #define KEY_JSON_STR "key" +#define PAYLOADLEN_JSON_STR "payloadLen" #define IV_JSON_STR "iv" #define PT_JSON_STR "pt" #define CT_JSON_STR "ct" @@ -52,6 +54,7 @@ struct { {AESAVS_TYPE_MMT, "MMT"}, {AESAVS_TYPE_MCT, "MCT"}, {AESAVS_TYPE_AFT, "AFT"}, + {AESAVS_TYPE_CTR, "CTR"}, }; struct aes_test_algo { @@ -60,6 +63,7 @@ struct aes_test_algo { } const algo_con[] = { {"CBC", RTE_CRYPTO_CIPHER_AES_CBC}, {"ECB", RTE_CRYPTO_CIPHER_AES_ECB}, + {"CTR", RTE_CRYPTO_CIPHER_AES_CTR}, }; static int @@ -291,6 +295,7 @@ parse_test_aes_json_init(void) case AESAVS_TYPE_MCT: info.parse_writeback = parse_test_aes_mct_json_writeback; break; + case AESAVS_TYPE_CTR: case AESAVS_TYPE_AFT: info.parse_writeback = parse_test_aes_json_writeback; break; diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 8bd5a66889..b7e8cf29b5 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -770,9 +770,11 @@ prepare_aes_xform(struct rte_crypto_sym_xform *xform) struct rte_crypto_cipher_xform *cipher_xform = &xform->cipher; xform->type = RTE_CRYPTO_SYM_XFORM_CIPHER; - if (info.interim_info.aes_data.cipher_algo == RTE_CRYPTO_CIPHER_AES_CBC) cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_CBC; + else if (info.interim_info.aes_data.cipher_algo == + RTE_CRYPTO_CIPHER_AES_CTR) + cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_CTR; else cipher_xform->algo = RTE_CRYPTO_CIPHER_AES_ECB; @@ -781,7 +783,8 @@ prepare_aes_xform(struct rte_crypto_sym_xform *xform) RTE_CRYPTO_CIPHER_OP_DECRYPT; cipher_xform->key.data = vec.cipher_auth.key.val; cipher_xform->key.length = vec.cipher_auth.key.len; - if (cipher_xform->algo == RTE_CRYPTO_CIPHER_AES_CBC) { + if (cipher_xform->algo == RTE_CRYPTO_CIPHER_AES_CBC || + RTE_CRYPTO_CIPHER_AES_CTR) { cipher_xform->iv.length = vec.iv.len; cipher_xform->iv.offset = IV_OFF; } else { @@ -1796,6 +1799,7 @@ init_test_ops(void) { switch (info.algo) { case FIPS_TEST_ALGO_AES_CBC: + case FIPS_TEST_ALGO_AES_CTR: case FIPS_TEST_ALGO_AES: test_ops.prepare_op = prepare_cipher_op; test_ops.prepare_xform = prepare_aes_xform; @@ -2007,6 +2011,7 @@ fips_test_one_test_group(void) ret = parse_test_xts_json_init(); break; case FIPS_TEST_ALGO_AES_CBC: + case FIPS_TEST_ALGO_AES_CTR: case FIPS_TEST_ALGO_AES: ret = parse_test_aes_json_init(); break;